Merge commit '4945b6f2d3a8a2d6e78c230bce6be09082dfa68c' * commit '4945b6f2d3a8a2d6e78c230bce6be09082dfa68c': Implement a minimum lock expiration time. Ensure the lock manager is injected as a singleton. Remove unused SingleNodeLockImpl and any references to this. Simplify the locks consistency level and default it to LQ in case something passed cannot be parsed to a valid consistency level. Fix Astyanax locking to be re-entrant as Hector locks were and possible UG code expects it to be. Remove all reference of Hector locks, changing its existing test to work with Astyanax. Remove commented, old Hector configuration from Spring context config. Fix new lock manager wiring issues in services layer. First commit of new implementation of Astyanax locks and having it wired with guide instead of Spring. Remove unused zookeeper lock manager. Fix typo in word 'tenant'.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/d796b68c Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/d796b68c Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/d796b68c Branch: refs/heads/USERGRID-1047 Commit: d796b68c64a47b5a79f9b98ae26f5a326ca62bd5 Parents: a51ee2c 4945b6f Author: George Reyes <g...@apache.org> Authored: Fri Jan 15 16:44:30 2016 -0800 Committer: George Reyes <g...@apache.org> Committed: Fri Jan 15 16:44:30 2016 -0800 ---------------------------------------------------------------------- .../src/main/dist/lib/log4j.properties | 1 - .../src/test/resources/usergrid-test.properties | 5 - stack/core/pom.xml | 10 +- .../apache/usergrid/batch/job/OnlyOnceJob.java | 3 +- .../usergrid/corepersistence/CoreModule.java | 2 + .../locking/cassandra/AstyanaxLockImpl.java | 92 +++++ .../cassandra/AstyanaxLockManagerImpl.java | 211 +++++++++++ .../locking/cassandra/HectorLockImpl.java | 86 ----- .../cassandra/HectorLockManagerImpl.java | 142 -------- .../usergrid/locking/guice/LockModule.java | 40 +++ .../locking/singlenode/SingleNodeLockImpl.java | 71 ---- .../singlenode/SingleNodeLockManagerImpl.java | 96 ----- .../zookeeper/ZooKeeperLockManagerImpl.java | 115 ------ .../locking/zookeeper/ZookeeperLockImpl.java | 88 ----- .../mq/cassandra/QueueManagerFactoryImpl.java | 5 +- .../persistence/cassandra/CassandraService.java | 5 +- .../main/resources/usergrid-core-context.xml | 36 +- .../org/apache/usergrid/CoreITSetupImpl.java | 4 + .../usergrid/locking/AstyanaxLockManagerIT.java | 164 +++++++++ .../locking/cassandra/HectorLockManagerIT.java | 185 ---------- .../SingleNodeLockTestSingleNode.java | 170 --------- .../zookeeper/AbstractZooKeeperTest.java | 127 ------- .../usergrid/locking/zookeeper/ZooPut.java | 114 ------ .../zookeeper/ZookeeperLockManagerTest.java | 186 ---------- stack/core/src/test/resources/log4j.properties | 1 - .../impl/ScopedCacheSerializationImpl.java | 12 +- .../MvccEntitySerializationStrategyImpl.java | 14 +- ...vccEntitySerializationStrategyProxyImpl.java | 4 +- .../MvccEntitySerializationStrategyV1Impl.java | 8 +- .../MvccEntitySerializationStrategyV2Impl.java | 13 +- .../MvccEntitySerializationStrategyV3Impl.java | 14 +- .../MvccLogEntrySerializationProxyImpl.java | 4 +- .../MvccLogEntrySerializationStrategyImpl.java | 6 +- ...MvccLogEntrySerializationStrategyV1Impl.java | 18 +- ...MvccLogEntrySerializationStrategyV2Impl.java | 18 +- .../UniqueValueSerializationStrategyImpl.java | 28 +- ...iqueValueSerializationStrategyProxyImpl.java | 4 +- .../UniqueValueSerializationStrategyV1Impl.java | 31 +- .../UniqueValueSerializationStrategyV2Impl.java | 31 +- stack/corepersistence/common/pom.xml | 351 ++++++++++--------- .../core/astyanax/AstyanaxKeyspaceProvider.java | 46 +-- .../core/astyanax/CassandraCluster.java | 20 ++ .../core/astyanax/CassandraClusterImpl.java | 198 +++++++++++ .../persistence/core/astyanax/CassandraFig.java | 72 +++- .../core/astyanax/MultiTenantColumnFamily.java | 47 +++ .../MultiTenantColumnFamilyDefinition.java | 138 ++++++++ .../core/astyanax/MultiTennantColumnFamily.java | 47 --- .../MultiTennantColumnFamilyDefinition.java | 138 -------- .../persistence/core/guice/CommonModule.java | 11 +- .../data/MigrationInfoSerializationImpl.java | 24 +- .../core/migration/schema/Migration.java | 4 +- .../migration/schema/MigrationManagerImpl.java | 9 +- .../core/astyanax/ColumnNameIteratorTest.java | 5 +- .../MultiKeyColumnNameIteratorTest.java | 5 +- .../astyanax/MultiRowColumnIteratorTest.java | 5 +- .../persistence/core/astyanax/TestUtils.java | 8 +- .../EdgeMetadataSerializationProxyImpl.java | 4 +- .../impl/EdgeMetadataSerializationV1Impl.java | 36 +- .../impl/EdgeMetadataSerializationV2Impl.java | 36 +- .../impl/NodeSerializationImpl.java | 14 +- .../impl/shard/EdgeColumnFamilies.java | 12 +- .../shard/impl/EdgeShardSerializationImpl.java | 14 +- .../impl/ShardedEdgeSerializationImpl.java | 58 +-- .../impl/shard/impl/ShardsColumnIterator.java | 15 +- .../shard/impl/SizebasedEdgeColumnFamilies.java | 46 +-- .../map/impl/MapSerializationImpl.java | 28 +- .../resources/usergrid-standalone.properties | 4 - stack/pom.xml | 39 +-- stack/rest/src/test/resources/log4j.properties | 1 - .../cassandra/ManagementServiceImpl.java | 36 +- .../services/ServiceManagerFactory.java | 6 +- .../services/guice/ServiceModuleImpl.java | 3 + .../resources/usergrid-services-context.xml | 133 +++---- .../src/test/resources/log4j.properties | 1 - stack/tools/src/main/resources/log4j.properties | 1 - .../test/resources/testApplicationContext.xml | 273 ++++++++------- 76 files changed, 1680 insertions(+), 2372 deletions(-) ----------------------------------------------------------------------
