Merge remote-tracking branch 'remotes/apache-main/master' into ignite-801
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ead78a4f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ead78a4f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ead78a4f Branch: refs/heads/ignite-801 Commit: ead78a4fae11fccad9572b14546700ec26178eab Parents: 2960c3d b08e0b2 Author: Denis Magda <dma...@gridgain.com> Authored: Fri Oct 2 12:28:05 2015 +0300 Committer: Denis Magda <dma...@gridgain.com> Committed: Fri Oct 2 12:28:05 2015 +0300 ---------------------------------------------------------------------- bin/igniterouter.bat | 2 +- bin/igniterouter.sh | 2 +- examples/pom.xml | 2 +- examples/schema-import/pom.xml | 15 +- .../computegrid/ComputeClosureExample.java | 2 +- .../socket/WordsSocketStreamerServer.java | 5 +- modules/aop/pom.xml | 2 +- modules/apache-license-gen/pom.xml | 2 +- modules/aws/pom.xml | 2 +- modules/clients/pom.xml | 2 +- modules/cloud/pom.xml | 2 +- .../TcpDiscoveryCloudIpFinderSelfTest.java | 2 + modules/codegen/pom.xml | 2 +- modules/core/pom.xml | 2 +- .../org/apache/ignite/IgniteAtomicLong.java | 15 +- .../apache/ignite/IgniteAtomicReference.java | 9 +- .../org/apache/ignite/IgniteAtomicSequence.java | 9 +- .../org/apache/ignite/IgniteAtomicStamped.java | 13 +- .../org/apache/ignite/IgniteFileSystem.java | 2 +- .../configuration/CacheConfiguration.java | 2 +- .../ignite/configuration/TopologyValidator.java | 38 +- .../java/org/apache/ignite/igfs/IgfsPath.java | 2 +- .../apache/ignite/internal/IgniteKernal.java | 70 +-- .../managers/discovery/CustomEventListener.java | 4 +- .../discovery/GridDiscoveryManager.java | 24 +- .../cache/DynamicCacheChangeRequest.java | 19 + .../cache/DynamicCacheDescriptor.java | 19 + .../processors/cache/GridCacheEventManager.java | 12 +- .../cache/GridCacheExplicitLockSpan.java | 13 +- .../processors/cache/GridCacheIoManager.java | 76 +-- .../processors/cache/GridCacheMessage.java | 7 - .../cache/GridCacheMvccCandidate.java | 5 +- .../processors/cache/GridCacheMvccManager.java | 47 +- .../GridCachePartitionExchangeManager.java | 20 +- .../processors/cache/GridCacheProcessor.java | 83 ++- .../cache/GridCacheSharedContext.java | 32 - .../processors/cache/GridCacheSwapManager.java | 4 +- .../processors/cache/GridCacheUtils.java | 8 - .../distributed/GridDistributedCacheEntry.java | 2 +- .../dht/GridDhtAffinityAssignmentRequest.java | 5 - .../dht/GridDhtAffinityAssignmentResponse.java | 5 - .../distributed/dht/GridDhtLockRequest.java | 5 - .../distributed/dht/GridDhtTxFinishRequest.java | 5 - .../distributed/dht/GridDhtTxPrepareFuture.java | 6 +- .../dht/GridDhtTxPrepareRequest.java | 7 +- .../dht/atomic/GridDhtAtomicUpdateFuture.java | 5 + .../dht/colocated/GridDhtColocatedCache.java | 12 +- .../colocated/GridDhtColocatedLockFuture.java | 16 +- .../dht/preloader/GridDhtForceKeysRequest.java | 5 - .../dht/preloader/GridDhtForceKeysResponse.java | 5 - .../GridDhtPartitionDemandMessage.java | 5 - .../GridDhtPartitionSupplyMessage.java | 5 - .../GridDhtPartitionsAbstractMessage.java | 5 - .../dht/preloader/GridDhtPreloader.java | 8 +- .../near/GridNearTxFinishFuture.java | 4 +- .../cache/distributed/near/GridNearTxLocal.java | 21 +- .../cache/local/GridLocalCacheEntry.java | 2 +- .../continuous/CacheContinuousQueryHandler.java | 10 +- .../transactions/IgniteTxLocalAdapter.java | 35 +- .../continuous/GridContinuousProcessor.java | 17 +- .../datastructures/DataStructuresProcessor.java | 6 +- .../internal/processors/igfs/IgfsFileInfo.java | 2 +- .../internal/processors/igfs/IgfsImpl.java | 144 +---- .../processors/igfs/IgfsMetaManager.java | 418 +++++++++++-- .../ignite/internal/util/GridArgumentCheck.java | 5 +- .../util/nio/GridNioRecoveryDescriptor.java | 4 +- .../org/apache/ignite/stream/StreamAdapter.java | 104 +++- .../stream/StreamMultipleTupleExtractor.java | 38 ++ .../stream/StreamSingleTupleExtractor.java | 40 ++ .../ignite/stream/StreamTupleExtractor.java | 20 +- .../ignite/stream/socket/SocketStreamer.java | 3 +- .../core/src/main/resources/ignite.properties | 2 +- .../ignite/igfs/IgfsFragmentizerSelfTest.java | 2 +- .../internal/GridUpdateNotifierSelfTest.java | 1 + .../IgniteClientReconnectAbstractTest.java | 35 +- .../IgniteClientReconnectCacheTest.java | 154 +++++ .../GridDiscoveryManagerAliveCacheSelfTest.java | 2 + .../processors/cache/CrossCacheLockTest.java | 142 +++++ .../GridCacheAbstractFailoverSelfTest.java | 3 + .../GridCacheAbstractRemoveFailureTest.java | 3 + .../GridCacheFinishPartitionsSelfTest.java | 5 +- .../GridCacheVariableTopologySelfTest.java | 3 +- ...IgniteCacheAtomicPutAllFailoverSelfTest.java | 4 + .../cache/IgniteCacheCreateRestartSelfTest.java | 3 + .../IgniteCacheP2pUnmarshallingErrorTest.java | 7 + ...CacheP2pUnmarshallingRebalanceErrorTest.java | 12 +- .../cache/IgniteDynamicCacheFilterTest.java | 150 +++++ .../IgniteTxExceptionAbstractSelfTest.java | 3 + ...omicOffheapQueueCreateMultiNodeSelfTest.java | 5 - ...ionedAtomicQueueCreateMultiNodeSelfTest.java | 9 +- ...artitionedOffHeapValuesQueueApiSelfTest.java | 4 + ...PartitionedQueueCreateMultiNodeSelfTest.java | 16 +- ...nedQueueFailoverDataConsistencySelfTest.java | 5 - ...GridCachePartitionedSetFailoverSelfTest.java | 4 + ...acheAsyncOperationsFailoverAbstractTest.java | 11 + .../CachePutAllFailoverAbstractTest.java | 11 + .../IgniteCacheAtomicNodeRestartTest.java | 8 + .../IgniteCacheCreatePutMultiNodeSelfTest.java | 151 +++++ .../IgniteCachePutGetRestartAbstractTest.java | 3 + .../IgniteCacheSizeFailoverTest.java | 3 + .../IgniteTxPreloadAbstractTest.java | 43 +- .../GridCacheColocatedTxExceptionSelfTest.java | 5 - ...gniteAtomicLongChangingTopologySelfTest.java | 29 +- .../IgniteCacheCrossCacheTxFailoverTest.java | 3 + .../IgniteCrossCacheTxNearEnabledSelfTest.java | 28 + .../dht/IgniteCrossCacheTxSelfTest.java | 213 +++++++ ...ledFairAffinityMultiNodeFullApiSelfTest.java | 4 + .../near/GridCacheNearTxExceptionSelfTest.java | 5 - .../near/NearCacheMultithreadedUpdateTest.java | 217 +++++++ .../GridCacheReplicatedInvalidateSelfTest.java | 249 -------- .../GridCacheReplicatedTxExceptionSelfTest.java | 5 - .../replicated/GridReplicatedTxPreloadTest.java | 2 - ...eCacheExpiryPolicyWithStoreAbstractTest.java | 5 +- .../GridCacheLocalTxExceptionSelfTest.java | 5 - .../processors/igfs/IgfsAbstractSelfTest.java | 257 ++++++-- .../igfs/IgfsClientCacheSelfTest.java | 15 +- .../igfs/IgfsMetaManagerSelfTest.java | 100 ++- .../processors/igfs/IgfsMetricsSelfTest.java | 2 +- .../processors/igfs/IgfsProcessorSelfTest.java | 29 +- .../igfs/UniversalFileSystemAdapter.java | 1 - .../stream/socket/SocketStreamerSelfTest.java | 112 +++- .../multijvm/IgniteCacheProcessProxy.java | 3 +- .../IgniteCacheFailoverTestSuite.java | 4 - .../IgniteCacheFailoverTestSuite3.java | 28 +- .../testsuites/IgniteCacheTestSuite3.java | 2 - .../testsuites/IgniteCacheTestSuite4.java | 17 + modules/extdata/p2p/pom.xml | 2 +- .../extdata/uri/modules/uri-dependency/pom.xml | 2 +- modules/extdata/uri/pom.xml | 2 +- modules/gce/pom.xml | 2 +- modules/geospatial/pom.xml | 2 +- modules/hadoop/pom.xml | 2 +- .../processors/hadoop/igfs/HadoopIgfsUtils.java | 36 ++ ...oopFileSystemUniversalFileSystemAdapter.java | 4 +- .../HadoopIgfs20FileSystemAbstractSelfTest.java | 7 +- .../IgniteHadoopFileSystemAbstractSelfTest.java | 5 +- .../testsuites/IgniteHadoopTestSuite.java | 19 +- modules/hibernate/pom.xml | 2 +- modules/indexing/pom.xml | 2 +- .../processors/query/h2/sql/GridSqlArray.java | 52 ++ .../processors/query/h2/sql/GridSqlElement.java | 2 +- .../query/h2/sql/GridSqlFunction.java | 60 +- .../query/h2/sql/GridSqlFunctionType.java | 3 + .../query/h2/sql/GridSqlPlaceholder.java | 7 +- .../query/h2/sql/GridSqlQueryParser.java | 84 +-- .../processors/query/h2/sql/GridSqlType.java | 29 +- .../query/h2/sql/GridQueryParsingTest.java | 27 + modules/jcl/pom.xml | 2 +- modules/jms11/pom.xml | 2 +- modules/jta/pom.xml | 2 +- modules/kafka/pom.xml | 2 +- modules/log4j/pom.xml | 2 +- modules/log4j2/pom.xml | 2 +- modules/mesos/pom.xml | 2 +- modules/mqtt/pom.xml | 114 ++++ .../apache/ignite/stream/mqtt/MqttStreamer.java | 611 +++++++++++++++++++ .../stream/mqtt/IgniteMqttStreamerTest.java | 553 +++++++++++++++++ .../mqtt/IgniteMqttStreamerTestSuite.java | 34 ++ modules/platform/pom.xml | 2 +- .../platform/src/main/cpp/common/configure.ac | 2 +- .../src/main/cpp/core-test/configure.ac | 2 +- modules/platform/src/main/cpp/core/configure.ac | 2 +- .../Properties/AssemblyInfo.cs | 4 +- .../Apache.Ignite/Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- modules/rest-http/pom.xml | 2 +- modules/scalar-2.10/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/spark-2.10/pom.xml | 2 +- modules/spark/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-2.10/pom.xml | 2 +- modules/visor-console/pom.xml | 2 +- modules/visor-plugins/pom.xml | 2 +- modules/web/pom.xml | 2 +- .../config/benchmark-put-indexed-val.properties | 2 +- modules/yardstick/pom.xml | 2 +- modules/yarn/pom.xml | 2 +- modules/zookeeper/pom.xml | 2 +- pom.xml | 19 +- 187 files changed, 4189 insertions(+), 1266 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/ead78a4f/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/ead78a4f/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/ead78a4f/pom.xml ----------------------------------------------------------------------
