performance tweaks for rocksdb

rfecher · rfecher · commit 890ef05245c6 · 2019-05-22T15:08:16.000-04:00
diff --git a/core/store/src/main/java/org/locationtech/geowave/core/store/metadata/InternalAdapterStoreImpl.java b/core/store/src/main/java/org/locationtech/geowave/core/store/metadata/InternalAdapterStoreImpl.java
@@ -104,7 +104,7 @@ private String internalGetTypeName(final short adapterId, final boolean warnIfNo
         return null;
       }
       typeName = StringUtils.stringFromBinary(it.next().getValue());
-      cache.put(typeName, adapterId);
+      cache.putIfAbsent(typeName, adapterId);
       return typeName;
     }
   }
@@ -143,7 +143,7 @@ public Short internalGetAdapterId(final String typeName, final boolean warnIfNot
         return null;
       }
       final short adapterId = ByteArrayUtils.byteArrayToShort(it.next().getValue());
-      cache.put(typeName, adapterId);
+      cache.putIfAbsent(typeName, adapterId);
       return adapterId;
     }
   }
diff --git a/extensions/datastores/rocksdb/src/main/java/org/locationtech/geowave/datastore/rocksdb/util/RocksDBDataIndexTable.java b/extensions/datastores/rocksdb/src/main/java/org/locationtech/geowave/datastore/rocksdb/util/RocksDBDataIndexTable.java
@@ -53,7 +53,7 @@ public synchronized void add(final byte[] dataId, final GeoWaveValue value) {
     put(dataId, DataIndexUtils.serializeDataIndexValue(value, visibilityEnabled));
   }
 
-  public synchronized CloseableIterator<GeoWaveRow> dataIndexIterator(final byte[][] dataIds) {
+  public CloseableIterator<GeoWaveRow> dataIndexIterator(final byte[][] dataIds) {
     final RocksDB readDb = getReadDb();
     if (readDb == null) {
       return new CloseableIterator.Empty<>();
@@ -74,7 +74,7 @@ public synchronized CloseableIterator<GeoWaveRow> dataIndexIterator(final byte[]
     return new CloseableIterator.Empty<>();
   }
 
-  public synchronized CloseableIterator<GeoWaveRow> dataIndexIterator(
+  public CloseableIterator<GeoWaveRow> dataIndexIterator(
       final byte[] startDataId,
       final byte[] endDataId) {
     final RocksDB readDb = getReadDb();
diff --git a/extensions/datastores/rocksdb/src/main/java/org/locationtech/geowave/datastore/rocksdb/util/RocksDBIndexTable.java b/extensions/datastores/rocksdb/src/main/java/org/locationtech/geowave/datastore/rocksdb/util/RocksDBIndexTable.java
@@ -92,7 +92,7 @@ public synchronized void add(
   }
 
 
-  public synchronized CloseableIterator<GeoWaveRow> iterator() {
+  public CloseableIterator<GeoWaveRow> iterator() {
     final RocksDB readDb = getReadDb();
     if (readDb == null) {
       return new CloseableIterator.Empty<>();
@@ -109,7 +109,7 @@ public synchronized CloseableIterator<GeoWaveRow> iterator() {
         visibilityEnabled);
   }
 
-  public synchronized CloseableIterator<GeoWaveRow> iterator(final ByteArrayRange range) {
+  public CloseableIterator<GeoWaveRow> iterator(final ByteArrayRange range) {
     final RocksDB readDb = getReadDb();
     if (readDb == null) {
       return new CloseableIterator.Empty<>();

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ private String internalGetTypeName(final short adapterId, final boolean warnIfNo`
`104`	`104`	`return null;`
`105`	`105`	`}`
`106`	`106`	`typeName = StringUtils.stringFromBinary(it.next().getValue());`
`107`		`- cache.put(typeName, adapterId);`
	`107`	`+ cache.putIfAbsent(typeName, adapterId);`
`108`	`108`	`return typeName;`
`109`	`109`	`}`
`110`	`110`	`}`
`@@ -143,7 +143,7 @@ public Short internalGetAdapterId(final String typeName, final boolean warnIfNot`
`143`	`143`	`return null;`
`144`	`144`	`}`
`145`	`145`	`final short adapterId = ByteArrayUtils.byteArrayToShort(it.next().getValue());`
`146`		`- cache.put(typeName, adapterId);`
	`146`	`+ cache.putIfAbsent(typeName, adapterId);`
`147`	`147`	`return adapterId;`
`148`	`148`	`}`
`149`	`149`	`}`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ public synchronized void add(`
`92`	`92`	`}`
`93`	`93`
`94`	`94`
`95`		`- public synchronized CloseableIterator<GeoWaveRow> iterator() {`
	`95`	`+ public CloseableIterator<GeoWaveRow> iterator() {`
`96`	`96`	`final RocksDB readDb = getReadDb();`
`97`	`97`	`if (readDb == null) {`
`98`	`98`	`return new CloseableIterator.Empty<>();`
`@@ -109,7 +109,7 @@ public synchronized CloseableIterator<GeoWaveRow> iterator() {`
`109`	`109`	`visibilityEnabled);`
`110`	`110`	`}`
`111`	`111`
`112`		`- public synchronized CloseableIterator<GeoWaveRow> iterator(final ByteArrayRange range) {`
	`112`	`+ public CloseableIterator<GeoWaveRow> iterator(final ByteArrayRange range) {`
`113`	`113`	`final RocksDB readDb = getReadDb();`
`114`	`114`	`if (readDb == null) {`
`115`	`115`	`return new CloseableIterator.Empty<>();`