Merge branch 'ignite-45' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-45-330
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6986cbf2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6986cbf2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6986cbf2 Branch: refs/heads/ignite-45 Commit: 6986cbf2336c9b2bc29362a61bac16c3fadabb6d Parents: 1653cb7 46fb088 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Mon Mar 23 11:16:15 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Mon Mar 23 11:16:15 2015 +0700 ---------------------------------------------------------------------- .../computegrid/ComputeAsyncExample.java | 3 +- .../examples/ScalarSnowflakeSchemaExample.scala | 2 +- .../rest/TaskCommandHandlerSelfTest.java | 2 +- .../eviction/fifo/CacheFifoEvictionPolicy.java | 4 +- .../CacheIgfsPerBlockLruEvictionPolicy.java | 4 +- .../eviction/lru/CacheLruEvictionPolicy.java | 4 +- .../cache/store/jdbc/CacheJdbcBlobStore.java | 2 +- .../org/apache/ignite/internal/IgnitionEx.java | 2 +- .../internal/MarshallerContextAdapter.java | 2 +- .../router/impl/GridRouterClientImpl.java | 2 +- .../cluster/ClusterNodeLocalMapImpl.java | 2 +- .../ignite/internal/igfs/common/IgfsLogger.java | 2 +- .../checkpoint/GridCheckpointManager.java | 4 +- .../managers/communication/GridIoManager.java | 4 +- .../communication/GridIoMessageFactory.java | 2 +- .../managers/deployment/GridDeployment.java | 2 +- .../deployment/GridDeploymentClassLoader.java | 2 +- .../deployment/GridDeploymentLocalStore.java | 2 +- .../GridDeploymentPerVersionStore.java | 2 +- .../discovery/GridDiscoveryManager.java | 2 +- .../eventstorage/GridEventStorageManager.java | 2 +- .../affinity/GridAffinityAssignmentCache.java | 2 +- .../affinity/GridAffinityProcessor.java | 2 +- .../cache/CacheStoreBalancingWrapper.java | 2 +- .../cache/CacheWeakQueryIteratorsHolder.java | 2 +- .../processors/cache/GridCacheAdapter.java | 2 +- .../cache/GridCacheConcurrentMap.java | 2 +- .../cache/GridCacheDeploymentManager.java | 2 +- .../GridCacheEntryInfoCollectSwapListener.java | 2 +- .../cache/GridCacheEvictionManager.java | 4 +- .../processors/cache/GridCacheIoManager.java | 2 +- .../processors/cache/GridCacheMvccManager.java | 5 +- .../GridCachePartitionExchangeManager.java | 2 +- .../processors/cache/GridCacheSwapManager.java | 2 +- .../processors/cache/GridCacheUtils.java | 2 +- .../cache/GridCacheWriteBehindStore.java | 2 +- .../CacheDataStructuresManager.java | 2 +- .../distributed/GridCacheTxFinishSync.java | 2 +- .../distributed/dht/GridDhtCacheAdapter.java | 2 +- .../distributed/dht/GridDhtLocalPartition.java | 2 +- .../distributed/dht/GridDhtLockFuture.java | 2 +- .../dht/GridDhtPartitionTopologyImpl.java | 2 +- .../distributed/dht/GridDhtTxLocalAdapter.java | 2 +- .../cache/distributed/dht/GridDhtTxRemote.java | 2 +- .../dht/atomic/GridDhtAtomicCache.java | 2 +- .../dht/atomic/GridDhtAtomicUpdateFuture.java | 2 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 2 +- .../colocated/GridDhtColocatedLockFuture.java | 2 +- .../GridDhtPartitionsExchangeFuture.java | 2 +- .../dht/preloader/GridDhtPreloader.java | 2 +- .../distributed/near/GridNearLockFuture.java | 2 +- .../cache/distributed/near/GridNearTxLocal.java | 3 +- .../near/GridNearTxPrepareFuture.java | 2 +- .../query/GridCacheDistributedQueryManager.java | 2 +- .../cache/query/GridCacheQueryManager.java | 2 +- .../continuous/CacheContinuousQueryManager.java | 2 +- .../cache/transactions/IgniteTxManager.java | 2 +- .../continuous/GridContinuousProcessor.java | 2 +- .../datastreamer/DataStreamerImpl.java | 2 +- .../datastructures/DataStructuresProcessor.java | 2 +- .../processors/igfs/IgfsClientSession.java | 2 +- .../processors/igfs/IgfsDataManager.java | 2 +- .../internal/processors/igfs/IgfsImpl.java | 2 +- .../processors/igfs/IgfsLocalMetrics.java | 2 +- .../internal/processors/igfs/IgfsProcessor.java | 2 +- .../internal/processors/igfs/IgfsServer.java | 2 +- .../processors/job/GridJobProcessor.java | 4 +- .../jobmetrics/GridJobMetricsProcessor.java | 2 +- .../offheap/GridOffHeapProcessor.java | 2 +- .../processors/query/GridQueryProcessor.java | 2 +- .../processors/resource/GridResourceIoc.java | 2 +- .../processors/rest/GridRestProcessor.java | 2 +- .../handlers/task/GridTaskCommandHandler.java | 2 +- .../service/GridServiceProcessor.java | 2 +- .../processors/service/GridServiceProxy.java | 2 +- .../session/GridTaskSessionProcessor.java | 2 +- .../processors/task/GridTaskProcessor.java | 2 +- .../processors/task/GridTaskWorker.java | 2 +- .../internal/util/GridAnnotationsCache.java | 2 +- .../GridBoundedConcurrentLinkedHashMap.java | 4 +- .../GridBoundedConcurrentLinkedHashSet.java | 6 +- .../internal/util/GridClassLoaderCache.java | 2 +- .../internal/util/GridConcurrentFactory.java | 2 +- .../internal/util/GridConcurrentHashSet.java | 2 +- .../util/GridConcurrentLinkedHashSet.java | 4 +- .../ignite/internal/util/GridEnumCache.java | 2 +- .../internal/util/GridExecutionStatistics.java | 2 +- .../ignite/internal/util/GridKeyLock.java | 2 +- .../ignite/internal/util/GridLogThrottle.java | 2 +- .../internal/util/GridSynchronizedMap.java | 2 +- .../ignite/internal/util/IgniteUtils.java | 2 +- .../util/future/GridCompoundFuture.java | 2 +- .../ignite/internal/util/lang/GridFunc.java | 2 +- .../ignite/internal/util/nio/GridNioServer.java | 2 +- .../util/nio/GridSelectorNioSessionImpl.java | 2 +- .../offheap/unsafe/GridOffHeapSnapTreeMap.java | 2 +- .../util/offheap/unsafe/GridUnsafeMap.java | 2 +- .../unsafe/GridUnsafePartitionedMap.java | 2 +- .../optimized/OptimizedMarshaller.java | 2 +- .../optimized/OptimizedMarshallerUtils.java | 2 - .../jobstealing/JobStealingCollisionSpi.java | 2 +- .../communication/tcp/TcpCommunicationSpi.java | 2 +- .../deployment/local/LocalDeploymentSpi.java | 2 +- .../discovery/tcp/TcpClientDiscoverySpi.java | 2 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 2 +- .../memory/MemoryEventStorageSpi.java | 2 +- .../adaptive/AdaptiveLoadBalancingSpi.java | 2 +- .../roundrobin/RoundRobinLoadBalancingSpi.java | 2 +- .../WeightedRandomLoadBalancingSpi.java | 2 +- .../spi/swapspace/file/FileSwapSpaceSpi.java | 2 +- .../org/jdk8/backport/ConcurrentHashMap8.java | 3794 ------------------ .../jdk8/backport/ConcurrentLinkedDeque8.java | 1954 --------- .../jdk8/backport/ConcurrentLinkedHashMap.java | 2141 ---------- .../main/java/org/jdk8/backport/LongAdder8.java | 206 - .../java/org/jdk8/backport/Striped64_8.java | 346 -- .../org/jdk8/backport/ThreadLocalRandom8.java | 202 - .../org/jetbrains/annotations/package-info.java | 21 + .../java/org/jsr166/ConcurrentHashMap8.java | 3794 ++++++++++++++++++ .../java/org/jsr166/ConcurrentLinkedDeque8.java | 1954 +++++++++ .../org/jsr166/ConcurrentLinkedHashMap.java | 2141 ++++++++++ .../src/main/java/org/jsr166/LongAdder8.java | 206 + .../src/main/java/org/jsr166/Striped64_8.java | 346 ++ .../java/org/jsr166/ThreadLocalRandom8.java | 202 + .../src/main/java/org/jsr166/package-info.java | 21 + ...CacheJdbcBlobStoreMultithreadedSelfTest.java | 2 +- .../GridDeploymentMessageCountSelfTest.java | 2 +- .../GridCacheAbstractRemoveFailureTest.java | 3 +- .../cache/GridCacheAbstractSelfTest.java | 2 +- .../GridCacheInterceptorAbstractSelfTest.java | 2 +- ...ridCacheReplicatedSynchronousCommitTest.java | 2 +- .../GridCacheWriteBehindStoreSelfTest.java | 2 +- .../cache/IgniteCacheAbstractTest.java | 2 +- ...chePartitionedReloadAllAbstractSelfTest.java | 3 +- .../dht/GridCacheGlobalLoadTest.java | 2 +- ...eAtomicInvalidPartitionHandlingSelfTest.java | 2 +- ...GridCacheValueConsistencyAtomicSelfTest.java | 2 +- .../IgniteCacheLoadAllAbstractTest.java | 2 +- .../IgniteCacheLoaderWriterAbstractTest.java | 2 +- ...ridCacheContinuousQueryAbstractSelfTest.java | 2 +- .../IgniteDataStreamerPerformanceTest.java | 2 +- .../processors/igfs/IgfsSizeSelfTest.java | 4 +- .../processors/service/DummyService.java | 2 +- .../util/future/GridCompoundFutureSelfTest.java | 3 +- .../future/GridFutureListenPerformanceTest.java | 2 +- .../util/future/GridFutureQueueTest.java | 2 +- .../ipc/shmem/IpcSharedMemorySpaceSelfTest.java | 2 +- .../offheap/GridOffHeapMapAbstractSelfTest.java | 3 +- ...idOffHeapPartitionedMapAbstractSelfTest.java | 2 +- ...apPartitionedMapPerformanceAbstractTest.java | 2 +- .../unsafe/GridUnsafeMemorySelfTest.java | 2 +- .../ignite/jvmtest/BlockingQueueTest.java | 2 +- .../ignite/jvmtest/ConcurrentMapTest.java | 2 +- .../ignite/lang/GridBasicPerformanceTest.java | 2 +- .../lang/GridFutureListenPerformanceTest.java | 2 +- .../GridCircularBufferPerformanceTest.java | 2 +- .../lang/utils/GridCircularBufferSelfTest.java | 2 +- .../utils/GridConcurrentHashMapSelfTest.java | 4 +- .../GridConcurrentLinkedHashMapSelfTest.java | 2 +- ...idFileSwapSpaceSpiMultithreadedLoadTest.java | 2 +- .../colocation/GridTestCacheStore.java | 2 +- .../communication/GridIoManagerBenchmark.java | 2 +- .../communication/GridIoManagerBenchmark0.java | 2 +- .../GridContinuousOperationsLoadTest.java | 2 +- .../ignite/loadtests/dsi/GridDsiPerfJob.java | 2 +- ...dBoundedConcurrentLinkedHashSetLoadTest.java | 6 +- .../job/GridJobExecutionLoadTestClient.java | 2 +- ...GridJobExecutionLoadTestClientSemaphore.java | 2 +- ...JobExecutionSingleNodeSemaphoreLoadTest.java | 2 +- .../GridConcurrentLinkedHashMapBenchmark.java | 6 +- ...apPartitionedMapPerformanceAbstractTest.java | 2 +- .../marshaller/MarshallerContextTestImpl.java | 2 +- .../OptimizedObjectStreamSelfTest.java | 2 +- .../tcp/GridTcpCommunicationSpiLanTest.java | 2 +- ...cpCommunicationSpiMultithreadedSelfTest.java | 2 +- .../file/GridFileSwapSpaceSpiSelfTest.java | 3 +- .../inmemory/GridTestSwapSpaceSpi.java | 2 +- ...dConcurrentLinkedDequeMultiThreadedTest.java | 6 +- .../util/GridConcurrentLinkedDequeSelfTest.java | 6 +- ...rrentLinkedHashMapMultiThreadedSelfTest.java | 4 +- .../processors/hadoop/HadoopClassLoader.java | 2 +- .../hadoop/counter/HadoopCountersImpl.java | 2 +- .../processors/hadoop/igfs/HadoopIgfsIpcIo.java | 2 +- .../hadoop/igfs/HadoopIgfsOutProc.java | 2 +- .../hadoop/jobtracker/HadoopJobTracker.java | 2 +- .../taskexecutor/HadoopExecutorService.java | 2 +- .../external/HadoopExternalTaskExecutor.java | 2 +- .../HadoopExternalCommunication.java | 2 +- .../processors/hadoop/v2/HadoopV2Job.java | 2 +- .../HadoopIgfs20FileSystemAbstractSelfTest.java | 4 +- .../IgniteHadoopFileSystemAbstractSelfTest.java | 2 +- .../hadoop/HadoopCommandLineTest.java | 2 +- .../processors/hadoop/HadoopSharedMap.java | 2 +- .../taskexecutor/HadoopExecutorServiceTest.java | 2 +- .../processors/query/h2/IgniteH2Indexing.java | 2 +- .../processors/query/h2/opt/GridH2Table.java | 2 +- .../query/h2/twostep/GridMapQueryExecutor.java | 2 +- .../query/h2/twostep/GridMergeIndex.java | 2 +- .../h2/twostep/GridReduceQueryExecutor.java | 2 +- .../cache/GridCacheQuerySimpleBenchmark.java | 2 +- .../cache/IgniteCacheAbstractQuerySelfTest.java | 2 +- .../ignite/cache/spring/SpringCacheManager.java | 2 +- 201 files changed, 8894 insertions(+), 8864 deletions(-) ----------------------------------------------------------------------
