Repository: usergrid Updated Branches: refs/heads/USERGRID-1076 6e8b2b621 -> 6d96a4c90
Fixed test and removed options that weren't being used. Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/6d96a4c9 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/6d96a4c9 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/6d96a4c9 Branch: refs/heads/USERGRID-1076 Commit: 6d96a4c90abae8768e9fbd41001a5cc66bbe8949 Parents: 6e8b2b6 Author: George Reyes <[email protected]> Authored: Wed Nov 4 16:37:30 2015 -0800 Committer: George Reyes <[email protected]> Committed: Wed Nov 4 16:37:30 2015 -0800 ---------------------------------------------------------------------- .../usergrid/tools/UniqueIndexCleanup.java | 70 +------------------- .../usergrid/tools/UniqueIndexCleanupTest.java | 2 - 2 files changed, 2 insertions(+), 70 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/6d96a4c9/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 9b1c202..39ac762 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 @@ -18,79 +18,36 @@ package org.apache.usergrid.tools; import java.nio.ByteBuffer; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; import java.util.UUID; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.cassandra.db.RowIteratorFactory; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.Option; import org.apache.commons.cli.OptionBuilder; import org.apache.commons.cli.Options; import org.apache.commons.io.Charsets; -import org.apache.usergrid.management.ApplicationInfo; -import org.apache.usergrid.persistence.Entity; -import org.apache.usergrid.persistence.EntityManager; -import org.apache.usergrid.persistence.EntityManagerFactory; -import org.apache.usergrid.persistence.Identifier; -import org.apache.usergrid.persistence.IndexBucketLocator; -import org.apache.usergrid.persistence.cassandra.CassandraService; import org.apache.usergrid.persistence.cassandra.EntityManagerImpl; -import org.apache.usergrid.persistence.cassandra.Serializers; -import org.apache.usergrid.persistence.cassandra.index.IndexBucketScanner; -import org.apache.usergrid.persistence.cassandra.index.IndexScanner; -import org.apache.usergrid.persistence.cassandra.index.UUIDStartToBytes; -import org.apache.usergrid.persistence.entities.Application; -import org.apache.usergrid.persistence.query.ir.result.ScanColumn; -import org.apache.usergrid.persistence.query.ir.result.SliceIterator; -import org.apache.usergrid.persistence.query.ir.result.UUIDIndexSliceParser; -import org.apache.usergrid.persistence.schema.CollectionInfo; - -import me.prettyprint.cassandra.service.KeyIterator; + import me.prettyprint.cassandra.service.RangeSlicesIterator; import me.prettyprint.hector.api.Keyspace; import me.prettyprint.hector.api.beans.ColumnSlice; -import me.prettyprint.hector.api.beans.DynamicComposite; import me.prettyprint.hector.api.beans.HColumn; -import me.prettyprint.hector.api.beans.OrderedRows; import me.prettyprint.hector.api.beans.Row; -import me.prettyprint.hector.api.beans.Rows; import me.prettyprint.hector.api.factory.HFactory; import me.prettyprint.hector.api.mutation.Mutator; -import me.prettyprint.hector.api.query.QueryResult; import me.prettyprint.hector.api.query.RangeSlicesQuery; -import me.prettyprint.hector.api.query.SliceQuery; import static me.prettyprint.hector.api.factory.HFactory.createMutator; -import static me.prettyprint.hector.api.factory.HFactory.createRangeSlicesQuery; -import static me.prettyprint.hector.api.factory.HFactory.createSliceQuery; -import static org.apache.usergrid.persistence.Schema.DICTIONARY_COLLECTIONS; -import static org.apache.usergrid.persistence.Schema.PROPERTY_UUID; -import static org.apache.usergrid.persistence.Schema.getDefaultSchema; -import static org.apache.usergrid.persistence.cassandra.ApplicationCF.ENTITY_ID_SETS; -import static org.apache.usergrid.persistence.cassandra.ApplicationCF.ENTITY_INDEX; -import static org.apache.usergrid.persistence.cassandra.ApplicationCF.ENTITY_PROPERTIES; 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.APPLICATIONS_CF; -import static org.apache.usergrid.persistence.cassandra.CassandraService.MANAGEMENT_APPLICATION; import static org.apache.usergrid.persistence.cassandra.CassandraService.MANAGEMENT_APPLICATION_ID; import static org.apache.usergrid.persistence.cassandra.Serializers.be; -import static org.apache.usergrid.persistence.cassandra.Serializers.dce; -import static org.apache.usergrid.persistence.cassandra.Serializers.le; -import static org.apache.usergrid.persistence.cassandra.Serializers.se; import static org.apache.usergrid.persistence.cassandra.Serializers.ue; -import static org.apache.usergrid.utils.ConversionUtils.bytebuffer; import static org.apache.usergrid.utils.UUIDUtils.getTimestampInMicros; import static org.apache.usergrid.utils.UUIDUtils.newTimeUUID; @@ -112,16 +69,6 @@ public class UniqueIndexCleanup extends ToolBase { private static final Logger logger = LoggerFactory.getLogger( UniqueIndexCleanup.class ); - /** - * - */ - private static final String APPLICATION_ARG = "app"; - - /** - * - */ - private static final String COLLECTION_ARG = "col"; - @Override @SuppressWarnings( "static-access" ) @@ -136,19 +83,6 @@ public class UniqueIndexCleanup extends ToolBase { options.addOption( hostOption ); - - - Option appOption = OptionBuilder.withArgName( APPLICATION_ARG ).hasArg().isRequired( false ) - .withDescription( "application id or app name" ).create( APPLICATION_ARG ); - - - options.addOption( appOption ); - - Option collectionOption = OptionBuilder.withArgName( COLLECTION_ARG ).hasArg().isRequired( false ) - .withDescription( "collection name" ).create( COLLECTION_ARG ); - - options.addOption( collectionOption ); - return options; } @@ -176,7 +110,7 @@ public class UniqueIndexCleanup extends ToolBase { //not sure if I trust the lower two settings as it might iterfere with paging or set // arbitrary limits and what I want to retrieve. //That needs to be verified. - .setKeys( null, null ).setRange( null, null, false, 100 ); + .setKeys( null, null ).setRange( null, null, false, PAGE_SIZE ); RangeSlicesIterator rangeSlicesIterator = new RangeSlicesIterator( rangeSlicesQuery, null, null ); http://git-wip-us.apache.org/repos/asf/usergrid/blob/6d96a4c9/stack/tools/src/test/java/org/apache/usergrid/tools/UniqueIndexCleanupTest.java ---------------------------------------------------------------------- diff --git a/stack/tools/src/test/java/org/apache/usergrid/tools/UniqueIndexCleanupTest.java b/stack/tools/src/test/java/org/apache/usergrid/tools/UniqueIndexCleanupTest.java index 8cb6a88..194793c 100644 --- a/stack/tools/src/test/java/org/apache/usergrid/tools/UniqueIndexCleanupTest.java +++ b/stack/tools/src/test/java/org/apache/usergrid/tools/UniqueIndexCleanupTest.java @@ -68,8 +68,6 @@ public class UniqueIndexCleanupTest { UniqueIndexCleanup uniqueIndexCleanup = new UniqueIndexCleanup(); uniqueIndexCleanup.startTool( new String[]{ - "-app", "942712f0-7ce2-11e5-b81a-17ac5477fa5c", - "-col", "users", "-host", "localhost:9160" }, false );
