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/20 19:21:08 UTC
[02/38] git commit: Merge branch 'two-dot-o' of
https://github.com/GERey/usergrid-1 into two-dot-o
Merge branch 'two-dot-o' of https://github.com/GERey/usergrid-1 into two-dot-o
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/6eacac3d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/6eacac3d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/6eacac3d
Branch: refs/pull/77/merge
Commit: 6eacac3daa836b75f9a7e6652c45d5bb41958f00
Parents: 304cd69 6671849
Author: GERey <gr...@apigee.com>
Authored: Wed Jan 29 14:16:43 2014 -0800
Committer: GERey <gr...@apigee.com>
Committed: Wed Jan 29 14:16:43 2014 -0800
----------------------------------------------------------------------
.gitignore | 3 +-
stack/corepersistence/.gitignore | 7 +
stack/corepersistence/README.md | 73 ++
stack/corepersistence/collection/pom.xml | 194 +++++
.../persistence/collection/CollectionScope.java | 26 +
.../collection/EntityCollectionManager.java | 35 +
.../EntityCollectionManagerFactory.java | 35 +
.../collection/EntityCollectionManagerSync.java | 33 +
.../collection/OrganizationScope.java | 16 +
.../astyanax/AstyanaxKeyspaceProvider.java | 68 ++
.../collection/astyanax/CassandraFig.java | 41 +
.../astyanax/CompositeFieldSerializer.java | 26 +
.../astyanax/IdRowCompositeSerializer.java | 51 ++
.../astyanax/MultiTennantColumnFamily.java | 28 +
.../MultiTennantColumnFamilyDefinition.java | 62 ++
.../collection/astyanax/ScopedRowKey.java | 92 +++
.../exception/CollectionRuntimeException.java | 31 +
.../collection/guice/CollectionModule.java | 49 ++
.../collection/guice/PropertyUtils.java | 98 +++
.../collection/hystrix/CollectionCommand.java | 46 ++
.../collection/hystrix/ReadCommand.java | 50 ++
.../collection/hystrix/WriteCommand.java | 49 ++
.../collection/impl/CollectionScopeImpl.java | 81 ++
.../impl/EntityCollectionManagerImpl.java | 158 ++++
.../impl/EntityCollectionManagerSyncImpl.java | 53 ++
.../collection/impl/OrganizationScopeImpl.java | 77 ++
.../collection/migration/Migration.java | 18 +
.../migration/MigrationException.java | 19 +
.../collection/migration/MigrationManager.java | 16 +
.../migration/MigrationManagerFig.java | 25 +
.../migration/MigrationManagerImpl.java | 194 +++++
.../mvcc/MvccEntitySerializationStrategy.java | 71 ++
.../mvcc/MvccLogEntrySerializationStrategy.java | 62 ++
.../mvcc/changelog/ChangeLogEntry.java | 101 +++
.../mvcc/changelog/ChangeLogGenerator.java | 48 ++
.../mvcc/changelog/ChangeLogGeneratorImpl.java | 107 +++
.../collection/mvcc/entity/MvccEntity.java | 35 +
.../collection/mvcc/entity/MvccLogEntry.java | 29 +
.../collection/mvcc/entity/Stage.java | 67 ++
.../collection/mvcc/entity/ValidationUtils.java | 134 +++
.../mvcc/entity/impl/MvccEntityImpl.java | 97 +++
.../mvcc/entity/impl/MvccLogEntryImpl.java | 99 +++
.../mvcc/event/PostProcessObserver.java | 24 +
.../mvcc/stage/CollectionIoEvent.java | 31 +
.../mvcc/stage/delete/DeleteCommit.java | 95 +++
.../mvcc/stage/delete/DeleteStart.java | 92 +++
.../collection/mvcc/stage/load/Load.java | 83 ++
.../mvcc/stage/write/WriteCommit.java | 92 +++
.../mvcc/stage/write/WriteOptimisticVerify.java | 32 +
.../collection/mvcc/stage/write/WriteStart.java | 86 ++
.../mvcc/stage/write/WriteUniqueVerify.java | 32 +
.../collection/rx/CassandraThreadScheduler.java | 93 +++
.../persistence/collection/rx/Concurrent.java | 69 ++
.../persistence/collection/rx/RxFig.java | 22 +
.../serialization/OptimisticUpdate.java | 23 +
.../serialization/SerializationFig.java | 18 +
.../collection/serialization/UniqueUpdate.java | 28 +
.../impl/CollectionScopedRowKeySerializer.java | 76 ++
.../MvccEntitySerializationStrategyImpl.java | 274 +++++++
.../MvccLogEntrySerializationStrategyImpl.java | 269 ++++++
.../serialization/impl/SerializationModule.java | 39 +
.../collection/service/UUIDService.java | 16 +
.../collection/service/impl/ServiceModule.java | 20 +
.../service/impl/UUIDServiceImpl.java | 19 +
.../collection/util/EntityUtils.java | 49 ++
.../collection/CollectionContextImplTest.java | 60 ++
.../EntityCollectionManagerFactoryTest.java | 62 ++
.../collection/EntityCollectionManagerIT.java | 213 +++++
.../EntityCollectionManagerSyncIT.java | 200 +++++
.../cassandra/AvailablePortFinder.java | 187 +++++
.../collection/cassandra/CassandraRule.java | 105 +++
.../collection/guice/MigrationManagerRule.java | 38 +
.../changelog/ChangeLogGeneratorImplTest.java | 222 +++++
.../mvcc/entity/impl/MvccEntityImplTest.java | 107 +++
.../mvcc/entity/impl/MvccLogEntryImplTest.java | 84 ++
.../collection/mvcc/entity/impl/StageTest.java | 84 ++
.../mvcc/stage/AbstractEntityStageTest.java | 61 ++
.../mvcc/stage/AbstractIdStageTest.java | 60 ++
.../mvcc/stage/AbstractMvccEntityStageTest.java | 72 ++
.../mvcc/stage/InvalidMvccEntityGenerator.java | 118 +++
.../mvcc/stage/TestEntityGenerator.java | 74 ++
.../mvcc/stage/delete/DeleteCommitTest.java | 122 +++
.../mvcc/stage/delete/DeleteStartTest.java | 97 +++
.../collection/mvcc/stage/load/LoadTest.java | 115 +++
.../mvcc/stage/write/WriteCommitTest.java | 117 +++
.../mvcc/stage/write/WriteStartTest.java | 84 ++
.../mvcc/stage/write/WriteUniqueVerifyTest.java | 72 ++
.../collection/rx/ConcurrentTest.java | 112 +++
.../serialization/impl/IdRowSerializerTest.java | 43 +
...MvccEntitySerializationStrategyImplTest.java | 482 +++++++++++
.../impl/MvccLESSTransientTest.java | 99 +++
...ccLogEntrySerializationStrategyImplTest.java | 254 ++++++
.../impl/ScopedRowKeySerializerTest.java | 46 ++
.../impl/SerializationComparison.java | 180 ++++
.../collection/util/InvalidEntityGenerator.java | 80 ++
.../collection/util/InvalidIdGenerator.java | 130 +++
.../resources/cassandra-defaults.properties | 12 +
.../src/test/resources/cassandra.properties | 5 +
.../src/test/resources/dynamic-test.properties | 12 +
.../src/test/resources/log4j.properties | 10 +
.../resources/serialization-defaults.properties | 4 +
stack/corepersistence/graph/pom.xml | 58 ++
.../apache/usergrid/persistence/graph/Edge.java | 55 ++
.../usergrid/persistence/graph/EdgeManager.java | 151 ++++
.../persistence/graph/EdgeManagerFactory.java | 40 +
.../persistence/graph/SearchByEdgeType.java | 64 ++
.../persistence/graph/SearchByIdType.java | 42 +
.../persistence/graph/SearchEdgeType.java | 53 ++
.../persistence/graph/SearchIdType.java | 38 +
.../DynamicCompositeFieldSerializer.java | 53 ++
.../IdColDynamicCompositeSerializer.java | 93 +++
.../persistence/graph/guice/GraphModule.java | 75 ++
.../graph/impl/CollectionIndexObserver.java | 78 ++
.../persistence/graph/impl/EdgeManagerImpl.java | 166 ++++
.../persistence/graph/impl/SimpleEdge.java | 76 ++
.../graph/impl/SimpleSearchByEdgeType.java | 87 ++
.../graph/impl/SimpleSearchByIdType.java | 62 ++
.../graph/impl/SimpleSearchEdgeType.java | 38 +
.../graph/impl/SimpleSearchIdType.java | 30 +
.../EdgeMetadataSerialization.java | 126 +++
.../graph/serialization/EdgeSerialization.java | 91 +++
.../graph/serialization/impl/CassUtils.java | 51 ++
.../impl/EdgeMetadataSerializationImpl.java | 407 +++++++++
.../impl/EdgeSerializationImpl.java | 531 ++++++++++++
.../OrganizationScopedRowKeySerializer.java | 88 ++
.../impl/parse/ColumnNameIterator.java | 60 ++
.../serialization/impl/parse/ColumnParser.java | 37 +
.../impl/parse/ObservableIterator.java | 50 ++
.../impl/parse/StringColumnParser.java | 46 ++
.../graph/serialization/stage/GraphIoEvent.java | 32 +
.../stage/write/EdgeWriteStage.java | 60 ++
.../graph/serialization/util/EdgeHasher.java | 77 ++
.../graph/serialization/util/EdgeUtils.java | 103 +++
.../persistence/graph/EdgeManagerIT.java | 816 +++++++++++++++++++
.../EdgeMetadataSerializationTest.java | 460 +++++++++++
.../serialization/util/EdgeHasherTest.java | 501 ++++++++++++
.../graph/test/util/EdgeTestUtils.java | 140 ++++
.../astyanax-cassandra-1.56.46-UG-javadoc.jar | Bin 0 -> 616253 bytes
...styanax-cassandra-1.56.46-UG-sources.sources | Bin 0 -> 161740 bytes
.../astyanax-cassandra-1.56.46-UG.jar | Bin 0 -> 224404 bytes
.../astyanax-cassandra-1.56.46-UG.pom | 112 +++
.../astyanax-cassandra/maven-metadata-local.xml | 12 +
.../astyanax-contrib-1.56.46-UG-javadoc.jar | Bin 0 -> 33029 bytes
.../astyanax-contrib-1.56.46-UG-sources.sources | Bin 0 -> 2314 bytes
.../1.56.46-UG/astyanax-contrib-1.56.46-UG.jar | Bin 0 -> 4842 bytes
.../1.56.46-UG/astyanax-contrib-1.56.46-UG.pom | 112 +++
.../astyanax-contrib/maven-metadata-local.xml | 12 +
.../astyanax-core-1.56.46-UG-javadoc.jar | Bin 0 -> 519966 bytes
.../astyanax-core-1.56.46-UG-sources.sources | Bin 0 -> 141783 bytes
.../1.56.46-UG/astyanax-core-1.56.46-UG.jar | Bin 0 -> 5510008 bytes
.../1.56.46-UG/astyanax-core-1.56.46-UG.pom | 88 ++
.../astyanax-core/maven-metadata-local.xml | 12 +
...styanax-entity-mapper-1.56.46-UG-javadoc.jar | Bin 0 -> 91123 bytes
...nax-entity-mapper-1.56.46-UG-sources.sources | Bin 0 -> 30392 bytes
.../astyanax-entity-mapper-1.56.46-UG.jar | Bin 0 -> 68615 bytes
.../astyanax-entity-mapper-1.56.46-UG.pom | 118 +++
.../maven-metadata-local.xml | 12 +
.../astyanax-examples-1.56.46-UG-javadoc.jar | Bin 0 -> 38106 bytes
...astyanax-examples-1.56.46-UG-sources.sources | Bin 0 -> 4457 bytes
.../1.56.46-UG/astyanax-examples-1.56.46-UG.jar | Bin 0 -> 8506 bytes
.../1.56.46-UG/astyanax-examples-1.56.46-UG.pom | 106 +++
.../astyanax-examples/maven-metadata-local.xml | 12 +
.../astyanax-queue-1.56.46-UG-javadoc.jar | Bin 0 -> 179575 bytes
.../astyanax-queue-1.56.46-UG-sources.sources | Bin 0 -> 44057 bytes
.../1.56.46-UG/astyanax-queue-1.56.46-UG.jar | Bin 0 -> 86618 bytes
.../1.56.46-UG/astyanax-queue-1.56.46-UG.pom | 112 +++
.../astyanax-queue/maven-metadata-local.xml | 12 +
.../astyanax-recipes-1.56.46-UG-javadoc.jar | Bin 0 -> 203394 bytes
.../astyanax-recipes-1.56.46-UG-sources.sources | Bin 0 -> 58144 bytes
.../1.56.46-UG/astyanax-recipes-1.56.46-UG.jar | Bin 0 -> 100221 bytes
.../1.56.46-UG/astyanax-recipes-1.56.46-UG.pom | 106 +++
.../astyanax-recipes/maven-metadata-local.xml | 12 +
.../astyanax-thrift-1.56.46-UG-javadoc.jar | Bin 0 -> 196141 bytes
.../astyanax-thrift-1.56.46-UG-sources.sources | Bin 0 -> 75715 bytes
.../1.56.46-UG/astyanax-thrift-1.56.46-UG.jar | Bin 0 -> 235965 bytes
.../1.56.46-UG/astyanax-thrift-1.56.46-UG.pom | 112 +++
.../astyanax-thrift/maven-metadata-local.xml | 12 +
.../netflix/astyanax/maven-metadata-local.xml | 12 +
.../1.4-UG/_maven.repositories | 4 +
.../1.4-UG/jukito-build-tools-1.4-UG.jar | Bin 0 -> 4603 bytes
.../1.4-UG/jukito-build-tools-1.4-UG.pom | 13 +
.../jukito-build-tools/maven-metadata-local.xml | 12 +
.../jukito-parent/1.4-UG/_maven.repositories | 3 +
.../1.4-UG/jukito-parent-1.4-UG.pom | 313 +++++++
.../jukito-parent/maven-metadata-local.xml | 12 +
.../jukito-samples/1.4-UG/_maven.repositories | 4 +
.../1.4-UG/jukito-samples-1.4-UG.jar | Bin 0 -> 5103 bytes
.../1.4-UG/jukito-samples-1.4-UG.pom | 33 +
.../jukito-samples/maven-metadata-local.xml | 12 +
.../jukito/jukito/1.4-UG/_maven.repositories | 5 +
.../jukito/1.4-UG/jukito-1.4-UG-sources.jar | Bin 0 -> 30660 bytes
.../org/jukito/jukito/1.4-UG/jukito-1.4-UG.jar | Bin 0 -> 42832 bytes
.../org/jukito/jukito/1.4-UG/jukito-1.4-UG.pom | 93 +++
.../org/jukito/jukito/maven-metadata-local.xml | 12 +
stack/corepersistence/model/pom.xml | 46 ++
.../model/builder/EntitySerializer.java | 30 +
.../model/builder/EntitySerializerFactory.java | 22 +
.../persistence/model/entity/Entity.java | 112 +++
.../usergrid/persistence/model/entity/Id.java | 31 +
.../persistence/model/entity/SimpleId.java | 89 ++
.../persistence/model/field/AbstractField.java | 67 ++
.../persistence/model/field/ArrayField.java | 27 +
.../persistence/model/field/BooleanField.java | 19 +
.../model/field/ByteBufferField.java | 29 +
.../persistence/model/field/DoubleField.java | 20 +
.../model/field/EntityObjectField.java | 20 +
.../usergrid/persistence/model/field/Field.java | 27 +
.../persistence/model/field/IntegerField.java | 20 +
.../persistence/model/field/ListField.java | 28 +
.../persistence/model/field/LocationField.java | 20 +
.../persistence/model/field/LongField.java | 23 +
.../persistence/model/field/SetField.java | 28 +
.../persistence/model/field/StringField.java | 17 +
.../persistence/model/field/UUIDField.java | 20 +
.../model/field/value/EntityObject.java | 40 +
.../persistence/model/field/value/Location.java | 32 +
.../persistence/model/util/UUIDGenerator.java | 93 +++
.../usergrid/persistence/model/util/Verify.java | 37 +
.../persistence/model/field/EntityTest.java | 115 +++
.../model/util/UUIDGeneratorTest.java | 119 +++
stack/corepersistence/pom.xml | 51 ++
stack/corepersistence/priamcluster/README.md | 83 ++
stack/corepersistence/priamcluster/assembly.xml | 29 +
.../priamcluster/aws-sample.properties | 2 +
.../priamcluster/cassandra-cf.json | 325 ++++++++
stack/corepersistence/priamcluster/pom.xml | 116 +++
.../src/main/dist/conf/Priam.properties | 21 +
.../src/main/dist/init_instance/init_cass.sh | 73 ++
.../dist/init_instance/install_oraclejdk.sh | 28 +
.../priam-cass-extensions-2.0.0-SNAPSHOT.jar | Bin 0 -> 5478 bytes
.../dist/webapps/priam-web-2.0.0-SNAPSHOT.war | Bin 0 -> 31266622 bytes
.../src/main/groovy/configure_cassandra.groovy | 113 +++
.../src/main/groovy/configure_priam.groovy | 41 +
.../src/main/groovy/registry_clear.groovy | 20 +
.../src/main/groovy/registry_list.groovy | 24 +
.../src/main/groovy/registry_register.groovy | 39 +
.../src/main/groovy/tag_instance.groovy | 28 +
.../src/main/groovy/wait_for_cassandra.groovy | 42 +
238 files changed, 16599 insertions(+), 1 deletion(-)
----------------------------------------------------------------------