Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-1277
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ae17756c Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ae17756c Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ae17756c Branch: refs/heads/ignite-1277 Commit: ae17756c7de344b7331aacf828dc07bb50963a8d Parents: 0bfbe0b 1327340 Author: iveselovskiy <iveselovs...@gridgain.com> Authored: Mon Aug 24 11:14:41 2015 +0300 Committer: iveselovskiy <iveselovs...@gridgain.com> Committed: Mon Aug 24 11:14:41 2015 +0300 ---------------------------------------------------------------------- examples/config/example-cache.xml | 2 - .../apache/ignite/IgniteSystemProperties.java | 3 + .../store/jdbc/CacheAbstractJdbcStore.java | 45 +- .../cache/store/jdbc/CacheJdbcPojoStore.java | 32 +- .../store/jdbc/dialect/BasicJdbcDialect.java | 3 + .../cache/store/jdbc/dialect/DB2Dialect.java | 3 + .../cache/store/jdbc/dialect/H2Dialect.java | 3 + .../cache/store/jdbc/dialect/JdbcDialect.java | 3 +- .../cache/store/jdbc/dialect/MySQLDialect.java | 3 + .../cache/store/jdbc/dialect/OracleDialect.java | 3 + .../store/jdbc/dialect/SQLServerDialect.java | 3 + .../cluster/ClusterTopologyException.java | 18 + .../ignite/internal/MarshallerContextImpl.java | 24 +- .../ClusterTopologyCheckedException.java | 18 + .../CachePartialUpdateCheckedException.java | 11 +- .../processors/cache/GridCacheAdapter.java | 85 ++- .../cache/GridCacheEvictionManager.java | 2 +- .../processors/cache/GridCacheIoManager.java | 1 - .../cache/GridCacheSharedContext.java | 17 + .../processors/cache/GridCacheUtils.java | 23 + .../distributed/GridDistributedCacheEntry.java | 11 +- .../dht/GridClientPartitionTopology.java | 20 + .../distributed/dht/GridDhtCacheAdapter.java | 12 +- .../cache/distributed/dht/GridDhtGetFuture.java | 12 +- .../dht/GridDhtPartitionTopology.java | 7 + .../dht/GridDhtPartitionTopologyImpl.java | 20 + .../cache/distributed/dht/GridDhtTxLocal.java | 4 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 182 ++++++- .../dht/GridDhtTxPrepareResponse.java | 42 +- .../dht/GridPartitionedGetFuture.java | 104 ++-- .../dht/atomic/GridDhtAtomicCache.java | 16 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 3 + .../dht/colocated/GridDhtColocatedCache.java | 19 +- .../colocated/GridDhtColocatedLockFuture.java | 8 +- .../GridDhtPartitionsExchangeFuture.java | 40 +- .../distributed/near/GridNearAtomicCache.java | 6 +- .../distributed/near/GridNearCacheAdapter.java | 15 +- .../distributed/near/GridNearCacheEntry.java | 10 +- .../distributed/near/GridNearGetFuture.java | 120 +++-- .../distributed/near/GridNearLockFuture.java | 12 +- .../near/GridNearOptimisticTxPrepareFuture.java | 13 +- .../GridNearPessimisticTxPrepareFuture.java | 9 +- .../near/GridNearTransactionalCache.java | 9 +- .../cache/distributed/near/GridNearTxLocal.java | 7 +- .../near/GridNearTxPrepareResponse.java | 3 - .../cache/local/GridLocalCacheEntry.java | 4 +- .../local/atomic/GridLocalAtomicCache.java | 17 +- .../cache/transactions/IgniteInternalTx.java | 2 +- .../cache/transactions/IgniteTxAdapter.java | 19 +- .../cache/transactions/IgniteTxEntry.java | 18 + .../cache/transactions/IgniteTxHandler.java | 5 +- .../transactions/IgniteTxLocalAdapter.java | 4 +- .../service/GridServiceProcessor.java | 5 + .../ignite/internal/util/IgniteUtils.java | 10 +- .../ignite/internal/util/lang/GridFunc.java | 14 + .../TcpDiscoveryMulticastIpFinder.java | 38 ++ .../config/store/jdbc/ignite-type-metadata.xml | 8 + .../store/jdbc/CacheJdbcPojoStoreTest.java | 33 +- ...eJdbcStoreAbstractMultithreadedSelfTest.java | 16 +- .../ignite/cache/store/jdbc/model/Person.java | 26 +- .../cache/CrossCacheTxRandomOperationsTest.java | 534 +++++++++++++++++++ ...teAtomicCacheEntryProcessorNodeJoinTest.java | 32 ++ .../IgniteCacheEntryProcessorNodeJoinTest.java | 225 ++++++++ .../IgniteCacheTopologySafeGetSelfTest.java | 218 ++++++++ .../GridCacheMultiNodeLockAbstractTest.java | 41 +- .../GridCacheTransformEventSelfTest.java | 2 + .../IgniteCacheCrossCacheTxFailoverTest.java | 433 +++++++++++++++ .../IgniteCachePutRetryAbstractSelfTest.java | 1 + ...gniteCachePutRetryTransactionalSelfTest.java | 187 +++++++ .../near/GridCacheNearOnlyTopologySelfTest.java | 4 +- .../near/GridCacheNearTxForceKeyTest.java | 76 +++ ...idCachePartitionedHitsAndMissesSelfTest.java | 20 +- ...idCachePartitionedMultiNodeLockSelfTest.java | 8 +- ...ridCacheReplicatedMultiNodeLockSelfTest.java | 8 +- .../lru/LruNearEvictionPolicySelfTest.java | 29 +- .../LruNearOnlyNearEvictionPolicySelfTest.java | 55 +- .../OptimizedMarshallerNodeFailoverTest.java | 97 +++- .../IgniteCacheFailoverTestSuite.java | 2 + .../IgniteCacheFailoverTestSuite2.java | 2 + .../testsuites/IgniteCacheTestSuite2.java | 5 + .../ignite/schema/model/PojoDescriptor.java | 6 +- .../ignite/schema/model/SchemaDescriptor.java | 61 +++ .../schema/parser/DatabaseMetadataParser.java | 54 +- .../parser/dialect/DB2MetadataDialect.java | 3 +- .../parser/dialect/DatabaseMetadataDialect.java | 13 +- .../parser/dialect/JdbcMetadataDialect.java | 129 +++-- .../parser/dialect/MySQLMetadataDialect.java | 57 ++ .../parser/dialect/OracleMetadataDialect.java | 111 ++-- .../org/apache/ignite/schema/ui/Controls.java | 25 +- .../ignite/schema/ui/SchemaImportApp.java | 157 +++++- .../schema/test/AbstractSchemaImportTest.java | 10 +- .../jdbc/CacheJdbcPojoStoreFactorySelfTest.java | 14 +- modules/zookeeper/pom.xml | 89 ++++ .../zk/TcpDiscoveryZookeeperIpFinder.java | 350 ++++++++++++ .../tcp/ipfinder/zk/ZookeeperIpFinderTest.java | 390 ++++++++++++++ pom.xml | 1 + 96 files changed, 4249 insertions(+), 425 deletions(-) ----------------------------------------------------------------------