Merge branch 'ignite-sprint-6' into ignite-648
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/05a58216 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/05a58216 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/05a58216 Branch: refs/heads/ignite-648-win Commit: 05a5821615f93aa239a8afd76912f1f20f442059 Parents: 5d0c2e7 0907338 Author: ashutak <ashu...@gridgain.com> Authored: Mon Jun 15 20:23:40 2015 +0300 Committer: ashutak <ashu...@gridgain.com> Committed: Mon Jun 15 20:23:40 2015 +0300 ---------------------------------------------------------------------- DEVNOTES.txt | 21 + RELEASE_NOTES.txt | 12 + assembly/dependencies-fabric.xml | 1 + examples/config/example-cache.xml | 2 + examples/pom.xml | 36 +- .../client/memcache/MemcacheRestExample.java | 32 +- idea/ignite_codeStyle.xml | 147 +++++ modules/aop/pom.xml | 2 +- modules/aws/pom.xml | 2 +- modules/clients/pom.xml | 2 +- .../client/router/TcpSslRouterSelfTest.java | 5 + .../client/suite/IgniteClientTestSuite.java | 3 +- modules/cloud/pom.xml | 2 +- .../cloud/TcpDiscoveryCloudIpFinder.java | 25 +- .../TcpDiscoveryCloudIpFinderSelfTest.java | 3 +- modules/codegen/pom.xml | 2 +- modules/core/pom.xml | 3 +- .../java/org/apache/ignite/IgniteCache.java | 25 +- .../apache/ignite/IgniteSystemProperties.java | 3 + .../apache/ignite/cache/query/ScanQuery.java | 48 +- .../configuration/CacheConfiguration.java | 1 - .../ignite/internal/GridKernalContextImpl.java | 5 +- .../ignite/internal/GridPluginContext.java | 6 + .../apache/ignite/internal/IgniteKernal.java | 23 +- .../internal/MarshallerContextAdapter.java | 48 +- .../ignite/internal/MarshallerContextImpl.java | 24 +- .../GridClientOptimizedMarshaller.java | 5 + .../internal/interop/InteropIgnition.java | 54 +- .../internal/interop/InteropProcessor.java | 8 + .../discovery/DiscoveryCustomMessage.java | 6 + .../discovery/GridDiscoveryManager.java | 32 + .../managers/indexing/GridIndexingManager.java | 4 - .../affinity/GridAffinityAssignment.java | 12 + .../affinity/GridAffinityAssignmentCache.java | 12 +- .../cache/DynamicCacheChangeBatch.java | 19 +- .../processors/cache/GridCacheAdapter.java | 15 +- .../processors/cache/GridCacheMessage.java | 51 -- .../GridCachePartitionExchangeManager.java | 2 +- .../processors/cache/GridCacheProcessor.java | 57 +- .../processors/cache/GridCacheSwapManager.java | 55 +- .../processors/cache/IgniteCacheProxy.java | 11 +- .../processors/cache/IgniteInternalCache.java | 27 +- .../processors/cache/KeyCacheObjectImpl.java | 11 +- .../processors/cache/QueryCursorImpl.java | 23 +- .../distributed/GridCacheTxRecoveryRequest.java | 26 +- .../GridCacheTxRecoveryResponse.java | 14 +- .../distributed/GridDistributedBaseMessage.java | 77 +-- .../distributed/GridDistributedLockRequest.java | 54 +- .../GridDistributedLockResponse.java | 14 +- .../GridDistributedTxFinishRequest.java | 46 +- .../GridDistributedTxPrepareRequest.java | 62 +- .../GridDistributedTxPrepareResponse.java | 64 +- .../GridDistributedUnlockRequest.java | 6 +- .../distributed/dht/GridDhtLocalPartition.java | 7 + .../distributed/dht/GridDhtLockRequest.java | 72 ++- .../distributed/dht/GridDhtLockResponse.java | 18 +- .../distributed/dht/GridDhtTxFinishRequest.java | 38 +- .../dht/GridDhtTxPrepareRequest.java | 54 +- .../dht/GridDhtTxPrepareResponse.java | 22 +- .../distributed/dht/GridDhtUnlockRequest.java | 6 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 6 +- .../GridDhtPartitionsExchangeFuture.java | 14 +- .../distributed/near/GridNearLockRequest.java | 58 +- .../distributed/near/GridNearLockResponse.java | 26 +- .../near/GridNearTxFinishRequest.java | 26 +- .../near/GridNearTxPrepareRequest.java | 50 +- .../near/GridNearTxPrepareResponse.java | 46 +- .../distributed/near/GridNearUnlockRequest.java | 2 +- .../processors/cache/query/CacheQuery.java | 2 +- .../query/GridCacheDistributedQueryManager.java | 3 + .../cache/query/GridCacheQueryAdapter.java | 147 ++++- .../cache/query/GridCacheQueryManager.java | 210 ++++--- .../cache/query/GridCacheQueryRequest.java | 47 +- .../processors/cache/query/QueryCursorEx.java | 8 + .../cache/transactions/IgniteTxHandler.java | 3 - .../cacheobject/IgniteCacheObjectProcessor.java | 9 +- .../IgniteCacheObjectProcessorImpl.java | 12 +- .../continuous/AbstractContinuousMessage.java | 9 + .../continuous/GridContinuousProcessor.java | 17 +- .../datastreamer/DataStreamerCacheUpdaters.java | 2 +- .../datastreamer/DataStreamerImpl.java | 8 +- .../datastructures/DataStructuresProcessor.java | 67 ++- .../datastructures/GridCacheSetImpl.java | 4 +- .../plugin/IgnitePluginProcessor.java | 16 +- .../portable/GridPortableInputStream.java | 10 + .../processors/query/GridQueryIndexing.java | 4 +- .../processors/query/GridQueryProcessor.java | 20 +- .../messages/GridQueryNextPageResponse.java | 1 + .../rest/client/message/GridRouterRequest.java | 18 + .../rest/client/message/GridRouterResponse.java | 18 + .../service/GridServiceProcessor.java | 2 +- .../ignite/internal/util/GridJavaProcess.java | 2 +- .../ignite/internal/util/IgniteUtils.java | 7 +- .../shmem/IpcSharedMemoryClientEndpoint.java | 2 +- .../ipc/shmem/IpcSharedMemoryNativeLoader.java | 151 ++++- .../shmem/IpcSharedMemoryServerEndpoint.java | 2 +- .../util/ipc/shmem/IpcSharedMemoryUtils.java | 4 +- .../util/nio/GridNioDelimitedBuffer.java | 2 +- .../util/nio/GridShmemCommunicationClient.java | 146 +++++ .../internal/visor/VisorMultiNodeTask.java | 2 +- .../internal/visor/query/VisorQueryJob.java | 2 +- .../internal/visor/util/VisorTaskUtils.java | 16 +- .../ignite/marshaller/MarshallerContext.java | 8 + .../org/apache/ignite/plugin/PluginContext.java | 6 + .../communication/tcp/TcpCommunicationSpi.java | 415 ++++++++++++- .../tcp/TcpCommunicationSpiMBean.java | 8 + .../ignite/spi/discovery/tcp/ServerImpl.java | 44 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 2 +- .../RoundRobinGlobalLoadBalancer.java | 2 +- .../java/org/jsr166/ConcurrentHashMap8.java | 8 +- .../java/org/jsr166/ConcurrentLinkedDeque8.java | 586 ++++++------------- .../src/main/java/org/jsr166/LongAdder8.java | 35 +- .../core/src/main/java/org/jsr166/README.txt | 11 + .../src/main/java/org/jsr166/Striped64_8.java | 22 +- .../java/org/jsr166/ThreadLocalRandom8.java | 19 +- .../src/main/java/org/jsr166/package-info.java | 12 +- .../core/src/main/resources/ignite.properties | 2 +- modules/core/src/test/config/tests.properties | 2 +- .../ignite/GridSuppressedExceptionSelfTest.java | 4 +- .../internal/GridDiscoveryEventSelfTest.java | 6 +- ...ridFailFastNodeFailureDetectionSelfTest.java | 2 + .../GridFailoverTaskWithPredicateSelfTest.java | 3 - .../GridJobMasterLeaveAwareSelfTest.java | 2 - .../internal/GridJobStealingSelfTest.java | 3 - ...ectionLocalJobMultipleArgumentsSelfTest.java | 2 - .../GridTaskExecutionContextSelfTest.java | 9 - .../IgniteComputeEmptyClusterGroupTest.java | 3 - .../IgniteComputeTopologyExceptionTest.java | 9 - .../GridDiscoveryManagerAliveCacheSelfTest.java | 5 + .../cache/GridCacheAbstractFullApiSelfTest.java | 15 + .../cache/GridCacheAbstractSelfTest.java | 3 - .../cache/GridCacheAffinityRoutingSelfTest.java | 4 +- .../cache/GridCacheDeploymentSelfTest.java | 3 - .../cache/GridCacheEntryMemorySizeSelfTest.java | 91 +-- .../cache/GridCacheMemoryModeSelfTest.java | 2 - ...inodeUpdateNearEnabledNoBackupsSelfTest.java | 2 +- ...CacheMultinodeUpdateNearEnabledSelfTest.java | 2 +- .../processors/cache/GridCacheOffHeapTest.java | 28 +- .../GridCacheReferenceCleanupSelfTest.java | 3 - .../processors/cache/GridCacheStopSelfTest.java | 5 + .../cache/GridCacheVersionMultinodeTest.java | 2 +- .../cache/IgniteCacheAbstractTest.java | 3 - .../IgniteCacheEntryListenerAbstractTest.java | 14 +- .../IgniteCacheInterceptorSelfTestSuite.java | 2 +- .../cache/IgniteCacheInvokeReadThroughTest.java | 5 + .../IgniteCacheP2pUnmarshallingTxErrorTest.java | 14 +- ...gniteCacheTransactionalStopBusySelfTest.java | 5 + .../cache/IgniteDynamicCacheStartSelfTest.java | 19 + ...teStartCacheInTransactionAtomicSelfTest.java | 32 + .../IgniteStartCacheInTransactionSelfTest.java | 254 ++++++++ .../IgniteTxMultiThreadedAbstractTest.java | 4 +- ...cheAtomicReferenceMultiNodeAbstractTest.java | 11 - ...GridCacheQueueMultiNodeAbstractSelfTest.java | 2 - ...dCacheQueueMultiNodeConsistencySelfTest.java | 5 + ...CacheQueueRotativeMultiNodeAbstractTest.java | 10 - .../GridCacheSetAbstractSelfTest.java | 9 - ...omicOffheapQueueCreateMultiNodeSelfTest.java | 5 + ...ionedAtomicQueueCreateMultiNodeSelfTest.java | 5 + ...rtitionedDataStructuresFailoverSelfTest.java | 5 + ...edOffheapDataStructuresFailoverSelfTest.java | 5 + ...PartitionedQueueCreateMultiNodeSelfTest.java | 5 + ...dCachePartitionedQueueEntryMoveSelfTest.java | 5 + ...nedQueueFailoverDataConsistencySelfTest.java | 5 + ...eplicatedDataStructuresFailoverSelfTest.java | 5 + ...CacheLoadingConcurrentGridStartSelfTest.java | 5 + .../GridCacheAbstractJobExecutionTest.java | 3 - .../GridCachePreloadLifecycleAbstractTest.java | 2 - .../distributed/IgniteCacheManyClientsTest.java | 169 ++++++ .../IgniteCacheMessageRecoveryAbstractTest.java | 1 + ...heAbstractTransformWriteThroughSelfTest.java | 3 - .../GridCacheColocatedTxExceptionSelfTest.java | 5 + ...ePartitionedNearDisabledMetricsSelfTest.java | 4 +- ...dCachePartitionedTopologyChangeSelfTest.java | 5 + .../near/GridCacheNearEvictionSelfTest.java | 3 - .../near/GridCacheNearTxExceptionSelfTest.java | 5 + ...PartitionedFullApiMultithreadedSelfTest.java | 5 + ...idCachePartitionedHitsAndMissesSelfTest.java | 3 - .../GridCachePartitionedNodeRestartTest.java | 5 + ...ePartitionedOptimisticTxNodeRestartTest.java | 5 + ...achePartitionedPreloadLifecycleSelfTest.java | 2 +- ...CachePartitionedTxMultiThreadedSelfTest.java | 5 + ...eReplicatedFullApiMultithreadedSelfTest.java | 5 + .../GridCacheReplicatedInvalidateSelfTest.java | 4 +- ...ridCacheReplicatedMultiNodeLockSelfTest.java | 5 + .../GridCacheReplicatedMultiNodeSelfTest.java | 5 + .../GridCacheReplicatedNodeRestartSelfTest.java | 5 + .../GridCacheReplicatedTxExceptionSelfTest.java | 5 + .../replicated/GridReplicatedTxPreloadTest.java | 2 + ...acheAtomicReplicatedNodeRestartSelfTest.java | 5 + ...CacheReplicatedPreloadLifecycleSelfTest.java | 6 +- .../GridCacheEvictionFilterSelfTest.java | 4 +- ...cheSynchronousEvictionsFailoverSelfTest.java | 5 + .../IgniteCacheExpiryPolicyAbstractTest.java | 10 +- ...eCacheExpiryPolicyWithStoreAbstractTest.java | 4 +- ...dCacheLocalFullApiMultithreadedSelfTest.java | 5 + .../GridCacheLocalTxExceptionSelfTest.java | 5 + .../GridCacheSwapScanQueryAbstractSelfTest.java | 115 +++- ...ridCacheContinuousQueryAbstractSelfTest.java | 2 - .../closure/GridClosureProcessorSelfTest.java | 29 +- .../continuous/GridEventConsumeSelfTest.java | 2 - .../DataStreamProcessorSelfTest.java | 47 +- .../DataStreamerMultinodeCreateCacheTest.java | 6 +- .../processors/igfs/IgfsModesSelfTest.java | 4 +- .../ipc/shmem/IgfsSharedMemoryTestServer.java | 2 + .../IpcSharedMemoryCrashDetectionSelfTest.java | 2 +- .../ipc/shmem/IpcSharedMemorySpaceSelfTest.java | 2 +- .../ipc/shmem/IpcSharedMemoryUtilsSelfTest.java | 2 +- .../LoadWithCorruptedLibFileTestRunner.java | 2 +- .../IpcSharedMemoryBenchmarkReader.java | 2 +- .../IpcSharedMemoryBenchmarkWriter.java | 2 +- .../nio/GridNioDelimitedBufferSelfTest.java | 112 ++++ .../util/nio/GridNioDelimitedBufferTest.java | 112 ---- .../internal/util/nio/GridNioSelfTest.java | 13 +- .../internal/util/nio/GridNioSslSelfTest.java | 2 + .../unsafe/GridUnsafeMemorySelfTest.java | 4 +- .../tostring/GridToStringBuilderSelfTest.java | 4 +- .../communication/GridIoManagerBenchmark0.java | 1 + .../marshaller/MarshallerContextTestImpl.java | 29 +- .../ignite/messaging/GridMessagingSelfTest.java | 3 - .../GridP2PContinuousDeploymentSelfTest.java | 2 + .../p2p/GridP2PLocalDeploymentSelfTest.java | 6 +- .../p2p/GridP2PRemoteClassLoadersSelfTest.java | 31 +- .../spi/GridTcpSpiForwardingSelfTest.java | 4 +- .../GridTcpCommunicationSpiAbstractTest.java | 13 + ...mmunicationSpiConcurrentConnectSelfTest.java | 4 +- ...cpCommunicationSpiMultithreadedSelfTest.java | 21 +- ...pCommunicationSpiMultithreadedShmemTest.java | 28 + ...dTcpCommunicationSpiRecoveryAckSelfTest.java | 1 + ...GridTcpCommunicationSpiRecoverySelfTest.java | 1 + .../GridTcpCommunicationSpiShmemSelfTest.java | 38 ++ .../tcp/GridTcpCommunicationSpiTcpSelfTest.java | 7 + .../tcp/TcpClientDiscoverySpiSelfTest.java | 114 +++- .../stream/socket/SocketStreamerSelfTest.java | 29 +- .../ignite/testframework/GridTestUtils.java | 16 +- .../config/GridTestProperties.java | 14 +- .../junits/GridTestKernalContext.java | 1 + .../junits/IgniteTestResources.java | 16 +- .../ignite/testsuites/IgniteBasicTestSuite.java | 30 +- .../IgniteCacheDataStructuresSelfTestSuite.java | 24 +- .../IgniteCacheEvictionSelfTestSuite.java | 3 +- .../IgniteCacheFailoverTestSuite.java | 22 +- .../IgniteCacheFullApiSelfTestSuite.java | 8 +- ...niteCacheP2pUnmarshallingErrorTestSuite.java | 20 +- .../testsuites/IgniteCacheRestartTestSuite.java | 10 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 44 +- .../testsuites/IgniteCacheTestSuite2.java | 4 +- .../testsuites/IgniteCacheTestSuite3.java | 14 +- .../testsuites/IgniteCacheTestSuite4.java | 15 +- .../testsuites/IgniteKernalSelfTestSuite.java | 16 +- .../IgniteMarshallerSelfTestSuite.java | 28 +- .../IgniteSpiCommunicationSelfTestSuite.java | 2 + .../testsuites/IgniteStreamSelfTestSuite.java | 39 ++ .../testsuites/IgniteStreamTestSuite.java | 39 -- .../testsuites/IgniteUtilSelfTestSuite.java | 20 +- .../apache/ignite/util/GridRandomSelfTest.java | 4 +- modules/extdata/p2p/pom.xml | 2 +- .../tests/p2p/P2PTestTaskExternalPath1.java | 10 +- .../tests/p2p/P2PTestTaskExternalPath2.java | 8 +- modules/extdata/uri/pom.xml | 2 +- modules/gce/pom.xml | 2 +- modules/geospatial/pom.xml | 2 +- modules/hadoop/pom.xml | 3 +- .../HadoopIgfs20FileSystemAbstractSelfTest.java | 17 +- ...oopSecondaryFileSystemConfigurationTest.java | 14 + .../IgniteHadoopFileSystemAbstractSelfTest.java | 2 +- ...IgniteHadoopFileSystemHandshakeSelfTest.java | 7 + .../IgniteHadoopFileSystemIpcCacheSelfTest.java | 7 + .../hadoop/HadoopAbstractSelfTest.java | 7 + .../processors/hadoop/HadoopMapReduceTest.java | 21 +- .../collections/HadoopHashMapSelfTest.java | 4 +- .../HadoopExternalTaskExecutionSelfTest.java | 2 + .../HadoopExternalCommunicationSelfTest.java | 5 + .../testsuites/IgniteHadoopTestSuite.java | 7 +- modules/hibernate/pom.xml | 2 +- .../hibernate/HibernateL2CacheSelfTest.java | 5 + .../HibernateL2CacheTransactionalSelfTest.java | 5 + .../testsuites/IgniteHibernateTestSuite.java | 4 +- modules/indexing/pom.xml | 18 +- .../processors/query/h2/IgniteH2Indexing.java | 44 +- .../h2/twostep/GridReduceQueryExecutor.java | 8 +- ...CacheScanPartitionQueryFallbackSelfTest.java | 408 +++++++++++++ .../cache/GridCacheCrossCacheQuerySelfTest.java | 22 +- .../cache/GridCacheOffHeapSelfTest.java | 1 - ...idCacheReduceQueryMultithreadedSelfTest.java | 10 - .../processors/cache/GridCacheSwapSelfTest.java | 3 - .../IgniteCacheAbstractFieldsQuerySelfTest.java | 13 +- .../cache/IgniteCacheAbstractQuerySelfTest.java | 79 ++- ...hePartitionedQueryMultiThreadedSelfTest.java | 40 +- .../IgniteCacheQueryMultiThreadedSelfTest.java | 1 - .../IgniteCacheQueryNodeRestartSelfTest.java | 5 + ...dCacheAbstractReduceFieldsQuerySelfTest.java | 1 - .../h2/GridIndexingSpiAbstractSelfTest.java | 4 +- .../query/h2/sql/BaseH2CompareQueryTest.java | 4 +- .../query/h2/sql/GridQueryParsingTest.java | 5 +- .../IgniteCacheQuerySelfTestSuite.java | 4 +- modules/jcl/pom.xml | 2 +- modules/jta/pom.xml | 2 +- modules/log4j/pom.xml | 2 +- modules/mesos/README.txt | 2 +- modules/mesos/pom.xml | 2 +- .../apache/ignite/mesos/ClusterProperties.java | 15 + .../apache/ignite/mesos/IgniteScheduler.java | 10 +- modules/rest-http/pom.xml | 2 +- modules/scalar-2.10/README.txt | 4 + modules/scalar-2.10/licenses/apache-2.0.txt | 202 +++++++ .../scalar-2.10/licenses/scala-bsd-license.txt | 18 + modules/scalar-2.10/pom.xml | 197 +++++++ 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/README.txt | 4 + modules/spark-2.10/licenses/apache-2.0.txt | 202 +++++++ .../spark-2.10/licenses/scala-bsd-license.txt | 18 + modules/spark-2.10/pom.xml | 120 ++++ modules/spark/README.txt | 8 + modules/spark/licenses/apache-2.0.txt | 202 +++++++ modules/spark/licenses/scala-bsd-license.txt | 18 + modules/spark/pom.xml | 110 ++++ .../org/apache/ignite/spark/IgniteContext.scala | 119 ++++ .../org/apache/ignite/spark/IgniteRDD.scala | 244 ++++++++ .../apache/ignite/spark/JavaIgniteContext.scala | 63 ++ .../org/apache/ignite/spark/JavaIgniteRDD.scala | 99 ++++ .../ignite/spark/impl/IgniteAbstractRDD.scala | 39 ++ .../ignite/spark/impl/IgnitePartition.scala | 24 + .../ignite/spark/impl/IgniteQueryIterator.scala | 27 + .../apache/ignite/spark/impl/IgniteSqlRDD.scala | 41 ++ .../spark/impl/JavaIgniteAbstractRDD.scala | 34 ++ .../ignite/spark/JavaIgniteRDDSelfTest.java | 298 ++++++++++ .../scala/org/apache/ignite/spark/Entity.scala | 28 + .../org/apache/ignite/spark/IgniteRddSpec.scala | 231 ++++++++ modules/spring/pom.xml | 2 +- modules/ssh/pom.xml | 2 +- modules/tools/pom.xml | 2 +- .../ignite/tools/classgen/ClassesGenerator.java | 30 +- modules/urideploy/pom.xml | 2 +- modules/visor-console-2.10/README.txt | 4 + modules/visor-console-2.10/pom.xml | 174 ++++++ modules/visor-console/pom.xml | 2 +- modules/visor-plugins/pom.xml | 2 +- modules/web/pom.xml | 2 +- .../IgniteWebSessionSelfTestSuite.java | 2 +- modules/yardstick/pom.xml | 2 +- parent/pom.xml | 5 + pom.xml | 22 +- 345 files changed, 7424 insertions(+), 2011 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/05a58216/modules/core/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/05a58216/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java ----------------------------------------------------------------------
