You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2016/04/19 18:51:01 UTC

[04/50] usergrid git commit: Revert "Add flag to turn of de-indexing of old entity versions during updates."

Revert "Add flag to turn of de-indexing of old entity versions during updates."

This reverts commit d7119a48c1f98b5f63a4a2fb3582f9fd1b9f9ec0.


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

Branch: refs/heads/master
Commit: c9d532f5e4cabef0907b6846f620da7571532a5b
Parents: fbb5807
Author: Michael Russo <mr...@apigee.com>
Authored: Tue Apr 5 13:47:19 2016 -0700
Committer: Michael Russo <mr...@apigee.com>
Committed: Tue Apr 5 13:47:19 2016 -0700

----------------------------------------------------------------------
 .../org/apache/usergrid/corepersistence/CpEntityManager.java     | 4 +---
 .../org/apache/usergrid/corepersistence/EntityManagerFig.java    | 4 ----
 2 files changed, 1 insertion(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/usergrid/blob/c9d532f5/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
index 42107f3..b29e6d3 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
@@ -593,9 +593,7 @@ public class CpEntityManager implements EntityManager {
 
 
         // queue up an event to clean-up older versions than this one from the index
-        if(entityManagerFig.deIndexOldVersions()) {
-            indexService.queueDeIndexOldVersion(applicationScope, entityId);
-        }
+        indexService.queueDeIndexOldVersion( applicationScope, entityId );
     }
 
 

http://git-wip-us.apache.org/repos/asf/usergrid/blob/c9d532f5/stack/core/src/main/java/org/apache/usergrid/corepersistence/EntityManagerFig.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/EntityManagerFig.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/EntityManagerFig.java
index 1528e46..45bebc6 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/EntityManagerFig.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/EntityManagerFig.java
@@ -37,8 +37,4 @@ public interface EntityManagerFig extends GuicyFig {
     @Key( "usergrid.entityManager_sleep_ms" )
     @Default( "100" )
     int sleep();
-
-    @Key( "usergrid.entityManager.deindex_old_versions" )
-    @Default( "false" )
-    boolean deIndexOldVersions();
 }