fixed issue with types in dynamodb data index

rfecher · rfecher · commit e4a08ab2ba93 · 2019-02-20T08:57:33.000-05:00
diff --git a/extensions/datastores/dynamodb/src/main/java/org/locationtech/geowave/datastore/dynamodb/operations/DynamoDBOperations.java b/extensions/datastores/dynamodb/src/main/java/org/locationtech/geowave/datastore/dynamodb/operations/DynamoDBOperations.java
@@ -152,8 +152,10 @@ public boolean ensureAuthorizations(final String clientUser, final String... aut
   @Override
   public RowWriter createWriter(final Index index, final InternalDataAdapter<?> adapter) {
     final boolean isDataIndex = DataIndexUtils.isDataIndex(index.getName());
-    final String qName = getQualifiedTableName(index.getName());
-
+    String qName = getQualifiedTableName(index.getName());
+    if (isDataIndex) {
+      qName = adapter.getTypeName() + "_" + qName;
+    }
     final DynamoDBWriter writer = new DynamoDBWriter(client, qName, isDataIndex);
 
     createTable(qName, isDataIndex);
@@ -167,11 +169,20 @@ public RowWriter createDataIndexWriter(final InternalDataAdapter<?> adapter) {
 
   @Override
   public void delete(final DataIndexReaderParams readerParams) {
-    deleteRowsFromDataIndex(readerParams.getDataIds(), readerParams.getAdapterId());
+    final String typeName =
+        readerParams.getInternalAdapterStore().getTypeName(readerParams.getAdapterId());
+    if (typeName == null) {
+      return;
+    }
+    deleteRowsFromDataIndex(readerParams.getDataIds(), readerParams.getAdapterId(), typeName);
   }
 
-  public void deleteRowsFromDataIndex(final byte[][] dataIds, final short adapterId) {
-    final String tableName = getQualifiedTableName(DataIndexUtils.DATA_ID_INDEX.getName());
+  public void deleteRowsFromDataIndex(
+      final byte[][] dataIds,
+      final short adapterId,
+      final String typeName) {
+    final String tableName =
+        typeName + "_" + getQualifiedTableName(DataIndexUtils.DATA_ID_INDEX.getName());
     final Iterator<byte[]> dataIdIterator = Arrays.stream(dataIds).iterator();
     while (dataIdIterator.hasNext()) {
       final List<WriteRequest> deleteRequests = new ArrayList<>();
@@ -192,6 +203,11 @@ public void deleteRowsFromDataIndex(final byte[][] dataIds, final short adapterI
 
   @Override
   public RowReader<GeoWaveRow> createReader(final DataIndexReaderParams readerParams) {
+    final String typeName =
+        readerParams.getInternalAdapterStore().getTypeName(readerParams.getAdapterId());
+    if (typeName == null) {
+      return new RowReaderWrapper<>(new CloseableIterator.Empty<GeoWaveRow>());
+    }
     // TODO use authorizations if provided
     byte[][] dataIds;
     if (readerParams.getDataIds() != null) {
@@ -207,10 +223,13 @@ public RowReader<GeoWaveRow> createReader(final DataIndexReaderParams readerPara
     }
     return new RowReaderWrapper<>(
         new CloseableIterator.Wrapper<>(
-            getRowsFromDataIndex(dataIds, readerParams.getAdapterId())));
+            getRowsFromDataIndex(dataIds, readerParams.getAdapterId(), typeName)));
   }
 
-  public Iterator<GeoWaveRow> getRowsFromDataIndex(final byte[][] dataIds, final short adapterId) {
+  public Iterator<GeoWaveRow> getRowsFromDataIndex(
+      final byte[][] dataIds,
+      final short adapterId,
+      final String typeName) {
     final Map<ByteArray, GeoWaveRow> resultMap = new HashMap<>();
     final Iterator<byte[]> dataIdIterator = Arrays.stream(dataIds).iterator();
     while (dataIdIterator.hasNext()) {
@@ -227,7 +246,7 @@ public Iterator<GeoWaveRow> getRowsFromDataIndex(final byte[][] dataIds, final s
       BatchGetItemResult result =
           getResults(
               Collections.singletonMap(
-                  getQualifiedTableName(DataIndexUtils.DATA_ID_INDEX.getName()),
+                  typeName + "_" + getQualifiedTableName(DataIndexUtils.DATA_ID_INDEX.getName()),
                   new KeysAndAttributes().withKeys(dataIdsForRequest)),
               adapterId,
               resultMap);
diff --git a/test/src/test/java/org/locationtech/geowave/test/secondary/BasicSecondaryIndexIT.java b/test/src/test/java/org/locationtech/geowave/test/secondary/BasicSecondaryIndexIT.java
@@ -32,7 +32,7 @@ public class BasicSecondaryIndexIT extends AbstractSecondaryIndexIT {
           GeoWaveStoreType.HBASE,
           GeoWaveStoreType.BIGTABLE,
           GeoWaveStoreType.CASSANDRA,
-          // GeoWaveStoreType.DYNAMODB,
+          GeoWaveStoreType.DYNAMODB,
           GeoWaveStoreType.REDIS,
           GeoWaveStoreType.ROCKSDB},
       options = {"enableSecondaryIndexing=true"})
