add delete back
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/00d7abaf Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/00d7abaf Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/00d7abaf Branch: refs/heads/USERGRID-347 Commit: 00d7abafe7303511649ce96835906cdfabcf1f61 Parents: cf80b8b Author: Shawn Feldman <[email protected]> Authored: Fri Mar 20 15:02:02 2015 -0600 Committer: Shawn Feldman <[email protected]> Committed: Fri Mar 20 15:02:02 2015 -0600 ---------------------------------------------------------------------- .../persistence/index/AliasedEntityIndex.java | 7 ++++++- .../index/impl/EsApplicationEntityIndexImpl.java | 7 +------ .../persistence/index/impl/EsEntityIndexImpl.java | 16 +++++++++------- .../test/resources/usergrid-custom-test.properties | 2 ++ .../test/resources/usergrid-custom-test.properties | 2 ++ 5 files changed, 20 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/00d7abaf/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/AliasedEntityIndex.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/AliasedEntityIndex.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/AliasedEntityIndex.java index 118b7ad..62235b8 100644 --- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/AliasedEntityIndex.java +++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/AliasedEntityIndex.java @@ -33,12 +33,17 @@ public interface AliasedEntityIndex extends EntityIndex{ public String[] getIndexes(final AliasType aliasType); /** + * get all unique indexes + * @return + */ + public String[] getUniqueIndexes(); + + /** * Add alias to index, will remove old index from write alias * @param indexSuffix must be different than current index */ public void addAlias(final String indexSuffix); - /** * type of alias */ http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/00d7abaf/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsApplicationEntityIndexImpl.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsApplicationEntityIndexImpl.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsApplicationEntityIndexImpl.java index 3633c5b..de29e83 100644 --- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsApplicationEntityIndexImpl.java +++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsApplicationEntityIndexImpl.java @@ -270,12 +270,7 @@ public class EsApplicationEntityIndexImpl implements ApplicationEntityIndex{ deleteApplicationMeter.mark(); String idString = IndexingUtils.idString(applicationScope.getApplication()); final TermQueryBuilder tqb = QueryBuilders.termQuery(APPLICATION_ID_FIELDNAME, idString); - Set<String> indexSet = new HashSet<>(); - List<String> reads = Arrays.asList(entityIndex.getIndexes(AliasedEntityIndex.AliasType.Read)); - List<String> writes = Arrays.asList(entityIndex.getIndexes(AliasedEntityIndex.AliasType.Write)); - indexSet.addAll(reads); - indexSet.addAll(writes); - String[] indexes = indexSet.toArray(new String[0]); + final String[] indexes = entityIndex.getUniqueIndexes(); Timer.Context timer = deleteApplicationTimer.time(); //Added For Graphite Metrics return Observable.from(indexes) http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/00d7abaf/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 7029bba..4290f23 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 @@ -340,12 +340,7 @@ public class EsEntityIndexImpl implements AliasedEntityIndex { public boolean doOp() { try { - Set<String> indexSet = new HashSet<>(); - List<String> reads = Arrays.asList(getIndexes(AliasType.Read)); - List<String> writes = Arrays.asList(getIndexes(AliasType.Write)); - indexSet.addAll(reads); - indexSet.addAll(writes); - String[] indexes = indexSet.toArray(new String[0]); + final String[] indexes = getUniqueIndexes(); if ( indexes.length == 0 ) { logger.debug( "Not refreshing indexes. none found"); @@ -378,7 +373,14 @@ public class EsEntityIndexImpl implements AliasedEntityIndex { doInRetry(retryOperation); } - + public String[] getUniqueIndexes() { + Set<String> indexSet = new HashSet<>(); + List<String> reads = Arrays.asList(getIndexes(AliasType.Read)); + List<String> writes = Arrays.asList(getIndexes(AliasType.Write)); + indexSet.addAll(reads); + indexSet.addAll(writes); + return indexSet.toArray(new String[0]); + } /** http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/00d7abaf/stack/rest/src/test/resources/usergrid-custom-test.properties ---------------------------------------------------------------------- diff --git a/stack/rest/src/test/resources/usergrid-custom-test.properties b/stack/rest/src/test/resources/usergrid-custom-test.properties index d726f2b..34ce9c2 100644 --- a/stack/rest/src/test/resources/usergrid-custom-test.properties +++ b/stack/rest/src/test/resources/usergrid-custom-test.properties @@ -41,4 +41,6 @@ usergrid.sysadmin.login.name=superuser [email protected] usergrid.sysadmin.login.password=superpassword usergrid.sysadmin.login.allowed=true +elasticsearch.index_prefix=rest_tests + http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/00d7abaf/stack/services/src/test/resources/usergrid-custom-test.properties ---------------------------------------------------------------------- diff --git a/stack/services/src/test/resources/usergrid-custom-test.properties b/stack/services/src/test/resources/usergrid-custom-test.properties index 1ddfead..2663f2a 100644 --- a/stack/services/src/test/resources/usergrid-custom-test.properties +++ b/stack/services/src/test/resources/usergrid-custom-test.properties @@ -29,4 +29,6 @@ hystrix.threadpool.graph_async.coreSize=50 usergrid.scheduler.job.timeout=300000 usergrid.notifications.listener.run=false +elasticsearch.index_prefix=services_tests +
