ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [49/50] [abbrv] ignite git commit: Merge remote-tracking branch 'remotes/origin/master' into ignite-1537
Date Wed, 28 Oct 2015 12:47:49 GMT
Merge remote-tracking branch 'remotes/origin/master' into ignite-1537


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/916b3a9b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/916b3a9b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/916b3a9b

Branch: refs/heads/ignite-1537
Commit: 916b3a9b5975baaf492c4763fdfb3d894770ada5
Parents: 0a4edc8 e769c3a
Author: sboikov <sboikov@gridgain.com>
Authored: Wed Oct 28 15:41:26 2015 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Wed Oct 28 15:41:26 2015 +0300

----------------------------------------------------------------------
 DEVNOTES.txt                                    |    8 +-
 assembly/dependencies-fabric-lgpl.xml           |  169 +
 assembly/dependencies-fabric.xml                |    3 +
 assembly/dependencies-hadoop.xml                |    1 +
 assembly/release-fabric-base.xml                |  107 +
 assembly/release-fabric-lgpl.xml                |   50 +
 assembly/release-fabric.xml                     |   85 +-
 config/fabric-lgpl/default-config.xml           |   29 +
 examples/README-LGPL.txt                        |   33 +
 examples/README.txt                             |   21 +-
 .../hibernate/example-hibernate-L2-cache.xml    |   30 +-
 examples/pom-standalone-lgpl.xml                |  217 +
 examples/pom-standalone.xml                     |  168 +-
 examples/pom.xml                                |  153 +-
 .../hibernate/HibernateL2CacheExample.java      |  245 +
 .../examples/datagrid/hibernate/Post.java       |  130 +
 .../examples/datagrid/hibernate/User.java       |  154 +
 .../datagrid/hibernate/package-info.java        |   22 +
 .../hibernate/CacheHibernatePersonStore.java    |  122 +
 .../hibernate/CacheHibernateStoreExample.java   |  151 +
 .../datagrid/store/hibernate/Person.hbm.xml     |   34 +
 .../datagrid/store/hibernate/hibernate.cfg.xml  |   41 +
 .../datagrid/store/hibernate/package-info.java  |   22 +
 .../misc/schedule/ComputeScheduleExample.java   |   82 +
 .../examples/misc/schedule/package-info.java    |   22 +
 .../hibernate/HibernateL2CacheExample.java      |  245 -
 .../examples/datagrid/hibernate/Post.java       |  130 -
 .../examples/datagrid/hibernate/User.java       |  154 -
 .../datagrid/hibernate/package-info.java        |   22 -
 .../hibernate/CacheHibernatePersonStore.java    |  122 -
 .../hibernate/CacheHibernateStoreExample.java   |  151 -
 .../datagrid/store/hibernate/Person.hbm.xml     |   34 -
 .../datagrid/store/hibernate/hibernate.cfg.xml  |   41 -
 .../datagrid/store/hibernate/package-info.java  |   22 -
 .../misc/schedule/ComputeScheduleExample.java   |   82 -
 .../examples/misc/schedule/package-info.java    |   22 -
 .../misc/schedule/ComputeScheduleExample.java   |   68 -
 .../java8/misc/schedule/package-info.java       |   22 -
 .../scalar/examples/ScalarScheduleExample.scala |   66 -
 ...ibernateL2CacheExampleMultiNodeSelfTest.java |   31 +
 .../HibernateL2CacheExampleSelfTest.java        |   33 +
 .../IgniteLgplExamplesSelfTestSuite.java        |   48 +
 ...ibernateL2CacheExampleMultiNodeSelfTest.java |   31 -
 .../HibernateL2CacheExampleSelfTest.java        |   33 -
 .../testsuites/IgniteExamplesSelfTestSuite.java |    4 -
 ...ibernateL2CacheExampleMultiNodeSelfTest.java |   29 -
 .../HibernateL2CacheExampleSelfTest.java        |   37 -
 .../tests/examples/ScalarExamplesSelfTest.scala |    5 -
 modules/apache-license-gen/pom.xml              |    3 +
 .../ClientAbstractMultiThreadedSelfTest.java    |    3 +-
 .../JettyRestProcessorAbstractSelfTest.java     |    4 +-
 .../apache/ignite/IgniteSystemProperties.java   |    9 +
 .../affinity/fair/FairAffinityFunction.java     |  497 +-
 .../rendezvous/RendezvousAffinityFunction.java  |  140 +-
 .../configuration/CacheConfiguration.java       |   28 +-
 .../configuration/TransactionConfiguration.java |    6 +-
 .../internal/GridEventConsumeHandler.java       |   19 +-
 .../apache/ignite/internal/IgniteKernal.java    |    2 +
 .../ignite/internal/IgniteNodeAttributes.java   |    3 +
 .../deployment/GridDeploymentLocalStore.java    |    8 +-
 .../GridDeploymentPerLoaderStore.java           |    8 +-
 .../GridDeploymentPerVersionStore.java          |    8 +-
 .../internal/portable/PortableContext.java      |  103 +-
 .../portable/api/PortableMarshaller.java        |    5 +
 .../processors/cache/CacheMetricsImpl.java      |   12 +-
 .../processors/cache/CacheObjectContext.java    |   17 +-
 .../processors/cache/GridCacheAdapter.java      |  816 ++--
 .../cache/GridCacheClearAllRunnable.java        |   18 +-
 .../cache/GridCacheConcurrentMap.java           |    4 +-
 .../processors/cache/GridCacheContext.java      |   10 +-
 .../processors/cache/GridCacheEntryEx.java      |   62 +-
 .../cache/GridCacheEvictionManager.java         |    5 +-
 .../cache/GridCacheEvictionRequest.java         |   18 +-
 .../cache/GridCacheEvictionResponse.java        |    7 +-
 .../processors/cache/GridCacheIoManager.java    |   34 +-
 .../processors/cache/GridCacheMapEntry.java     |  137 +-
 .../processors/cache/GridCacheMessage.java      |   72 +-
 .../processors/cache/GridCacheMvcc.java         |  143 +-
 .../cache/GridCacheMvccCandidate.java           |   26 +-
 .../processors/cache/GridCacheProcessor.java    |   26 -
 .../processors/cache/GridCacheProxyImpl.java    |   14 +-
 .../cache/GridCacheSharedContext.java           |    3 +
 .../processors/cache/GridCacheUtils.java        |   70 +-
 .../processors/cache/IgniteCacheProxy.java      |    2 +-
 .../processors/cache/IgniteInternalCache.java   |   19 +-
 .../distributed/GridCacheTtlUpdateRequest.java  |    7 +-
 .../distributed/GridCacheTxRecoveryFuture.java  |    9 +-
 .../distributed/GridCacheTxRecoveryRequest.java |    8 +-
 .../GridCacheTxRecoveryResponse.java            |   10 +-
 .../distributed/GridDistributedBaseMessage.java |   16 +-
 .../distributed/GridDistributedCacheEntry.java  |   12 +-
 .../distributed/GridDistributedLockRequest.java |    8 +-
 .../GridDistributedLockResponse.java            |   20 +-
 .../GridDistributedTxFinishRequest.java         |    6 +-
 .../GridDistributedTxFinishResponse.java        |    7 +-
 .../GridDistributedTxPrepareRequest.java        |   13 +-
 .../GridDistributedTxPrepareResponse.java       |   12 +-
 .../GridDistributedTxRemoteAdapter.java         |   61 +-
 .../GridDistributedUnlockRequest.java           |    7 +-
 .../dht/CacheDistributedGetFutureAdapter.java   |  158 +
 .../dht/GridDhtAffinityAssignmentRequest.java   |    7 +-
 .../dht/GridDhtAffinityAssignmentResponse.java  |    7 +-
 .../distributed/dht/GridDhtCacheAdapter.java    |   26 +-
 .../distributed/dht/GridDhtCacheEntry.java      |   23 +-
 .../cache/distributed/dht/GridDhtGetFuture.java |  199 +-
 .../distributed/dht/GridDhtLockFuture.java      |   10 +-
 .../distributed/dht/GridDhtLockRequest.java     |    7 +-
 .../distributed/dht/GridDhtLockResponse.java    |   14 +-
 .../dht/GridDhtTransactionalCacheAdapter.java   |  127 +-
 .../distributed/dht/GridDhtTxFinishFuture.java  |    9 +-
 .../distributed/dht/GridDhtTxFinishRequest.java |    7 +-
 .../dht/GridDhtTxFinishResponse.java            |    2 +-
 .../cache/distributed/dht/GridDhtTxLocal.java   |    4 +-
 .../distributed/dht/GridDhtTxPrepareFuture.java |  118 +-
 .../dht/GridDhtTxPrepareRequest.java            |   28 +-
 .../dht/GridDhtTxPrepareResponse.java           |   13 +-
 .../distributed/dht/GridDhtUnlockRequest.java   |    7 +-
 .../dht/GridPartitionedGetFuture.java           |  182 +-
 .../dht/atomic/GridDhtAtomicCache.java          |   28 +-
 .../GridDhtAtomicDeferredUpdateResponse.java    |   12 +-
 .../dht/atomic/GridDhtAtomicUpdateFuture.java   |    6 +-
 .../dht/atomic/GridDhtAtomicUpdateRequest.java  |   25 +-
 .../dht/atomic/GridDhtAtomicUpdateResponse.java |   11 +-
 .../dht/atomic/GridNearAtomicUpdateFuture.java  |   12 +-
 .../dht/atomic/GridNearAtomicUpdateRequest.java |   33 +-
 .../atomic/GridNearAtomicUpdateResponse.java    |   11 +-
 .../dht/colocated/GridDhtColocatedCache.java    |  138 +-
 .../colocated/GridDhtColocatedLockFuture.java   |    9 +-
 .../dht/preloader/GridDhtForceKeysFuture.java   |    5 +-
 .../dht/preloader/GridDhtForceKeysRequest.java  |   35 +-
 .../dht/preloader/GridDhtForceKeysResponse.java |   11 +-
 .../GridDhtPartitionDemandMessage.java          |    5 +
 .../GridDhtPartitionSupplyMessage.java          |    9 +-
 .../preloader/GridDhtPartitionSupplyPool.java   |   10 +-
 .../GridDhtPartitionsAbstractMessage.java       |    7 +-
 .../dht/preloader/GridDhtPreloader.java         |    3 +-
 .../distributed/near/GridNearAtomicCache.java   |    2 -
 .../distributed/near/GridNearCacheAdapter.java  |   53 +-
 .../near/GridNearCacheClearAllRunnable.java     |    9 +-
 .../distributed/near/GridNearCacheEntry.java    |   81 +-
 .../distributed/near/GridNearGetFuture.java     |  345 +-
 .../distributed/near/GridNearGetRequest.java    |   15 +-
 .../distributed/near/GridNearGetResponse.java   |   12 +-
 .../distributed/near/GridNearLockFuture.java    |    3 +-
 .../distributed/near/GridNearLockRequest.java   |    8 +-
 .../distributed/near/GridNearLockResponse.java  |    8 +-
 ...arOptimisticSerializableTxPrepareFuture.java |  930 ++++
 .../near/GridNearOptimisticTxPrepareFuture.java |  260 +-
 ...ridNearOptimisticTxPrepareFutureAdapter.java |  222 +
 .../GridNearPessimisticTxPrepareFuture.java     |   11 +-
 .../near/GridNearTransactionalCache.java        |   22 +-
 .../near/GridNearTxFinishFuture.java            |   20 +-
 .../near/GridNearTxFinishRequest.java           |    7 +-
 .../near/GridNearTxFinishResponse.java          |    2 +-
 .../cache/distributed/near/GridNearTxLocal.java |  157 +-
 .../near/GridNearTxPrepareFutureAdapter.java    |   13 +-
 .../near/GridNearTxPrepareRequest.java          |    8 +-
 .../near/GridNearTxPrepareResponse.java         |    8 +-
 .../distributed/near/GridNearUnlockRequest.java |    7 +-
 .../cache/local/GridLocalCacheEntry.java        |   23 +-
 .../cache/local/GridLocalLockFuture.java        |    2 +
 .../local/atomic/GridLocalAtomicCache.java      |    9 -
 .../portable/CacheObjectPortableContext.java    |    6 +-
 .../CacheObjectPortableProcessorImpl.java       |    5 +-
 .../query/GridCacheDistributedQueryFuture.java  |    5 +-
 .../query/GridCacheDistributedQueryManager.java |   25 +-
 .../cache/query/GridCacheQueryRequest.java      |   46 +-
 .../cache/query/GridCacheQueryResponse.java     |   29 +-
 .../continuous/CacheContinuousQueryHandler.java |    8 +-
 .../continuous/CacheContinuousQueryManager.java |    6 +-
 .../cache/transactions/IgniteInternalTx.java    |    8 +-
 .../transactions/IgniteTransactionsImpl.java    |    6 -
 .../cache/transactions/IgniteTxAdapter.java     |  128 +-
 .../cache/transactions/IgniteTxEntry.java       |   59 +-
 .../cache/transactions/IgniteTxHandler.java     |   20 +-
 .../transactions/IgniteTxLocalAdapter.java      |  843 ++--
 .../cache/transactions/IgniteTxLocalEx.java     |   27 +-
 .../cache/transactions/IgniteTxManager.java     |  327 +-
 .../cache/version/GridCacheVersionManager.java  |   73 +-
 .../IgniteCacheObjectProcessorImpl.java         |    7 +-
 .../datastreamer/DataStreamerImpl.java          |    2 +-
 .../processors/igfs/IgfsDataManager.java        |    2 -
 .../processors/igfs/IgfsDeleteWorker.java       |  102 +-
 .../internal/processors/igfs/IgfsImpl.java      |  164 +-
 .../processors/igfs/IgfsMetaManager.java        |  901 ++--
 .../processors/igfs/IgfsOutputStreamImpl.java   |    2 +
 .../internal/processors/igfs/IgfsUtils.java     |   23 +
 .../ignite/internal/util/lang/GridFunc.java     |    8 +-
 .../ignite/internal/util/nio/GridNioServer.java |    2 +-
 .../ignite/marshaller/AbstractMarshaller.java   |   12 +-
 .../ignite/marshaller/jdk/JdkMarshaller.java    |    7 +-
 .../optimized/OptimizedMarshaller.java          |   14 +-
 .../optimized/OptimizedMarshallerUtils.java     |   35 +-
 .../ignite/spi/deployment/DeploymentSpi.java    |    8 +-
 .../ignite/spi/discovery/tcp/ServerImpl.java    |   52 +
 .../apache/ignite/transactions/Transaction.java |    2 +-
 .../transactions/TransactionIsolation.java      |    3 +-
 modules/core/src/test/config/tests.properties   |    3 +
 .../AbstractAffinityFunctionSelfTest.java       |  293 ++
 .../affinity/AffinityClientNodeSelfTest.java    |  194 +
 ...ityFunctionBackupFilterAbstractSelfTest.java |  138 +
 ...unctionExcludeNeighborsAbstractSelfTest.java |  182 +
 .../affinity/IgniteClientNodeAffinityTest.java  |  194 -
 .../fair/FairAffinityDynamicCacheSelfTest.java  |   97 +
 ...airAffinityFunctionBackupFilterSelfTest.java |   35 +
 ...ffinityFunctionExcludeNeighborsSelfTest.java |   31 +
 .../fair/FairAffinityFunctionNodesSelfTest.java |  245 +
 .../fair/FairAffinityFunctionSelfTest.java      |   31 +
 .../GridFairAffinityFunctionNodesSelfTest.java  |  245 -
 .../fair/GridFairAffinityFunctionSelfTest.java  |  270 --
 .../IgniteFairAffinityDynamicCacheSelfTest.java |   97 -
 ...ousAffinityFunctionBackupFilterSelfTest.java |   35 +
 ...ffinityFunctionExcludeNeighborsSelfTest.java |   32 +
 .../RendezvousAffinityFunctionSelfTest.java     |   50 +
 .../ignite/igfs/IgfsEventsAbstractSelfTest.java |    6 +-
 .../GridDiscoveryManagerAttributesSelfTest.java |   44 +-
 .../cache/CacheAffinityCallSelfTest.java        |    4 +-
 .../cache/CacheNearReaderUpdateTest.java        |  388 ++
 .../CacheSerializableTransactionsTest.java      | 4295 ++++++++++++++++++
 .../cache/CrossCacheTxRandomOperationsTest.java |    8 +-
 .../GridCacheAbstractFailoverSelfTest.java      |   14 +-
 .../cache/GridCacheAbstractFullApiSelfTest.java |    4 +-
 .../GridCacheAbstractLocalStoreSelfTest.java    |    5 +
 .../GridCacheAbstractRemoveFailureTest.java     |   94 +-
 ...eAtomicEntryProcessorDeploymentSelfTest.java |  211 +
 .../cache/GridCacheClearSelfTest.java           |  308 ++
 .../GridCacheConcurrentTxMultiNodeTest.java     |    3 -
 .../GridCacheConditionalDeploymentSelfTest.java |  190 +
 ...idCacheConfigurationConsistencySelfTest.java |   17 -
 .../GridCacheDeploymentOffHeapSelfTest.java     |   17 +-
 .../cache/GridCacheDeploymentSelfTest.java      |   26 +-
 .../cache/GridCacheMvccFlagsTest.java           |    6 +-
 .../cache/GridCacheMvccPartitionedSelfTest.java |  164 +
 .../processors/cache/GridCacheMvccSelfTest.java |    3 +-
 .../processors/cache/GridCacheTestEntryEx.java  |   53 +-
 ...ctionalEntryProcessorDeploymentSelfTest.java |   31 +
 .../cache/IgniteCacheCreateRestartSelfTest.java |    2 +
 .../IgniteCacheEntryListenerAbstractTest.java   |   50 +-
 .../processors/cache/IgniteTxAbstractTest.java  |   42 +-
 .../IgniteTxMultiThreadedAbstractTest.java      |  106 +-
 ...IgnitePartitionedCountDownLatchSelfTest.java |    7 +-
 .../CacheAbstractRestartSelfTest.java           |  247 +
 ...NearDisabledAtomicInvokeRestartSelfTest.java |  179 +
 ...abledTransactionalInvokeRestartSelfTest.java |  173 +
 ...edTransactionalWriteReadRestartSelfTest.java |  124 +
 ...dCachePartitionedAffinityFilterSelfTest.java |  143 -
 ...onedNearDisabledTxMultiThreadedSelfTest.java |   31 +
 ...niteCacheClientNodeChangingTopologyTest.java |  174 +-
 .../dht/GridCacheDhtEntrySelfTest.java          |    2 +-
 .../dht/GridCacheDhtPreloadPutGetSelfTest.java  |    3 +
 .../dht/GridCacheTxNodeFailureSelfTest.java     |    2 +
 ...gniteAtomicLongChangingTopologySelfTest.java |    4 +-
 .../IgniteCacheCrossCacheTxFailoverTest.java    |   19 +
 .../dht/IgniteCacheLockFailoverSelfTest.java    |   11 +
 ...eAtomicInvalidPartitionHandlingSelfTest.java |    6 +-
 ...unctionExcludeNeighborsAbstractSelfTest.java |  184 -
 ...ledFairAffinityMultiNodeFullApiSelfTest.java |    8 +-
 ...icOffHeapTieredMultiNodeFullApiSelfTest.java |    7 +-
 .../near/GridCacheNearTxExceptionSelfTest.java  |    1 +
 ...CachePartitionedTxMultiThreadedSelfTest.java |   15 +-
 ...ffinityFunctionExcludeNeighborsSelfTest.java |   32 -
 ...xcludeNeighborsMultiNodeFullApiSelfTest.java |   36 +
 ...tedFairAffinityMultiNodeFullApiSelfTest.java |   35 +
 ...xcludeNeighborsMultiNodeFullApiSelfTest.java |   36 +
 ...dezvousAffinityMultiNodeFullApiSelfTest.java |   36 +
 .../replicated/GridReplicatedTxPreloadTest.java |    7 +-
 .../DataStreamerUpdateAfterLoadTest.java        |  184 +
 .../processors/igfs/IgfsAbstractSelfTest.java   |  639 ++-
 .../igfs/IgfsDataManagerSelfTest.java           |   13 +-
 .../igfs/IgfsMetaManagerSelfTest.java           |  170 +-
 .../processors/igfs/IgfsProcessorSelfTest.java  |   12 +-
 .../nio/IgniteExceptionInNioWorkerSelfTest.java |  105 +
 .../loadtests/hashmap/GridHashMapLoadTest.java  |    6 +-
 .../communication/GridCacheMessageSelfTest.java |   17 +-
 .../tcp/TcpClientDiscoverySpiSelfTest.java      |    4 +-
 .../inmemory/GridTestSwapSpaceSpi.java          |    8 +
 .../ignite/testframework/GridTestUtils.java     |   19 +-
 .../junits/common/GridCommonAbstractTest.java   |   19 +-
 .../ignite/testsuites/IgniteBasicTestSuite.java |    7 +-
 .../IgniteCacheFullApiSelfTestSuite.java        |   16 +-
 .../IgniteCacheLoadConsistencyTestSuite.java    |   42 +
 .../ignite/testsuites/IgniteCacheTestSuite.java |   38 +-
 .../testsuites/IgniteCacheTestSuite2.java       |   14 +-
 .../testsuites/IgniteCacheTestSuite3.java       |    8 +-
 .../testsuites/IgniteCacheTestSuite5.java       |   40 +
 .../ignite/testsuites/IgniteIgfsTestSuite.java  |    6 +
 .../testsuites/IgniteP2PSelfTestSuite.java      |   16 +-
 .../p2p/CacheDeploymentEntryProcessor.java      |   35 +
 .../CacheDeploymentPortableEntryProcessor.java  |   35 +
 modules/extdata/uri/pom.xml                     |   14 +-
 .../hadoop/igfs/HadoopIgfsWrapper.java          |   54 +-
 .../ignite/igfs/Hadoop1DualAbstractTest.java    |    5 -
 .../HadoopIgfs20FileSystemAbstractSelfTest.java |   27 +-
 .../IgniteHadoopFileSystemAbstractSelfTest.java |    2 +-
 .../CacheHibernateBlobStoreSelfTest.java        |    6 +-
 .../cache/IgniteCacheAbstractQuerySelfTest.java |    4 +
 .../cache/SqlFieldsQuerySelfTest.java           |  172 +
 .../IgniteCacheQuerySelfTestSuite.java          |    2 +
 modules/jms11/pom.xml                           |    2 +-
 .../apache/ignite/stream/mqtt/MqttStreamer.java |  386 +-
 .../stream/mqtt/IgniteMqttStreamerTest.java     |  142 +-
 .../mqtt/IgniteMqttStreamerTestSuite.java       |    4 +-
 .../main/cpp/common/project/vs/common.vcxproj   |    4 +-
 .../http/jetty/GridJettyRestHandler.java        |    2 +-
 modules/spark-2.10/pom.xml                      |    4 +-
 modules/spark/pom.xml                           |    4 +-
 .../spi/deployment/uri/UriDeploymentSpi.java    |   93 +-
 .../scanners/http/UriDeploymentHttpScanner.java |   10 +-
 .../http/GridHttpDeploymentSelfTest.java        |  132 +-
 .../config/benchmark-multicast.properties       |    5 +-
 .../yardstick/IgniteBenchmarkArguments.java     |   11 +
 .../IgniteAccountSerializableTxBenchmark.java   |   81 +
 .../cache/IgniteAccountTxAbstractBenchmark.java |   61 +
 .../cache/IgniteAccountTxBenchmark.java         |   74 +
 .../cache/IgniteCacheAbstractBenchmark.java     |   68 +
 .../IgnitePutAllSerializableTxBenchmark.java    |   77 +
 .../cache/IgnitePutAllTxBenchmark.java          |    6 +-
 .../ignite/yardstick/cache/model/Account.java   |   42 +
 .../ipfinder/zk/ZookeeperIpFinderTestSuite.java |   32 +
 parent/pom.xml                                  |    1 +
 pom.xml                                         |   19 +-
 321 files changed, 18491 insertions(+), 6903 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/916b3a9b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
index 3e76361,d806801..3eac499
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
@@@ -427,11 -427,8 +427,8 @@@ public final class GridDhtTxPrepareFutu
                  U.error(log, "Failed to get result value for cache entry: " + cached, e);
              }
              catch (GridCacheEntryRemovedException e) {
 -                assert false : "Got entry removed exception while holding transactional
lock on entry: " + e;
 +                assert false : "Got entry removed exception while holding transactional
lock on entry [e=" + e + ", cached=" + cached + ']';
              }
-             catch (GridCacheFilterFailedException e) {
-                 assert false : "Got filter failed exception with fail fast false " + e;
-             }
          }
      }
  

http://git-wip-us.apache.org/repos/asf/ignite/blob/916b3a9b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
index 55d3817,af43113..fb03c6f
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
@@@ -70,10 -64,11 +65,10 @@@ import static org.apache.ignite.transac
  /**
   *
   */
- public class GridNearOptimisticTxPrepareFuture extends GridNearTxPrepareFutureAdapter
+ public class GridNearOptimisticTxPrepareFuture extends GridNearOptimisticTxPrepareFutureAdapter
      implements GridCacheMvccFuture<IgniteInternalTx> {
      /** */
 -    @GridToStringInclude
 -    private Collection<IgniteTxKey> lockKeys = new GridConcurrentHashSet<>();
 +    private KeyLockFuture keyLockFut = new KeyLockFuture();
  
      /**
       * @param cctx Context.
@@@ -428,31 -266,27 +244,25 @@@
                  return;
              }
  
-             prepare(
-                 tx.optimistic() && tx.serializable() ? tx.readEntries() : Collections.<IgniteTxEntry>emptyList(),
-                 tx.writeEntries(),
-                 remap,
-                 topLocked);
 -            prepare(tx.writeEntries(), topLocked);
++            prepare(tx.writeEntries(), remap, topLocked);
  
              markInitialized();
          }
-         catch (TransactionTimeoutException | TransactionOptimisticException e) {
-             onError(cctx.localNodeId(), null, e);
+         catch (TransactionTimeoutException e) {
+             onError( e);
          }
 -        catch (IgniteCheckedException e) {
 -            onDone(e);
 -        }
      }
  
      /**
-      * @param reads Read entries.
       * @param writes Write entries.
 +     * @param remap Remap flag.
       * @param topLocked {@code True} if thread already acquired lock preventing topology
change.
 -     * @throws IgniteCheckedException If failed.
       */
      private void prepare(
-         Iterable<IgniteTxEntry> reads,
          Iterable<IgniteTxEntry> writes,
 +        boolean remap,
          boolean topLocked
 -    ) throws IgniteCheckedException {
 +    ) {
          AffinityTopologyVersion topVer = tx.topologyVersion();
  
          assert topVer.topologyVersion() > 0;
@@@ -477,35 -311,8 +287,12 @@@
          // Assign keys to primary nodes.
          GridDistributedTxMapping cur = null;
  
-         for (IgniteTxEntry read : reads) {
-             GridDistributedTxMapping updated = map(read, 
-                 topVer, 
-                 cur, 
-                 false,
-                 remap,
-                 topLocked);
- 
-             if (cur != updated) {
-                 mappings.offer(updated);
- 
-                 if (updated.node().isLocal()) {
-                     if (read.context().isNear())
-                         tx.nearLocallyMapped(true);
-                     else if (read.context().isColocated())
-                         tx.colocatedLocallyMapped(true);
-                 }
- 
-                 cur = updated;
-             }
-         }
- 
          for (IgniteTxEntry write : writes) {
 -            GridDistributedTxMapping updated = map(write, topVer, cur, topLocked);
 +            GridDistributedTxMapping updated = map(write, 
 +                topVer, 
 +                cur, 
-                 true, 
 +                remap,
 +                topLocked);
  
              if (cur != updated) {
                  mappings.offer(updated);
@@@ -642,8 -445,6 +430,7 @@@
       * @param entry Transaction entry.
       * @param topVer Topology version.
       * @param cur Current mapping.
-      * @param waitLock Wait lock flag.
 +     * @param remap Remap flag.                
       * @param topLocked {@code True} if thread already acquired lock preventing topology
change.
       * @return Mapping.
       */
@@@ -651,8 -452,6 +438,7 @@@
          IgniteTxEntry entry,
          AffinityTopologyVersion topVer,
          @Nullable GridDistributedTxMapping cur,
-         boolean waitLock,
 +        boolean remap,
          boolean topLocked
      ) {
          GridCacheContext cacheCtx = entry.context();
@@@ -679,9 -478,9 +465,9 @@@
          else
              entry.cached(cacheCtx.local().entryEx(entry.key(), topVer));
  
 -        if (cacheCtx.isNear() || cacheCtx.isLocal()) {
 +        if (!remap && (cacheCtx.isNear() || cacheCtx.isLocal())) {
-             if (waitLock && entry.explicitVersion() == null)
+             if (entry.explicitVersion() == null)
 -                lockKeys.add(entry.txKey());
 +                keyLockFut.addLockKey(entry.txKey());
          }
  
          if (cur == null || !cur.node().id().equals(primary.id()) || cur.near() != cacheCtx.isNear())
{

http://git-wip-us.apache.org/repos/asf/ignite/blob/916b3a9b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCacheEntry.java
----------------------------------------------------------------------


Mime
View raw message