Brute Force Merging for HBase and CLI partition strategy converter (#1617)

rfecher · web-flow · commit 30fd9de8cca8 · 2019-09-04T13:47:28.000-04:00
diff --git a/core/store/src/main/java/org/locationtech/geowave/core/store/index/IndexPluginOptions.java b/core/store/src/main/java/org/locationtech/geowave/core/store/index/IndexPluginOptions.java
@@ -88,7 +88,7 @@ public int getNumPartitions() {
     return basicIndexOptions.getNumPartitions();
   }
 
-  public void setName(String indexName) {
+  public void setName(final String indexName) {
     this.indexName = indexName;
   }
 
@@ -160,5 +160,17 @@ public static String getIndexNamespace(final String name) {
 
   public static enum PartitionStrategy {
     NONE, HASH, ROUND_ROBIN;
+
+    // converter that will be used later
+    public static PartitionStrategy fromString(final String code) {
+
+      for (final PartitionStrategy output : PartitionStrategy.values()) {
+        if (output.toString().equalsIgnoreCase(code)) {
+          return output;
+        }
+      }
+
+      return null;
+    }
   }
 }
diff --git a/core/store/src/main/java/org/locationtech/geowave/core/store/operations/remote/options/BasicIndexOptions.java b/core/store/src/main/java/org/locationtech/geowave/core/store/operations/remote/options/BasicIndexOptions.java
@@ -8,8 +8,11 @@
  */
 package org.locationtech.geowave.core.store.operations.remote.options;
 
+import java.util.Arrays;
 import org.locationtech.geowave.core.store.index.IndexPluginOptions.PartitionStrategy;
+import com.beust.jcommander.IStringConverter;
 import com.beust.jcommander.Parameter;
+import com.beust.jcommander.ParameterException;
 
 public class BasicIndexOptions {
 
@@ -20,7 +23,8 @@ public class BasicIndexOptions {
 
   @Parameter(
       names = {"-ps", "--partitionStrategy"},
-      description = "The partition strategy to use.  Default will be none.")
+      description = "The partition strategy to use.  Default will be none.",
+      converter = PartitionStrategyConverter.class)
   protected PartitionStrategy partitionStrategy = PartitionStrategy.NONE;
 
   public int getNumPartitions() {
@@ -38,4 +42,22 @@ public PartitionStrategy getPartitionStrategy() {
   public void setPartitionStrategy(final PartitionStrategy partitionStrategy) {
     this.partitionStrategy = partitionStrategy;
   }
+
+  public static class PartitionStrategyConverter implements IStringConverter<PartitionStrategy> {
+
+    @Override
+    public PartitionStrategy convert(final String value) {
+      final PartitionStrategy convertedValue = PartitionStrategy.fromString(value);
+
+      if (convertedValue == null) {
+        throw new ParameterException(
+            "Value "
+                + value
+                + " can not be converted to PartitionStrategy. "
+                + "Available values are: "
+                + Arrays.toString(PartitionStrategy.values()));
+      }
+      return convertedValue;
+    }
+  }
 }
diff --git a/extensions/datastores/hbase/src/main/java/org/locationtech/geowave/datastore/hbase/operations/HBaseOperations.java b/extensions/datastores/hbase/src/main/java/org/locationtech/geowave/datastore/hbase/operations/HBaseOperations.java
@@ -781,54 +781,6 @@ public boolean indexExists(final String indexName) throws IOException {
     }
   }
 
-  @Override
-  public boolean mergeData(
-      final Index index,
-      final PersistentAdapterStore adapterStore,
-      final InternalAdapterStore internalAdapterStore,
-      final AdapterIndexMappingStore adapterIndexMappingStore,
-      final Integer maxRangeDecomposition) {
-    if (options.isServerSideLibraryEnabled()) {
-      final TableName tableName = getTableName(index.getName());
-      try (Admin admin = conn.getAdmin()) {
-        admin.compact(tableName);
-        // wait for table compaction to finish
-        while (!admin.getCompactionState(tableName).equals(CompactionState.NONE)) {
-          Thread.sleep(100);
-        }
-      } catch (final Exception e) {
-        LOGGER.error("Cannot compact table '" + index.getName() + "'", e);
-        return false;
-      }
-    } else {
-      return DataStoreUtils.mergeData(
-          this,
-          maxRangeDecomposition,
-          index,
-          adapterStore,
-          internalAdapterStore,
-          adapterIndexMappingStore);
-    }
-    return true;
-  }
-
-  @Override
-  public boolean mergeStats(
-      final DataStatisticsStore store,
-      final InternalAdapterStore internalAdapterStore) {
-    if (options.isServerSideLibraryEnabled()) {
-      try (Admin admin = conn.getAdmin()) {
-        admin.compact(getTableName(AbstractGeoWavePersistence.METADATA_TABLE));
-      } catch (final IOException e) {
-        LOGGER.error("Cannot compact table '" + AbstractGeoWavePersistence.METADATA_TABLE + "'", e);
-        return false;
-      }
-    } else {
-
-    }
-    return true;
-  }
-
   @Override
   public boolean ensureAuthorizations(final String clientUser, final String... authorizations) {
     return true;

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ public int getNumPartitions() {`
`88`	`88`	`return basicIndexOptions.getNumPartitions();`
`89`	`89`	`}`
`90`	`90`
`91`		`- public void setName(String indexName) {`
	`91`	`+ public void setName(final String indexName) {`
`92`	`92`	`this.indexName = indexName;`
`93`	`93`	`}`
`94`	`94`
`@@ -160,5 +160,17 @@ public static String getIndexNamespace(final String name) {`
`160`	`160`
`161`	`161`	`public static enum PartitionStrategy {`
`162`	`162`	`NONE, HASH, ROUND_ROBIN;`
	`163`	`+`
	`164`	`+ // converter that will be used later`
	`165`	`+ public static PartitionStrategy fromString(final String code) {`
	`166`	`+`
	`167`	`+ for (final PartitionStrategy output : PartitionStrategy.values()) {`
	`168`	`+ if (output.toString().equalsIgnoreCase(code)) {`
	`169`	`+ return output;`
	`170`	`+ }`
	`171`	`+ }`
	`172`	`+`
	`173`	`+ return null;`
	`174`	`+ }`
`163`	`175`	`}`
`164`	`176`	`}`