Merge branch 'master' into ignite-1056
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/89804fdd Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/89804fdd Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/89804fdd Branch: refs/heads/ignite-1056 Commit: 89804fddce2405e1ab307cdfa397a5e595397d78 Parents: 71df95b 94a42a4 Author: ashutak <ashu...@gridgain.com> Authored: Wed Jul 8 16:33:26 2015 +0300 Committer: ashutak <ashu...@gridgain.com> Committed: Wed Jul 8 16:33:26 2015 +0300 ---------------------------------------------------------------------- assembly/dependencies-fabric.xml | 1 + bin/ignite.bat | 8 +- bin/ignite.sh | 6 +- bin/include/parseargs.bat | 1 + bin/include/parseargs.sh | 3 + dev-tools/slurp.sh | 2 +- examples/pom.xml | 2 +- modules/aop/pom.xml | 2 +- modules/aws/pom.xml | 2 +- modules/clients/pom.xml | 2 +- modules/cloud/pom.xml | 2 +- modules/codegen/pom.xml | 2 +- modules/core/pom.xml | 6 +- .../java/org/apache/ignite/IgniteCache.java | 5 + .../apache/ignite/IgniteSystemProperties.java | 3 + .../cache/eviction/fifo/FifoEvictionPolicy.java | 5 - .../cache/eviction/lru/LruEvictionPolicy.java | 5 - .../eviction/sorted/SortedEvictionPolicy.java | 19 +- .../org/apache/ignite/cluster/ClusterGroup.java | 9 +- .../ignite/compute/ComputeTaskSplitAdapter.java | 2 +- .../configuration/CacheConfiguration.java | 105 +++--- .../configuration/NearCacheConfiguration.java | 10 +- .../ignite/internal/GridKernalContextImpl.java | 2 +- .../internal/cluster/ClusterGroupAdapter.java | 12 +- .../cluster/IgniteClusterAsyncImpl.java | 7 +- .../internal/interop/InteropIgnition.java | 48 ++- .../internal/interop/InteropProcessor.java | 7 + .../managers/communication/GridIoManager.java | 173 ++++++--- .../managers/communication/GridIoMessage.java | 15 +- .../managers/communication/GridIoPolicy.java | 32 +- .../discovery/GridDiscoveryManager.java | 32 +- .../eventstorage/GridEventStorageManager.java | 2 +- .../processors/cache/CacheObjectImpl.java | 1 - .../processors/cache/CacheOperationContext.java | 44 ++- .../internal/processors/cache/CacheType.java | 8 +- .../processors/cache/GridCacheAdapter.java | 91 +++-- .../processors/cache/GridCacheAtomicFuture.java | 12 +- .../processors/cache/GridCacheContext.java | 4 +- .../cache/GridCacheDeploymentManager.java | 10 +- .../processors/cache/GridCacheIoManager.java | 12 +- .../processors/cache/GridCacheMvccManager.java | 8 +- .../GridCachePartitionExchangeManager.java | 6 +- .../processors/cache/GridCacheProcessor.java | 62 ++- .../processors/cache/GridCacheProxyImpl.java | 10 +- .../processors/cache/GridCacheSwapManager.java | 257 ++++++++----- .../processors/cache/GridCacheUtils.java | 42 +++ .../processors/cache/IgniteCacheFutureImpl.java | 42 +++ .../processors/cache/IgniteCacheProxy.java | 38 +- .../GridDistributedTxFinishRequest.java | 11 +- .../GridDistributedTxPrepareRequest.java | 9 +- .../GridDistributedTxRemoteAdapter.java | 3 +- .../distributed/dht/GridDhtTxFinishRequest.java | 3 +- .../cache/distributed/dht/GridDhtTxLocal.java | 3 +- .../distributed/dht/GridDhtTxLocalAdapter.java | 3 +- .../cache/distributed/dht/GridDhtTxRemote.java | 5 +- .../dht/GridPartitionedGetFuture.java | 13 +- .../dht/atomic/GridDhtAtomicCache.java | 18 +- .../dht/atomic/GridDhtAtomicUpdateFuture.java | 15 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 177 ++++++++- .../near/GridNearTxFinishRequest.java | 3 +- .../cache/distributed/near/GridNearTxLocal.java | 3 +- .../distributed/near/GridNearTxRemote.java | 5 +- .../cache/query/GridCacheQueryAdapter.java | 35 +- .../cache/transactions/IgniteInternalTx.java | 3 +- .../cache/transactions/IgniteTxAdapter.java | 11 +- .../transactions/IgniteTxLocalAdapter.java | 3 +- .../processors/clock/GridClockServer.java | 21 +- .../datastructures/GridCacheAtomicLongImpl.java | 25 +- .../GridCacheAtomicSequenceImpl.java | 11 +- .../GridCacheAtomicStampedImpl.java | 21 +- .../GridCacheCountDownLatchImpl.java | 16 +- .../internal/processors/igfs/IgfsContext.java | 5 +- .../plugin/IgnitePluginProcessor.java | 3 +- .../processors/query/GridQueryProcessor.java | 5 + .../processors/rest/GridRestProcessor.java | 4 +- .../handlers/task/GridTaskCommandHandler.java | 12 +- .../processors/task/GridTaskWorker.java | 4 +- .../ignite/internal/util/IgniteUtils.java | 6 +- .../internal/util/future/IgniteFutureImpl.java | 18 +- .../shmem/IpcSharedMemoryServerEndpoint.java | 10 +- .../util/nio/GridNioMessageTracker.java | 23 +- .../apache/ignite/internal/visor/VisorJob.java | 2 + .../internal/visor/log/VisorLogSearchTask.java | 2 +- .../visor/node/VisorNodeDataCollectorJob.java | 4 + .../visor/query/VisorQueryCleanupTask.java | 14 + .../util/VisorClusterGroupEmptyException.java | 37 ++ .../plugin/extensions/communication/IoPool.java | 42 +++ .../communication/tcp/TcpCommunicationSpi.java | 2 +- .../ignite/spi/discovery/tcp/ClientImpl.java | 156 +++++--- .../ignite/spi/discovery/tcp/ServerImpl.java | 156 +++++++- .../spi/discovery/tcp/TcpDiscoverySpi.java | 3 +- .../tcp/internal/TcpDiscoveryNode.java | 2 +- .../tcp/internal/TcpDiscoveryNodesRing.java | 8 +- .../tcp/internal/TcpDiscoveryStatistics.java | 10 +- .../TcpDiscoveryMulticastIpFinder.java | 76 +++- .../startup/cmdline/CommandLineStartup.java | 3 +- .../startup/cmdline/CommandLineTransformer.java | 9 + .../core/src/main/resources/ignite.properties | 2 +- .../core/src/test/config/spark/spark-config.xml | 46 +++ modules/core/src/test/config/tests.properties | 6 +- .../internal/ClusterForHostsSelfTest.java | 113 ------ .../internal/ClusterGroupHostsSelfTest.java | 141 +++++++ .../communication/GridIoManagerSelfTest.java | 2 +- .../IgniteTopologyPrintFormatSelfTest.java | 289 ++++++++++++++ .../cache/CacheFutureExceptionSelfTest.java | 102 +++++ .../cache/GridCacheDaemonNodeStopSelfTest.java | 119 ------ .../IgniteDaemonNodeMarshallerCacheTest.java | 192 ++++++++++ .../cache/IgniteInternalCacheTypesTest.java | 3 +- .../IgniteCachePutRetryAbstractSelfTest.java | 147 ++++++++ .../dht/IgniteCachePutRetryAtomicSelfTest.java | 34 ++ ...gniteCachePutRetryTransactionalSelfTest.java | 74 ++++ ...eAtomicInvalidPartitionHandlingSelfTest.java | 5 +- .../GridCachePartitionedFailoverSelfTest.java | 5 + ...achePartitionedMultiNodeFullApiSelfTest.java | 4 +- .../GridCachePartitionedNodeRestartTest.java | 5 - ...ePartitionedOptimisticTxNodeRestartTest.java | 2 +- .../GridCacheReplicatedFailoverSelfTest.java | 5 - .../GridCacheReplicatedNodeRestartSelfTest.java | 5 - ...acheAtomicReplicatedNodeRestartSelfTest.java | 14 +- ...heConcurrentEvictionConsistencySelfTest.java | 15 +- .../GridCacheEvictionFilterSelfTest.java | 2 - .../GridP2PContinuousDeploymentSelfTest.java | 2 - .../tcp/TcpClientDiscoverySpiSelfTest.java | 265 ++++++++++++- .../tcp/TcpDiscoveryMultiThreadedTest.java | 38 ++ .../TcpDiscoveryNodeConsistentIdSelfTest.java | 80 ++++ .../inmemory/GridTestSwapSpaceSpi.java | 3 +- .../ignite/testsuites/IgniteBasicTestSuite.java | 3 +- .../IgniteCacheFailoverTestSuite.java | 3 + .../ignite/testsuites/IgniteCacheTestSuite.java | 1 + .../testsuites/IgniteCacheTestSuite3.java | 1 - .../testsuites/IgniteKernalSelfTestSuite.java | 1 + .../IgniteSpiDiscoverySelfTestSuite.java | 5 + modules/core/src/test/resources/helloworld.gar | Bin 6092 -> 0 bytes modules/core/src/test/resources/helloworld1.gar | Bin 6092 -> 0 bytes modules/core/src/test/resources/readme.txt | 6 - modules/docker/Dockerfile | 55 +++ modules/docker/README.txt | 11 + modules/docker/build_users_libs.sh | 39 ++ modules/docker/download_ignite.sh | 49 +++ modules/docker/execute.sh | 62 +++ modules/docker/run.sh | 34 ++ modules/extdata/p2p/pom.xml | 4 +- modules/extdata/uri/META-INF/ignite.xml | 38 ++ .../extdata/uri/modules/uri-dependency/pom.xml | 42 +++ .../deployment/uri/tasks/GarHelloWorldBean.java | 60 +++ .../src/main/resources/gar-example.properties | 18 + modules/extdata/uri/pom.xml | 62 ++- .../deployment/uri/tasks/GarHelloWorldTask.java | 81 ++++ .../deployment/uri/tasks/gar-spring-bean.xml | 29 ++ modules/gce/pom.xml | 2 +- modules/geospatial/pom.xml | 2 +- modules/hadoop/pom.xml | 2 +- modules/hibernate/pom.xml | 2 +- modules/indexing/pom.xml | 2 +- .../query/h2/opt/GridH2KeyValueRowOffheap.java | 8 +- .../processors/query/h2/opt/GridH2Table.java | 2 +- .../CacheAbstractQueryMetricsSelfTest.java | 157 +++++++- .../cache/CacheLocalQueryMetricsSelfTest.java | 33 ++ ...titionedQueryMetricsDistributedSelfTest.java | 33 ++ ...chePartitionedQueryMetricsLocalSelfTest.java | 33 ++ .../CachePartitionedQueryMetricsSelfTest.java | 32 -- ...plicatedQueryMetricsDistributedSelfTest.java | 33 ++ ...acheReplicatedQueryMetricsLocalSelfTest.java | 33 ++ .../CacheReplicatedQueryMetricsSelfTest.java | 32 -- .../cache/IgniteCacheOffheapEvictQueryTest.java | 2 +- .../IgniteCacheQueryMultiThreadedSelfTest.java | 4 +- ...QueryOffheapEvictsMultiThreadedSelfTest.java | 5 - .../IgniteCacheQueryNodeRestartSelfTest2.java | 5 + .../IgniteCacheQuerySelfTestSuite.java | 7 +- modules/jcl/pom.xml | 2 +- modules/jta/pom.xml | 2 +- modules/kafka/licenses/apache-2.0.txt | 202 ++++++++++ modules/kafka/pom.xml | 116 ++++++ .../ignite/stream/kafka/KafkaStreamer.java | 220 +++++++++++ .../kafka/IgniteKafkaStreamerSelfTestSuite.java | 37 ++ .../stream/kafka/KafkaEmbeddedBroker.java | 378 +++++++++++++++++++ .../kafka/KafkaIgniteStreamerSelfTest.java | 227 +++++++++++ .../ignite/stream/kafka/SimplePartitioner.java | 53 +++ modules/log4j/pom.xml | 2 +- modules/mesos/pom.xml | 3 +- modules/rest-http/pom.xml | 16 +- modules/scalar-2.10/pom.xml | 2 +- modules/scalar/pom.xml | 2 +- modules/schedule/pom.xml | 2 +- modules/schema-import/pom.xml | 2 +- .../ignite/schema/model/PojoDescriptor.java | 2 + .../apache/ignite/schema/model/PojoField.java | 1 + .../parser/dialect/OracleMetadataDialect.java | 2 +- modules/slf4j/pom.xml | 2 +- modules/spark-2.10/pom.xml | 2 +- modules/spark/pom.xml | 2 +- .../org/apache/ignite/spark/IgniteContext.scala | 50 ++- .../org/apache/ignite/spark/IgniteRddSpec.scala | 18 + modules/spring/pom.xml | 2 +- .../util/spring/IgniteSpringHelperImpl.java | 72 +++- .../IgniteExcludeInConfigurationTest.java | 78 ++++ .../org/apache/ignite/spring/sprint-exclude.xml | 57 +++ .../testsuites/IgniteSpringTestSuite.java | 2 + modules/ssh/pom.xml | 2 +- modules/tools/pom.xml | 2 +- modules/urideploy/pom.xml | 10 +- .../GridTaskUriDeploymentDeadlockSelfTest.java | 13 +- .../ignite/p2p/GridP2PDisabledSelfTest.java | 2 +- modules/visor-console-2.10/pom.xml | 2 +- modules/visor-console/pom.xml | 2 +- .../ignite/visor/commands/VisorConsole.scala | 3 +- .../visor/commands/open/VisorOpenCommand.scala | 319 ++++++++++++++++ .../scala/org/apache/ignite/visor/visor.scala | 230 +---------- .../ignite/visor/VisorRuntimeBaseSpec.scala | 2 + .../commands/kill/VisorKillCommandSpec.scala | 1 + .../commands/start/VisorStartCommandSpec.scala | 1 + .../commands/tasks/VisorTasksCommandSpec.scala | 1 + .../commands/vvm/VisorVvmCommandSpec.scala | 1 + modules/visor-plugins/pom.xml | 2 +- modules/web/pom.xml | 8 +- .../config/benchmark-put-indexed-val.properties | 64 ++++ modules/yardstick/config/ignite-base-config.xml | 23 ++ modules/yardstick/pom.xml | 2 +- .../cache/IgnitePutIndexedValue1Benchmark.java | 42 +++ .../cache/IgnitePutIndexedValue2Benchmark.java | 42 +++ .../cache/IgnitePutIndexedValue8Benchmark.java | 42 +++ .../ignite/yardstick/cache/model/Person1.java | 55 +++ .../ignite/yardstick/cache/model/Person2.java | 67 ++++ .../ignite/yardstick/cache/model/Person8.java | 109 ++++++ parent/pom.xml | 1 + pom.xml | 15 +- scripts/git-patch-prop.sh | 2 +- 227 files changed, 6297 insertions(+), 1289 deletions(-) ----------------------------------------------------------------------
