You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sf...@apache.org on 2015/06/12 22:40:15 UTC
incubator-usergrid git commit: test management alias name
Repository: incubator-usergrid
Updated Branches:
refs/heads/two-dot-o-dev 66b97cbf0 -> a4b51fb5e
test management alias name
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/a4b51fb5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/a4b51fb5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/a4b51fb5
Branch: refs/heads/two-dot-o-dev
Commit: a4b51fb5e33bda103bf1f08421533893fffb7ba0
Parents: 66b97cb
Author: Shawn Feldman <sf...@apache.org>
Authored: Fri Jun 12 14:40:09 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Fri Jun 12 14:40:09 2015 -0600
----------------------------------------------------------------------
.../index/ApplicationIndexLocationStrategy.java | 2 +-
.../index/ManagementIndexLocationStrategy.java | 2 +-
.../corepersistence/index/IndexNamingTest.java | 35 ++++++++++++++++----
.../index/IndexLocationStrategy.java | 6 +++-
.../index/impl/EsEntityIndexImpl.java | 3 +-
.../index/impl/TestIndexIdentifier.java | 2 +-
6 files changed, 38 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a4b51fb5/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/ApplicationIndexLocationStrategy.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/ApplicationIndexLocationStrategy.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/ApplicationIndexLocationStrategy.java
index bc329e2..c75eac3 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/ApplicationIndexLocationStrategy.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/ApplicationIndexLocationStrategy.java
@@ -80,7 +80,7 @@ class ApplicationIndexLocationStrategy implements IndexLocationStrategy {
* @return
*/
@Override
- public String getIndexBucketName() {
+ public String getIndexInitialName() {
return indexBucketName;
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a4b51fb5/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/ManagementIndexLocationStrategy.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/ManagementIndexLocationStrategy.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/ManagementIndexLocationStrategy.java
index d65bd9b..c9cfe2c 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/ManagementIndexLocationStrategy.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/ManagementIndexLocationStrategy.java
@@ -62,7 +62,7 @@ class ManagementIndexLocationStrategy implements IndexLocationStrategy {
return indexName;
}
@Override
- public String getIndexBucketName() {
+ public String getIndexInitialName() {
return getIndexRootName();
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a4b51fb5/stack/core/src/test/java/org/apache/usergrid/corepersistence/index/IndexNamingTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/corepersistence/index/IndexNamingTest.java b/stack/core/src/test/java/org/apache/usergrid/corepersistence/index/IndexNamingTest.java
index bb9f877..55e209e 100644
--- a/stack/core/src/test/java/org/apache/usergrid/corepersistence/index/IndexNamingTest.java
+++ b/stack/core/src/test/java/org/apache/usergrid/corepersistence/index/IndexNamingTest.java
@@ -23,7 +23,6 @@ import com.google.inject.Inject;
import net.jcip.annotations.NotThreadSafe;
import org.apache.usergrid.corepersistence.TestIndexModule;
import org.apache.usergrid.corepersistence.util.CpNamingUtils;
-import org.apache.usergrid.persistence.IndexBucketLocator;
import org.apache.usergrid.persistence.core.astyanax.CassandraFig;
import org.apache.usergrid.persistence.core.guicyfig.ClusterFig;
import org.apache.usergrid.persistence.core.scope.ApplicationScope;
@@ -90,15 +89,34 @@ public class IndexNamingTest {
@Test
public void managementNaming(){
IndexLocationStrategy indexLocationStrategy = indexLocationStrategyFactory.getIndexLocationStrategy(managementApplicationScope);
+ //check that factory works
assertEquals(indexLocationStrategy.getIndexRootName(),managementLocationStrategy.getIndexRootName());
+ //check that root name is as expected
assertEquals(indexLocationStrategy.getIndexRootName(),clusterName + "_" + keyspacename + "_" + indexProcessorFig.getManagementAppIndexName());
- assertEquals(indexLocationStrategy.getIndexRootName(), indexLocationStrategy.getIndexBucketName());
- assertEquals(indexLocationStrategy.getIndexBucketName(),clusterName + "_" + keyspacename + "_" +indexProcessorFig.getManagementAppIndexName());
+ //check bucket name is as expected
+ assertEquals(indexLocationStrategy.getIndexRootName(), indexLocationStrategy.getIndexInitialName());
+ assertEquals(indexLocationStrategy.getIndexInitialName(),clusterName + "_" + keyspacename + "_" +indexProcessorFig.getManagementAppIndexName());
}
+
+ @Test
+ public void managementAliasName(){
+ IndexLocationStrategy indexLocationStrategy = indexLocationStrategyFactory.getIndexLocationStrategy(managementApplicationScope);
+
+ assertEquals(
+ indexLocationStrategy.getAlias().getReadAlias(),
+ clusterName + "_" + keyspacename+ "_" + indexProcessorFig.getManagementAppIndexName() + "_read_" + indexFig.getAliasPostfix()
+ );
+ assertEquals(
+ indexLocationStrategy.getAlias().getWriteAlias(),
+ clusterName + "_" + keyspacename + "_" + indexProcessorFig.getManagementAppIndexName() + "_write_" + indexFig.getAliasPostfix()
+ );
+ }
+
@Test
public void applicationRootNaming(){
IndexLocationStrategy indexLocationStrategy = indexLocationStrategyFactory.getIndexLocationStrategy(applicationScope);
+
assertEquals(
indexLocationStrategy.getIndexRootName(),
applicationLocationStrategy.getIndexRootName()
@@ -108,6 +126,12 @@ public class IndexNamingTest {
indexLocationStrategy.getIndexRootName(),
clusterName + "_" + keyspacename
);
+
+ }
+
+ @Test
+ public void applicationAliasName(){
+ IndexLocationStrategy indexLocationStrategy = indexLocationStrategyFactory.getIndexLocationStrategy(applicationScope);
assertEquals(
indexLocationStrategy.getAlias().getReadAlias(),
clusterName + "_" + keyspacename+"_"+ applicationScope.getApplication().getUuid().toString().toLowerCase() + "_read_" + indexFig.getAliasPostfix()
@@ -116,7 +140,6 @@ public class IndexNamingTest {
indexLocationStrategy.getAlias().getWriteAlias(),
clusterName + "_" + keyspacename+"_"+ applicationScope.getApplication().getUuid().toString().toLowerCase() + "_write_" + indexFig.getAliasPostfix()
);
-
}
@Test
@@ -128,7 +151,7 @@ public class IndexNamingTest {
clusterFig, cassandraFig, indexFig,applicationScope,
new ApplicationIndexBucketLocator(indexProcessorFig)
);
- names.add(indexLocationStrategyBucket.getIndexBucketName());
+ names.add(indexLocationStrategyBucket.getIndexInitialName());
}
String expectedName = clusterName+"_"+keyspacename+"_\\d+";
Pattern regex = Pattern.compile(expectedName);
@@ -143,7 +166,7 @@ public class IndexNamingTest {
indexFig,
new ApplicationScopeImpl(CpNamingUtils.generateApplicationId(UUID.randomUUID())),
new ApplicationIndexBucketLocator(indexProcessorFig));
- String name = indexLocationStrategyBucket.getIndexBucketName();
+ String name = indexLocationStrategyBucket.getIndexInitialName();
assertTrue("failed to match correct name",regex.matcher(name).matches());
names.add(name);
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a4b51fb5/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/IndexLocationStrategy.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/IndexLocationStrategy.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/IndexLocationStrategy.java
index 3cea7b1..97add7c 100644
--- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/IndexLocationStrategy.java
+++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/IndexLocationStrategy.java
@@ -37,7 +37,11 @@ public interface IndexLocationStrategy {
String getIndexRootName();
- String getIndexBucketName() ;
+ /**
+ * get the initial index name, to create the first instance of the index
+ * @return
+ */
+ String getIndexInitialName() ;
/**
* return unique string
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a4b51fb5/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java
index 09e864f..051264f 100644
--- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java
+++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java
@@ -21,7 +21,6 @@ package org.apache.usergrid.persistence.index.impl;
import com.codahale.metrics.Meter;
import com.codahale.metrics.Timer;
import com.google.common.base.*;
-import com.google.common.base.Optional;
import com.google.common.collect.ImmutableMap;
import com.google.common.io.Resources;
import com.google.inject.Inject;
@@ -159,7 +158,7 @@ public class EsEntityIndexImpl implements EntityIndex,VersionedData {
final int numberOfReplicas = indexLocationStrategy.getNumberOfReplicas();
if (shouldInitialize()) {
- addIndex( indexLocationStrategy.getIndexBucketName(), numberOfShards, numberOfReplicas, indexFig.getWriteConsistencyLevel() );
+ addIndex( indexLocationStrategy.getIndexInitialName(), numberOfShards, numberOfReplicas, indexFig.getWriteConsistencyLevel() );
}
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a4b51fb5/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/TestIndexIdentifier.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/TestIndexIdentifier.java b/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/TestIndexIdentifier.java
index c059287..29f9bad 100644
--- a/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/TestIndexIdentifier.java
+++ b/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/TestIndexIdentifier.java
@@ -52,7 +52,7 @@ public class TestIndexIdentifier implements IndexLocationStrategy {
return keyspaceName;
}
@Override
- public String getIndexBucketName() {
+ public String getIndexInitialName() {
return getIndexRootName();
}