Merge branches 'ignite-443' and 'sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-443-2
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2fd8c33d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2fd8c33d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2fd8c33d Branch: refs/heads/ignite-443 Commit: 2fd8c33dbe062f6c15715c8735a96525c0318020 Parents: b4285d2 3b03646 Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Fri Mar 27 16:44:39 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Fri Mar 27 16:44:39 2015 +0300 ---------------------------------------------------------------------- .../rest/AbstractRestProcessorSelfTest.java | 9 - .../java/org/apache/ignite/IgniteCache.java | 4 +- .../swapspace/GridSwapSpaceManager.java | 6 +- .../processors/cache/CacheProjection.java | 6 +- .../processors/cache/GridCacheAdapter.java | 12 +- .../processors/cache/GridCacheMapEntry.java | 24 +- .../processors/cache/GridCacheProcessor.java | 25 +- .../cache/GridCacheProjectionImpl.java | 6 +- .../processors/cache/GridCacheProxyImpl.java | 6 +- .../processors/cache/GridCacheUtils.java | 5 +- .../processors/cache/IgniteCacheProxy.java | 4 +- .../distributed/dht/GridDhtLocalPartition.java | 101 ++- .../distributed/near/GridNearCacheAdapter.java | 7 - .../cache/query/GridCacheQueryManager.java | 4 +- .../processors/query/GridQueryIndexing.java | 3 +- .../processors/query/GridQueryProcessor.java | 22 +- .../ignite/internal/util/lang/GridFunc.java | 14 + .../spi/swapspace/SwapSpaceSpiListener.java | 3 +- .../spi/swapspace/file/FileSwapSpaceSpi.java | 2 +- .../ignite/IgniteCacheAffinitySelfTest.java | 37 +- .../ignite/igfs/IgfsFragmentizerSelfTest.java | 3 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 95 +-- .../cache/GridCacheAbstractMetricsSelfTest.java | 4 + .../cache/GridCacheAbstractSelfTest.java | 109 +-- .../cache/GridCacheClearLocallySelfTest.java | 81 ++- .../GridCacheConcurrentTxMultiNodeTest.java | 28 - .../cache/GridCacheEntryVersionSelfTest.java | 4 +- .../GridCacheExAbstractFullApiSelfTest.java | 10 +- ...CacheFullTextQueryMultithreadedSelfTest.java | 4 +- .../cache/GridCacheLuceneQueryIndexTest.java | 20 +- .../cache/GridCacheMemoryModeSelfTest.java | 28 +- .../cache/GridCacheOffHeapSelfTest.java | 662 ------------------- .../processors/cache/GridCacheOffHeapTest.java | 4 +- .../GridCacheOffHeapTieredAbstractSelfTest.java | 4 +- .../GridCacheOnCopyFlagAbstractSelfTest.java | 8 +- .../GridCacheQueryIndexingDisabledSelfTest.java | 19 +- .../GridCacheQueryInternalKeysSelfTest.java | 4 +- .../cache/GridCacheSwapPreloadSelfTest.java | 16 +- ...idCacheValueConsistencyAbstractSelfTest.java | 59 +- .../IgniteCacheContainsKeyAbstractSelfTest.java | 15 +- .../IgniteClientAffinityAssignmentSelfTest.java | 4 +- .../cache/IgnitePutAllLargeBatchSelfTest.java | 16 +- ...tAllUpdateNonPreloadedPartitionSelfTest.java | 5 +- .../cache/IgniteTxMultiNodeAbstractTest.java | 20 +- .../GridCacheClientModesAbstractSelfTest.java | 6 +- .../distributed/GridCacheEventAbstractTest.java | 279 ++++---- .../GridCacheNodeFailureAbstractTest.java | 8 - ...GridCachePreloadRestartAbstractSelfTest.java | 9 - .../IgniteCacheSystemTransactionsSelfTest.java | 2 +- ...xOriginatingNodeFailureAbstractSelfTest.java | 4 +- ...cOriginatingNodeFailureAbstractSelfTest.java | 4 +- .../IgniteTxTimeoutAbstractTest.java | 8 - ...heAbstractTransformWriteThroughSelfTest.java | 2 +- .../GridCacheDhtEvictionsDisabledSelfTest.java | 6 +- .../dht/GridCacheDhtPreloadSelfTest.java | 8 - .../distributed/dht/GridCacheDhtTestUtils.java | 10 - ...itionedTxOriginatingNodeFailureSelfTest.java | 17 +- .../near/GridCacheNearEvictionSelfTest.java | 2 +- .../near/GridCacheNearMetricsSelfTest.java | 2 +- .../near/GridCacheNearMultiNodeSelfTest.java | 2 +- .../near/GridCacheNearOneNodeSelfTest.java | 2 +- ...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 26 +- ...GridCachePartitionedFilteredPutSelfTest.java | 5 +- .../GridCachePartitionedLoadCacheSelfTest.java | 2 +- ...achePartitionedMultiNodeCounterSelfTest.java | 8 - ...achePartitionedMultiNodeFullApiSelfTest.java | 68 +- ...ePartitionedMultiThreadedPutGetSelfTest.java | 4 +- ...achePartitionedPreloadLifecycleSelfTest.java | 2 +- .../near/GridPartitionedBackupLoadSelfTest.java | 2 +- .../GridCacheReplicatedEvictionSelfTest.java | 8 +- .../GridCacheReplicatedInvalidateSelfTest.java | 13 +- ...CacheReplicatedPreloadLifecycleSelfTest.java | 2 +- .../GridCacheReplicatedPreloadSelfTest.java | 2 +- .../eviction/GridCacheEvictionAbstractTest.java | 6 +- .../IgniteCacheExpiryPolicyAbstractTest.java | 10 +- ...eCacheExpiryPolicyWithStoreAbstractTest.java | 4 +- .../GridCacheSwapScanQueryAbstractSelfTest.java | 26 +- ...ridCacheContinuousQueryAbstractSelfTest.java | 20 +- .../DataStreamProcessorSelfTest.java | 8 +- .../processors/igfs/IgfsAbstractSelfTest.java | 2 +- .../igfs/IgfsDataManagerSelfTest.java | 6 +- .../igfs/IgfsDualAbstractSelfTest.java | 2 +- .../processors/igfs/IgfsProcessorSelfTest.java | 8 +- .../processors/igfs/IgfsSizeSelfTest.java | 10 +- .../processors/igfs/IgfsStreamsSelfTest.java | 7 +- .../GridSwapSpaceSpiAbstractSelfTest.java | 9 +- .../inmemory/GridTestSwapSpaceSpi.java | 2 +- .../ignite/testframework/GridTestUtils.java | 14 +- .../junits/common/GridCommonAbstractTest.java | 83 +-- .../query/h2/GridH2IndexingGeoSelfTest.java | 14 +- .../igfs/HadoopIgfsDualAbstractSelfTest.java | 3 +- .../processors/query/h2/IgniteH2Indexing.java | 50 +- .../query/h2/opt/GridH2AbstractKeyValueRow.java | 95 ++- .../query/h2/opt/GridH2KeyValueRowOffheap.java | 64 +- .../query/h2/opt/GridH2RowDescriptor.java | 2 +- .../processors/query/h2/opt/GridH2Table.java | 31 +- .../query/h2/opt/GridH2TreeIndex.java | 4 +- .../GridCacheAbstractFieldsQuerySelfTest.java | 40 +- .../cache/GridCacheCrossCacheQuerySelfTest.java | 52 +- .../cache/GridCacheOffHeapAndSwapSelfTest.java | 129 ++-- .../cache/GridCacheOffHeapSelfTest.java | 624 +++++++++++++++++ .../cache/GridCacheQueryMetricsSelfTest.java | 6 +- ...idCacheReduceQueryMultithreadedSelfTest.java | 5 +- .../processors/cache/GridCacheSwapSelfTest.java | 138 ++-- .../cache/GridIndexingWithNoopSwapSelfTest.java | 4 +- .../cache/IgniteCacheAbstractQuerySelfTest.java | 16 +- ...CacheOffheapTieredMultithreadedSelfTest.java | 319 +++++++++ .../cache/IgniteCacheQueryLoadSelfTest.java | 26 +- .../IgniteCacheQueryMultiThreadedSelfTest.java | 79 +-- ...GridCachePartitionedFieldsQuerySelfTest.java | 7 +- .../GridCacheReplicatedFieldsQuerySelfTest.java | 4 +- ...dCacheAbstractReduceFieldsQuerySelfTest.java | 16 +- .../query/h2/GridH2IndexRebuildTest.java | 66 +- .../h2/GridIndexingSpiAbstractSelfTest.java | 8 +- .../IgniteCacheQuerySelfTestSuite.java | 2 +- pom.xml | 6 +- 116 files changed, 2072 insertions(+), 1990 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2fd8c33d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ----------------------------------------------------------------------
