Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into
ignite-gg-9998
Conflicts:
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java
modules/core/src/main/resources/META-INF/classnames.properties
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8012b0b1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8012b0b1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8012b0b1
Branch: refs/heads/ignite-gg-9998
Commit: 8012b0b10aa8a709f01d66067bf34dd2d9985e39
Parents: 73b110a 0f3d372
Author: ivasilinets <[email protected]>
Authored: Tue Apr 28 14:27:37 2015 +0300
Committer: ivasilinets <[email protected]>
Committed: Tue Apr 28 14:27:37 2015 +0300
----------------------------------------------------------------------
DEVNOTES.txt | 53 +-
RELEASE_NOTES.txt | 13 +
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 -
.../streaming/wordcount/CacheConfig.java | 5 +
.../streaming/wordcount/QueryWords.java | 4 +-
.../examples/ScalarContinuationExample.scala | 10 +-
modules/aop/pom.xml | 2 +-
.../aop/aspectj/GridifyAspectJAspect.java | 2 +-
.../aspectj/GridifySetToSetAspectJAspect.java | 2 +-
.../aspectj/GridifySetToValueAspectJAspect.java | 2 +-
.../aop/spring/GridifySetToSetSpringAspect.java | 2 +-
.../spring/GridifySetToValueSpringAspect.java | 2 +-
.../gridify/aop/spring/GridifySpringAspect.java | 2 +-
modules/aws/pom.xml | 2 +-
.../s3/S3CheckpointManagerSelfTest.java | 2 +-
.../checkpoint/s3/S3CheckpointSpiSelfTest.java | 2 +-
.../s3/S3SessionCheckpointSelfTest.java | 2 +-
modules/clients/pom.xml | 2 +-
.../client/ClientReconnectionSelfTest.java | 2 +
modules/codegen/pom.xml | 14 +-
modules/core/pom.xml | 2 +-
.../java/org/apache/ignite/IgniteCache.java | 10 +-
.../apache/ignite/IgniteSystemProperties.java | 13 +-
.../main/java/org/apache/ignite/Ignition.java | 44 +
.../apache/ignite/cache/CacheInterceptor.java | 9 +-
.../cache/CacheServerNotFoundException.java | 12 +-
.../apache/ignite/cache/CachingProvider.java | 3 +
.../cache/eviction/fifo/FifoEvictionPolicy.java | 7 +-
.../igfs/IgfsPerBlockLruEvictionPolicy.java | 3 +-
.../cache/eviction/lru/LruEvictionPolicy.java | 5 +-
.../eviction/sorted/SortedEvictionPolicy.java | 431 +++++
.../sorted/SortedEvictionPolicyMBean.java | 66 +
.../cache/eviction/sorted/package-info.java | 21 +
.../apache/ignite/cache/query/QueryMetrics.java | 4 +-
.../apache/ignite/cache/query/ScanQuery.java | 2 +-
.../ignite/cache/query/SqlFieldsQuery.java | 55 +-
.../ignite/compute/ComputeJobContinuation.java | 2 +
.../configuration/CacheConfiguration.java | 40 +-
.../configuration/IgniteConfiguration.java | 107 ++
.../ignite/configuration/TopologyValidator.java | 35 +
.../ignite/events/CacheQueryExecutedEvent.java | 3 +-
.../ignite/events/CacheQueryReadEvent.java | 3 +-
.../ignite/internal/ClusterMetricsSnapshot.java | 3 -
.../apache/ignite/internal/GridComponent.java | 5 +-
.../ignite/internal/GridJobContextImpl.java | 99 +-
.../ignite/internal/GridPluginComponent.java | 5 +-
.../org/apache/ignite/internal/IgniteEx.java | 10 +-
.../apache/ignite/internal/IgniteKernal.java | 25 +-
.../org/apache/ignite/internal/IgnitionEx.java | 179 +-
.../ignite/internal/MarshallerContextImpl.java | 2 +-
.../connection/GridClientNioTcpConnection.java | 9 +-
.../ClusterTopologyServerNotFoundException.java | 12 +-
.../internal/managers/GridManagerAdapter.java | 12 +-
.../managers/communication/GridIoManager.java | 33 +-
.../GridLifecycleAwareMessageFilter.java | 35 +
.../deployment/GridDeploymentClassLoader.java | 2 +-
.../discovery/GridDiscoveryManager.java | 83 +-
.../eventstorage/GridEventStorageManager.java | 6 +
.../processors/GridProcessorAdapter.java | 5 +-
.../affinity/GridAffinityAssignmentCache.java | 11 +-
.../processors/cache/CacheEntryImpl.java | 29 +-
.../processors/cache/CacheInvokeResult.java | 24 +-
.../processors/cache/CacheLockImpl.java | 20 +-
.../processors/cache/CacheOperationContext.java | 170 ++
.../processors/cache/CacheProjection.java | 1614 ----------------
.../cache/CacheStoreBalancingWrapper.java | 6 +
.../cache/CacheVersionedEntryImpl.java | 29 +-
.../internal/processors/cache/GridCache.java | 224 ---
.../processors/cache/GridCacheAdapter.java | 743 +++----
.../cache/GridCacheAffinityManager.java | 12 -
.../processors/cache/GridCacheAtomicFuture.java | 7 -
.../cache/GridCacheConcurrentMap.java | 26 +-
.../processors/cache/GridCacheContext.java | 66 +-
.../processors/cache/GridCacheEntryEx.java | 4 +
.../cache/GridCacheEvictionManager.java | 11 +-
.../processors/cache/GridCacheGateway.java | 119 +-
.../processors/cache/GridCacheIoManager.java | 6 +
.../processors/cache/GridCacheMapAdapter.java | 238 ---
.../processors/cache/GridCacheMapEntry.java | 24 +-
.../GridCachePartitionExchangeManager.java | 7 +-
.../processors/cache/GridCacheProcessor.java | 25 +-
.../processors/cache/GridCacheProjectionEx.java | 480 -----
.../cache/GridCacheProjectionImpl.java | 932 ---------
.../processors/cache/GridCacheProxy.java | 27 -
.../processors/cache/GridCacheProxyImpl.java | 845 ++------
.../processors/cache/GridCacheReturn.java | 5 +-
.../processors/cache/GridCacheSwapManager.java | 4 +-
.../processors/cache/GridCacheUtils.java | 87 +-
.../processors/cache/IgniteCacheProxy.java | 482 ++---
.../processors/cache/IgniteInternalCache.java | 1816 ++++++++++++++++++
.../cache/affinity/GridCacheAffinityImpl.java | 2 +-
.../cache/affinity/GridCacheAffinityProxy.java | 30 +-
.../CacheDataStructuresManager.java | 12 +-
.../GridDistributedCacheAdapter.java | 35 +-
.../distributed/GridDistributedLockRequest.java | 89 +-
.../GridDistributedTxRemoteAdapter.java | 3 +
.../dht/GridDhtAffinityAssignmentResponse.java | 21 +-
.../distributed/dht/GridDhtCacheAdapter.java | 31 +-
.../cache/distributed/dht/GridDhtGetFuture.java | 9 +-
.../distributed/dht/GridDhtLockFuture.java | 20 +-
.../distributed/dht/GridDhtLockRequest.java | 7 +-
.../distributed/dht/GridDhtTopologyFuture.java | 8 +
.../dht/GridDhtTransactionalCacheAdapter.java | 24 +-
.../distributed/dht/GridDhtTxFinishFuture.java | 2 +-
.../cache/distributed/dht/GridDhtTxLocal.java | 3 +
.../distributed/dht/GridDhtTxLocalAdapter.java | 26 +-
.../distributed/dht/GridDhtTxPrepareFuture.java | 18 +-
.../cache/distributed/dht/GridDhtTxRemote.java | 7 +-
.../dht/GridPartitionedGetFuture.java | 27 +-
.../dht/atomic/GridDhtAtomicCache.java | 232 +--
.../dht/atomic/GridDhtAtomicUpdateFuture.java | 19 -
.../dht/atomic/GridNearAtomicUpdateFuture.java | 57 +-
.../dht/atomic/GridNearAtomicUpdateRequest.java | 49 +-
.../dht/colocated/GridDhtColocatedCache.java | 80 +-
.../colocated/GridDhtColocatedLockFuture.java | 42 +-
.../preloader/GridDhtPartitionSupplyPool.java | 2 +-
.../GridDhtPartitionsExchangeFuture.java | 28 +
.../distributed/near/GridNearAtomicCache.java | 143 +-
.../distributed/near/GridNearCacheAdapter.java | 67 +-
.../distributed/near/GridNearCacheEntry.java | 26 +-
.../distributed/near/GridNearGetFuture.java | 37 +-
.../distributed/near/GridNearLockFuture.java | 41 +-
.../distributed/near/GridNearLockRequest.java | 7 +-
.../near/GridNearTransactionalCache.java | 56 +-
.../near/GridNearTxFinishFuture.java | 3 +
.../cache/distributed/near/GridNearTxLocal.java | 7 +-
.../near/GridNearTxPrepareFuture.java | 20 +
.../distributed/near/GridNearTxRemote.java | 7 +-
.../processors/cache/local/GridLocalCache.java | 16 +-
.../cache/local/GridLocalLockFuture.java | 2 +
.../local/atomic/GridLocalAtomicCache.java | 206 +-
.../processors/cache/query/CacheQueries.java | 143 --
.../processors/cache/query/CacheQuery.java | 12 +-
.../CacheQueryCloseableScanBiPredicate.java | 30 +
.../query/GridCacheDistributedQueryManager.java | 3 +
.../cache/query/GridCacheLocalQueryFuture.java | 3 +
.../cache/query/GridCacheQueriesEx.java | 68 -
.../cache/query/GridCacheQueriesImpl.java | 217 ---
.../cache/query/GridCacheQueriesProxy.java | 285 ---
.../query/GridCacheQueryFutureAdapter.java | 3 +
.../cache/query/GridCacheQueryManager.java | 138 +-
.../jdbc/GridCacheQueryJdbcMetadataTask.java | 7 +-
.../cache/transactions/IgniteTxAdapter.java | 9 +-
.../cache/transactions/IgniteTxEntry.java | 74 +-
.../cache/transactions/IgniteTxHandler.java | 27 +-
.../transactions/IgniteTxLocalAdapter.java | 134 +-
.../cache/transactions/IgniteTxLocalEx.java | 4 +-
.../cache/transactions/IgniteTxManager.java | 44 -
.../IgniteCacheObjectProcessorImpl.java | 2 +-
.../closure/GridClosureProcessor.java | 16 +-
.../continuous/GridContinuousProcessor.java | 4 +-
.../datastreamer/DataStreamProcessor.java | 28 +-
.../datastreamer/DataStreamerCacheUpdaters.java | 15 +-
.../datastreamer/DataStreamerImpl.java | 84 +-
.../datastreamer/DataStreamerRequest.java | 38 +-
.../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/IgfsFileWorkerBatch.java | 3 +
.../processors/igfs/IgfsInputStreamImpl.java | 2 +-
.../processors/igfs/IgfsMetaManager.java | 47 +-
.../processors/igfs/IgfsOutputStreamImpl.java | 6 +-
.../internal/processors/igfs/IgfsThread.java | 8 +-
.../processors/job/GridJobHoldListener.java | 6 +-
.../processors/job/GridJobProcessor.java | 28 +-
.../internal/processors/job/GridJobWorker.java | 32 +-
.../plugin/IgnitePluginProcessor.java | 13 +-
.../portable/GridPortableInputStream.java | 26 -
.../query/GridQueryFieldMetadata.java | 2 +-
.../processors/query/GridQueryIndexing.java | 4 +-
.../processors/query/GridQueryProcessor.java | 94 +-
.../processors/rest/GridRestCommand.java | 11 +-
.../processors/rest/GridRestProcessor.java | 12 +-
.../message/GridClientCacheQueryRequest.java | 366 ----
.../cache/GridCacheClientQueryResult.java | 97 -
.../handlers/cache/GridCacheCommandHandler.java | 78 +-
.../cache/GridCacheQueryCommandHandler.java | 480 -----
.../top/GridTopologyCommandHandler.java | 3 +-
.../protocols/tcp/GridTcpRestNioListener.java | 24 -
.../rest/request/GridRestCacheQueryRequest.java | 143 --
.../service/GridServiceProcessor.java | 24 +-
.../processors/task/GridTaskProcessor.java | 8 +-
.../processors/task/GridTaskWorker.java | 12 +
.../timeout/GridTimeoutProcessor.java | 3 +
.../ignite/internal/util/GridJavaProcess.java | 42 +-
.../ignite/internal/util/IgniteUtils.java | 22 +-
.../util/future/GridCompoundFuture.java | 9 +-
.../util/ipc/loopback/IpcServerTcpEndpoint.java | 2 +-
.../shmem/IpcSharedMemoryServerEndpoint.java | 2 +-
.../ignite/internal/util/lang/GridFunc.java | 12 +-
.../ignite/internal/util/nio/GridNioServer.java | 6 +
.../util/spring/IgniteSpringHelper.java | 54 +-
.../apache/ignite/internal/util/typedef/X.java | 2 +-
.../ignite/internal/util/worker/GridWorker.java | 3 +
.../ignite/internal/visor/cache/VisorCache.java | 92 +-
.../visor/cache/VisorCacheConfiguration.java | 2 +-
.../visor/cache/VisorCacheMetadataTask.java | 9 +-
.../internal/visor/cache/VisorCacheMetrics.java | 6 +-
.../visor/cache/VisorCacheRebalanceTask.java | 4 +-
.../visor/cache/VisorCacheResetMetricsTask.java | 2 +-
.../visor/cache/VisorCacheSwapBackupsTask.java | 2 +-
.../visor/misc/VisorResolveHostNameTask.java | 2 +-
.../visor/node/VisorBasicConfiguration.java | 11 +
.../visor/node/VisorNodeDataCollectorJob.java | 8 +-
.../visor/node/VisorNodeDataCollectorTask.java | 1 +
.../internal/visor/query/VisorQueryArg.java | 82 +
.../visor/query/VisorQueryCleanupTask.java | 10 +-
.../internal/visor/query/VisorQueryCursor.java | 96 +
.../internal/visor/query/VisorQueryField.java | 66 +-
.../internal/visor/query/VisorQueryJob.java | 174 ++
.../visor/query/VisorQueryNextPageTask.java | 75 +-
.../internal/visor/query/VisorQueryResult.java | 6 +-
.../visor/query/VisorQueryResultEx.java | 16 +-
.../internal/visor/query/VisorQueryTask.java | 283 +--
.../internal/visor/query/VisorQueryUtils.java | 55 +-
.../ignite/messaging/MessagingListenActor.java | 3 +
.../apache/ignite/plugin/PluginProvider.java | 5 +-
.../org/apache/ignite/spi/IgniteSpiAdapter.java | 5 +
.../org/apache/ignite/spi/IgniteSpiContext.java | 6 +
.../org/apache/ignite/spi/IgniteSpiThread.java | 3 +
.../communication/tcp/TcpCommunicationSpi.java | 70 +-
.../tcp/TcpCommunicationSpiMBean.java | 9 -
.../ignite/spi/discovery/DiscoverySpi.java | 7 +
.../spi/discovery/DiscoverySpiDataExchange.java | 5 +-
.../discovery/tcp/TcpClientDiscoverySpi.java | 22 +-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 145 +-
.../discovery/tcp/TcpDiscoverySpiAdapter.java | 27 +
.../tcp/internal/TcpDiscoveryNode.java | 12 +-
.../TcpDiscoveryCustomEventMessage.java | 23 +-
.../TcpDiscoveryJoinRequestMessage.java | 6 +-
.../messages/TcpDiscoveryNodeAddedMessage.java | 16 +-
.../ignite/startup/BasicWarmupClosure.java | 39 +-
.../startup/cmdline/CommandLineStartup.java | 5 +-
.../startup/cmdline/CommandLineTransformer.java | 3 +
.../TransactionSynchronization.java | 45 -
.../cache/IgniteWarmupClosureSelfTest.java | 82 +
.../fair/GridFairAffinityFunctionSelfTest.java | 2 -
.../IgniteFairAffinityDynamicCacheSelfTest.java | 97 +
.../internal/GridCacheProjectionRemoveTest.java | 41 -
.../internal/GridContinuousTaskSelfTest.java | 114 ++
.../internal/GridDiscoveryEventSelfTest.java | 30 +-
...ridFailFastNodeFailureDetectionSelfTest.java | 117 ++
.../internal/GridLifecycleBeanSelfTest.java | 36 +
.../internal/IgniteInternalCacheRemoveTest.java | 41 +
.../GridDiscoveryManagerAliveCacheSelfTest.java | 6 +-
.../CacheMetricsForClusterGroupSelfTest.java | 18 +-
.../GridCacheAbstractFailoverSelfTest.java | 44 +-
.../cache/GridCacheAbstractFullApiSelfTest.java | 568 +++++-
.../GridCacheConcurrentTxMultiNodeTest.java | 2 +-
...CacheFullTextQueryMultithreadedSelfTest.java | 6 +-
...CacheOffHeapMultiThreadedUpdateSelfTest.java | 5 +
.../processors/cache/GridCacheOffHeapTest.java | 4 +-
.../GridCachePreloadingEvictionsSelfTest.java | 4 +-
.../cache/GridCachePutAllFailoverSelfTest.java | 14 +-
.../processors/cache/GridCachePutAllTask.java | 56 +-
.../processors/cache/GridCacheTestEntryEx.java | 2 +
...IgniteCacheAtomicPutAllFailoverSelfTest.java | 32 +
.../cache/IgniteDynamicCacheStartSelfTest.java | 4 +-
.../cache/IgniteExchangeFutureHistoryTest.java | 77 +
...gniteTopologyValidatorAbstractCacheTest.java | 183 ++
...iteTopologyValidatorAbstractTxCacheTest.java | 125 ++
...ValidatorNearPartitionedAtomicCacheTest.java | 30 +
...logyValidatorNearPartitionedTxCacheTest.java | 30 +
...logyValidatorPartitionedAtomicCacheTest.java | 49 +
...TopologyValidatorPartitionedTxCacheTest.java | 30 +
...ologyValidatorReplicatedAtomicCacheTest.java | 49 +
...eTopologyValidatorReplicatedTxCacheTest.java | 30 +
.../cache/IgniteTxMultiNodeAbstractTest.java | 35 +-
.../GridCacheSequenceApiSelfAbstractTest.java | 2 +-
.../GridCacheSetFailoverAbstractSelfTest.java | 2 +
...GridCachePartitionedNodeRestartSelfTest.java | 67 -
.../CacheNoValueClassOnServerNodeTest.java | 129 ++
.../GridCacheAbstractNodeRestartSelfTest.java | 23 +-
.../GridCacheAtomicTimeoutSelfTest.java | 314 ---
.../GridCacheMultiNodeLockAbstractTest.java | 14 +-
...ridCachePartitionNotLoadedEventSelfTest.java | 22 +-
.../IgniteCacheAtomicMessageRecoveryTest.java | 32 +
.../IgniteCacheAtomicNodeRestartTest.java | 33 +
.../IgniteCacheMessageRecoveryAbstractTest.java | 175 ++
.../IgniteCachePutGetRestartAbstractTest.java | 234 +++
.../IgniteCacheSystemTransactionsSelfTest.java | 4 +-
.../IgniteCacheTxFairAffinityNodeJoinTest.java | 35 +
.../IgniteCacheTxMessageRecoveryTest.java | 32 +
...arDisabledFairAffinityPutGetRestartTest.java | 35 +
...iteCacheTxNearDisabledPutGetRestartTest.java | 30 +
...GridCacheDhtEvictionNearReadersSelfTest.java | 2 +-
.../dht/GridCacheDhtEvictionSelfTest.java | 4 +-
.../dht/GridCacheDhtPreloadPutGetSelfTest.java | 8 +-
.../dht/GridCacheDhtPreloadSelfTest.java | 4 +-
...ledFairAffinityMultiNodeFullApiSelfTest.java | 36 +
.../dht/IgniteCacheMultiTxLockSelfTest.java | 2 +-
...eAtomicInvalidPartitionHandlingSelfTest.java | 14 +-
...nlyFairAffinityMultiNodeFullApiSelfTest.java | 36 +
...micFairAffinityMultiNodeFullApiSelfTest.java | 35 +
...ledFairAffinityMultiNodeFullApiSelfTest.java | 36 +
...derFairAffinityMultiNodeFullApiSelfTest.java | 36 +
...nlyFairAffinityMultiNodeFullApiSelfTest.java | 35 +
...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 1 +
.../GridCachePartitionedFullApiSelfTest.java | 2 +-
.../GridCachePartitionedNodeRestartTest.java | 1 +
...achePartitionedPreloadLifecycleSelfTest.java | 2 +-
.../GridCachePartitionedTxSalvageSelfTest.java | 4 +
...nedFairAffinityMultiNodeFullApiSelfTest.java | 37 +
.../GridCacheReplicatedNodeRestartSelfTest.java | 2 +
...dezvousAffinityMultiNodeFullApiSelfTest.java | 35 -
...acheAtomicReplicatedNodeRestartSelfTest.java | 32 +
...CacheReplicatedPreloadLifecycleSelfTest.java | 2 +-
.../GridCacheReplicatedPreloadSelfTest.java | 4 +-
...dCacheSortedBatchEvictionPolicySelfTest.java | 385 ++++
...acheSortedEvictionPolicyPerformanceTest.java | 135 ++
.../GridCacheSortedEvictionPolicySelfTest.java | 373 ++++
.../GridCacheLocalIsolatedNodesSelfTest.java | 102 +
.../GridCacheSwapScanQueryAbstractSelfTest.java | 38 +-
.../continuous/GridEventConsumeSelfTest.java | 3 +-
.../DataStreamerMultiThreadedSelfTest.java | 110 ++
.../processors/igfs/IgfsSizeSelfTest.java | 2 +-
.../processors/igfs/IgfsStreamsSelfTest.java | 2 +-
.../cache/GridCacheCommandHandlerSelfTest.java | 10 +-
.../GridServiceReassignmentSelfTest.java | 2 +-
.../GridContinuousOperationsLoadTest.java | 3 +-
.../GridTcpCommunicationSpiConfigSelfTest.java | 1 -
.../discovery/AbstractDiscoverySelfTest.java | 4 +-
...ClusterMetricsSnapshotSerializeSelfTest.java | 28 +
.../spi/discovery/tcp/TcpDiscoverySelfTest.java | 5 +-
.../tcp/TcpDiscoverySpiStartStopSelfTest.java | 5 +-
.../GridSwapSpaceSpiAbstractSelfTest.java | 2 +-
.../testframework/GridSpiTestContext.java | 5 +
.../testframework/junits/GridAbstractTest.java | 15 +
.../junits/common/GridCommonAbstractTest.java | 36 +-
.../junits/spi/GridSpiAbstractTest.java | 4 +-
.../ignite/testsuites/IgniteBasicTestSuite.java | 1 +
.../IgniteCacheEvictionSelfTestSuite.java | 3 +
.../IgniteCacheFailoverTestSuite.java | 6 +-
.../IgniteCacheFullApiSelfTestSuite.java | 9 +-
.../testsuites/IgniteCacheRestartTestSuite.java | 20 +-
.../ignite/testsuites/IgniteCacheTestSuite.java | 18 +-
.../IgniteTopologyValidatorTestSuit.java | 43 +
.../ignite/util/TestTcpCommunicationSpi.java | 54 +
modules/extdata/p2p/pom.xml | 2 +-
.../CacheNoValueClassOnServerTestClient.java | 88 +
.../apache/ignite/tests/p2p/cache/Person.java | 42 +
.../p2p/startcache/CacheAllNodesFilter.java | 31 +
.../CacheConfigurationP2PTestClient.java | 117 ++
.../tests/p2p/startcache/Organization1.java | 52 +
.../tests/p2p/startcache/Organization2.java | 52 +
modules/extdata/uri/pom.xml | 2 +-
modules/geospatial/pom.xml | 2 +-
.../query/h2/GridH2IndexingGeoSelfTest.java | 70 +-
modules/hadoop/docs/hadoop_readme.pdf | Bin 82297 -> 82219 bytes
modules/hadoop/pom.xml | 2 +-
.../processors/hadoop/HadoopDefaultJobInfo.java | 3 +
.../processors/hadoop/igfs/HadoopIgfsIpcIo.java | 3 +
.../hadoop/jobtracker/HadoopJobTracker.java | 21 +-
.../hadoop/taskexecutor/HadoopRunnableTask.java | 3 +
.../external/HadoopExternalTaskExecutor.java | 3 +
.../processors/hadoop/v2/HadoopV2Job.java | 11 +-
.../hadoop/v2/HadoopV2TaskContext.java | 9 +
.../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 | 32 +-
.../query/h2/sql/GridSqlFunction.java | 6 +-
.../query/h2/sql/GridSqlPlaceholder.java | 51 +
.../query/h2/sql/GridSqlQueryParser.java | 6 +-
.../query/h2/sql/GridSqlQuerySplitter.java | 18 +-
.../query/h2/twostep/GridMapQueryExecutor.java | 37 +-
.../query/h2/twostep/GridMergeIndex.java | 17 +-
.../h2/twostep/GridReduceQueryExecutor.java | 36 +-
.../cache/CacheConfigurationP2PTest.java | 179 ++
.../cache/CacheConfigurationP2PTestServer.java | 49 +
.../GridCacheAbstractFieldsQuerySelfTest.java | 1282 -------------
.../cache/GridCacheCrossCacheQuerySelfTest.java | 74 +-
.../cache/GridCacheQueryMetricsSelfTest.java | 32 +-
.../GridCacheQuerySerializationSelfTest.java | 144 ++
...idCacheReduceQueryMultithreadedSelfTest.java | 12 +-
.../cache/GridIndexingWithNoopSwapSelfTest.java | 19 +-
.../IgniteCacheAbstractFieldsQuerySelfTest.java | 235 ++-
.../IgniteCacheCollocatedQuerySelfTest.java | 209 ++
.../cache/IgniteCacheLargeResultSelfTest.java | 104 +
.../IgniteCacheQueryMultiThreadedSelfTest.java | 4 +
...artitionedFieldsQueryP2PEnabledSelfTest.java | 34 -
...GridCachePartitionedFieldsQuerySelfTest.java | 115 --
...rtitionedFieldsQueryP2PDisabledSelfTest.java | 34 -
...artitionedFieldsQueryP2PEnabledSelfTest.java | 34 +
...eReplicatedFieldsQueryP2PEnableSelfTest.java | 34 -
.../GridCacheReplicatedFieldsQuerySelfTest.java | 157 --
...eplicatedFieldsQueryP2PDisabledSelfTest.java | 34 -
...ReplicatedFieldsQueryP2PEnabledSelfTest.java | 34 +
...dCacheAbstractReduceFieldsQuerySelfTest.java | 11 +-
...cheReduceFieldsQueryPartitionedSelfTest.java | 5 +-
.../query/h2/GridH2IndexRebuildTest.java | 18 +-
.../h2/GridIndexingSpiAbstractSelfTest.java | 2 +-
.../h2/sql/AbstractH2CompareQueryTest.java | 49 +-
.../query/h2/sql/BaseH2CompareQueryTest.java | 52 +-
.../query/h2/sql/GridQueryParsingTest.java | 9 +
.../query/h2/sql/H2CompareBigQueryTest.java | 2 +-
.../IgniteCacheQuerySelfTestSuite.java | 10 +-
.../IgniteCacheWithIndexingTestSuite.java | 2 +
.../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 +-
.../http/jetty/GridJettyRestHandler.java | 3 +
modules/scalar/pom.xml | 2 +-
modules/schedule/pom.xml | 2 +-
modules/schema-import/pom.xml | 2 +-
.../ignite/schema/generator/CodeGenerator.java | 60 +-
.../ignite/schema/ui/SchemaImportApp.java | 8 +-
modules/slf4j/pom.xml | 2 +-
modules/spring/pom.xml | 2 +-
.../util/spring/IgniteSpringHelperImpl.java | 217 ++-
.../ignite/internal/GridFactorySelfTest.java | 3 +-
.../IgniteStartFromStreamConfigurationTest.java | 50 +
.../testsuites/IgniteSpringTestSuite.java | 2 +
modules/ssh/pom.xml | 2 +-
modules/tools/pom.xml | 2 +-
modules/urideploy/pom.xml | 2 +-
.../uri/GridUriDeploymentClassLoader.java | 4 +-
modules/visor-console/pom.xml | 6 +-
.../ignite/visor/commands/VisorConsole.scala | 20 +-
.../commands/cache/VisorCacheScanCommand.scala | 13 +-
.../config/VisorConfigurationCommand.scala | 1 +
.../scala/org/apache/ignite/visor/visor.scala | 11 +
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 | 79 +-
464 files changed, 13584 insertions(+), 11713 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8012b0b1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java
----------------------------------------------------------------------
diff --cc
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java
index 8edf7ed,fd1040f..5adfb5d
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java
@@@ -333,85 -362,91 +362,85 @@@ public class GridDistributedLockReques
}
switch (writer.state()) {
- case 9:
+ case 8:
- if (!writer.writeByte("flags", flags))
- return false;
-
- writer.incrementState();
-
- case 9:
if (!writer.writeIgniteUuid("futId", futId))
return false;
writer.incrementState();
-- case 10:
++ case 9:
if (!writer.writeMessage("grpLockKey", grpLockKey))
return false;
writer.incrementState();
-- case 11:
++ case 10:
if (!writer.writeBoolean("isInTx", isInTx))
return false;
writer.incrementState();
-- case 12:
++ case 11:
if (!writer.writeBoolean("isInvalidate", isInvalidate))
return false;
writer.incrementState();
-- case 13:
++ case 12:
if (!writer.writeBoolean("isRead", isRead))
return false;
writer.incrementState();
-- case 14:
++ case 13:
if (!writer.writeByte("isolation", isolation != null ?
(byte)isolation.ordinal() : -1))
return false;
writer.incrementState();
-- case 15:
++ case 14:
if (!writer.writeCollection("keys", keys,
MessageCollectionItemType.MSG))
return false;
writer.incrementState();
-- case 16:
++ case 15:
if (!writer.writeMessage("nearXidVer", nearXidVer))
return false;
writer.incrementState();
-- case 17:
++ case 16:
if (!writer.writeUuid("nodeId", nodeId))
return false;
writer.incrementState();
-- case 18:
++ case 17:
if (!writer.writeBoolean("partLock", partLock))
return false;
writer.incrementState();
-- case 19:
++ case 18:
if (!writer.writeBooleanArray("retVals", retVals))
return false;
writer.incrementState();
-- case 20:
++ case 19:
if (!writer.writeLong("threadId", threadId))
return false;
writer.incrementState();
-- case 21:
++ case 20:
if (!writer.writeLong("timeout", timeout))
return false;
writer.incrementState();
-- case 22:
++ case 21:
if (!writer.writeInt("txSize", txSize))
return false;
@@@ -433,7 -468,15 +462,7 @@@
return false;
switch (reader.state()) {
- case 9:
+ case 8:
- flags = reader.readByte("flags");
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 9:
futId = reader.readIgniteUuid("futId");
if (!reader.isLastRead())
@@@ -441,7 -484,7 +470,7 @@@
reader.incrementState();
-- case 10:
++ case 9:
grpLockKey = reader.readMessage("grpLockKey");
if (!reader.isLastRead())
@@@ -449,7 -492,7 +478,7 @@@
reader.incrementState();
-- case 11:
++ case 10:
isInTx = reader.readBoolean("isInTx");
if (!reader.isLastRead())
@@@ -457,7 -500,7 +486,7 @@@
reader.incrementState();
-- case 12:
++ case 11:
isInvalidate = reader.readBoolean("isInvalidate");
if (!reader.isLastRead())
@@@ -465,7 -508,7 +494,7 @@@
reader.incrementState();
-- case 13:
++ case 12:
isRead = reader.readBoolean("isRead");
if (!reader.isLastRead())
@@@ -473,7 -516,7 +502,7 @@@
reader.incrementState();
-- case 14:
++ case 13:
byte isolationOrd;
isolationOrd = reader.readByte("isolation");
@@@ -485,7 -528,7 +514,7 @@@
reader.incrementState();
-- case 15:
++ case 14:
keys = reader.readCollection("keys",
MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@@ -493,7 -536,7 +522,7 @@@
reader.incrementState();
-- case 16:
++ case 15:
nearXidVer = reader.readMessage("nearXidVer");
if (!reader.isLastRead())
@@@ -501,7 -544,7 +530,7 @@@
reader.incrementState();
-- case 17:
++ case 16:
nodeId = reader.readUuid("nodeId");
if (!reader.isLastRead())
@@@ -509,7 -552,7 +538,7 @@@
reader.incrementState();
-- case 18:
++ case 17:
partLock = reader.readBoolean("partLock");
if (!reader.isLastRead())
@@@ -517,7 -560,7 +546,7 @@@
reader.incrementState();
-- case 19:
++ case 18:
retVals = reader.readBooleanArray("retVals");
if (!reader.isLastRead())
@@@ -525,7 -568,7 +554,7 @@@
reader.incrementState();
-- case 20:
++ case 19:
threadId = reader.readLong("threadId");
if (!reader.isLastRead())
@@@ -533,7 -576,7 +562,7 @@@
reader.incrementState();
-- case 21:
++ case 20:
timeout = reader.readLong("timeout");
if (!reader.isLastRead())
@@@ -541,7 -584,7 +570,7 @@@
reader.incrementState();
-- case 22:
++ case 21:
txSize = reader.readInt("txSize");
if (!reader.isLastRead())
@@@ -561,7 -604,7 +590,7 @@@
/** {@inheritDoc} */
@Override public byte fieldsCount() {
-- return 23;
++ return 22;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8012b0b1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8012b0b1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java
----------------------------------------------------------------------
