Merge branches 'ignite-public-api-cleanup' and 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-public-api-cleanup
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/63bcd34d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/63bcd34d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/63bcd34d Branch: refs/heads/ignite-239 Commit: 63bcd34d78bc7efcc254b68ff2138c19aaed32af Parents: aa837c6 9f5b287 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Mon Feb 16 14:47:25 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Mon Feb 16 14:47:25 2015 +0700 ---------------------------------------------------------------------- .../apache/ignite/examples/ExamplesUtils.java | 2 +- .../computegrid/ComputeBroadcastExample.java | 2 +- .../ComputeClusterGroupsExample.java | 93 +++++ .../computegrid/ComputeProjectionExample.java | 93 ----- .../examples/datagrid/CacheAffinityExample.java | 4 +- .../datagrid/CacheDataLoaderExample.java | 2 +- .../datagrid/CacheTransactionExample.java | 6 +- .../datagrid/store/CacheStoreExample.java | 2 +- .../store/dummy/CacheDummyPersonStore.java | 8 +- .../hibernate/CacheHibernatePersonStore.java | 24 +- .../store/jdbc/CacheJdbcPersonStore.java | 14 +- .../datastructures/IgniteQueueExample.java | 2 +- .../examples/messaging/MessagingExample.java | 14 +- .../ignite/examples/MessagingExample.java | 6 +- .../scalar/examples/ScalarCacheExample.scala | 4 +- .../scalar/examples/ScalarClosureExample.scala | 4 +- .../examples/ScalarContinuationExample.scala | 4 +- .../ComputeClusterGroupsExampleSelfTest.java | 39 +++ .../examples/ProjectionExampleSelfTest.java | 39 --- .../testsuites/IgniteExamplesSelfTestSuite.java | 2 +- .../java/org/apache/ignite/IgniteCache.java | 3 +- .../org/apache/ignite/IgniteTransactions.java | 10 +- .../apache/ignite/cache/CacheAtomicityMode.java | 2 +- .../apache/ignite/cache/CacheProjection.java | 110 +++--- .../cache/CacheWriteSynchronizationMode.java | 4 +- .../java/org/apache/ignite/cache/GridCache.java | 10 +- .../apache/ignite/cache/store/CacheStore.java | 4 +- .../ignite/cache/store/CacheStoreSession.java | 19 +- .../store/jdbc/CacheAbstractJdbcStore.java | 2 +- .../cache/store/jdbc/CacheJdbcBlobStore.java | 14 +- .../configuration/TransactionConfiguration.java | 22 +- .../ignite/internal/IgniteTransactionsEx.java | 8 +- .../affinity/GridAffinityAssignmentCache.java | 13 +- .../internal/processors/cache/CacheFlag.java | 2 +- .../processors/cache/GridCacheAdapter.java | 33 +- .../processors/cache/GridCacheMapEntry.java | 17 +- .../processors/cache/GridCacheProcessor.java | 2 +- .../processors/cache/GridCacheProjectionEx.java | 8 +- .../cache/GridCacheProjectionImpl.java | 10 +- .../processors/cache/GridCacheProxyImpl.java | 16 +- .../cache/GridCacheSharedContext.java | 8 +- .../processors/cache/GridCacheStoreManager.java | 4 +- .../processors/cache/GridCacheUtils.java | 12 +- .../processors/cache/IgniteCacheProxy.java | 6 +- .../CacheDataStructuresManager.java | 3 +- .../GridDistributedCacheAdapter.java | 4 +- .../distributed/GridDistributedLockRequest.java | 8 +- .../GridDistributedTxPrepareRequest.java | 12 +- .../GridDistributedTxRemoteAdapter.java | 8 +- .../distributed/dht/GridDhtLockFuture.java | 2 +- .../distributed/dht/GridDhtLockRequest.java | 2 +- .../dht/GridDhtTransactionalCacheAdapter.java | 8 +- .../distributed/dht/GridDhtTxFinishFuture.java | 2 +- .../distributed/dht/GridDhtTxFinishRequest.java | 8 +- .../cache/distributed/dht/GridDhtTxLocal.java | 7 +- .../distributed/dht/GridDhtTxLocalAdapter.java | 10 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 2 +- .../cache/distributed/dht/GridDhtTxRemote.java | 8 +- .../dht/atomic/GridDhtAtomicCache.java | 2 +- .../dht/colocated/GridDhtColocatedCache.java | 2 +- .../colocated/GridDhtColocatedLockFuture.java | 2 +- .../distributed/near/GridNearAtomicCache.java | 2 +- .../distributed/near/GridNearGetFuture.java | 2 +- .../distributed/near/GridNearLockFuture.java | 2 +- .../distributed/near/GridNearLockRequest.java | 2 +- .../near/GridNearTransactionalCache.java | 4 +- .../near/GridNearTxFinishFuture.java | 3 +- .../cache/distributed/near/GridNearTxLocal.java | 8 +- .../near/GridNearTxPrepareFuture.java | 4 +- .../distributed/near/GridNearTxRemote.java | 8 +- .../processors/cache/local/GridLocalCache.java | 2 +- .../processors/cache/local/GridLocalTx.java | 8 +- .../cache/local/GridLocalTxFuture.java | 2 +- .../local/atomic/GridLocalAtomicCache.java | 2 +- .../continuous/CacheContinuousQueryHandler.java | 12 + .../CacheContinuousQueryListener.java | 2 + .../continuous/CacheContinuousQueryManager.java | 88 ++++- .../cache/transactions/IgniteInternalTx.java | 10 +- .../transactions/IgniteTransactionsImpl.java | 24 +- .../cache/transactions/IgniteTxAdapter.java | 70 ++-- .../cache/transactions/IgniteTxHandler.java | 6 +- .../transactions/IgniteTxLocalAdapter.java | 18 +- .../cache/transactions/IgniteTxManager.java | 30 +- .../transactions/IgniteTxMetricsAdapter.java | 119 ------- .../cache/transactions/IgniteTxProxy.java | 27 -- .../cache/transactions/IgniteTxProxyImpl.java | 345 ------------------- .../transactions/TransactionMetricsAdapter.java | 119 +++++++ .../cache/transactions/TransactionProxy.java | 27 ++ .../transactions/TransactionProxyImpl.java | 345 +++++++++++++++++++ .../dataload/GridDataLoadCacheUpdaters.java | 7 - .../datastructures/DataStructuresProcessor.java | 4 +- .../datastructures/GridCacheAtomicLongImpl.java | 4 +- .../GridCacheAtomicReferenceImpl.java | 4 +- .../GridCacheAtomicSequenceImpl.java | 4 +- .../GridCacheAtomicStampedImpl.java | 4 +- .../GridCacheCountDownLatchImpl.java | 4 +- .../GridTransactionalCacheQueueImpl.java | 4 +- .../processors/igfs/IgfsDataManager.java | 4 +- .../processors/igfs/IgfsMetaManager.java | 4 +- .../handlers/cache/GridCacheCommandHandler.java | 4 +- .../service/GridServiceProcessor.java | 10 +- .../processors/streamer/IgniteStreamerImpl.java | 41 +-- .../ignite/internal/util/IgniteUtils.java | 8 +- .../util/future/GridCompoundFuture.java | 2 + .../util/future/GridCompoundIdentityFuture.java | 10 - .../internal/util/nio/GridDirectParser.java | 7 +- .../cache/VisorCacheDefaultConfiguration.java | 12 +- .../node/VisorTransactionConfiguration.java | 12 +- .../streamer/VisorStreamerConfiguration.java | 19 +- .../apache/ignite/lang/IgniteAsyncSupport.java | 2 +- .../optimized/optimized-classnames.properties | 27 +- .../communication/tcp/TcpCommunicationSpi.java | 7 +- .../spi/swapspace/noop/NoopSwapSpaceSpi.java | 2 +- .../ignite/streamer/StreamerConfiguration.java | 50 +-- .../apache/ignite/transactions/IgniteTx.java | 275 --------------- .../transactions/IgniteTxConcurrency.java | 45 --- .../IgniteTxHeuristicException.java | 51 --- .../ignite/transactions/IgniteTxIsolation.java | 49 --- .../ignite/transactions/IgniteTxMetrics.java | 53 --- .../IgniteTxOptimisticException.java | 47 --- .../transactions/IgniteTxRollbackException.java | 47 --- .../ignite/transactions/IgniteTxState.java | 65 ---- .../transactions/IgniteTxSynchronization.java | 45 --- .../transactions/IgniteTxTimeoutException.java | 47 --- .../apache/ignite/transactions/Transaction.java | 275 +++++++++++++++ .../transactions/TransactionConcurrency.java | 45 +++ .../TransactionHeuristicException.java | 51 +++ .../transactions/TransactionIsolation.java | 49 +++ .../ignite/transactions/TransactionMetrics.java | 53 +++ .../TransactionOptimisticException.java | 47 +++ .../TransactionRollbackException.java | 47 +++ .../ignite/transactions/TransactionState.java | 65 ++++ .../TransactionSynchronization.java | 45 +++ .../TransactionTimeoutException.java | 47 +++ .../store/jdbc/CacheJdbcPojoStoreTest.java | 8 +- ...eJdbcStoreAbstractMultithreadedSelfTest.java | 2 +- ...CacheJdbcBlobStoreMultithreadedSelfTest.java | 2 +- .../ignite/internal/GridStartStopSelfTest.java | 6 +- .../GridCacheAbstractFailoverSelfTest.java | 19 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 94 ++--- .../cache/GridCacheAbstractMetricsSelfTest.java | 4 +- .../cache/GridCacheAbstractSelfTest.java | 2 +- .../cache/GridCacheAbstractTxReadTest.java | 16 +- .../cache/GridCacheBasicStoreAbstractTest.java | 10 +- .../cache/GridCacheClearLocalySelfTest.java | 2 +- .../GridCacheConcurrentTxMultiNodeTest.java | 6 +- .../GridCacheDaemonNodeAbstractSelfTest.java | 8 +- .../cache/GridCacheDeploymentSelfTest.java | 5 - .../GridCacheExAbstractFullApiSelfTest.java | 6 +- .../GridCacheFinishPartitionsSelfTest.java | 9 +- .../GridCacheInterceptorAbstractSelfTest.java | 10 +- .../GridCacheMarshallerTxAbstractTest.java | 6 +- ...GridCacheMixedPartitionExchangeSelfTest.java | 7 +- .../cache/GridCacheMultiUpdateLockSelfTest.java | 9 +- .../cache/GridCacheMvccManagerSelfTest.java | 2 +- .../cache/GridCacheNestedTxAbstractTest.java | 10 +- .../cache/GridCacheObjectToStringSelfTest.java | 6 +- ...CacheOffHeapMultiThreadedUpdateSelfTest.java | 17 +- .../GridCacheOffHeapTieredAbstractSelfTest.java | 22 +- .../cache/GridCacheOffheapUpdateSelfTest.java | 14 +- .../cache/GridCachePartitionedWritesTest.java | 2 +- .../GridCacheReferenceCleanupSelfTest.java | 4 +- .../cache/GridCacheSlowTxWarnTest.java | 3 +- .../processors/cache/GridCacheStopSelfTest.java | 2 +- .../cache/GridCacheStorePutxSelfTest.java | 3 +- .../processors/cache/GridCacheTestStore.java | 8 +- ...cheTransactionalAbstractMetricsSelfTest.java | 16 +- .../GridCacheVariableTopologySelfTest.java | 5 +- .../cache/GridCacheVersionMultinodeTest.java | 8 +- .../GridCacheWriteBehindStoreAbstractTest.java | 8 +- ...BehindStorePartitionedMultiNodeSelfTest.java | 6 +- .../IgniteCacheContainsKeyAbstractSelfTest.java | 10 +- .../cache/IgniteCacheInvokeAbstractTest.java | 16 +- .../cache/IgnitePutAllLargeBatchSelfTest.java | 6 +- ...tAllUpdateNonPreloadedPartitionSelfTest.java | 6 +- .../processors/cache/IgniteTxAbstractTest.java | 26 +- .../IgniteTxConcurrentGetAbstractTest.java | 6 +- .../IgniteTxExceptionAbstractSelfTest.java | 34 +- .../cache/IgniteTxMultiNodeAbstractTest.java | 12 +- .../IgniteTxMultiThreadedAbstractTest.java | 18 +- .../cache/IgniteTxReentryAbstractSelfTest.java | 6 +- .../IgniteTxSingleThreadedAbstractTest.java | 4 +- .../IgniteTxStoreExceptionAbstractSelfTest.java | 32 +- .../GridCacheSequenceApiSelfAbstractTest.java | 6 +- .../IgniteAtomicLongApiAbstractSelfTest.java | 2 +- ...idCachePartitionedNodeRestartTxSelfTest.java | 12 +- ...PartitionedQueueCreateMultiNodeSelfTest.java | 6 +- ...tractDistributedByteArrayValuesSelfTest.java | 10 +- .../GridCacheAbstractJobExecutionTest.java | 11 +- .../GridCacheAbstractNodeRestartSelfTest.java | 12 +- .../GridCacheAbstractPrimarySyncSelfTest.java | 6 +- .../GridCacheBasicOpAbstractTest.java | 9 +- .../GridCacheEntrySetAbstractSelfTest.java | 7 +- .../distributed/GridCacheEventAbstractTest.java | 24 +- ...dCacheMultithreadedFailoverAbstractTest.java | 2 +- .../GridCacheNodeFailureAbstractTest.java | 8 +- .../GridCacheTransformEventSelfTest.java | 14 +- .../IgniteCrossCacheTxStoreSelfTest.java | 6 +- ...iteTxConsistencyRestartAbstractSelfTest.java | 6 +- ...xOriginatingNodeFailureAbstractSelfTest.java | 4 +- ...cOriginatingNodeFailureAbstractSelfTest.java | 12 +- .../IgniteTxPreloadAbstractTest.java | 6 +- .../IgniteTxTimeoutAbstractTest.java | 12 +- ...heAbstractTransformWriteThroughSelfTest.java | 8 +- .../dht/GridCacheColocatedDebugTest.java | 32 +- ...eColocatedOptimisticTransactionSelfTest.java | 6 +- .../dht/GridCacheDhtEntrySelfTest.java | 2 +- ...dCachePartitionedTopologyChangeSelfTest.java | 13 +- .../atomic/GridCacheAtomicPreloadSelfTest.java | 8 +- .../near/GridCacheNearMultiGetSelfTest.java | 12 +- .../near/GridCacheNearMultiNodeSelfTest.java | 14 +- .../near/GridCacheNearOneNodeSelfTest.java | 10 +- ...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 2 +- .../near/GridCacheNearOnlyTopologySelfTest.java | 8 +- .../near/GridCacheNearTxMultiNodeSelfTest.java | 14 +- ...ePartitionedBasicStoreMultiNodeSelfTest.java | 6 +- .../GridCachePartitionedEvictionSelfTest.java | 8 +- ...GridCachePartitionedFilteredPutSelfTest.java | 3 +- ...achePartitionedMultiNodeCounterSelfTest.java | 12 +- ...ePartitionedMultiThreadedPutGetSelfTest.java | 8 +- .../GridCachePartitionedNodeRestartTest.java | 2 +- ...ePartitionedOptimisticTxNodeRestartTest.java | 4 +- ...achePartitionedPreloadLifecycleSelfTest.java | 4 +- .../GridCachePartitionedTxSalvageSelfTest.java | 12 +- .../GridCacheReplicatedInvalidateSelfTest.java | 10 +- ...CacheReplicatedPreloadLifecycleSelfTest.java | 4 +- ...heConcurrentEvictionConsistencySelfTest.java | 6 +- .../GridCacheConcurrentEvictionsSelfTest.java | 4 +- .../GridCacheDistributedEvictionsSelfTest.java | 4 +- .../GridCacheEmptyEntriesAbstractSelfTest.java | 10 +- .../eviction/GridCacheEvictionAbstractTest.java | 6 +- .../GridCacheEvictionTouchSelfTest.java | 7 +- .../IgniteCacheExpiryPolicyAbstractTest.java | 40 +-- ...iteCacheNoLoadPreviousValueAbstractTest.java | 10 +- .../IgniteCacheNoReadThroughAbstractTest.java | 14 +- .../IgniteCacheNoWriteThroughAbstractTest.java | 18 +- .../IgniteCacheTxStoreSessionTest.java | 32 +- .../GridCacheLocalByteArrayValuesSelfTest.java | 10 +- .../local/GridCacheLocalTxTimeoutSelfTest.java | 12 +- .../processors/igfs/IgfsSizeSelfTest.java | 8 +- .../cache/GridCacheAbstractLoadTest.java | 13 +- .../cache/GridCacheDataStructuresLoadTest.java | 5 +- .../GridCachePartitionedAtomicLongLoadTest.java | 6 +- .../ignite/loadtests/dsi/GridDsiPerfJob.java | 3 +- .../p2p/GridAbstractMultinodeRedeployTest.java | 23 +- .../GridFifoQueueCollisionSpiSelfTest.java | 12 +- .../GridPriorityQueueCollisionSpiSelfTest.java | 2 + .../cache/GridAbstractCacheStoreSelfTest.java | 16 +- .../junits/cache/TestCacheSession.java | 6 +- .../cache/TestThreadLocalCacheSession.java | 4 +- .../IgniteCacheDataStructuresSelfTestSuite.java | 3 +- .../hadoop/jobtracker/GridHadoopJobTracker.java | 1 + .../GridHibernateReadWriteAccessStrategy.java | 8 +- .../hibernate/CacheHibernateBlobStore.java | 24 +- .../processors/query/h2/IgniteH2Indexing.java | 98 +++++- .../query/h2/opt/GridLuceneIndex.java | 13 +- ...rtitionedFieldsQueryP2PDisabledSelfTest.java | 34 -- ...artitionedFieldsQueryP2PEnabledSelfTest.java | 34 ++ ...idCachePartitionedHitsAndMissesSelfTest.java | 5 +- ...achePartitionedQueryP2PDisabledSelfTest.java | 34 -- ...CachePartitionedQueryP2PEnabledSelfTest.java | 34 ++ ...eplicatedFieldsQueryP2PDisabledSelfTest.java | 34 -- ...eReplicatedFieldsQueryP2PEnableSelfTest.java | 34 ++ ...CacheReplicatedQueryP2PDisabledSelfTest.java | 34 -- ...dCacheReplicatedQueryP2PEnabledSelfTest.java | 34 ++ .../GridCacheReplicatedQuerySelfTest.java | 4 +- .../IgniteCacheQuerySelfTestSuite.java | 8 +- .../cache/jta/GridCacheXAResource.java | 4 +- .../processors/cache/GridCacheJtaSelfTest.java | 6 +- .../websession/IgniteWebSessionFilter.java | 6 +- .../yardstick/IgniteBenchmarkArguments.java | 8 +- .../cache/IgnitePutGetTxBenchmark.java | 2 +- .../cache/IgniteSqlQueryBenchmark.java | 22 +- .../cache/IgniteSqlQueryJoinBenchmark.java | 26 +- .../cache/IgniteSqlQueryPutBenchmark.java | 22 +- 275 files changed, 2784 insertions(+), 2727 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/63bcd34d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllLargeBatchSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/63bcd34d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllUpdateNonPreloadedPartitionSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/63bcd34d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/63bcd34d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/63bcd34d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/63bcd34d/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java ----------------------------------------------------------------------
