Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 84150183CE for ; Wed, 8 Jul 2015 19:21:48 +0000 (UTC) Received: (qmail 13527 invoked by uid 500); 8 Jul 2015 19:21:48 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 13495 invoked by uid 500); 8 Jul 2015 19:21:48 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 13485 invoked by uid 99); 8 Jul 2015 19:21:48 -0000 Received: from Unknown (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 08 Jul 2015 19:21:48 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id DF7EE181A31 for ; Wed, 8 Jul 2015 19:21:47 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.791 X-Spam-Level: * X-Spam-Status: No, score=1.791 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id vBOtH4OnrUHE for ; Wed, 8 Jul 2015 19:21:32 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id 625CC4C0CE for ; Wed, 8 Jul 2015 19:21:27 +0000 (UTC) Received: (qmail 9723 invoked by uid 99); 8 Jul 2015 19:21:26 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 08 Jul 2015 19:21:26 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A1A91E35C7; Wed, 8 Jul 2015 19:21:26 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vkulichenko@apache.org To: commits@ignite.incubator.apache.org Date: Wed, 08 Jul 2015 19:21:37 -0000 Message-Id: <1364fe0ee5724d7b8895909dcfc68a2f@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [12/50] incubator-ignite git commit: Merge branch 'ignite-sprint-7' of https://git-wip-us.apache.org/repos/asf/incubator-ignite Merge branch 'ignite-sprint-7' of https://git-wip-us.apache.org/repos/asf/incubator-ignite Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b87f1385 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b87f1385 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b87f1385 Branch: refs/heads/ignite-1026 Commit: b87f1385dc0cdc323bdea0b304d7d92e6ac5b653 Parents: f9fe999 4ff352f Author: Yakov Zhdanov Authored: Mon Jul 6 16:56:36 2015 +0300 Committer: Yakov Zhdanov Committed: Mon Jul 6 16:56:36 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 + examples/pom.xml | 2 +- modules/aop/pom.xml | 2 +- modules/aws/pom.xml | 2 +- modules/clients/pom.xml | 2 +- .../ClientAbstractConnectivitySelfTest.java | 4 +- 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 + .../org/apache/ignite/cluster/ClusterGroup.java | 18 +- .../org/apache/ignite/cluster/ClusterNode.java | 2 + .../configuration/CacheConfiguration.java | 105 +-- .../configuration/IgniteReflectionFactory.java | 81 +- .../configuration/NearCacheConfiguration.java | 10 +- .../ignite/internal/GridKernalContextImpl.java | 5 +- .../apache/ignite/internal/IgniteKernal.java | 1 - .../internal/cluster/ClusterGroupAdapter.java | 50 +- .../cluster/IgniteClusterAsyncImpl.java | 12 +- .../internal/interop/InteropIgnition.java | 31 +- .../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/CacheOperationContext.java | 44 +- .../internal/processors/cache/CacheType.java | 8 +- .../processors/cache/GridCacheAdapter.java | 91 ++- .../processors/cache/GridCacheAtomicFuture.java | 12 +- .../processors/cache/GridCacheContext.java | 6 +- .../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/GridDhtLocalPartition.java | 3 +- .../distributed/dht/GridDhtLockFuture.java | 2 +- .../distributed/dht/GridDhtTxFinishRequest.java | 3 +- .../cache/distributed/dht/GridDhtTxLocal.java | 3 +- .../distributed/dht/GridDhtTxLocalAdapter.java | 3 +- .../cache/distributed/dht/GridDhtTxRemote.java | 5 +- .../dht/atomic/GridDhtAtomicCache.java | 27 +- .../dht/atomic/GridDhtAtomicUpdateFuture.java | 15 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 177 ++++- .../GridDhtPartitionsExchangeFuture.java | 46 +- .../near/GridNearTxFinishRequest.java | 3 +- .../cache/distributed/near/GridNearTxLocal.java | 3 +- .../distributed/near/GridNearTxRemote.java | 5 +- .../cache/transactions/IgniteInternalTx.java | 3 +- .../cache/transactions/IgniteTxAdapter.java | 11 +- .../transactions/IgniteTxLocalAdapter.java | 3 +- .../processors/clock/GridClockServer.java | 21 +- .../datastructures/DataStructuresProcessor.java | 64 +- .../datastructures/GridCacheAtomicLongImpl.java | 25 +- .../GridCacheAtomicSequenceImpl.java | 11 +- .../GridCacheAtomicStampedImpl.java | 21 +- .../GridCacheCountDownLatchImpl.java | 16 +- .../processors/hadoop/HadoopJobInfo.java | 4 +- .../hadoop/counter/HadoopCounterWriter.java | 5 +- .../internal/processors/igfs/IgfsContext.java | 5 +- .../processors/plugin/CachePluginManager.java | 10 +- .../plugin/IgnitePluginProcessor.java | 3 +- .../processors/rest/GridRestProcessor.java | 4 +- .../handlers/task/GridTaskCommandHandler.java | 12 +- .../processors/task/GridTaskProcessor.java | 23 +- .../processors/task/GridTaskWorker.java | 4 +- .../internal/util/GridConfigurationFinder.java | 55 +- .../ignite/internal/util/IgniteUtils.java | 12 +- .../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 | 110 ++- .../spi/discovery/tcp/TcpDiscoverySpi.java | 3 +- .../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/ClusterGroupAbstractTest.java | 777 ++++++++++++++++++ .../internal/ClusterGroupHostsSelfTest.java | 141 ++++ .../ignite/internal/ClusterGroupSelfTest.java | 251 ++++++ .../internal/GridDiscoveryEventSelfTest.java | 12 +- .../internal/GridProjectionAbstractTest.java | 784 ------------------- .../ignite/internal/GridProjectionSelfTest.java | 251 ------ .../apache/ignite/internal/GridSelfTest.java | 2 +- .../GridTaskFailoverAffinityRunTest.java | 170 ++++ .../communication/GridIoManagerSelfTest.java | 2 +- .../IgniteTopologyPrintFormatSelfTest.java | 289 +++++++ .../CacheReadThroughAtomicRestartSelfTest.java | 32 + ...heReadThroughLocalAtomicRestartSelfTest.java | 32 + .../CacheReadThroughLocalRestartSelfTest.java | 32 + ...dThroughReplicatedAtomicRestartSelfTest.java | 32 + ...cheReadThroughReplicatedRestartSelfTest.java | 32 + .../cache/CacheReadThroughRestartSelfTest.java | 133 ++++ .../cache/GridCacheAbstractSelfTest.java | 2 +- .../cache/GridCacheDaemonNodeStopSelfTest.java | 119 --- .../IgniteDaemonNodeMarshallerCacheTest.java | 192 +++++ ...eDynamicCacheStartNoExchangeTimeoutTest.java | 466 +++++++++++ .../cache/IgniteDynamicCacheStartSelfTest.java | 37 + .../cache/IgniteInternalCacheTypesTest.java | 3 +- ...GridCacheQueueMultiNodeAbstractSelfTest.java | 4 +- .../GridCacheSetAbstractSelfTest.java | 22 +- .../IgniteDataStructureWithJobTest.java | 111 +++ ...ridCachePartitionNotLoadedEventSelfTest.java | 82 ++ .../distributed/IgniteCache150ClientsTest.java | 189 +++++ ...teCacheClientNodePartitionsExchangeTest.java | 1 + .../distributed/IgniteCacheManyClientsTest.java | 2 + .../IgniteCacheTxMessageRecoveryTest.java | 5 + .../IgniteCachePutRetryAbstractSelfTest.java | 147 ++++ .../dht/IgniteCachePutRetryAtomicSelfTest.java | 34 + ...gniteCachePutRetryTransactionalSelfTest.java | 74 ++ ...eAtomicInvalidPartitionHandlingSelfTest.java | 5 +- ...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 5 - .../GridCachePartitionedFailoverSelfTest.java | 5 + ...achePartitionedMultiNodeFullApiSelfTest.java | 53 +- .../GridCacheReplicatedFailoverSelfTest.java | 5 + ...acheAtomicReplicatedNodeRestartSelfTest.java | 10 + .../GridCacheEvictionFilterSelfTest.java | 2 - .../IgniteCacheTxStoreSessionTest.java | 4 + .../internal/util/IgniteUtilsSelfTest.java | 22 + .../GridP2PContinuousDeploymentSelfTest.java | 2 - .../tcp/TcpClientDiscoverySpiSelfTest.java | 265 ++++++- .../TcpDiscoveryNodeConsistentIdSelfTest.java | 80 ++ .../inmemory/GridTestSwapSpaceSpi.java | 3 +- .../testframework/junits/GridAbstractTest.java | 2 +- .../ignite/testsuites/IgniteBasicTestSuite.java | 7 +- .../IgniteCacheDataStructuresSelfTestSuite.java | 1 + .../IgniteCacheFailoverTestSuite.java | 3 + .../ignite/testsuites/IgniteCacheTestSuite.java | 4 +- .../testsuites/IgniteCacheTestSuite3.java | 1 - .../testsuites/IgniteCacheTestSuite4.java | 8 + .../testsuites/IgniteClientTestSuite.java | 38 + .../testsuites/IgniteComputeGridTestSuite.java | 1 + .../testsuites/IgniteKernalSelfTestSuite.java | 1 + .../IgniteSpiDiscoverySelfTestSuite.java | 2 + .../ignite/util/TestTcpCommunicationSpi.java | 21 + 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 +- .../p2p/GridP2PContinuousDeploymentTask1.java | 2 +- 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 | 80 +- .../fs/IgniteHadoopFileSystemCounterWriter.java | 9 +- .../processors/hadoop/HadoopClassLoader.java | 29 + .../processors/hadoop/HadoopDefaultJobInfo.java | 27 +- .../internal/processors/hadoop/HadoopUtils.java | 237 ------ .../hadoop/SecondaryFileSystemProvider.java | 3 +- .../hadoop/fs/HadoopFileSystemCacheUtils.java | 241 ++++++ .../hadoop/fs/HadoopFileSystemsUtils.java | 11 + .../hadoop/fs/HadoopLazyConcurrentMap.java | 5 + .../hadoop/jobtracker/HadoopJobTracker.java | 25 +- .../child/HadoopChildProcessRunner.java | 3 +- .../processors/hadoop/v2/HadoopV2Job.java | 84 +- .../hadoop/v2/HadoopV2JobResourceManager.java | 22 +- .../hadoop/v2/HadoopV2TaskContext.java | 37 +- .../apache/ignite/igfs/IgfsEventsTestSuite.java | 5 +- .../processors/hadoop/HadoopMapReduceTest.java | 2 +- .../processors/hadoop/HadoopTasksV1Test.java | 7 +- .../processors/hadoop/HadoopTasksV2Test.java | 7 +- .../processors/hadoop/HadoopV2JobSelfTest.java | 6 +- .../collections/HadoopAbstractMapTest.java | 3 +- .../testsuites/IgniteHadoopTestSuite.java | 2 +- .../IgniteIgfsLinuxAndMacOSTestSuite.java | 3 +- modules/hibernate/pom.xml | 2 +- modules/indexing/pom.xml | 2 +- .../query/h2/opt/GridH2KeyValueRowOffheap.java | 8 +- .../processors/query/h2/opt/GridH2Table.java | 2 +- .../cache/IgniteCacheOffheapEvictQueryTest.java | 2 +- .../IgniteCacheQueryMultiThreadedSelfTest.java | 4 +- .../IgniteCacheQueryNodeRestartSelfTest2.java | 5 + .../IgniteCacheQuerySelfTestSuite.java | 2 +- modules/jcl/pom.xml | 2 +- modules/jta/pom.xml | 2 +- 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 | 14 +- 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 +- .../commands/cache/VisorCacheCommand.scala | 7 +- .../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 | 6 +- .../IgniteWebSessionSelfTestSuite.java | 2 +- modules/yardstick/pom.xml | 2 +- parent/pom.xml | 1 + pom.xml | 15 +- scripts/git-patch-prop.sh | 2 +- 259 files changed, 8315 insertions(+), 2609 deletions(-) ----------------------------------------------------------------------