[1/2] usergrid git commit: Fix issue where read repair was causing empty messages to be queued.

2015-11-04 Thread mdunker 
Repository: usergrid
Updated Branches:
  refs/heads/2.1-release 70b7e2750 -> 8da60e2aa


Fix issue where read repair was causing empty messages to be queued.


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

Branch: refs/heads/2.1-release
Commit: 913544719ddc84c1eb6cbbdfe463a7712ad73051
Parents: dfc70f4
Author: Michael Russo 
Authored: Wed Nov 4 14:02:53 2015 -0800
Committer: Michael Russo 
Committed: Wed Nov 4 14:02:53 2015 -0800

--
 .../corepersistence/asyncevents/AmazonAsyncEventService.java | 8 +---
 .../pipeline/read/traverse/AbstractReadGraphFilter.java  | 2 +-
 .../persistence/index/impl/IndexOperationMessage.java| 4 ++--
 3 files changed, 8 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/usergrid/blob/91354471/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/AmazonAsyncEventService.java
--
diff --git 
a/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/AmazonAsyncEventService.java
 
b/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/AmazonAsyncEventService.java
index 6b9abbc..16e119c 100644
--- 
a/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/AmazonAsyncEventService.java
+++ 
b/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/AmazonAsyncEventService.java
@@ -490,6 +490,11 @@ public class AmazonAsyncEventService implements 
AsyncEventService {
  */
 public void queueIndexOperationMessage( final IndexOperationMessage 
indexOperationMessage ) {
 
+// don't try to produce something with nothing
+if(indexOperationMessage.isEmpty()){
+return;
+}
+
 final String jsonValue = ObjectJsonSerializer.INSTANCE.toString( 
indexOperationMessage );
 
 final UUID newMessageId = UUIDGenerator.newTimeUUID();
@@ -760,10 +765,7 @@ public class AmazonAsyncEventService implements 
AsyncEventService {
 .map(result -> result.getQueueMessage().get())
 .collect(Collectors.toList());
 
-//only Q it if it's empty
-if(!combined.isEmpty()) {
 queueIndexOperationMessage( combined );
-}
 
 return messagesToAck;
 }

http://git-wip-us.apache.org/repos/asf/usergrid/blob/91354471/stack/core/src/main/java/org/apache/usergrid/corepersistence/pipeline/read/traverse/AbstractReadGraphFilter.java
--
diff --git 
a/stack/core/src/main/java/org/apache/usergrid/corepersistence/pipeline/read/traverse/AbstractReadGraphFilter.java
 
b/stack/core/src/main/java/org/apache/usergrid/corepersistence/pipeline/read/traverse/AbstractReadGraphFilter.java
index 89230d7..78a3450 100644
--- 
a/stack/core/src/main/java/org/apache/usergrid/corepersistence/pipeline/read/traverse/AbstractReadGraphFilter.java
+++ 
b/stack/core/src/main/java/org/apache/usergrid/corepersistence/pipeline/read/traverse/AbstractReadGraphFilter.java
@@ -245,8 +245,8 @@ public abstract class AbstractReadGraphFilter extends 
AbstractPathFilter applyCollector() {
 
 return observable -> observable
-.filter((IndexOperationMessage msg) -> !msg.isEmpty())
 .collect(() -> new IndexOperationMessage(), (collector, single) -> 
collector.ingest(single))
+.filter(msg -> !msg.isEmpty())
 .doOnNext(indexOperation -> {
 asyncEventService.queueIndexOperationMessage(indexOperation);
 });

http://git-wip-us.apache.org/repos/asf/usergrid/blob/91354471/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/IndexOperationMessage.java
--
diff --git 
a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/IndexOperationMessage.java
 
b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/IndexOperationMessage.java
index bcee308..7d19ce3 100644
--- 
a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/IndexOperationMessage.java
+++ 
b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/IndexOperationMessage.java
@@ -115,7 +115,7 @@ public class IndexOperationMessage implements Serializable {
 }
 
 public void ingest(IndexOperationMessage singleMessage) {
-

[2/2] usergrid git commit: Merge commit 'refs/pull/427/head' of apache.github.com:apache/usergrid into 2.1-release

2015-11-04 Thread mdunker 
Merge commit 'refs/pull/427/head' of apache.github.com:apache/usergrid into 
2.1-release


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

Branch: refs/heads/2.1-release
Commit: 8da60e2aa745a1f897bebbe4773438e6339637df
Parents: 70b7e27 9135447
Author: Mike Dunker 
Authored: Wed Nov 4 14:12:39 2015 -0800
Committer: Mike Dunker 
Committed: Wed Nov 4 14:12:39 2015 -0800

--
 .../corepersistence/asyncevents/AmazonAsyncEventService.java | 8 +---
 .../pipeline/read/traverse/AbstractReadGraphFilter.java  | 2 +-
 .../persistence/index/impl/IndexOperationMessage.java| 4 ++--
 3 files changed, 8 insertions(+), 6 deletions(-)
--

Git Push Summary

2015-11-04 Thread mrusso 
Repository: usergrid
Updated Branches:
  refs/heads/USERGRID-1091 [created] 913544719

usergrid git commit: remove exclusion

2015-11-04 Thread mrusso 
Repository: usergrid
Updated Branches:
  refs/heads/2.1-release dfc70f45c -> 70b7e2750


remove exclusion


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

Branch: refs/heads/2.1-release
Commit: 70b7e27504690895d53053b9e247edf4614beedb
Parents: dfc70f4
Author: Shawn Feldman 
Authored: Wed Nov 4 12:45:12 2015 -0700
Committer: Shawn Feldman 
Committed: Wed Nov 4 12:45:12 2015 -0700

--
 stack/services/pom.xml | 6 --
 1 file changed, 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/usergrid/blob/70b7e275/stack/services/pom.xml
--
diff --git a/stack/services/pom.xml b/stack/services/pom.xml
index d1ec212..0be2bcf 100644
--- a/stack/services/pom.xml
+++ b/stack/services/pom.xml
@@ -438,12 +438,6 @@
   com.github.fernandospr
   java-wns
   1.3
-  
-  
-  jackson-jaxrs
-  org.codehaus.jackson
-  
-

usergrid git commit: revert pom

2015-11-04 Thread sfeldman 
Repository: usergrid
Updated Branches:
  refs/heads/2.1-release 8da60e2aa -> 5fd1d5df5


revert pom


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

Branch: refs/heads/2.1-release
Commit: 5fd1d5df5597e196031937f63d406d790e1f113d
Parents: 8da60e2
Author: Shawn Feldman 
Authored: Wed Nov 4 17:02:49 2015 -0700
Committer: Shawn Feldman 
Committed: Wed Nov 4 17:02:49 2015 -0700

--
 stack/services/pom.xml | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/usergrid/blob/5fd1d5df/stack/services/pom.xml
--
diff --git a/stack/services/pom.xml b/stack/services/pom.xml
index 0be2bcf..2daa8f6 100644
--- a/stack/services/pom.xml
+++ b/stack/services/pom.xml
@@ -438,7 +438,12 @@
   com.github.fernandospr
   java-wns
   1.3
+  
+  
+  jackson-jaxrs
+  org.codehaus.jackson
+  
+  
   
-

[2/3] usergrid git commit: Committing smoke test to step through the new unique index cleanup

2015-11-04 Thread grey 
Committing smoke test to step through the new 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/ac7e30a8
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/ac7e30a8
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/ac7e30a8

Branch: refs/heads/USERGRID-1076
Commit: ac7e30a871ebb3701bc3d62f3b5923f9e0e3e332
Parents: 5dabe6e
Author: George Reyes 
Authored: Tue Nov 3 15:56:44 2015 -0800
Committer: George Reyes 
Committed: Tue Nov 3 15:56:44 2015 -0800

--
 .../usergrid/tools/UniqueIndexCleanupTest.java  | 88 
 1 file changed, 88 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/usergrid/blob/ac7e30a8/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
new file mode 100644
index 000..8cb6a88
--- /dev/null
+++ 
b/stack/tools/src/test/java/org/apache/usergrid/tools/UniqueIndexCleanupTest.java
@@ -0,0 +1,88 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.usergrid.tools;
+
+
+import java.io.File;
+import java.io.FileFilter;
+
+import org.junit.ClassRule;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.apache.commons.lang.RandomStringUtils;
+
+import org.apache.usergrid.ServiceITSetup;
+import org.apache.usergrid.ServiceITSetupImpl;
+import org.apache.usergrid.ServiceITSuite;
+
+import static org.junit.Assert.assertTrue;
+
+
+/**
+ * Created by ApigeeCorporation on 11/2/15.
+ */
+public class UniqueIndexCleanupTest {
+static final Logger logger = LoggerFactory.getLogger( 
ExportAppTest.class );
+
+int NUM_COLLECTIONS = 10;
+int NUM_ENTITIES = 50;
+int NUM_CONNECTIONS = 3;
+
+@ClassRule
+public static ServiceITSetup setup = new ServiceITSetupImpl( 
ServiceITSuite.cassandraResource );
+
+@org.junit.Test
+public void testBasicOperation() throws Exception {
+
+String rand = RandomStringUtils.randomAlphanumeric( 10 );
+
+// create app with some data
+
+String orgName = "org_" + rand;
+String appName = "app_" + rand;
+//
+//ExportDataCreator creator = new ExportDataCreator();
+//creator.startTool( new String[] {
+//"-organization", orgName,
+//"-application", appName,
+//"-host", "localhost:9160" //+ 
ServiceITSuite.cassandraResource.getRpcPort()
+//}, false);
+
+long start = System.currentTimeMillis();
+
+
+UniqueIndexCleanup uniqueIndexCleanup = new UniqueIndexCleanup();
+uniqueIndexCleanup.startTool( new String[]{
+"-app", "942712f0-7ce2-11e5-b81a-17ac5477fa5c",
+"-col", "users",
+"-host", "localhost:9160"
+}, false );
+
+System.out.println("completed");
+}
+
+private static int getFileCount(File exportDir, final String ext ) {
+return exportDir.listFiles( new FileFilter() {
+@Override
+public boolean accept(File pathname) {
+return pathname.getAbsolutePath().endsWith("." + ext);
+}
+} ).length;
+}
+}
+

[3/3] usergrid git commit: Created initial version that actually iterates through entity unique column and finds uuid's to corresponding entities.

2015-11-04 Thread grey 
Created initial version that actually iterates through entity unique column and 
finds uuid's to corresponding entities.


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

Branch: refs/heads/USERGRID-1076
Commit: bd1acf578faa7747380dcb1f3d5b2dd564d74008
Parents: ac7e30a
Author: George Reyes 
Authored: Wed Nov 4 15:41:46 2015 -0800
Committer: George Reyes 
Committed: Wed Nov 4 15:41:46 2015 -0800

--
 .../usergrid/tools/UniqueIndexCleanup.java  | 249 +--
 1 file changed, 122 insertions(+), 127 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/usergrid/blob/bd1acf57/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 f86da7b..e03e286 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
@@ -30,10 +30,12 @@ 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;
@@ -43,30 +45,51 @@ 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.AbstractComposite.ComponentEquality;
+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_INDEX_ENTRIES;
+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.INDEX_ENTRY_LIST_COUNT;
+import static 
org.apache.usergrid.persistence.cassandra.CassandraService.APPLICATIONS_CF;
+import static

usergrid git commit: Fixed test and removed options that weren't being used.

2015-11-04 Thread grey 
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 
Authored: Wed Nov 4 16:37:30 2015 -0800
Committer: George Reyes 
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

usergrid git commit: Cleaned up code that was left over from dev process.

2015-11-04 Thread grey 
Repository: usergrid
Updated Branches:
  refs/heads/USERGRID-1076 bd1acf578 -> 948269977


Cleaned up code that was left over from dev process.


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

Branch: refs/heads/USERGRID-1076
Commit: 94826997754300b034754860424e5987a9f2ab7e
Parents: bd1acf5
Author: George Reyes 
Authored: Wed Nov 4 16:01:57 2015 -0800
Committer: George Reyes 
Committed: Wed Nov 4 16:01:57 2015 -0800

--
 .../usergrid/tools/UniqueIndexCleanup.java  | 121 ---
 1 file changed, 23 insertions(+), 98 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/usergrid/blob/94826997/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 e03e286..ba7441b 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
@@ -216,115 +216,40 @@ public class UniqueIndexCleanup extends ToolBase {
 OrderedRows rows = 
result.get();
 result.get().getList().get( 0 ).getColumnSlice();
 
-while(rangeSlicesIterator.hasNext()){
+while(rangeSlicesIterator.hasNext()) {
 //UUID returned_uuid = 
UUID.nameUUIDFromBytes(((ByteBuffer)rangeSlicesIterator.next().getKey()).array());
 Row rangeSliceValue = rangeSlicesIterator.next();
 
-String returnedRowKey = new String( 
((ByteBuffer)rangeSliceValue.getKey()).array(), Charsets.UTF_8);
-if ( returnedRowKey.contains( "users" ) || 
returnedRowKey.contains( "username" ) || returnedRowKey.contains( "email" ) ) {
-ColumnSlice columnSlice = 
rangeSliceValue.getColumnSlice();
-if(columnSlice.getColumns().size()!=0) {
+String returnedRowKey =
+new String( ( ( ByteBuffer ) 
rangeSliceValue.getKey() ).array(), Charsets.UTF_8 ).trim();
+
+String[] parsedRowKey = returnedRowKey.split( ":" );
+if ( parsedRowKey[1].equals( "users" ) || 
returnedRowKey.contains( "username" ) || returnedRowKey
+.contains( "email" ) ) {
+ColumnSlice columnSlice = 
rangeSliceValue.getColumnSlice();
+if ( columnSlice.getColumns().size() != 0 ) {
 System.out.println( returnedRowKey );
-List> cols = 
columnSlice.getColumns();
+List> cols = 
columnSlice.getColumns();
+
+for ( HColumn col : cols ) 
{
+UUID entityId = ue.fromByteBuffer( 
col.getName() );
 
-for ( HColumn col : cols ) {
-UUID entityId = ue.fromByteBuffer( col.getName() );
 
-if(em.get( entityId )==null){
-logger.warn( "Entity with id {} did not exist 
in app {}", entityId, applicationId );
-System.out.println("Deleting column uuid: 
"+entityId.toString());
+if ( em.get( entityId ) == null && 
managementService.getAdminUserByUuid( entityId )==null ) {
+logger.warn( "Entity with id {} did not 
exist in app {}", entityId, applicationId );
+System.out.println( "Deleting column uuid: 
" + entityId.toString() );
 
 
-Object key = key( applicationId, 
collectionName,"username", entityId );
-
addDeleteToMutator(m,ENTITY_UNIQUE,key,entityId,timestamp);
-m.execute();
-continue;
+Object key = key( applicationId, 
collectionName, "username", entityId );
+addDeleteToMutator( m, ENTITY_UNIQUE, key, 
entityId, timestamp );
+m.execute();
+continue;
+}

usergrid git commit: RC1 for unique index cleanup tool

2015-11-04 Thread grey 
Repository: usergrid
Updated Branches:
  refs/heads/USERGRID-1076 948269977 -> 03a123dc8


RC1 for unique index cleanup tool


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

Branch: refs/heads/USERGRID-1076
Commit: 03a123dc830908f0f1eb46504d39d0050c8887c5
Parents: 9482699
Author: George Reyes 
Authored: Wed Nov 4 16:11:46 2015 -0800
Committer: George Reyes 
Committed: Wed Nov 4 16:11:46 2015 -0800

--
 .../usergrid/tools/UniqueIndexCleanup.java  | 24 ++--
 1 file changed, 17 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/usergrid/blob/03a123dc/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 ba7441b..52288e4 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
@@ -83,6 +83,7 @@ import static 
org.apache.usergrid.persistence.cassandra.ApplicationCF.ENTITY_UNI
 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;
@@ -204,7 +205,7 @@ public class UniqueIndexCleanup extends ToolBase {
 RangeSlicesQuery 
rangeSlicesQuery = HFactory
 .createRangeSlicesQuery( ko, be, be, be )
 .setColumnFamily( ENTITY_UNIQUE.getColumnFamily() )
-//not sure if I trust the lower two ssettings as it 
might iterfere with paging or set arbitrary limits and what I want to retrieve.
+//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 );
@@ -217,15 +218,14 @@ public class UniqueIndexCleanup extends ToolBase {
 result.get().getList().get( 0 ).getColumnSlice();
 
 while(rangeSlicesIterator.hasNext()) {
-//UUID returned_uuid = 
UUID.nameUUIDFromBytes(((ByteBuffer)rangeSlicesIterator.next().getKey()).array());
 Row rangeSliceValue = rangeSlicesIterator.next();
 
 String returnedRowKey =
 new String( ( ( ByteBuffer ) 
rangeSliceValue.getKey() ).array(), Charsets.UTF_8 ).trim();
 
 String[] parsedRowKey = returnedRowKey.split( ":" );
-if ( parsedRowKey[1].equals( "users" ) || 
returnedRowKey.contains( "username" ) || returnedRowKey
-.contains( "email" ) ) {
+if ( parsedRowKey[1].equals( "users" ) ) {
+
 ColumnSlice columnSlice = 
rangeSliceValue.getColumnSlice();
 if ( columnSlice.getColumns().size() != 0 ) {
 System.out.println( returnedRowKey );
@@ -234,13 +234,23 @@ public class UniqueIndexCleanup extends ToolBase {
 for ( HColumn col : cols ) 
{
 UUID entityId = ue.fromByteBuffer( 
col.getName() );
 
+if(parsedRowKey[0].equals( 
MANAGEMENT_APPLICATION_ID.toString() )){
+if(managementService.getAdminUserByUuid( 
entityId )==null ){
+logger.warn( "Entity with id {} did 
not exist in app {}", entityId, applicationId );
+System.out.println( "Deleting column 
uuid: " + entityId.toString() );
+
 
-if ( em.get( entityId ) == null && 
managementService.getAdminUserByUuid( entityId )==null ) {
+

usergrid git commit: remove exclusion

2015-11-04 Thread sfeldman 
Repository: usergrid
Updated Branches:
  refs/heads/jackson-exclusion [created] 70b7e2750


remove exclusion


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

Branch: refs/heads/jackson-exclusion
Commit: 70b7e27504690895d53053b9e247edf4614beedb
Parents: dfc70f4
Author: Shawn Feldman 
Authored: Wed Nov 4 12:45:12 2015 -0700
Committer: Shawn Feldman 
Committed: Wed Nov 4 12:45:12 2015 -0700

--
 stack/services/pom.xml | 6 --
 1 file changed, 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/usergrid/blob/70b7e275/stack/services/pom.xml
--
diff --git a/stack/services/pom.xml b/stack/services/pom.xml
index d1ec212..0be2bcf 100644
--- a/stack/services/pom.xml
+++ b/stack/services/pom.xml
@@ -438,12 +438,6 @@
   com.github.fernandospr
   java-wns
   1.3
-  
-  
-  jackson-jaxrs
-  org.codehaus.jackson
-  
-