You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by to...@apache.org on 2015/06/10 17:35:27 UTC
[11/13] incubator-usergrid git commit: abstract index alias from
query index into strategy
abstract index alias from query index into strategy
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/7d354d99
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/7d354d99
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/7d354d99
Branch: refs/heads/two-dot-o-dev
Commit: 7d354d9969e05bb8720b5ed91f74d4bc5e0f9dd5
Parents: eff7474
Author: Shawn Feldman <sf...@apache.org>
Authored: Tue Jun 9 18:55:21 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Tue Jun 9 18:55:21 2015 -0600
----------------------------------------------------------------------
.../index/ApplicationIndexLocationStrategy.java | 31 ++++++++++++++++++--
.../index/ManagementIndexLocationStrategy.java | 30 +++++++++++++++++--
.../usergrid/persistence/index/IndexAlias.java | 29 +++++-------------
.../index/impl/TestIndexIdentifier.java | 25 +++++++++++++++-
4 files changed, 87 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/7d354d99/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 d4867c0..04bdf9b 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
@@ -34,7 +34,7 @@ class ApplicationIndexLocationStrategy implements IndexLocationStrategy {
private final IndexFig indexFig;
private final ApplicationScope applicationScope;
private final String prefix;
- private final String aliasPrefix;
+ private final IndexAlias alias;
public ApplicationIndexLocationStrategy(final CassandraFig cassandraFig,
final IndexFig indexFig,
@@ -44,7 +44,7 @@ class ApplicationIndexLocationStrategy implements IndexLocationStrategy {
this.indexFig = indexFig;
this.applicationScope = applicationScope;
this.prefix = getPrefix();
- this.aliasPrefix = prefix + "_" + applicationScope.getApplication().getUuid();
+ this.alias = new ApplicationIndexAlias(indexFig, applicationScope, prefix);
}
private String getPrefix() {
@@ -68,7 +68,8 @@ class ApplicationIndexLocationStrategy implements IndexLocationStrategy {
@Override
public IndexAlias getAlias() {
//TODO: include appid
- return new IndexAlias(indexFig,aliasPrefix);
+
+ return alias;
}
/**
@@ -124,4 +125,28 @@ class ApplicationIndexLocationStrategy implements IndexLocationStrategy {
result = 31 * result + prefix.hashCode();
return result;
}
+
+ public class ApplicationIndexAlias implements IndexAlias {
+
+ private final String readAlias;
+ private final String writeAlias;
+
+ /**
+ *
+ * @param indexFig config
+ * @param aliasPrefix alias prefix, e.g. app_id etc..
+ */
+ public ApplicationIndexAlias(IndexFig indexFig, ApplicationScope applicationScope, String aliasPrefix) {
+ this.writeAlias = aliasPrefix + "_" + applicationScope.getApplication().getUuid() + "_write_" + indexFig.getAliasPostfix();
+ this.readAlias = aliasPrefix + "_" + applicationScope.getApplication().getUuid() + "_read_" + indexFig.getAliasPostfix();
+ }
+
+ public String getReadAlias() {
+ return readAlias;
+ }
+
+ public String getWriteAlias() {
+ return writeAlias;
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/7d354d99/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 6be05c9..59f1025 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
@@ -36,6 +36,7 @@ class ManagementIndexLocationStrategy implements IndexLocationStrategy {
private final String prefix;
private final IndexFig indexFig;
private final CoreIndexFig coreIndexFig;
+ private final IndexAlias alias;
public ManagementIndexLocationStrategy(final IndexFig indexFig, final CoreIndexFig coreIndexFig){
this.indexFig = indexFig;
@@ -43,12 +44,11 @@ class ManagementIndexLocationStrategy implements IndexLocationStrategy {
this.managementAppId = CpNamingUtils.getManagementApplicationId();
//remove usergrid
this.prefix = coreIndexFig.getManagementAppIndexName().toLowerCase(); ////use lowercase value
-
-
+ this.alias = new ManagementIndexAlias(indexFig,prefix);
}
@Override
public IndexAlias getAlias() {
- return new IndexAlias(indexFig,prefix);
+ return alias;
}
@Override
@@ -93,4 +93,28 @@ class ManagementIndexLocationStrategy implements IndexLocationStrategy {
result = 31 * result + prefix.hashCode();
return result;
}
+
+ public class ManagementIndexAlias implements IndexAlias{
+
+ private final String readAlias;
+ private final String writeAlias;
+
+ /**
+ *
+ * @param indexFig config
+ * @param aliasPrefix alias prefix, e.g. app_id etc..
+ */
+ public ManagementIndexAlias(IndexFig indexFig,String aliasPrefix) {
+ this.writeAlias = aliasPrefix + "_write_" + indexFig.getAliasPostfix();
+ this.readAlias = aliasPrefix + "_read_" + indexFig.getAliasPostfix();
+ }
+
+ public String getReadAlias() {
+ return readAlias;
+ }
+
+ public String getWriteAlias() {
+ return writeAlias;
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/7d354d99/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/IndexAlias.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/IndexAlias.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/IndexAlias.java
index f33783d..9952aa8 100644
--- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/IndexAlias.java
+++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/IndexAlias.java
@@ -23,25 +23,12 @@ import org.apache.usergrid.persistence.index.IndexFig;
/**
* Abstraction for Index alias names
*/
-public class IndexAlias{
- private final String readAlias;
- private final String writeAlias;
-
- /**
- *
- * @param indexFig config
- * @param aliasPrefix alias prefix, e.g. app_id etc..
- */
- public IndexAlias(IndexFig indexFig,String aliasPrefix) {
- this.writeAlias = aliasPrefix + "_write_" + indexFig.getAliasPostfix();
- this.readAlias = aliasPrefix + "_read_" + indexFig.getAliasPostfix();
- }
-
- public String getReadAlias() {
- return readAlias;
- }
-
- public String getWriteAlias() {
- return writeAlias;
- }
+public interface IndexAlias{
+
+
+
+ public String getReadAlias();
+
+ public String getWriteAlias();
}
+
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/7d354d99/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 eb2f7f8..babb3b1 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
@@ -63,7 +63,7 @@ public class TestIndexIdentifier implements IndexLocationStrategy {
*/
@Override
public IndexAlias getAlias() {
- return new IndexAlias(indexFig,prefix);
+ return new TestIndexAlias(indexFig,prefix);
}
/**
@@ -100,4 +100,27 @@ public class TestIndexIdentifier implements IndexLocationStrategy {
public int getNumberOfReplicas() {
return indexFig.getNumberOfReplicas();
}
+
+ private class TestIndexAlias implements IndexAlias {
+ private final String readAlias;
+ private final String writeAlias;
+
+ /**
+ *
+ * @param indexFig config
+ * @param aliasPrefix alias prefix, e.g. app_id etc..
+ */
+ public TestIndexAlias(IndexFig indexFig,String aliasPrefix) {
+ this.writeAlias = aliasPrefix + "_write_" + indexFig.getAliasPostfix();
+ this.readAlias = aliasPrefix + "_read_" + indexFig.getAliasPostfix();
+ }
+
+ public String getReadAlias() {
+ return readAlias;
+ }
+
+ public String getWriteAlias() {
+ return writeAlias;
+ }
+ }
}