usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From g...@apache.org
Subject [3/3] usergrid git commit: Added some additional comments and final look over of entity manager read repair.
Date Fri, 13 Nov 2015 17:36:03 GMT
Added some additional comments and final look over of entity manager read repair.


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

Branch: refs/heads/readRepairForIndexValues
Commit: 3a2a88c405ccf6a7a7fa1fd9d19e8a1067a2f3f0
Parents: 15e25de
Author: George Reyes <grey@apache.org>
Authored: Fri Nov 13 09:35:57 2015 -0800
Committer: George Reyes <grey@apache.org>
Committed: Fri Nov 13 09:35:57 2015 -0800

----------------------------------------------------------------------
 .../usergrid/persistence/cassandra/EntityManagerImpl.java      | 2 --
 .../java/org/apache/usergrid/tools/UserUniqueIndexCleanup.java | 6 ++----
 2 files changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/usergrid/blob/3a2a88c4/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/EntityManagerImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/EntityManagerImpl.java
b/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/EntityManagerImpl.java
index 80d9f44..38a80a0 100644
--- a/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/EntityManagerImpl.java
+++ b/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/EntityManagerImpl.java
@@ -587,8 +587,6 @@ public class EntityManagerImpl implements EntityManager {
 
                 if (entities[index] == null ) {
                     deleteUniqueColumn( ownerEntityId, key, indexCorruptionUuid );
-                    //iffy since cols won't have the same values of indexingColumns.
-                    //cols.remove( col );
                 }
                 else{
                     index++;

http://git-wip-us.apache.org/repos/asf/usergrid/blob/3a2a88c4/stack/tools/src/main/java/org/apache/usergrid/tools/UserUniqueIndexCleanup.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/apache/usergrid/tools/UserUniqueIndexCleanup.java
b/stack/tools/src/main/java/org/apache/usergrid/tools/UserUniqueIndexCleanup.java
index d95a6e7..aec4266 100644
--- a/stack/tools/src/main/java/org/apache/usergrid/tools/UserUniqueIndexCleanup.java
+++ b/stack/tools/src/main/java/org/apache/usergrid/tools/UserUniqueIndexCleanup.java
@@ -55,8 +55,6 @@ import static org.apache.usergrid.persistence.cassandra.Serializers.ue;
 import static org.apache.usergrid.utils.UUIDUtils.getTimestampInMicros;
 import static org.apache.usergrid.utils.UUIDUtils.newTimeUUID;
 
-//TODO: write docs so support can run it.
-//TODO: provide support with log4j file and instructions on how to use it.
 /**
  *
  *This utility audits all values in the ENTITY_UNIQUE column family. If it finds any duplicates
of users
@@ -64,11 +62,11 @@ import static org.apache.usergrid.utils.UUIDUtils.newTimeUUID;
  * If there exists more than one existing column then the one with the most recent timestamp
wins and the other is deleted.
  *
  *If you want the run the tool on their cluster the following is what you need to do
- * nohup java -Dlog4j.configuration=file:log4j.properties -jar usergrid-tools-1.0.2.jar UniqueIndexCleanup
-host <cassandra_host_here>  > log.txt
+ * nohup java -Dlog4j.configuration=file:log4j.properties -jar usergrid-tools-1.0.2.jar UserUniqueIndexCleanup
-host <cassandra_host_here>  > log.txt
  *
  * if there is a specific value you want to run the tool on then you need the following
 
- * nohup java -Dlog4j.configuration=file:log4j.properties -jar usergrid-tools-1.0.2.jar UniqueIndexCleanup
-host <cassandra_host_here>
+ * nohup java -Dlog4j.configuration=file:log4j.properties -jar usergrid-tools-1.0.2.jar UserUniqueIndexCleanup
-host <cassandra_host_here>
  *     -app <applicationUUID> -col <collection_name> -property <unique_property_key>
-value <unique_property_value> > log.txt
  *
  * @author grey


Mime
View raw message