commit a2cc42eb9d5ca3899a61bf154bea1093491aa691
author Keith Turner <kturner@apache.org> Tue Oct 04 19:02:03 2016 -0400
committer Keith Turner <kturner@apache.org> Wed Oct 05 12:04:17 2016 -0400
tree e8633f4c45ca26d4ba7edec83917f20657138e7d
parent afef5e95457391db55f919705904eb87141e9462

Update for changes in apache/fluo-recipes#110

modules/data/src/main/java/webindex/data/FluoApp.java

diff --git a/modules/data/src/main/java/webindex/data/FluoApp.java b/modules/data/src/main/java/webindex/data/FluoApp.java
index fafa640..4f88384 100644
--- a/modules/data/src/main/java/webindex/data/FluoApp.java
+++ b/modules/data/src/main/java/webindex/data/FluoApp.java
@@ -17,6 +17,7 @@
 import org.apache.fluo.api.config.FluoConfiguration;
 import org.apache.fluo.api.config.ObserverSpecification;
 import org.apache.fluo.recipes.accumulo.export.AccumuloExporter;
+import org.apache.fluo.recipes.core.data.RowHasher;
 import org.apache.fluo.recipes.core.export.ExportQueue;
 import org.apache.fluo.recipes.kryo.KryoSimplerSerializer;
 import webindex.core.models.export.IndexUpdate;
@@ -45,5 +46,7 @@
         new ExportQueue.Options(EXPORT_QUEUE_ID, IndexExporter.class.getName(), String.class
             .getName(), IndexUpdate.class.getName(), numBuckets).setBucketsPerTablet(
             numBuckets / numTablets).setExporterConfiguration(aeConf));
+
+    RowHasher.configure(fluoConfig, PageObserver.getPageRowHasher().getPrefix(), numTablets);
   }
 }

modules/data/src/main/java/webindex/data/spark/IndexEnv.java

diff --git a/modules/data/src/main/java/webindex/data/spark/IndexEnv.java b/modules/data/src/main/java/webindex/data/spark/IndexEnv.java
index e8d50c6..42c3ed8 100644
--- a/modules/data/src/main/java/webindex/data/spark/IndexEnv.java
+++ b/modules/data/src/main/java/webindex/data/spark/IndexEnv.java
@@ -188,10 +188,7 @@
   public void setFluoTableSplits() {
     final String table = fluoConfig.getAccumuloTable();
     try {
-      TableOptimizations tableOptimizations =
-          TableOptimizations.getConfiguredOptimizations(getFluoConfig());
-      tableOptimizations.merge(PageObserver.getPageRowHasher().getTableOptimizations(numTablets));
-      TableOperations.optimizeTable(getFluoConfig(), tableOptimizations);
+      TableOperations.optimizeTable(getFluoConfig());
     } catch (Exception e) {
       throw new IllegalStateException("Failed to add splits to Fluo's Accumulo table " + table, e);
     }