Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-286
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/dc1317da Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/dc1317da Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/dc1317da Branch: refs/heads/ignite-286 Commit: dc1317da7e719e2e901048b6e243fcd1762e53f3 Parents: 9ac387a a33d3d4 Author: ivasilinets <[email protected]> Authored: Wed May 6 15:45:35 2015 +0300 Committer: ivasilinets <[email protected]> Committed: Wed May 6 15:45:35 2015 +0300 ---------------------------------------------------------------------- DEVNOTES.txt | 2 +- assembly/release-base.xml | 2 + assembly/release-schema-import.xml | 50 ++ .../streaming/wordcount/CacheConfig.java | 5 - .../config/grid-client-config.properties | 50 +- .../ClientPropertiesConfigurationSelfTest.java | 12 +- .../ignite/codegen/MessageCodeGenerator.java | 4 +- .../java/org/apache/ignite/IgniteCache.java | 5 + .../org/apache/ignite/IgniteJdbcDriver.java | 81 ++- .../client/GridClientConfiguration.java | 2 +- .../communication/GridIoMessageFactory.java | 4 +- .../cache/DynamicCacheDescriptor.java | 16 +- .../processors/cache/GridCacheAdapter.java | 511 +++++++++--------- .../processors/cache/GridCacheMapEntry.java | 18 +- .../GridCachePartitionExchangeManager.java | 3 + .../processors/cache/GridCacheProcessor.java | 189 ++++--- .../processors/cache/GridCacheTtlManager.java | 156 +++--- .../processors/cache/GridCacheUtils.java | 6 +- ...ridCacheOptimisticCheckPreparedTxFuture.java | 434 --------------- ...idCacheOptimisticCheckPreparedTxRequest.java | 232 -------- ...dCacheOptimisticCheckPreparedTxResponse.java | 179 ------- .../distributed/GridCacheTxRecoveryFuture.java | 506 ++++++++++++++++++ .../distributed/GridCacheTxRecoveryRequest.java | 261 +++++++++ .../GridCacheTxRecoveryResponse.java | 182 +++++++ .../GridDistributedTxRemoteAdapter.java | 2 +- .../distributed/dht/GridDhtLocalPartition.java | 2 +- .../dht/GridPartitionedGetFuture.java | 2 +- .../cache/query/GridCacheSqlQuery.java | 2 +- .../cache/query/GridCacheTwoStepQuery.java | 17 + .../cache/transactions/IgniteInternalTx.java | 5 +- .../cache/transactions/IgniteTxAdapter.java | 2 +- .../cache/transactions/IgniteTxHandler.java | 38 +- .../transactions/IgniteTxLocalAdapter.java | 2 +- .../cache/transactions/IgniteTxManager.java | 173 ++---- .../datastreamer/DataStreamerImpl.java | 2 + .../processors/igfs/IgfsDataManager.java | 3 + .../processors/igfs/IgfsMetaManager.java | 2 +- .../internal/processors/igfs/IgfsUtils.java | 11 +- .../internal/visor/query/VisorQueryArg.java | 14 +- .../internal/visor/query/VisorQueryJob.java | 2 + .../apache/ignite/lang/IgniteAsyncSupport.java | 4 +- .../discovery/tcp/TcpClientDiscoverySpi.java | 4 - .../spi/discovery/tcp/TcpDiscoverySpi.java | 4 - .../discovery/tcp/TcpDiscoverySpiAdapter.java | 8 +- .../resources/META-INF/classnames.properties | 12 +- .../internal/GridUpdateNotifierSelfTest.java | 21 +- .../processors/cache/CacheGetFromJobTest.java | 110 ++++ .../GridCacheAbstractFailoverSelfTest.java | 4 +- .../IgniteCacheEntryListenerAbstractTest.java | 4 +- ...CacheLoadingConcurrentGridStartSelfTest.java | 154 ++++++ .../GridCacheAbstractNodeRestartSelfTest.java | 94 ++-- ...GridCacheLoadingConcurrentGridStartTest.java | 154 ------ ...xOriginatingNodeFailureAbstractSelfTest.java | 2 +- .../dht/GridCacheDhtPreloadSelfTest.java | 2 +- ...rDisabledPrimaryNodeFailureRecoveryTest.java | 31 ++ ...rtitionedPrimaryNodeFailureRecoveryTest.java | 31 ++ ...woBackupsPrimaryNodeFailureRecoveryTest.java | 37 ++ ...ePrimaryNodeFailureRecoveryAbstractTest.java | 533 +++++++++++++++++++ .../GridCachePartitionedNodeRestartTest.java | 4 +- ...ePartitionedOptimisticTxNodeRestartTest.java | 4 +- .../GridCacheReplicatedNodeRestartSelfTest.java | 2 + .../IgniteCacheExpiryPolicyAbstractTest.java | 2 +- .../IgniteCacheExpiryPolicyTestSuite.java | 2 + .../expiry/IgniteCacheTtlCleanupSelfTest.java | 85 +++ .../igfs/IgfsClientCacheSelfTest.java | 132 +++++ .../processors/igfs/IgfsOneClientNodeTest.java | 133 +++++ .../processors/igfs/IgfsStreamsSelfTest.java | 2 +- .../tcp/TcpClientDiscoverySelfTest.java | 8 + .../testsuites/IgniteCacheRestartTestSuite.java | 5 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 5 +- .../IgniteCacheTxRecoverySelfTestSuite.java | 4 + .../ignite/testsuites/IgniteIgfsTestSuite.java | 3 + .../processors/query/h2/IgniteH2Indexing.java | 4 + .../processors/query/h2/sql/GridSqlQuery.java | 20 + .../query/h2/sql/GridSqlQueryParser.java | 10 +- .../query/h2/sql/GridSqlQuerySplitter.java | 11 +- .../processors/query/h2/sql/GridSqlSelect.java | 2 +- .../processors/query/h2/sql/GridSqlUnion.java | 2 +- .../query/h2/twostep/GridMapQueryExecutor.java | 3 + .../h2/twostep/GridReduceQueryExecutor.java | 119 ++++- .../IgniteCacheAbstractFieldsQuerySelfTest.java | 21 + modules/schema-import/pom.xml | 6 +- .../ignite/schema/generator/CodeGenerator.java | 41 +- .../commands/cache/VisorCacheScanCommand.scala | 2 +- pom.xml | 227 +++++++- 85 files changed, 3465 insertions(+), 1792 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc1317da/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc1317da/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java ----------------------------------------------------------------------
