Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-72-1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e19655df Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e19655df Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e19655df Branch: refs/heads/ingite-9655-merge Commit: e19655dfb3fd53f5423d3842bce7ca3395dc0f3b Parents: 18e02cd 9550905 Author: avinogradov <avinogra...@gridgain.com> Authored: Fri Jan 30 11:30:11 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Fri Jan 30 11:30:11 2015 +0300 ---------------------------------------------------------------------- assembly/release-base-fabric.xml | 2 +- assembly/release-hadoop.xml | 6 +- ipc/shmem/Makefile.am | 2 +- ipc/shmem/Makefile.in | 2 +- ipc/shmem/configure | 4 +- ipc/shmem/configure.ac | 2 +- ipc/shmem/ggshmem/Makefile.am | 23 - ipc/shmem/ggshmem/Makefile.in | 589 -- ..._util_ipc_shmem_GridIpcSharedMemoryUtils.cpp | 882 -- ipc/shmem/igniteshmem/Makefile.am | 23 + ipc/shmem/igniteshmem/Makefile.in | 589 ++ ...rnal_util_ipc_shmem_IpcSharedMemoryUtils.cpp | 882 ++ ipc/shmem/include/Makefile.am | 2 +- ipc/shmem/include/Makefile.in | 2 +- ...ternal_util_ipc_shmem_IpcSharedMemoryUtils.h | 117 + ...id_util_ipc_shmem_GridIpcSharedMemoryUtils.h | 117 - ipc/shmem/readme.txt | 9 +- .../spi/checkpoint/s3/S3CheckpointSpi.java | 4 +- .../ClientAbstractMultiThreadedSelfTest.java | 2 +- .../ClientPropertiesConfigurationSelfTest.java | 4 +- .../ClientAbstractMultiNodeSelfTest.java | 4 +- .../rest/RestBinaryProtocolSelfTest.java | 2 +- .../rest/TaskCommandHandlerSelfTest.java | 2 +- .../java/META-INF/native/linux64/libggshmem.so | Bin 138023 -> 0 bytes .../META-INF/native/linux64/libigniteshmem.so | Bin 0 -> 138345 bytes .../java/META-INF/native/osx/libggshmem.dylib | Bin 32940 -> 0 bytes .../META-INF/native/osx/libigniteshmem.dylib | Bin 0 -> 33116 bytes .../apache/ignite/IgniteCheckedException.java | 2 +- .../java/org/apache/ignite/IgniteException.java | 2 +- .../main/java/org/apache/ignite/Ignition.java | 38 +- .../apache/ignite/cache/CachingProvider.java | 2 +- .../ignite/fs/mapreduce/IgniteFsTask.java | 2 +- .../ignite/internal/ClusterGroupAdapter.java | 2 +- .../internal/ClusterNodeLocalMapImpl.java | 2 +- .../java/org/apache/ignite/internal/GridEx.java | 143 - .../org/apache/ignite/internal/GridGainEx.java | 2399 ----- .../org/apache/ignite/internal/GridKernal.java | 3322 ------- .../ignite/internal/GridKernalContext.java | 2 +- .../ignite/internal/GridKernalContextImpl.java | 8 +- .../apache/ignite/internal/GridLoggerProxy.java | 2 +- .../ignite/internal/GridUpdateNotifier.java | 2 +- .../ignite/internal/IgniteClusterAsyncImpl.java | 4 +- .../org/apache/ignite/internal/IgniteEx.java | 143 + .../apache/ignite/internal/IgniteKernal.java | 3322 +++++++ .../org/apache/ignite/internal/IgnitionEx.java | 2396 +++++ .../processors/affinity/GridAffinityUtils.java | 2 +- .../processors/cache/GridCacheAdapter.java | 24 +- .../processors/cache/GridCacheContext.java | 4 +- .../cache/GridCacheDeploymentManager.java | 2 +- .../cache/GridCacheMvccCandidate.java | 4 +- .../processors/cache/GridCacheStoreManager.java | 25 +- .../processors/cache/IgniteCacheProxy.java | 24 +- .../GridCacheDataStructuresManager.java | 4 +- .../cache/query/GridCacheQueryManager.java | 2 +- .../jdbc/GridCacheQueryJdbcMetadataTask.java | 2 +- .../query/jdbc/GridCacheQueryJdbcTask.java | 2 +- .../transactions/IgniteTxLocalAdapter.java | 42 +- .../dr/GridDrDataLoadCacheUpdater.java | 2 +- .../internal/processors/fs/GridGgfsImpl.java | 2 +- .../internal/processors/fs/GridGgfsServer.java | 26 +- .../processors/fs/GridGgfsServerManager.java | 8 +- .../processors/fs/IgniteFsNoopProcessor.java | 2 +- .../processors/fs/IgniteFsProcessor.java | 4 +- .../processors/fs/IgniteFsProcessorAdapter.java | 2 +- .../resource/GridResourceProcessor.java | 2 +- .../resource/GridSpringResourceContext.java | 2 +- .../handlers/cache/GridCacheCommandHandler.java | 6 +- .../handlers/task/GridTaskCommandHandler.java | 2 +- .../service/GridServiceProcessor.java | 2 +- .../processors/service/GridServiceProxy.java | 2 +- .../apache/ignite/internal/util/GridUtils.java | 9100 ----------------- .../ignite/internal/util/IgniteUtils.java | 9141 ++++++++++++++++++ .../internal/util/ipc/GridIpcEndpoint.java | 49 - .../util/ipc/GridIpcEndpointBindException.java | 47 - .../util/ipc/GridIpcEndpointFactory.java | 84 - .../internal/util/ipc/GridIpcEndpointType.java | 29 - .../util/ipc/GridIpcServerEndpoint.java | 73 - .../ipc/GridIpcServerEndpointDeserializer.java | 66 - .../internal/util/ipc/GridIpcToNioAdapter.java | 250 - .../ignite/internal/util/ipc/IpcEndpoint.java | 49 + .../util/ipc/IpcEndpointBindException.java | 47 + .../internal/util/ipc/IpcEndpointFactory.java | 84 + .../internal/util/ipc/IpcEndpointType.java | 29 + .../internal/util/ipc/IpcServerEndpoint.java | 73 + .../util/ipc/IpcServerEndpointDeserializer.java | 66 + .../internal/util/ipc/IpcToNioAdapter.java | 250 + .../ipc/loopback/GridIpcClientTcpEndpoint.java | 87 - .../ipc/loopback/GridIpcServerTcpEndpoint.java | 179 - .../util/ipc/loopback/IpcClientTcpEndpoint.java | 87 + .../util/ipc/loopback/IpcServerTcpEndpoint.java | 179 + .../GridIpcOutOfSystemResourcesException.java | 59 - .../GridIpcSharedMemoryClientEndpoint.java | 336 - .../shmem/GridIpcSharedMemoryInitRequest.java | 67 - .../shmem/GridIpcSharedMemoryInitResponse.java | 171 - .../shmem/GridIpcSharedMemoryInputStream.java | 99 - .../shmem/GridIpcSharedMemoryNativeLoader.java | 242 - ...cSharedMemoryOperationTimedoutException.java | 59 - .../shmem/GridIpcSharedMemoryOutputStream.java | 80 - .../GridIpcSharedMemoryServerEndpoint.java | 707 -- .../ipc/shmem/GridIpcSharedMemorySpace.java | 374 - .../ipc/shmem/GridIpcSharedMemoryUtils.java | 242 - .../shmem/IpcOutOfSystemResourcesException.java | 59 + .../shmem/IpcSharedMemoryClientEndpoint.java | 336 + .../ipc/shmem/IpcSharedMemoryInitRequest.java | 67 + .../ipc/shmem/IpcSharedMemoryInitResponse.java | 171 + .../ipc/shmem/IpcSharedMemoryInputStream.java | 99 + .../ipc/shmem/IpcSharedMemoryNativeLoader.java | 261 + ...cSharedMemoryOperationTimedoutException.java | 59 + .../ipc/shmem/IpcSharedMemoryOutputStream.java | 80 + .../shmem/IpcSharedMemoryServerEndpoint.java | 707 ++ .../util/ipc/shmem/IpcSharedMemorySpace.java | 374 + .../util/ipc/shmem/IpcSharedMemoryUtils.java | 242 + .../util/nio/GridShmemCommunicationClient.java | 4 +- .../internal/util/typedef/internal/U.java | 4 +- .../apache/ignite/internal/visor/VisorJob.java | 2 +- .../internal/visor/VisorMultiNodeTask.java | 2 +- .../ignite/internal/visor/cache/VisorCache.java | 2 +- .../compute/VisorComputeMonitoringHolder.java | 10 +- .../visor/misc/VisorResolveHostNameTask.java | 2 +- .../visor/node/VisorBasicConfiguration.java | 2 +- .../visor/node/VisorGridConfiguration.java | 2 +- .../visor/node/VisorNodeDataCollectorJob.java | 6 +- .../internal/visor/query/VisorQueryTask.java | 2 +- .../internal/visor/query/VisorQueryUtils.java | 4 +- .../ignite/lang/IgniteAsyncSupportAdapter.java | 27 +- .../optimized/IgniteOptimizedMarshaller.java | 2 +- .../communication/tcp/TcpCommunicationSpi.java | 24 +- .../StreamerCacheAffinityEventRouter.java | 2 +- .../ignite/GridExceptionHelpLinksSelfTest.java | 106 - .../ignite/GridExternalizableAbstractTest.java | 41 - .../IgniteExceptionHelpLinksSelfTest.java | 105 + .../IgniteExternalizableAbstractTest.java | 41 + ...CachePartitionFairAffinityNodesSelfTest.java | 6 +- ...CacheJdbcBlobStoreMultithreadedSelfTest.java | 2 +- .../fs/GridGgfsEventsAbstractSelfTest.java | 2 +- .../ignite/fs/GridGgfsFragmentizerSelfTest.java | 2 +- .../internal/GridDiscoveryEventSelfTest.java | 3 +- .../ignite/internal/GridDiscoverySelfTest.java | 4 +- .../GridEventStorageCheckAllEventsSelfTest.java | 2 +- .../internal/GridExecutorServiceTest.java | 315 - .../GridExplicitImplicitDeploymentSelfTest.java | 476 - .../ignite/internal/GridKernalTestUtils.java | 3 +- .../internal/GridListenActorSelfTest.java | 3 +- .../GridTopicExternalizableSelfTest.java | 3 +- .../GridTopologyBuildVersionSelfTest.java | 2 +- .../internal/GridUpdateNotifierSelfTest.java | 3 +- .../internal/IgniteExecutorServiceTest.java | 315 + ...gniteExplicitImplicitDeploymentSelfTest.java | 476 + .../GridCheckpointManagerAbstractSelfTest.java | 2 +- .../GridCommunicationSendMessageSelfTest.java | 4 +- .../GridDiscoveryManagerAliveCacheSelfTest.java | 2 +- .../discovery/GridDiscoveryManagerSelfTest.java | 6 +- .../swapspace/GridSwapSpaceManagerSelfTest.java | 2 +- .../GridAffinityProcessorAbstractSelfTest.java | 6 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 4 +- .../cache/GridCacheAbstractMetricsSelfTest.java | 10 +- .../GridCacheAbstractProjectionSelfTest.java | 50 + .../cache/GridCacheAbstractSelfTest.java | 2 +- .../cache/GridCacheAffinityApiSelfTest.java | 4 +- .../GridCacheConcurrentTxMultiNodeTest.java | 4 +- .../cache/GridCacheEntryVersionSelfTest.java | 4 +- .../GridCacheFinishPartitionsSelfTest.java | 4 +- .../GridCacheGroupLockAbstractSelfTest.java | 4 +- .../processors/cache/GridCacheLeakTest.java | 2 +- ...GridCacheMixedPartitionExchangeSelfTest.java | 2 +- .../cache/GridCacheMultiUpdateLockSelfTest.java | 2 +- .../cache/GridCacheMvccFlagsTest.java | 4 +- .../cache/GridCacheMvccManagerSelfTest.java | 4 +- .../cache/GridCacheMvccPartitionedSelfTest.java | 4 +- .../processors/cache/GridCacheMvccSelfTest.java | 4 +- .../cache/GridCacheNestedTxAbstractTest.java | 2 +- .../cache/GridCacheObjectToStringSelfTest.java | 2 +- .../GridCacheOrderedPreloadingSelfTest.java | 2 +- .../cache/GridCacheP2PUndeploySelfTest.java | 6 +- .../cache/GridCachePartitionedGetSelfTest.java | 2 +- .../GridCachePreloadingEvictionsSelfTest.java | 6 +- .../GridCacheQueryInternalKeysSelfTest.java | 2 +- .../GridCacheReturnValueTransferSelfTest.java | 2 +- .../cache/GridCacheSlowTxWarnTest.java | 4 +- .../cache/GridCacheStoreValueBytesSelfTest.java | 4 +- .../cache/GridCacheSwapReloadSelfTest.java | 2 +- .../cache/GridCacheTtlManagerLoadTest.java | 2 +- .../cache/GridCacheTtlManagerSelfTest.java | 2 +- .../IgniteCacheEntryListenerAbstractTest.java | 2 +- .../cache/IgniteCacheInvokeAbstractTest.java | 4 +- .../processors/cache/IgniteTxAbstractTest.java | 2 +- .../IgniteTxConcurrentGetAbstractTest.java | 3 +- .../IgniteTxExceptionAbstractSelfTest.java | 2 +- .../cache/IgniteTxMultiNodeAbstractTest.java | 6 +- .../IgniteTxStoreExceptionAbstractSelfTest.java | 2 +- ...actQueueFailoverDataConsistencySelfTest.java | 2 +- .../GridCacheCountDownLatchSelfTest.java | 2 +- .../GridCacheQueueCleanupSelfTest.java | 2 +- .../GridCacheSetAbstractSelfTest.java | 8 +- .../GridCacheSetFailoverAbstractSelfTest.java | 2 +- .../GridCacheAtomicTimeoutSelfTest.java | 2 +- .../distributed/GridCacheEventAbstractTest.java | 2 +- ...heExpiredEntriesPreloadAbstractSelfTest.java | 2 +- .../GridCacheMultiNodeLockAbstractTest.java | 2 +- .../IgniteCrossCacheTxStoreSelfTest.java | 288 + ...iteTxConsistencyRestartAbstractSelfTest.java | 4 +- ...xOriginatingNodeFailureAbstractSelfTest.java | 10 +- ...cOriginatingNodeFailureAbstractSelfTest.java | 20 +- .../dht/GridCacheAtomicNearCacheSelfTest.java | 2 +- .../dht/GridCacheColocatedDebugTest.java | 6 +- .../dht/GridCacheDhtEntrySelfTest.java | 2 +- ...GridCacheDhtEvictionNearReadersSelfTest.java | 4 +- .../dht/GridCacheDhtEvictionSelfTest.java | 4 +- .../dht/GridCacheDhtMappingSelfTest.java | 2 +- .../dht/GridCacheDhtPreloadDelayedSelfTest.java | 2 +- .../GridCacheDhtPreloadStartStopSelfTest.java | 2 +- ...dCachePartitionedTopologyChangeSelfTest.java | 32 +- ...itionedTxOriginatingNodeFailureSelfTest.java | 8 +- ...eAtomicInvalidPartitionHandlingSelfTest.java | 2 +- .../atomic/GridCacheAtomicPreloadSelfTest.java | 4 +- ...GridCacheValueConsistencyAtomicSelfTest.java | 2 +- .../near/GridCacheNearMultiNodeSelfTest.java | 6 +- .../near/GridCacheNearReadersSelfTest.java | 4 +- .../near/GridCacheNearTxMultiNodeSelfTest.java | 2 +- .../GridCachePartitionedFullApiSelfTest.java | 4 +- ...achePartitionedMultiNodeCounterSelfTest.java | 2 +- .../GridCachePartitionedProjectionSelfTest.java | 4 +- .../GridCachePartitionedTxSalvageSelfTest.java | 2 +- .../IgniteCacheExpiryPolicyAbstractTest.java | 2 +- .../IgniteCacheTxStoreSessionTest.java | 11 +- ...ridCacheContinuousQueryAbstractSelfTest.java | 4 +- .../clock/GridTimeSyncProcessorSelfTest.java | 6 +- .../continuous/GridEventConsumeSelfTest.java | 2 +- .../processors/fs/GridGgfsAbstractSelfTest.java | 2 +- .../processors/fs/GridGgfsModesSelfTest.java | 4 +- .../fs/GridGgfsProcessorSelfTest.java | 2 +- ...IpcEndpointRegistrationAbstractSelfTest.java | 6 +- ...pcEndpointRegistrationOnWindowsSelfTest.java | 4 +- .../processors/fs/GridGgfsSizeSelfTest.java | 8 +- .../cache/GridCacheCommandHandlerSelfTest.java | 10 +- .../GridServiceReassignmentSelfTest.java | 2 +- ...artupWithSpecifiedWorkDirectorySelfTest.java | 2 +- ...tartupWithUndefinedGridGainHomeSelfTest.java | 4 +- .../internal/util/GridTestClockTimer.java | 6 +- .../ignite/internal/util/GridUtilsSelfTest.java | 717 -- .../internal/util/IgniteUtilsSelfTest.java | 728 ++ .../util/future/GridFinishedFutureSelfTest.java | 2 +- ...idIpcServerEndpointDeserializerSelfTest.java | 160 - .../IpcServerEndpointDeserializerSelfTest.java | 160 + .../ipc/shmem/GgfsSharedMemoryTestClient.java | 76 + .../ipc/shmem/GgfsSharedMemoryTestServer.java | 71 + .../shmem/GridGgfsSharedMemoryTestClient.java | 76 - .../shmem/GridGgfsSharedMemoryTestServer.java | 71 - ...idIpcSharedMemoryCrashDetectionSelfTest.java | 500 - .../shmem/GridIpcSharedMemoryFakeClient.java | 36 - .../shmem/GridIpcSharedMemoryNodeStartup.java | 87 - .../shmem/GridIpcSharedMemorySpaceSelfTest.java | 267 - .../shmem/GridIpcSharedMemoryUtilsSelfTest.java | 84 - .../IpcSharedMemoryCrashDetectionSelfTest.java | 500 + .../ipc/shmem/IpcSharedMemoryFakeClient.java | 36 + .../IpcSharedMemoryNativeLoaderSelfTest.java | 78 + .../ipc/shmem/IpcSharedMemoryNodeStartup.java | 87 + .../ipc/shmem/IpcSharedMemorySpaceSelfTest.java | 267 + .../ipc/shmem/IpcSharedMemoryUtilsSelfTest.java | 84 + .../LoadWithCorruptedLibFileTestRunner.java | 65 + .../GridIpcSharedMemoryBenchmarkParty.java | 35 - .../GridIpcSharedMemoryBenchmarkReader.java | 133 - .../GridIpcSharedMemoryBenchmarkWriter.java | 125 - .../IpcSharedMemoryBenchmarkParty.java | 35 + .../IpcSharedMemoryBenchmarkReader.java | 133 + .../IpcSharedMemoryBenchmarkWriter.java | 125 + .../ignite/lang/GridSetWrapperSelfTest.java | 2 +- .../cache/GridCachePutRemoveLoadTest.java | 2 +- .../communication/GridIoManagerBenchmark.java | 10 +- .../communication/GridIoManagerBenchmark0.java | 12 +- .../ignite/loadtests/dsi/GridDsiPerfJob.java | 2 +- .../marshaller/GridMarshallerAbstractTest.java | 6 +- .../tcp/GridTcpDiscoveryMultiThreadedTest.java | 2 +- .../discovery/tcp/GridTcpDiscoverySelfTest.java | 14 +- .../ignite/testframework/GridTestUtils.java | 4 +- .../testframework/junits/GridAbstractTest.java | 14 +- .../junits/GridTestKernalContext.java | 2 +- .../junits/common/GridCommonAbstractTest.java | 22 +- .../ignite/testsuites/IgniteBasicTestSuite.java | 2 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 1 + .../testsuites/IgniteComputeGridTestSuite.java | 4 +- .../ignite/testsuites/IgniteFsTestSuite.java | 2 +- .../IgniteIpcSharedMemorySelfTestSuite.java | 7 +- .../testsuites/IgniteUtilSelfTestSuite.java | 2 +- .../internal/fs/hadoop/GridGgfsHadoopIpcIo.java | 10 +- .../GridHadoopDefaultMapReducePlanner.java | 2 +- .../GridHadoopExternalCommunication.java | 26 +- .../GridHadoopIpcToNioAdapter.java | 6 +- ...doop20FileSystemLoopbackPrimarySelfTest.java | 2 +- ...sHadoop20FileSystemShmemPrimarySelfTest.java | 2 +- .../GridGgfsHadoopFileSystemClientSelfTest.java | 4 +- ...idGgfsHadoopFileSystemHandshakeSelfTest.java | 2 +- ...ridGgfsHadoopFileSystemIpcCacheSelfTest.java | 2 +- ...adoopFileSystemLoopbackAbstractSelfTest.java | 2 +- ...fsHadoopFileSystemShmemAbstractSelfTest.java | 8 +- .../fs/GridGgfsNearOnlyMultiNodeSelfTest.java | 4 +- .../ignite/fs/IgniteFsEventsTestSuite.java | 4 +- ...idHadoopDefaultMapReducePlannerSelfTest.java | 4 +- .../hadoop/GridHadoopJobTrackerSelfTest.java | 2 +- .../cache/GridCacheAbstractQuerySelfTest.java | 6 +- .../cache/GridCacheOffHeapAndSwapSelfTest.java | 4 +- .../cache/GridCacheQueryLoadSelfTest.java | 2 +- .../GridCacheQueryMultiThreadedSelfTest.java | 8 +- .../GridCacheReplicatedFieldsQuerySelfTest.java | 2 +- .../GridCacheReplicatedQuerySelfTest.java | 4 +- .../query/h2/sql/GridQueryParsingTest.java | 2 +- .../tcp/GridOrderedMessageCancelSelfTest.java | 2 +- .../GridTmLookupLifecycleAwareSelfTest.java | 2 +- .../java/org/apache/ignite/IgniteSpring.java | 8 +- .../cache/spring/SpringDynamicCacheManager.java | 2 +- .../ignite/visor/commands/VisorConsole.scala | 6 +- .../commands/alert/VisorAlertCommand.scala | 2 +- .../config/VisorConfigurationCommand.scala | 6 +- .../commands/deploy/VisorDeployCommand.scala | 4 +- .../commands/disco/VisorDiscoveryCommand.scala | 4 +- .../commands/events/VisorEventsCommand.scala | 4 +- .../visor/commands/gc/VisorGcCommand.scala | 13 +- .../visor/commands/node/VisorNodeCommand.scala | 4 +- .../commands/start/VisorStartCommand.scala | 4 +- .../commands/tasks/VisorTasksCommand.scala | 4 +- .../commands/top/VisorTopologyCommand.scala | 6 +- .../visor/commands/vvm/VisorVvmCommand.scala | 8 +- .../scala/org/apache/ignite/visor/visor.scala | 26 +- .../visor/commands/gc/VisorGcCommandSpec.scala | 25 +- .../GridServletContextListenerStartup.java | 4 +- .../startup/servlet/GridServletStartup.java | 4 +- 326 files changed, 24257 insertions(+), 23673 deletions(-) ----------------------------------------------------------------------
