You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2014/03/27 18:21:14 UTC
[27/27] git commit: Merge branch 'two-dot-o' into entity-manager
Merge branch 'two-dot-o' into entity-manager
Conflicts:
stack/corepersistence/perftest1/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/c6628382
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/c6628382
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/c6628382
Branch: refs/heads/entity-manager
Commit: c662838273497cbf1e08b2c5e20c704eaee521f0
Parents: 8adbe29 9caf38b
Author: Dave Johnson <dm...@apigee.com>
Authored: Thu Mar 27 12:30:23 2014 -0400
Committer: Dave Johnson <dm...@apigee.com>
Committed: Thu Mar 27 12:30:23 2014 -0400
----------------------------------------------------------------------
.../usergrid/corepersistence/CpModule.java | 42 +-
stack/corepersistence/collection/pom.xml | 13 +
.../collection/guice/CollectionModule.java | 8 +-
.../impl/EntityCollectionManagerImpl.java | 19 +-
.../mvcc/stage/write/WriteUniqueVerify.java | 14 +-
.../collection/rx/CassandraThreadScheduler.java | 107 --
.../persistence/collection/rx/RxFig.java | 42 -
.../stage/write/WriteUniqueVerifyStageTest.java | 3 +-
.../mvcc/stage/write/WriteUniqueVerifyTest.java | 6 +-
.../rx/CassandraThreadSchedulerTest.java | 413 -----
.../persistence/collection/rx/ParallelTest.java | 6 +-
stack/corepersistence/graph/pom.xml | 1 +
.../usergrid/persistence/graph/EdgeManager.java | 163 --
.../persistence/graph/EdgeManagerFactory.java | 40 -
.../usergrid/persistence/graph/GraphFig.java | 39 +-
.../persistence/graph/GraphManager.java | 169 ++
.../persistence/graph/GraphManagerFactory.java | 40 +
.../graph/consistency/AsyncProcessorImpl.java | 48 +-
.../graph/consistency/TimeoutTask.java | 2 +-
.../persistence/graph/guice/EdgeWrite.java | 37 -
.../persistence/graph/guice/GraphModule.java | 14 +-
.../graph/hystrix/HystrixGraphObservable.java | 71 +
.../graph/impl/CollectionIndexObserver.java | 14 +-
.../graph/impl/EdgeDeleteListener.java | 68 +-
.../persistence/graph/impl/EdgeManagerImpl.java | 408 -----
.../graph/impl/EdgeWriteListener.java | 103 --
.../graph/impl/GraphManagerImpl.java | 384 +++++
.../graph/impl/NodeDeleteListener.java | 216 ++-
.../graph/impl/SimpleSearchByEdgeType.java | 38 +
.../graph/impl/stage/AbstractEdgeRepair.java | 47 +-
.../graph/impl/stage/EdgeDeleteRepairImpl.java | 4 +-
.../graph/impl/stage/EdgeMetaRepairImpl.java | 33 +-
.../graph/impl/stage/EdgeWriteRepair.java | 44 -
.../graph/impl/stage/EdgeWriteRepairImpl.java | 76 -
.../graph/serialization/EdgeSerialization.java | 12 +-
.../impl/EdgeMetadataSerializationImpl.java | 19 +-
.../impl/EdgeSerializationImpl.java | 256 +--
.../impl/parse/ColumnNameIterator.java | 38 +-
.../impl/parse/ObservableIterator.java | 26 +-
.../persistence/graph/EdgeManagerIT.java | 1468 -----------------
.../graph/EdgeManagerStressTest.java | 313 ----
.../persistence/graph/GraphManagerIT.java | 1497 ++++++++++++++++++
.../graph/GraphManagerStressTest.java | 317 ++++
.../graph/GraphManagerTimeoutIT.java | 230 +++
.../graph/consistency/AsyncProcessorTest.java | 25 +-
.../consistency/LocalTimeoutQueueTest.java | 2 +-
.../graph/guice/TestGraphModule.java | 4 +-
.../graph/impl/NodeDeleteListenerTest.java | 221 ++-
.../graph/impl/stage/EdgeDeleteRepairTest.java | 6 +-
.../graph/impl/stage/EdgeMetaRepairTest.java | 83 +-
.../graph/impl/stage/EdgeWriteRepairTest.java | 220 ---
.../EdgeSerializationChopTest.java | 35 +-
.../serialization/EdgeSerializationTest.java | 206 ++-
.../serialization/NodeSerializationTest.java | 13 +-
.../graph/serialization/TestCount.java | 125 ++
.../serialization/util/EdgeHasherTest.java | 14 +-
.../graph/test/util/EdgeTestUtils.java | 7 +-
.../graph/src/test/resources/log4j.properties | 36 +
stack/corepersistence/perftest1/pom.xml | 2 +-
stack/corepersistence/pom.xml | 3 +
60 files changed, 3880 insertions(+), 4030 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/c6628382/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpModule.java
----------------------------------------------------------------------
diff --cc stack/core/src/main/java/org/apache/usergrid/corepersistence/CpModule.java
index 7388a8a,0000000..3529ace
mode 100644,000000..100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpModule.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpModule.java
@@@ -1,124 -1,0 +1,122 @@@
+/*
+ * Copyright 2014 The Apache Software Foundation.
+ *
+ * Licensed 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.corepersistence;
+
+import com.google.inject.AbstractModule;
+import com.google.inject.assistedinject.FactoryModuleBuilder;
+import com.google.inject.multibindings.Multibinder;
+import org.apache.usergrid.persistence.collection.guice.CollectionModule;
+import org.apache.usergrid.persistence.collection.migration.Migration;
+import org.apache.usergrid.persistence.collection.mvcc.event.PostProcessObserver;
- import org.apache.usergrid.persistence.graph.EdgeManager;
- import org.apache.usergrid.persistence.graph.EdgeManagerFactory;
+import org.apache.usergrid.persistence.graph.GraphFig;
++import org.apache.usergrid.persistence.graph.GraphManager;
++import org.apache.usergrid.persistence.graph.GraphManagerFactory;
+import org.apache.usergrid.persistence.graph.consistency.AsyncProcessor;
+import org.apache.usergrid.persistence.graph.consistency.AsyncProcessorImpl;
+import org.apache.usergrid.persistence.graph.consistency.LocalTimeoutQueue;
+import org.apache.usergrid.persistence.graph.consistency.TimeService;
+import org.apache.usergrid.persistence.graph.consistency.TimeoutQueue;
+import org.apache.usergrid.persistence.graph.guice.EdgeDelete;
- import org.apache.usergrid.persistence.graph.guice.EdgeWrite;
+import org.apache.usergrid.persistence.graph.guice.NodeDelete;
+import org.apache.usergrid.persistence.graph.impl.CollectionIndexObserver;
- import org.apache.usergrid.persistence.graph.impl.EdgeManagerImpl;
++import org.apache.usergrid.persistence.graph.impl.GraphManagerImpl;
+import org.apache.usergrid.persistence.graph.impl.stage.EdgeDeleteRepair;
+import org.apache.usergrid.persistence.graph.impl.stage.EdgeDeleteRepairImpl;
+import org.apache.usergrid.persistence.graph.impl.stage.EdgeMetaRepair;
+import org.apache.usergrid.persistence.graph.impl.stage.EdgeMetaRepairImpl;
- import org.apache.usergrid.persistence.graph.impl.stage.EdgeWriteRepair;
- import org.apache.usergrid.persistence.graph.impl.stage.EdgeWriteRepairImpl;
+import org.apache.usergrid.persistence.graph.serialization.CassandraConfig;
+import org.apache.usergrid.persistence.graph.serialization.EdgeMetadataSerialization;
+import org.apache.usergrid.persistence.graph.serialization.EdgeSerialization;
+import org.apache.usergrid.persistence.graph.serialization.NodeSerialization;
+import org.apache.usergrid.persistence.graph.serialization.impl.CassandraConfigImpl;
+import org.apache.usergrid.persistence.graph.serialization.impl.EdgeMetadataSerializationImpl;
+import org.apache.usergrid.persistence.graph.serialization.impl.EdgeSerializationImpl;
+import org.apache.usergrid.persistence.graph.serialization.impl.NodeSerializationImpl;
+import org.apache.usergrid.persistence.index.EntityCollectionIndex;
+import org.apache.usergrid.persistence.index.EntityCollectionIndexFactory;
+import org.apache.usergrid.persistence.index.IndexFig;
+import org.apache.usergrid.persistence.index.impl.EsEntityCollectionIndex;
+import org.safehaus.guicyfig.GuicyFigModule;
+
++
++
+/**
+ * Guice Module that encapsulates Core Persistence.
+ */
+public class CpModule extends AbstractModule {
+
+ @Override
+ protected void configure() {
+
+ //------------
+ // COLLECTION
+ //
+
+ // configure collections and our core astyanax framework
+ install(new CollectionModule());
+
+ //------------
+ // INDEX
+ //
+
+ install (new GuicyFigModule( IndexFig.class ));
+
+ install( new FactoryModuleBuilder()
+ .implement( EntityCollectionIndex.class, EsEntityCollectionIndex.class )
+ .build( EntityCollectionIndexFactory.class ) );
+
+ //------------
+ // GRAPH
+ //
+
++ //install our configuration
+ install (new GuicyFigModule( GraphFig.class ));
-
++
+ bind( PostProcessObserver.class ).to( CollectionIndexObserver.class );
+
+ bind( EdgeMetadataSerialization.class).to( EdgeMetadataSerializationImpl.class);
+ bind( EdgeSerialization.class).to( EdgeSerializationImpl.class );
+ bind( NodeSerialization.class).to( NodeSerializationImpl.class );
+
+ bind( CassandraConfig.class).to( CassandraConfigImpl.class );
+
- // create a guice factory for getting our collection manager
- install( new FactoryModuleBuilder()
- .implement( EdgeManager.class, EdgeManagerImpl.class )
- .build( EdgeManagerFactory.class ) );
-
- Multibinder<Migration> migrationBinding =
- Multibinder.newSetBinder( binder(), Migration.class );
++ // create a guice factory for getting our collection manager
++ install( new FactoryModuleBuilder().implement( GraphManager.class, GraphManagerImpl.class )
++ .build( GraphManagerFactory.class ) );
+
++ //do multibindings for migrations
++ Multibinder<Migration> migrationBinding = Multibinder.newSetBinder( binder(), Migration.class );
+ migrationBinding.addBinding().to( EdgeMetadataSerializationImpl.class );
+ migrationBinding.addBinding().to( EdgeSerializationImpl.class );
+ migrationBinding.addBinding().to( NodeSerializationImpl.class );
+
- // local queue
- bind(TimeoutQueue.class).to( LocalTimeoutQueue.class );
++ // Graph event bus, will need to be refactored into it's own classes
++
++ // create a guice factor for getting our collection manager
+
++ //local queue. Need to
++ bind(TimeoutQueue.class).to( LocalTimeoutQueue.class );
+
- bind( AsyncProcessor.class).annotatedWith( EdgeDelete.class ).to( AsyncProcessorImpl.class );
- bind( AsyncProcessor.class).annotatedWith( EdgeWrite.class ).to( AsyncProcessorImpl.class );
- bind( AsyncProcessor.class).annotatedWith( NodeDelete.class ).to( AsyncProcessorImpl.class );
++ bind(AsyncProcessor.class).annotatedWith( EdgeDelete.class ).to( AsyncProcessorImpl.class );
++ bind(AsyncProcessor.class).annotatedWith( NodeDelete.class ).to( AsyncProcessorImpl.class );
+
- // Repair/cleanup classes
++ //Repair/cleanup classes
+ bind( EdgeMetaRepair.class).to( EdgeMetaRepairImpl.class );
- bind( EdgeWriteRepair.class).to( EdgeWriteRepairImpl.class );
+ bind( EdgeDeleteRepair.class).to( EdgeDeleteRepairImpl.class );
-
+ bind( TimeService.class).to( TimeServiceImpl.class );
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/c6628382/stack/corepersistence/perftest1/pom.xml
----------------------------------------------------------------------
diff --cc stack/corepersistence/perftest1/pom.xml
index fd58f9a,08f5513..c9b9f2e
--- a/stack/corepersistence/perftest1/pom.xml
+++ b/stack/corepersistence/perftest1/pom.xml
@@@ -68,4 -68,4 +68,4 @@@
</plugins>
</build>
--</project>
++</project>