usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mru...@apache.org
Subject [6/6] usergrid git commit: Revert "Reduce number of old ES indexes that are being deleted at a time."
Date Tue, 05 Apr 2016 20:49:18 GMT
Revert "Reduce number of old ES indexes that are being deleted at a time."

This reverts commit dcd8c39f396bffa79395ef504c9640eb492dde8f.


Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/ab028e96
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/ab028e96
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/ab028e96

Branch: refs/heads/release-2.1.1
Commit: ab028e96a7f44ccf35a4474a21143c46a25556a5
Parents: 90217b5
Author: Michael Russo <mrusso@apigee.com>
Authored: Tue Apr 5 13:47:39 2016 -0700
Committer: Michael Russo <mrusso@apigee.com>
Committed: Tue Apr 5 13:47:39 2016 -0700

----------------------------------------------------------------------
 .../java/org/apache/usergrid/persistence/index/IndexFig.java   | 6 ------
 .../usergrid/persistence/index/impl/EsEntityIndexImpl.java     | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/usergrid/blob/ab028e96/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/IndexFig.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/IndexFig.java
b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/IndexFig.java
index 447169e..e81219a 100644
--- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/IndexFig.java
+++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/IndexFig.java
@@ -62,8 +62,6 @@ public interface IndexFig extends GuicyFig {
 
     String ELASTICSEARCH_VERSION_QUERY_LIMIT = "elasticsearch.version_query_limit";
 
-    String ELASTICSEARCH_OLD_VERSION_QUERY_LIMIT = "elasticsearch.old_version_query_limit";
-
 
     /**
      * Comma-separated list of Elasticsearch hosts.
@@ -207,8 +205,4 @@ public interface IndexFig extends GuicyFig {
     @Default("1000")
     @Key( ELASTICSEARCH_VERSION_QUERY_LIMIT )
     int getVersionQueryLimit();
-
-    @Default("10")
-    @Key( ELASTICSEARCH_OLD_VERSION_QUERY_LIMIT )
-    int getOldVersionQueryLimit();
 }

http://git-wip-us.apache.org/repos/asf/usergrid/blob/ab028e96/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 f754cc2..f5da29a 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
@@ -545,7 +545,7 @@ public class EsEntityIndexImpl implements EntityIndex,VersionedData {
         final long markedTimestamp = markedVersion.timestamp();
 
         // never let the limit be less than 2 as there are potential indefinite paging issues
-        final int searchLimit = Math.max(2, indexFig.getOldVersionQueryLimit());
+        final int searchLimit = Math.max(2, indexFig.getVersionQueryLimit());
 
         // this query will find the document for the entity itself
         final QueryBuilder entityQuery = QueryBuilders


Mime
View raw message