bucket tests

stack/core/src/main/java/org/apache/usergrid/corepersistence/index/ApplicationIndexBucketLocator.java

@@ -36,7 +36,7 @@ public class ApplicationIndexBucketLocator{
     /**
      * Number of buckets to hash across.
      */
-    private final int[] numberOfBuckets ;
+    private final int numberOfBuckets ;
     /**
      * How to funnel keys for buckets
      */
@@ -50,12 +50,10 @@ public class ApplicationIndexBucketLocator{
      */
     private final int indexBucketSeed;
 
-    private final CoreIndexFig indexFig;
 
     @Inject
     public ApplicationIndexBucketLocator(CoreIndexFig indexFig){
-        this.indexFig = indexFig;
-        numberOfBuckets = new int[indexFig.getNumberOfIndexBuckets()];
+        numberOfBuckets = indexFig.getNumberOfIndexBuckets();
         mapKeyFunnel = (key, into) -> into.putString( key, StringHashUtils.UTF8 );
         indexBucketSeed = indexFig.getBucketSeed();
         bucketLocator = new ExpandingShardLocator<>(mapKeyFunnel, numberOfBuckets);

stack/core/src/test/java/org/apache/usergrid/corepersistence/index/IndexNamingTest.java

@@ -26,6 +26,7 @@
 import org.apache.usergrid.persistence.IndexBucketLocator;
 import org.apache.usergrid.persistence.core.astyanax.CassandraFig;
 import org.apache.usergrid.persistence.core.scope.ApplicationScope;
+import org.apache.usergrid.persistence.core.scope.ApplicationScopeImpl;
 import org.apache.usergrid.persistence.core.test.UseModules;
 import org.apache.usergrid.persistence.index.IndexFig;
 import org.apache.usergrid.persistence.index.IndexLocationStrategy;
@@ -34,9 +35,12 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import java.util.HashSet;
+import java.util.Set;
 import java.util.UUID;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertTrue;
 
 /**
@@ -80,6 +84,7 @@ public void managementNaming(){
         IndexLocationStrategy indexLocationStrategy = indexLocationStrategyFactory.getIndexLocationStrategy(managementApplicationScope);
         assertEquals(indexLocationStrategy.getIndexRootName(),managementLocationStrategy.getIndexRootName());
         assertEquals(indexLocationStrategy.getIndexRootName(),indexProcessorFig.getManagementAppIndexName());
+        assertEquals(indexLocationStrategy.getIndexRootName(), indexLocationStrategy.getIndexBucketName());
 
     }
     @Test
@@ -93,6 +98,25 @@ public void applicationNaming(){
         assertTrue(indexLocationStrategy.getAlias().getWriteAlias().contains(applicationScope.getApplication().getUuid().toString().toLowerCase()));
         assertTrue(indexLocationStrategy.getAlias().getWriteAlias().contains("write"));
         assertTrue(indexLocationStrategy.getAlias().getReadAlias().contains("read"));
+        Set<String> names = new HashSet<>();
+        for(int i=0;i<10;i++){
+            IndexLocationStrategy indexLocationStrategyBucket = new ApplicationIndexLocationStrategy(cassandraFig,indexFig,applicationScope, new ApplicationIndexBucketLocator(indexProcessorFig));
+            names.add(indexLocationStrategyBucket.getIndexBucketName());
+        }
+        //always hashes to same bucket
+        assertTrue(names.size()==1);
+         names = new HashSet<>();
+        for(int i=0;i<10;i++){
+            IndexLocationStrategy indexLocationStrategyBucket =
+                new ApplicationIndexLocationStrategy(
+                    cassandraFig,
+                    indexFig,
+                    new ApplicationScopeImpl(CpNamingUtils.generateApplicationId(UUID.randomUUID())),
+                    new ApplicationIndexBucketLocator(indexProcessorFig));
+            names.add(indexLocationStrategyBucket.getIndexBucketName());
+        }
+        //always hashes to diff't bucket
+        assertTrue(names.size()>1);
 
     }
 

stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java

@@ -163,6 +163,10 @@ public void initialize() {
         }
     }
 
+    /**
+     * if there are aliases then we must have an index...weak knowledge
+     * @return
+     */
     private boolean shouldInitialize() {
         String[] reads = getIndexes();
         return reads.length==0;
@@ -175,7 +179,7 @@ public void addIndex(final Optional<String> indexNameOverride,
                          final String writeConsistency
     ) {
         try {
-            //get index name with suffix attached
+            //get index name with bucket attached
             final String indexName = indexNameOverride.or( indexLocationStrategy.getIndexBucketName() ) ;
 
             //Create index
@@ -269,15 +273,6 @@ public String[] getIndexes(final AliasType aliasType) {
         return aliasCache.getIndexes(alias, aliasType);
     }
 
-    /**
-     * Get our index info from ES, but clear our cache first
-     * @param aliasType
-     * @return
-     */
-    public String[] getIndexesFromEs(final AliasType aliasType){
-        aliasCache.invalidate(alias);
-        return getIndexes(aliasType);
-    }
 
     /**
      * Tests writing a document to a new index to ensure it's working correctly. See this post: