Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build/dependencies.txt
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ org.eclipse.imagen:vectorbin:0.9.1:compile
org.eclipse.imagen:warp:0.9.1:compile
org.eclipse.imagen:zonal:0.9.1:compile
org.eclipse.xsd:org.eclipse.xsd:2.12.0:compile
org.ehcache:sizeof:0.4.3:compile
org.ehcache:sizeof:0.4.4:compile
org.ejml:ejml-core:0.41:compile
org.ejml:ejml-ddense:0.41:compile
org.ejml:ejml-fsparse:0.41:compile
Expand Down
1 change: 1 addition & 0 deletions docs/user/upgrade/6.0.0.rst
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ The following dependencies have been upgraded:
* scala 2.12 ``2.12.19`` -> ``2.12.20``
* scala 2.13 ``2.13.12`` -> ``2.13.16``
* sedona ``1.8.0`` -> ``1.8.1``
* sizeof ``0.4.3`` -> ``0.4.4``
* spark ``3.5.5`` -> ``3.5.7``
* zookeeper ``3.9.3`` -> ``3.9.5``

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,23 @@ class ScalaSimpleFeature private (sft: SimpleFeatureType, values: Array[AnyRef])
userData
}

override def calculateSizeOf(): Long = Sizable.sizeOf(this) + Sizable.deepSizeOf(id, values, userData)
override def calculateSizeOf(): Long = {
var size = Sizable.sizeOf(this) + Sizable.sizeOf(id) + Sizable.sizeOf(values)
values.foreach { value =>
if (value != null) {
size += Sizable.sizeOf(value)
}
}
if (userData != null) {
userData.forEach { (k, v) =>
size += Sizable.sizeOf(k)
if (v != null) {
size += Sizable.sizeOf(v)
}
}
}
size
}
}

object ScalaSimpleFeature {
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
<pureconfig.version>0.17.4</pureconfig.version>
<rhino.js.version>1.8.1</rhino.js.version>
<s2.geometry.version>20250620-rc1</s2.geometry.version>
<sizeof.version>0.4.3</sizeof.version>
<sizeof.version>0.4.4</sizeof.version>
<spring.security.version>5.8.16</spring.security.version> <!-- geoserver is still on 5.x -->
<typesafe.config.version>1.4.3</typesafe.config.version>
<zstd.version>1.5.7-7</zstd.version>
Expand Down
Loading