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 19:54:30 UTC
incubator-usergrid git commit: add keyspace to cassandra
Repository: incubator-usergrid
Updated Branches:
refs/heads/two-dot-o-dev d57374b8f -> 42860a0c5
add keyspace to cassandra
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/42860a0c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/42860a0c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/42860a0c
Branch: refs/heads/two-dot-o-dev
Commit: 42860a0c5a08b2943b42683e44cab83a3d298330
Parents: d57374b
Author: Shawn Feldman <sf...@apache.org>
Authored: Fri Jun 12 11:52:30 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Fri Jun 12 11:52:30 2015 -0600
----------------------------------------------------------------------
.../index/IndexLocationStrategyFactoryImpl.java | 2 +-
.../index/ManagementIndexLocationStrategy.java | 7 +++++--
.../usergrid/corepersistence/index/IndexNamingTest.java | 6 +++---
3 files changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/42860a0c/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/IndexLocationStrategyFactoryImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/IndexLocationStrategyFactoryImpl.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/IndexLocationStrategyFactoryImpl.java
index 55888d12..2d71e41 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/IndexLocationStrategyFactoryImpl.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/IndexLocationStrategyFactoryImpl.java
@@ -49,7 +49,7 @@ public class IndexLocationStrategyFactoryImpl implements IndexLocationStrategyFa
}
public IndexLocationStrategy getIndexLocationStrategy(ApplicationScope applicationScope){
if(CpNamingUtils.getManagementApplicationId().equals(applicationScope.getApplication())){
- return new ManagementIndexLocationStrategy(clusterFig,indexFig,coreIndexFig);
+ return new ManagementIndexLocationStrategy(clusterFig,cassandraFig,indexFig,coreIndexFig);
}
return new ApplicationIndexLocationStrategy(clusterFig,cassandraFig,indexFig,applicationScope, applicationLocatorBucketStrategy);
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/42860a0c/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 545bc8a..d65bd9b 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
@@ -20,6 +20,7 @@
package org.apache.usergrid.corepersistence.index;
import org.apache.usergrid.corepersistence.util.CpNamingUtils;
+import org.apache.usergrid.persistence.core.astyanax.CassandraFig;
import org.apache.usergrid.persistence.core.guicyfig.ClusterFig;
import org.apache.usergrid.persistence.core.scope.ApplicationScope;
import org.apache.usergrid.persistence.core.scope.ApplicationScopeImpl;
@@ -35,18 +36,20 @@ import org.apache.usergrid.utils.StringUtils;
class ManagementIndexLocationStrategy implements IndexLocationStrategy {
private final String indexName;
private final ClusterFig clusterFig;
+ private final CassandraFig cassandraFig;
private final IndexFig indexFig;
private final CoreIndexFig coreIndexFig;
private final IndexAlias alias;
private final ApplicationScope applicationScope;
- public ManagementIndexLocationStrategy(final ClusterFig clusterFig, final IndexFig indexFig, final CoreIndexFig coreIndexFig){
+ public ManagementIndexLocationStrategy(final ClusterFig clusterFig, CassandraFig cassandraFig, final IndexFig indexFig, final CoreIndexFig coreIndexFig){
this.clusterFig = clusterFig;
+ this.cassandraFig = cassandraFig;
this.indexFig = indexFig;
this.coreIndexFig = coreIndexFig;
this.applicationScope = CpNamingUtils.getApplicationScope( CpNamingUtils.getManagementApplicationId().getUuid());
//remove usergrid
- this.indexName = clusterFig.getClusterName() + "_" + coreIndexFig.getManagementAppIndexName().toLowerCase(); ////use lowercase value
+ this.indexName = clusterFig.getClusterName() + "_" + cassandraFig .getApplicationKeyspace().toLowerCase() + "_" + coreIndexFig.getManagementAppIndexName().toLowerCase(); ////use lowercase value
this.alias = new ManagementIndexAlias(indexFig,indexName);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/42860a0c/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 7326a6f..bb9f877 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
@@ -83,7 +83,7 @@ public class IndexNamingTest {
clusterName = clusterFig.getClusterName();
this.applicationScope = CpNamingUtils.getApplicationScope(UUID.randomUUID());
this.managementApplicationScope = CpNamingUtils.getApplicationScope(CpNamingUtils.getManagementApplicationId().getUuid());
- this.managementLocationStrategy = new ManagementIndexLocationStrategy(clusterFig,indexFig, indexProcessorFig);
+ this.managementLocationStrategy = new ManagementIndexLocationStrategy(clusterFig,cassandraFig,indexFig, indexProcessorFig);
this.applicationLocationStrategy = new ApplicationIndexLocationStrategy(clusterFig, cassandraFig,indexFig,applicationScope,bucketLocator);
}
@@ -91,9 +91,9 @@ public class IndexNamingTest {
public void managementNaming(){
IndexLocationStrategy indexLocationStrategy = indexLocationStrategyFactory.getIndexLocationStrategy(managementApplicationScope);
assertEquals(indexLocationStrategy.getIndexRootName(),managementLocationStrategy.getIndexRootName());
- assertEquals(indexLocationStrategy.getIndexRootName(),clusterName + "_" + indexProcessorFig.getManagementAppIndexName());
+ assertEquals(indexLocationStrategy.getIndexRootName(),clusterName + "_" + keyspacename + "_" + indexProcessorFig.getManagementAppIndexName());
assertEquals(indexLocationStrategy.getIndexRootName(), indexLocationStrategy.getIndexBucketName());
- assertEquals(indexLocationStrategy.getIndexBucketName(),clusterName + "_"+indexProcessorFig.getManagementAppIndexName());
+ assertEquals(indexLocationStrategy.getIndexBucketName(),clusterName + "_" + keyspacename + "_" +indexProcessorFig.getManagementAppIndexName());
}
@Test