#ignite-656: merged with ignite-sprint-4
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/637a1905 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/637a1905 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/637a1905 Branch: refs/heads/ignite-800 Commit: 637a190568031f6839fee7d6e0c05b9fa9dab98d Parents: 075ed82 fa20888 Author: Denis Magda <dma...@gridgain.com> Authored: Mon Apr 20 15:22:09 2015 +0300 Committer: Denis Magda <dma...@gridgain.com> Committed: Mon Apr 20 15:22:09 2015 +0300 ---------------------------------------------------------------------- DEVNOTES.txt | 53 +- assembly/dependencies-fabric.xml | 50 + assembly/dependencies-hadoop.xml | 1 - assembly/dependencies-optional-fabric.xml | 82 - assembly/dependencies-optional-hadoop.xml | 83 - assembly/release-base.xml | 5 - assembly/release-fabric.xml | 5 + examples/README.txt | 2 +- examples/pom.xml | 2 +- .../hibernate/CacheHibernateStoreExample.java | 3 - .../store/jdbc/CacheJdbcStoreExample.java | 3 - modules/aop/pom.xml | 2 +- modules/aws/pom.xml | 2 +- .../s3/S3CheckpointManagerSelfTest.java | 2 +- .../checkpoint/s3/S3CheckpointSpiSelfTest.java | 2 +- .../s3/S3SessionCheckpointSelfTest.java | 2 +- modules/clients/pom.xml | 2 +- modules/codegen/pom.xml | 14 +- modules/core/pom.xml | 2 +- .../apache/ignite/IgniteSystemProperties.java | 6 - .../apache/ignite/cache/query/QueryMetrics.java | 4 +- .../configuration/CacheConfiguration.java | 3 +- .../org/apache/ignite/internal/IgniteEx.java | 10 +- .../apache/ignite/internal/IgniteKernal.java | 10 +- .../internal/managers/GridManagerAdapter.java | 8 +- .../discovery/GridDiscoveryManager.java | 60 +- .../processors/cache/CacheEntryImpl.java | 29 +- .../processors/cache/CacheLockImpl.java | 20 +- .../processors/cache/CacheOperationContext.java | 170 ++ .../processors/cache/CacheProjection.java | 1614 ---------------- .../cache/CacheVersionedEntryImpl.java | 29 +- .../internal/processors/cache/GridCache.java | 224 --- .../processors/cache/GridCacheAdapter.java | 740 +++---- .../processors/cache/GridCacheAtomicFuture.java | 7 - .../cache/GridCacheConcurrentMap.java | 26 +- .../processors/cache/GridCacheContext.java | 66 +- .../processors/cache/GridCacheGateway.java | 119 +- .../processors/cache/GridCacheMapAdapter.java | 238 --- .../processors/cache/GridCacheProcessor.java | 21 +- .../processors/cache/GridCacheProjectionEx.java | 480 ----- .../cache/GridCacheProjectionImpl.java | 932 --------- .../processors/cache/GridCacheProxy.java | 27 - .../processors/cache/GridCacheProxyImpl.java | 845 ++------ .../processors/cache/GridCacheSwapManager.java | 4 +- .../processors/cache/GridCacheUtils.java | 34 +- .../processors/cache/IgniteCacheProxy.java | 469 ++--- .../processors/cache/IgniteInternalCache.java | 1816 ++++++++++++++++++ .../cache/affinity/GridCacheAffinityProxy.java | 30 +- .../CacheDataStructuresManager.java | 12 +- .../GridDistributedCacheAdapter.java | 15 +- .../distributed/dht/GridDhtCacheAdapter.java | 31 +- .../dht/GridDhtTransactionalCacheAdapter.java | 5 +- .../dht/GridPartitionedGetFuture.java | 20 +- .../dht/atomic/GridDhtAtomicCache.java | 190 +- .../dht/atomic/GridDhtAtomicUpdateFuture.java | 19 - .../dht/atomic/GridNearAtomicUpdateFuture.java | 14 - .../dht/colocated/GridDhtColocatedCache.java | 30 +- .../GridDhtPartitionsExchangeFuture.java | 5 + .../distributed/near/GridNearAtomicCache.java | 138 +- .../distributed/near/GridNearCacheAdapter.java | 57 +- .../distributed/near/GridNearCacheEntry.java | 16 +- .../distributed/near/GridNearGetFuture.java | 20 +- .../near/GridNearTransactionalCache.java | 17 +- .../processors/cache/local/GridLocalCache.java | 16 +- .../local/atomic/GridLocalAtomicCache.java | 143 +- .../processors/cache/query/CacheQueries.java | 143 -- .../processors/cache/query/CacheQuery.java | 12 +- .../CacheQueryCloseableScanBiPredicate.java | 30 + .../cache/query/GridCacheQueriesEx.java | 68 - .../cache/query/GridCacheQueriesImpl.java | 217 --- .../cache/query/GridCacheQueriesProxy.java | 285 --- .../cache/query/GridCacheQueryManager.java | 118 +- .../jdbc/GridCacheQueryJdbcMetadataTask.java | 4 +- .../cache/transactions/IgniteTxAdapter.java | 2 - .../transactions/IgniteTxLocalAdapter.java | 28 +- .../cache/transactions/IgniteTxManager.java | 44 - .../datastreamer/DataStreamerCacheUpdaters.java | 15 +- .../datastreamer/DataStreamerImpl.java | 81 +- .../datastreamer/DataStreamerUpdateJob.java | 16 +- .../datastructures/DataStructuresProcessor.java | 40 +- .../GridAtomicCacheQueueImpl.java | 12 +- .../datastructures/GridCacheAtomicLongImpl.java | 20 +- .../GridCacheAtomicReferenceImpl.java | 8 +- .../GridCacheAtomicSequenceImpl.java | 6 +- .../GridCacheAtomicStampedImpl.java | 8 +- .../GridCacheCountDownLatchImpl.java | 6 +- .../datastructures/GridCacheSetImpl.java | 6 +- .../GridTransactionalCacheQueueImpl.java | 8 +- .../dr/IgniteDrDataStreamerCacheUpdater.java | 2 - .../processors/igfs/IgfsDataManager.java | 12 +- .../processors/igfs/IgfsMetaManager.java | 47 +- .../processors/rest/GridRestCommand.java | 11 +- .../processors/rest/GridRestProcessor.java | 9 - .../message/GridClientCacheQueryRequest.java | 366 ---- .../cache/GridCacheClientQueryResult.java | 97 - .../handlers/cache/GridCacheCommandHandler.java | 78 +- .../cache/GridCacheQueryCommandHandler.java | 480 ----- .../protocols/tcp/GridTcpRestNioListener.java | 24 - .../rest/request/GridRestCacheQueryRequest.java | 143 -- .../service/GridServiceProcessor.java | 15 +- .../processors/task/GridTaskProcessor.java | 8 +- .../util/future/GridCompoundFuture.java | 9 +- .../visor/cache/VisorCacheMetadataTask.java | 9 +- .../internal/visor/cache/VisorCacheMetrics.java | 4 +- .../visor/cache/VisorCacheRebalanceTask.java | 4 +- .../visor/cache/VisorCacheResetMetricsTask.java | 2 +- .../visor/cache/VisorCacheSwapBackupsTask.java | 2 +- .../org/apache/ignite/spi/IgniteSpiAdapter.java | 5 + .../org/apache/ignite/spi/IgniteSpiContext.java | 6 + .../communication/tcp/TcpCommunicationSpi.java | 70 +- .../tcp/TcpCommunicationSpiMBean.java | 9 - .../ignite/spi/discovery/DiscoverySpi.java | 7 + .../discovery/tcp/TcpClientDiscoverySpi.java | 12 + .../spi/discovery/tcp/TcpDiscoverySpi.java | 32 +- .../ignite/startup/BasicWarmupClosure.java | 32 +- .../TransactionSynchronization.java | 45 - .../internal/GridCacheProjectionRemoveTest.java | 41 - ...ridFailFastNodeFailureDetectionSelfTest.java | 117 ++ .../internal/GridLifecycleBeanSelfTest.java | 36 + .../internal/IgniteInternalCacheRemoveTest.java | 41 + .../GridCacheAbstractFailoverSelfTest.java | 44 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 50 +- .../GridCacheConcurrentTxMultiNodeTest.java | 2 +- ...CacheFullTextQueryMultithreadedSelfTest.java | 6 +- .../processors/cache/GridCacheOffHeapTest.java | 4 +- .../GridCachePreloadingEvictionsSelfTest.java | 4 +- .../cache/GridCachePutAllFailoverSelfTest.java | 14 +- .../processors/cache/GridCachePutAllTask.java | 56 +- ...IgniteCacheAtomicPutAllFailoverSelfTest.java | 32 + .../cache/IgniteDynamicCacheStartSelfTest.java | 4 +- .../cache/IgniteTxMultiNodeAbstractTest.java | 35 +- .../GridCacheSequenceApiSelfAbstractTest.java | 2 +- ...GridCachePartitionedNodeRestartSelfTest.java | 67 - .../GridCacheAbstractNodeRestartSelfTest.java | 23 +- .../GridCacheAtomicTimeoutSelfTest.java | 314 --- .../GridCacheMultiNodeLockAbstractTest.java | 14 +- .../IgniteCacheAtomicMessageRecoveryTest.java | 32 + .../IgniteCacheAtomicNodeRestartTest.java | 33 + .../IgniteCacheMessageRecoveryAbstractTest.java | 175 ++ .../IgniteCacheSystemTransactionsSelfTest.java | 4 +- .../IgniteCacheTxMessageRecoveryTest.java | 32 + ...GridCacheDhtEvictionNearReadersSelfTest.java | 2 +- .../dht/GridCacheDhtEvictionSelfTest.java | 4 +- .../dht/GridCacheDhtPreloadPutGetSelfTest.java | 8 +- .../dht/IgniteCacheMultiTxLockSelfTest.java | 2 +- ...eAtomicInvalidPartitionHandlingSelfTest.java | 14 +- .../GridCachePartitionedFullApiSelfTest.java | 2 +- .../GridCachePartitionedNodeRestartTest.java | 1 + ...achePartitionedPreloadLifecycleSelfTest.java | 2 +- .../GridCachePartitionedTxSalvageSelfTest.java | 4 + .../GridCacheReplicatedNodeRestartSelfTest.java | 2 + ...acheAtomicReplicatedNodeRestartSelfTest.java | 32 + ...CacheReplicatedPreloadLifecycleSelfTest.java | 2 +- .../GridCacheReplicatedPreloadSelfTest.java | 4 +- .../GridCacheSwapScanQueryAbstractSelfTest.java | 38 +- .../processors/igfs/IgfsSizeSelfTest.java | 2 +- .../processors/igfs/IgfsStreamsSelfTest.java | 2 +- .../cache/GridCacheCommandHandlerSelfTest.java | 10 +- .../GridServiceReassignmentSelfTest.java | 2 +- .../GridContinuousOperationsLoadTest.java | 3 +- .../GridTcpCommunicationSpiConfigSelfTest.java | 1 - .../testframework/GridSpiTestContext.java | 5 + .../junits/common/GridCommonAbstractTest.java | 36 +- .../ignite/testsuites/IgniteBasicTestSuite.java | 1 + .../IgniteCacheFailoverTestSuite.java | 2 +- .../testsuites/IgniteCacheRestartTestSuite.java | 20 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 3 +- modules/extdata/p2p/pom.xml | 2 +- modules/extdata/uri/pom.xml | 2 +- modules/geospatial/pom.xml | 2 +- .../query/h2/GridH2IndexingGeoSelfTest.java | 70 +- modules/hadoop/pom.xml | 2 +- .../hadoop/jobtracker/HadoopJobTracker.java | 16 +- .../HadoopDefaultMapReducePlannerSelfTest.java | 8 +- modules/hibernate/pom.xml | 2 +- .../HibernateAccessStrategyAdapter.java | 14 +- .../hibernate/HibernateCollectionRegion.java | 2 +- .../cache/hibernate/HibernateEntityRegion.java | 2 +- .../hibernate/HibernateGeneralDataRegion.java | 4 +- .../hibernate/HibernateNaturalIdRegion.java | 2 +- .../HibernateNonStrictAccessStrategy.java | 6 +- .../hibernate/HibernateQueryResultsRegion.java | 2 +- .../HibernateReadOnlyAccessStrategy.java | 4 +- .../HibernateReadWriteAccessStrategy.java | 10 +- .../ignite/cache/hibernate/HibernateRegion.java | 6 +- .../cache/hibernate/HibernateRegionFactory.java | 10 +- .../hibernate/HibernateTimestampsRegion.java | 2 +- .../HibernateTransactionalAccessStrategy.java | 12 +- .../HibernateTransactionalDataRegion.java | 2 +- .../HibernateL2CacheConfigurationSelfTest.java | 2 +- .../hibernate/HibernateL2CacheSelfTest.java | 2 +- modules/indexing/pom.xml | 2 +- .../processors/query/h2/IgniteH2Indexing.java | 7 +- .../query/h2/sql/GridSqlFunction.java | 6 +- .../query/h2/sql/GridSqlPlaceholder.java | 51 + .../query/h2/sql/GridSqlQueryParser.java | 6 +- .../GridCacheAbstractFieldsQuerySelfTest.java | 78 +- .../cache/GridCacheCrossCacheQuerySelfTest.java | 74 +- .../cache/GridCacheQueryMetricsSelfTest.java | 32 +- .../GridCacheQuerySerializationSelfTest.java | 144 ++ ...idCacheReduceQueryMultithreadedSelfTest.java | 12 +- .../cache/GridIndexingWithNoopSwapSelfTest.java | 19 +- ...GridCachePartitionedFieldsQuerySelfTest.java | 4 +- .../GridCacheReplicatedFieldsQuerySelfTest.java | 8 +- ...dCacheAbstractReduceFieldsQuerySelfTest.java | 11 +- ...cheReduceFieldsQueryPartitionedSelfTest.java | 5 +- .../query/h2/GridH2IndexRebuildTest.java | 18 +- .../h2/sql/AbstractH2CompareQueryTest.java | 49 +- .../query/h2/sql/GridQueryParsingTest.java | 9 + .../query/h2/sql/H2CompareBigQueryTest.java | 2 +- .../IgniteCacheQuerySelfTestSuite.java | 4 + .../processors/query/h2/sql/bigQuery.sql | 2 +- modules/jcl/pom.xml | 2 +- modules/jta/pom.xml | 2 +- modules/log4j/pom.xml | 2 +- modules/rest-http/pom.xml | 2 +- modules/scalar/pom.xml | 2 +- modules/schedule/pom.xml | 2 +- modules/schema-import/pom.xml | 2 +- modules/slf4j/pom.xml | 2 +- modules/spring/pom.xml | 2 +- modules/ssh/pom.xml | 2 +- modules/tools/pom.xml | 2 +- modules/urideploy/pom.xml | 2 +- modules/visor-console/pom.xml | 6 +- .../ignite/visor/commands/VisorConsole.scala | 20 +- modules/visor-plugins/pom.xml | 2 +- modules/web/pom.xml | 2 +- modules/yardstick/pom.xml | 2 +- .../cache/IgniteCacheAbstractBenchmark.java | 2 +- .../jdbc/IgniteJdbcStoreAbstractBenchmark.java | 4 +- pom.xml | 43 +- 232 files changed, 5184 insertions(+), 8859 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/637a1905/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java index b9c41d0,e0e1f06..59ce0e9 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java @@@ -1700,20 -1583,20 +1583,20 @@@ public abstract class GridCacheAdapter< boolean deserializePortable, boolean skipVals ) { - GridCacheProjectionImpl<K, V> prj = ctx.projectionPerCall(); + CacheOperationContext opCtx = ctx.operationContextPerCall(); - subjId = ctx.subjectIdPerCall(subjId, prj); + subjId = ctx.subjectIdPerCall(subjId, opCtx); return getAllAsync(keys, - prj == null || !prj.skipStore(), - entry, - !skipTx, - subjId, - taskName, - deserializePortable, - forcePrimary, - skipVals ? null : expiryPolicy(prj != null ? prj.expiry() : null), - skipVals); - true, ++ opCtx == null || !opCtx.skipStore(), + entry, + !skipTx, + subjId, + taskName, + deserializePortable, + forcePrimary, + skipVals ? null : expiryPolicy(opCtx != null ? opCtx.expiry() : null), + skipVals); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/637a1905/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/637a1905/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/637a1905/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java index da0814c,d85bc75..1c46fd0 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java @@@ -528,10 -519,8 +519,10 @@@ public abstract class GridDhtCacheAdapt boolean deserializePortable, boolean skipVals ) { - GridCacheProjectionImpl<K, V> prj = ctx.projectionPerCall(); ++ CacheOperationContext opCtx = ctx.operationContextPerCall(); + return getAllAsync(keys, - prj == null || !prj.skipStore(), - true, ++ opCtx == null || !opCtx.skipStore(), null, /*don't check local tx. */false, subjId, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/637a1905/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/637a1905/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java index c56ff2a,85f11b5..08a1622 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java @@@ -284,10 -262,8 +262,10 @@@ public class GridDhtAtomicCache<K, V> e final UUID subjId0 = subjId; - final ExpiryPolicy expiryPlc = skipVals ? null : prj != null ? prj.expiry() : null; + final ExpiryPolicy expiryPlc = skipVals ? null : opCtx != null ? opCtx.expiry() : null; - final boolean skipStore = prj != null && prj.skipStore(); ++ final boolean skipStore = opCtx != null && opCtx.skipStore(); + return asyncOp(new CO<IgniteInternalFuture<Map<K, V>>>() { @Override public IgniteInternalFuture<Map<K, V>> apply() { return getAllAsync0(ctx.cacheKeysView(keys), http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/637a1905/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/637a1905/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java index 018c071,9c59354..00443bc --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java @@@ -186,7 -185,7 +185,7 @@@ public class GridDhtColocatedCache<K, V return loadAsync( ctx.cacheKeysView(keys), - prj == null || !prj.skipStore(), - true, ++ opCtx == null || !opCtx.skipStore(), false, forcePrimary, topVer, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/637a1905/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java index 1792d60,786f028..29989e7 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java @@@ -383,9 -383,8 +383,9 @@@ public class GridNearAtomicCache<K, V> subjId, taskName, deserializePortable, - skipVals ? null : prj != null ? prj.expiry() : null, + skipVals ? null : opCtx != null ? opCtx.expiry() : null, - skipVals); + skipVals, - prj != null && prj.skipStore()); ++ opCtx != null && opCtx.skipStore()); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/637a1905/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java index e2cf83b,f8923e8..28e1f28 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java @@@ -197,27 -197,9 +197,10 @@@ public abstract class GridNearCacheAdap taskName, true, null, - skipVals); + skipVals, + /*skip store*/false); } - /** {@inheritDoc} */ - @Override public V reload(K key) - throws IgniteCheckedException { - V val; - - try { - val = dht().reload(key); - } - catch (GridDhtInvalidPartitionException ignored) { - return null; - } - - V nearVal = super.reload(key); - - return val == null ? nearVal : val; - } - /** * @param tx Transaction. * @param keys Keys to load. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/637a1905/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheEntry.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/637a1905/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java index c66c208,a0197c7..ca73e9b --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java @@@ -137,9 -137,8 +137,9 @@@ public class GridNearTransactionalCache subjId, taskName, deserializePortable, - skipVals ? null : prj != null ? prj.expiry() : null, + skipVals ? null : opCtx != null ? opCtx.expiry() : null, - skipVals); + skipVals, - prj != null && prj.skipStore()); ++ opCtx != null && opCtx.skipStore()); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/637a1905/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java index b546a38,00a7e06..00a7a22 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java @@@ -597,8 -551,8 +551,8 @@@ public class GridLocalAtomicCache<K, V if (success || !storeEnabled) return vals; - return getAllAsync(keys, prj == null || !prj.skipStore(), null, false, subjId, taskName, deserializePortable, - return getAllAsync(keys, true, null, false, subjId, taskName, deserializePortable, false, expiry, skipVals) - .get(); ++ return getAllAsync(keys, opCtx == null || !opCtx.skipStore(), null, false, subjId, taskName, deserializePortable, + false, expiry, skipVals).get(); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/637a1905/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/637a1905/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java ----------------------------------------------------------------------
