Repository: usergrid Updated Branches: refs/heads/USERGRID-1076 [created] a4a7884b8
Added entity unique to unique index cleanup. Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/a4a7884b Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/a4a7884b Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/a4a7884b Branch: refs/heads/USERGRID-1076 Commit: a4a7884b8c9f1b4f996dc3b51124c72eee3e9afa Parents: a420523 Author: George Reyes <g...@apache.org> Authored: Mon Nov 2 14:57:06 2015 -0800 Committer: George Reyes <g...@apache.org> Committed: Mon Nov 2 14:57:06 2015 -0800 ---------------------------------------------------------------------- .../main/java/org/apache/usergrid/tools/UniqueIndexCleanup.java | 5 +++++ 1 file changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/a4a7884b/stack/tools/src/main/java/org/apache/usergrid/tools/UniqueIndexCleanup.java ---------------------------------------------------------------------- diff --git a/stack/tools/src/main/java/org/apache/usergrid/tools/UniqueIndexCleanup.java b/stack/tools/src/main/java/org/apache/usergrid/tools/UniqueIndexCleanup.java index 994e850..bf8f0f2 100644 --- a/stack/tools/src/main/java/org/apache/usergrid/tools/UniqueIndexCleanup.java +++ b/stack/tools/src/main/java/org/apache/usergrid/tools/UniqueIndexCleanup.java @@ -61,6 +61,7 @@ import static org.apache.usergrid.persistence.Schema.DICTIONARY_COLLECTIONS; import static org.apache.usergrid.persistence.Schema.getDefaultSchema; import static org.apache.usergrid.persistence.cassandra.ApplicationCF.ENTITY_INDEX; import static org.apache.usergrid.persistence.cassandra.ApplicationCF.ENTITY_INDEX_ENTRIES; +import static org.apache.usergrid.persistence.cassandra.ApplicationCF.ENTITY_UNIQUE; import static org.apache.usergrid.persistence.cassandra.CassandraPersistenceUtils.addDeleteToMutator; import static org.apache.usergrid.persistence.cassandra.CassandraPersistenceUtils.key; import static org.apache.usergrid.persistence.cassandra.CassandraService.INDEX_ENTRY_LIST_COUNT; @@ -255,6 +256,8 @@ public class UniqueIndexCleanup extends ToolBase { "Could not find reference to value '{}' for property '{}' on entity " + "{} in collection {}. " + " Forcing reindex", new Object[] { propValue, prop, id, collectionName } ); + Object key = key( applicationId, collectionName, prop, id ); + addDeleteToMutator( m, ENTITY_UNIQUE, key, timestamp, id ); addDeleteToMutator( m, ENTITY_INDEX, rowKey, index.getName().duplicate(), timestamp ); @@ -263,6 +266,8 @@ public class UniqueIndexCleanup extends ToolBase { } if ( entries.size() > 1 ) { + Object key = key( applicationId, collectionName, prop, id ); + addDeleteToMutator( m, ENTITY_UNIQUE, key, timestamp, id ); logger.info( "Found more than 1 entity referencing unique index for property " + "'{}' "
