This is an automated email from the ASF dual-hosted git repository. bchapuis pushed a commit to branch 681-handle-the-out-of-memory-errors in repository https://gitbox.apache.org/repos/asf/incubator-baremaps.git
commit 1a4f7201307b84ffc9691c3f2d0ac3c3ef06907d Author: Bertil Chapuis <[email protected]> AuthorDate: Thu Jul 13 01:03:58 2023 +0200 Fix issues identified by sonar --- .../org/apache/baremaps/database/collection/DataMap.java | 4 ++-- .../database/collection/Long2LongOpenHashDataMap.java | 12 ++++++------ .../database/collection/Long2LongPackedOpenHashDataMap.java | 12 ++++++------ .../database/collection/Long2ObjectIndexedDataMap.java | 4 ++-- .../database/collection/Long2ObjectJaggedDataMap.java | 2 +- .../database/collection/Long2ObjectMemoryAlignedDataMap.java | 8 ++++---- .../database/collection/Long2ObjectMonotonicDataMap.java | 2 +- .../database/collection/Long2ObjectOpenHashDataMap.java | 10 +++++----- .../openstreetmap/postgres/PostgresCoordinateMap.java | 2 +- .../openstreetmap/postgres/PostgresReferenceMap.java | 2 +- .../org/apache/baremaps/openstreetmap/store/MockDataMap.java | 2 +- 11 files changed, 30 insertions(+), 30 deletions(-) diff --git a/baremaps-core/src/main/java/org/apache/baremaps/database/collection/DataMap.java b/baremaps-core/src/main/java/org/apache/baremaps/database/collection/DataMap.java index e37e52f3..e1d5a457 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/database/collection/DataMap.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/database/collection/DataMap.java @@ -29,12 +29,12 @@ public interface DataMap<E> extends Map<Long, E> { * * @return the size of the map */ - long sizeAsLong(); + long size64(); /** {@inheritDoc} */ @Override default int size() { - return (int) Math.min(sizeAsLong(), Integer.MAX_VALUE); + return (int) Math.min(size64(), Integer.MAX_VALUE); } /** diff --git a/baremaps-core/src/main/java/org/apache/baremaps/database/collection/Long2LongOpenHashDataMap.java b/baremaps-core/src/main/java/org/apache/baremaps/database/collection/Long2LongOpenHashDataMap.java index cba05892..2b80a156 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/database/collection/Long2LongOpenHashDataMap.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/database/collection/Long2LongOpenHashDataMap.java @@ -161,7 +161,7 @@ public class Long2LongOpenHashDataMap extends AbstractLong2LongMap if (f <= .5) { ensureCapacity(m.size()); } else { - tryCapacity(sizeAsLong() + m.size()); + tryCapacity(size64() + m.size()); } super.putAll(m); } @@ -643,13 +643,13 @@ public class Long2LongOpenHashDataMap extends AbstractLong2LongMap } @Override - public long sizeAsLong() { + public long size64() { return size.get(); } @Override public int size() { - return (int) Math.min(sizeAsLong(), Integer.MAX_VALUE); + return (int) Math.min(size64(), Integer.MAX_VALUE); } /** @@ -1107,7 +1107,7 @@ public class Long2LongOpenHashDataMap extends AbstractLong2LongMap @Override public int size() { - return (int) Math.min(sizeAsLong(), Integer.MAX_VALUE); + return (int) Math.min(size64(), Integer.MAX_VALUE); } @Override @@ -1340,7 +1340,7 @@ public class Long2LongOpenHashDataMap extends AbstractLong2LongMap @Override public int size() { - return (int) Math.min(sizeAsLong(), Integer.MAX_VALUE); + return (int) Math.min(size64(), Integer.MAX_VALUE); } @Override @@ -1458,7 +1458,7 @@ public class Long2LongOpenHashDataMap extends AbstractLong2LongMap @Override public int size() { - return (int) Math.min(sizeAsLong(), Integer.MAX_VALUE); + return (int) Math.min(size64(), Integer.MAX_VALUE); } @Override diff --git a/baremaps-core/src/main/java/org/apache/baremaps/database/collection/Long2LongPackedOpenHashDataMap.java b/baremaps-core/src/main/java/org/apache/baremaps/database/collection/Long2LongPackedOpenHashDataMap.java index 419234ae..2b655863 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/database/collection/Long2LongPackedOpenHashDataMap.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/database/collection/Long2LongPackedOpenHashDataMap.java @@ -151,7 +151,7 @@ public class Long2LongPackedOpenHashDataMap extends AbstractLong2LongMap if (f <= .5) { ensureCapacity(m.size()); } else { - tryCapacity(size() + m.size()); + tryCapacity(size64() + m.size()); } super.putAll(m); } @@ -630,13 +630,13 @@ public class Long2LongPackedOpenHashDataMap extends AbstractLong2LongMap } @Override - public long sizeAsLong() { + public long size64() { return size.get(); } @Override public int size() { - return (int) Math.min(sizeAsLong(), Integer.MAX_VALUE); + return (int) Math.min(size64(), Integer.MAX_VALUE); } /** @@ -1102,7 +1102,7 @@ public class Long2LongPackedOpenHashDataMap extends AbstractLong2LongMap @Override public int size() { - return (int) Math.min(sizeAsLong(), Integer.MAX_VALUE); + return (int) Math.min(size64(), Integer.MAX_VALUE); } @Override @@ -1340,7 +1340,7 @@ public class Long2LongPackedOpenHashDataMap extends AbstractLong2LongMap @Override public int size() { - return (int) Math.min(sizeAsLong(), Integer.MAX_VALUE); + return (int) Math.min(size64(), Integer.MAX_VALUE); } @Override @@ -1459,7 +1459,7 @@ public class Long2LongPackedOpenHashDataMap extends AbstractLong2LongMap @Override public int size() { - return (int) Math.min(sizeAsLong(), Integer.MAX_VALUE); + return (int) Math.min(size64(), Integer.MAX_VALUE); } @Override diff --git a/baremaps-core/src/main/java/org/apache/baremaps/database/collection/Long2ObjectIndexedDataMap.java b/baremaps-core/src/main/java/org/apache/baremaps/database/collection/Long2ObjectIndexedDataMap.java index e5c426fd..4df17eff 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/database/collection/Long2ObjectIndexedDataMap.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/database/collection/Long2ObjectIndexedDataMap.java @@ -108,9 +108,9 @@ public class Long2ObjectIndexedDataMap<E> extends AbstractDataMap<E> { * {@inheritDoc} */ @Override - public long sizeAsLong() { + public long size64() { if (index instanceof DataMap<Long>dataMap) { - return dataMap.sizeAsLong(); + return dataMap.size64(); } else { return index.size(); } diff --git a/baremaps-core/src/main/java/org/apache/baremaps/database/collection/Long2ObjectJaggedDataMap.java b/baremaps-core/src/main/java/org/apache/baremaps/database/collection/Long2ObjectJaggedDataMap.java index d1d2c076..d0952cc9 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/database/collection/Long2ObjectJaggedDataMap.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/database/collection/Long2ObjectJaggedDataMap.java @@ -174,7 +174,7 @@ public class Long2ObjectJaggedDataMap<E> extends AbstractDataMap<E> { * {@inheritDoc} */ @Override - public long sizeAsLong() { + public long size64() { return size.get(); } diff --git a/baremaps-core/src/main/java/org/apache/baremaps/database/collection/Long2ObjectMemoryAlignedDataMap.java b/baremaps-core/src/main/java/org/apache/baremaps/database/collection/Long2ObjectMemoryAlignedDataMap.java index be22e632..e6c6d73f 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/database/collection/Long2ObjectMemoryAlignedDataMap.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/database/collection/Long2ObjectMemoryAlignedDataMap.java @@ -108,7 +108,7 @@ public class Long2ObjectMemoryAlignedDataMap<E> extends AbstractDataMap<E> { /** {@inheritDoc} */ @Override - public long sizeAsLong() { + public long size64() { return memory.size() / dataType.size(); } @@ -125,7 +125,7 @@ public class Long2ObjectMemoryAlignedDataMap<E> extends AbstractDataMap<E> { private long index = 0; - private long size = sizeAsLong(); + private long size = size64(); @Override public boolean hasNext() { @@ -149,7 +149,7 @@ public class Long2ObjectMemoryAlignedDataMap<E> extends AbstractDataMap<E> { private long index = 0; - private long size = sizeAsLong(); + private long size = size64(); @Override public boolean hasNext() { @@ -173,7 +173,7 @@ public class Long2ObjectMemoryAlignedDataMap<E> extends AbstractDataMap<E> { private long index = 0; - private long size = sizeAsLong(); + private long size = size64(); @Override public boolean hasNext() { diff --git a/baremaps-core/src/main/java/org/apache/baremaps/database/collection/Long2ObjectMonotonicDataMap.java b/baremaps-core/src/main/java/org/apache/baremaps/database/collection/Long2ObjectMonotonicDataMap.java index 055560e0..55320f48 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/database/collection/Long2ObjectMonotonicDataMap.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/database/collection/Long2ObjectMonotonicDataMap.java @@ -149,7 +149,7 @@ public class Long2ObjectMonotonicDataMap<E> extends AbstractDataMap<E> { /** {@inheritDoc} */ @Override - public long sizeAsLong() { + public long size64() { return keys.size64(); } diff --git a/baremaps-core/src/main/java/org/apache/baremaps/database/collection/Long2ObjectOpenHashDataMap.java b/baremaps-core/src/main/java/org/apache/baremaps/database/collection/Long2ObjectOpenHashDataMap.java index a4fc0cd4..9330f18e 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/database/collection/Long2ObjectOpenHashDataMap.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/database/collection/Long2ObjectOpenHashDataMap.java @@ -166,7 +166,7 @@ public class Long2ObjectOpenHashDataMap<V> extends AbstractLong2ObjectMap<V> if (f <= .5) { ensureCapacity(m.size()); // The resulting map will be sized for m.size() elements } else { - tryCapacity(size() + m.size()); // The resulting map will be tentatively sized for size() + + tryCapacity(size64() + m.size()); // The resulting map will be tentatively sized for size() + } // m.size() // elements @@ -582,18 +582,18 @@ public class Long2ObjectOpenHashDataMap<V> extends AbstractLong2ObjectMap<V> } @Override - public long sizeAsLong() { + public long size64() { return size.get(); } @Override public int size() { - return (int) Math.min(sizeAsLong(), Integer.MAX_VALUE); + return (int) Math.min(size64(), Integer.MAX_VALUE); } @Override public boolean isEmpty() { - return sizeAsLong() == 0; + return size64() == 0; } /** @@ -652,7 +652,7 @@ public class Long2ObjectOpenHashDataMap<V> extends AbstractLong2ObjectMap<V> @Deprecated @Override public Long getKey() { - return Long.valueOf(key.get(index)); + return key.get(index); } @Override diff --git a/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/postgres/PostgresCoordinateMap.java b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/postgres/PostgresCoordinateMap.java index 92920b74..c4ab3432 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/postgres/PostgresCoordinateMap.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/postgres/PostgresCoordinateMap.java @@ -179,7 +179,7 @@ public class PostgresCoordinateMap extends AbstractDataMap<Coordinate> { } @Override - public long sizeAsLong() { + public long size64() { try (Connection connection = dataSource.getConnection(); PreparedStatement statement = connection.prepareStatement(SELECT_SIZE)) { try (ResultSet result = statement.executeQuery()) { diff --git a/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/postgres/PostgresReferenceMap.java b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/postgres/PostgresReferenceMap.java index a5827730..1338eab1 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/postgres/PostgresReferenceMap.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/postgres/PostgresReferenceMap.java @@ -80,7 +80,7 @@ public class PostgresReferenceMap extends AbstractDataMap<List<Long>> { } @Override - public long sizeAsLong() { + public long size64() { try (Connection connection = dataSource.getConnection(); PreparedStatement statement = connection.prepareStatement(SELECT_SIZE)) { try (ResultSet result = statement.executeQuery()) { diff --git a/baremaps-core/src/test/java/org/apache/baremaps/openstreetmap/store/MockDataMap.java b/baremaps-core/src/test/java/org/apache/baremaps/openstreetmap/store/MockDataMap.java index 28ed0399..482e64b2 100644 --- a/baremaps-core/src/test/java/org/apache/baremaps/openstreetmap/store/MockDataMap.java +++ b/baremaps-core/src/test/java/org/apache/baremaps/openstreetmap/store/MockDataMap.java @@ -43,7 +43,7 @@ public class MockDataMap<T> extends AbstractDataMap<T> { } @Override - public long sizeAsLong() { + public long size64() { return values.size(); }
