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 2014/12/10 01:31:42 UTC
[02/14] incubator-usergrid git commit: Add enum to prevent mistakes
in naming
Add enum to prevent mistakes in naming
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/7e347422
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/7e347422
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/7e347422
Branch: refs/heads/USERGRID-252
Commit: 7e3474227a5f97faea141a9b6bdf2246327e2ac0
Parents: 4b90e97
Author: Shawn Feldman <sf...@apache.org>
Authored: Mon Dec 8 08:51:22 2014 -0700
Committer: Shawn Feldman <sf...@apache.org>
Committed: Mon Dec 8 08:51:22 2014 -0700
----------------------------------------------------------------------
.../apache/usergrid/persistence/index/EntityIndex.java | 9 ++++++++-
.../persistence/index/impl/EsEntityIndexBatchImpl.java | 2 +-
.../persistence/index/impl/EsEntityIndexImpl.java | 11 +++++++----
3 files changed, 16 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/7e347422/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/EntityIndex.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/EntityIndex.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/EntityIndex.java
index 6e7779f..f38a390 100644
--- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/EntityIndex.java
+++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/EntityIndex.java
@@ -51,7 +51,7 @@ public interface EntityIndex {
* @param aliasName name of alias
* @return list of index names
*/
- public String[] getIndexes(final String aliasName);
+ public String[] getIndexes(final AliasType aliasType);
/**
* Create the index batch.
@@ -95,6 +95,13 @@ public interface EntityIndex {
*/
public Health getIndexHealth();
+ /**
+ * type of alias
+ */
+ public enum AliasType {
+ Read, Write
+ }
+
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/7e347422/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexBatchImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexBatchImpl.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexBatchImpl.java
index 35c89ae..ecc71e9 100644
--- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexBatchImpl.java
+++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexBatchImpl.java
@@ -184,7 +184,7 @@ public class EsEntityIndexBatchImpl implements EntityIndexBatch {
log.debug( "De-indexing type {} with documentId '{}'" , entityType, indexId);
- final String[] indexes = entityIndex.getIndexes(alias.getReadAlias());
+ final String[] indexes = entityIndex.getIndexes(EntityIndex.AliasType.Read);
//get all indexes then flush everyone
Observable.from(indexes).subscribeOn(Schedulers.io()).forEach(new Action1<String>() {
@Override
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/7e347422/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 13d07d6..610fe6c 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
@@ -178,8 +178,7 @@ public class EsEntityIndexImpl implements EntityIndex {
Boolean isAck;
String indexName = indexIdentifier.getIndex(indexSuffix);
final AdminClient adminClient = esProvider.getClient().admin();
- final String aliasName = alias.getWriteAlias();
- String[] indexNames = getIndexes( aliasName);
+ String[] indexNames = getIndexes(alias.getWriteAlias());
for(String currentIndex : indexNames){
isAck = adminClient.indices().prepareAliases().removeAlias(currentIndex,alias.getWriteAlias()).execute().actionGet().isAcknowledged();
@@ -199,14 +198,18 @@ public class EsEntityIndexImpl implements EntityIndex {
}
@Override
- public String[] getIndexes(String aliasName) {
+ public String[] getIndexes(final AliasType aliasType) {
+ final String aliasName = aliasType == AliasType.Read ? alias.getReadAlias() : alias.getWriteAlias();
+ return getIndexes(aliasName);
+ }
+
+ private String[] getIndexes(final String aliasName){
final AdminClient adminClient = esProvider.getClient().admin();
//remove write alias, can only have one
ImmutableOpenMap<String,List<AliasMetaData>> aliasMap = adminClient.indices().getAliases(new GetAliasesRequest(aliasName)).actionGet().getAliases();
return aliasMap.keys().toArray(String.class);
}
-
/**
* Tests writing a document to a new index to ensure it's working correctly. See this post:
* http://s.apache.org/index-missing-exception