usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject git commit: Oops.
Date Wed, 01 Oct 2014 14:56:08 GMT
Repository: incubator-usergrid
Updated Branches:
  refs/heads/two-dot-o-rebuildable-index 3df5d4d25 -> 352d69e02


Oops.


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

Branch: refs/heads/two-dot-o-rebuildable-index
Commit: 352d69e02ece003acd6dc5f2027cbd15354d3714
Parents: 3df5d4d
Author: Dave Johnson <dmjohnson@apigee.com>
Authored: Wed Oct 1 10:55:54 2014 -0400
Committer: Dave Johnson <dmjohnson@apigee.com>
Committed: Wed Oct 1 10:55:54 2014 -0400

----------------------------------------------------------------------
 .../apache/usergrid/corepersistence/CpEntityManagerFactory.java  | 1 +
 .../usergrid/corepersistence/HybridEntityManagerFactory.java     | 4 ++--
 .../org/apache/usergrid/persistence/EntityManagerFactory.java    | 2 +-
 .../usergrid/persistence/cassandra/EntityManagerFactoryImpl.java | 2 +-
 .../src/main/java/org/apache/usergrid/tools/IndexRebuild.java    | 3 ++-
 5 files changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/352d69e0/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java
b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java
index 168c1bf..00a808c 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java
@@ -617,4 +617,5 @@ public class CpEntityManagerFactory implements EntityManagerFactory, Application
     @Override
     public void rebuildCollectionIndex(UUID appId, String collection, ProgressObserver po
) {
     }
+
 }

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/352d69e0/stack/core/src/main/java/org/apache/usergrid/corepersistence/HybridEntityManagerFactory.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/HybridEntityManagerFactory.java
b/stack/core/src/main/java/org/apache/usergrid/corepersistence/HybridEntityManagerFactory.java
index 5897d6c..54a5dee 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/HybridEntityManagerFactory.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/HybridEntityManagerFactory.java
@@ -160,7 +160,7 @@ public class HybridEntityManagerFactory implements EntityManagerFactory,
Applica
     }
 
     @Override
-    public void rebuildCollectionIndex(UUID appId, String collection, Object object) {
-        factory.rebuildCollectionIndex(appId, collection, object);
+    public void rebuildCollectionIndex(UUID appId, String collection, ProgressObserver po)
{
+        factory.rebuildCollectionIndex(appId, collection, po);
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/352d69e0/stack/core/src/main/java/org/apache/usergrid/persistence/EntityManagerFactory.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/persistence/EntityManagerFactory.java
b/stack/core/src/main/java/org/apache/usergrid/persistence/EntityManagerFactory.java
index d962d2a..06c3114 100644
--- a/stack/core/src/main/java/org/apache/usergrid/persistence/EntityManagerFactory.java
+++ b/stack/core/src/main/java/org/apache/usergrid/persistence/EntityManagerFactory.java
@@ -128,7 +128,7 @@ public interface EntityManagerFactory {
     /** For testing purposes */
     public void flushEntityManagerCaches();
 
-    public void rebuildCollectionIndex(UUID appId, String collection, Object object);
+    public void rebuildCollectionIndex(UUID appId, String collection, ProgressObserver object);
 
     public interface ProgressObserver {
         public void onProgress( EntityRef source, EntityRef target, String edgeType );

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/352d69e0/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImpl.java
b/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImpl.java
index 955e707..399bccd 100644
--- a/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImpl.java
+++ b/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImpl.java
@@ -435,7 +435,7 @@ public class EntityManagerFactoryImpl implements EntityManagerFactory,
Applicati
     }
 
     @Override
-    public void rebuildCollectionIndex(UUID appId, String collection, Object object) {
+    public void rebuildCollectionIndex(UUID appId, String collection, ProgressObserver po)
{
         throw new UnsupportedOperationException("Not supported."); 
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/352d69e0/stack/tools/src/main/java/org/apache/usergrid/tools/IndexRebuild.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/apache/usergrid/tools/IndexRebuild.java b/stack/tools/src/main/java/org/apache/usergrid/tools/IndexRebuild.java
index 66a5cfb..795fa1d 100644
--- a/stack/tools/src/main/java/org/apache/usergrid/tools/IndexRebuild.java
+++ b/stack/tools/src/main/java/org/apache/usergrid/tools/IndexRebuild.java
@@ -74,7 +74,8 @@ public class IndexRebuild extends ToolBase {
         Option collOpt = OptionBuilder.withArgName( COLLECTION_ARG ).hasArg().isRequired(
false )
                 .withDescription( "Collection name" ).create( COLLECTION_ARG );
 
-        Option allOpt = OptionBuilder.withType( Boolean.class ).withArgName( ALL_ARG ).hasArg().isRequired(
false )
+        Option allOpt = OptionBuilder.withType( Boolean.class )
+                .withArgName( ALL_ARG ).hasArg().isRequired( false )
                 .withDescription( "True to reindex all application" ).create( ALL_ARG );
 
         Options options = new Options();


Mime
View raw message