Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-69
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5a50356e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5a50356e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5a50356e Branch: refs/heads/ignite-26 Commit: 5a50356e2f06f633ea3da1516694d606bc03cd48 Parents: a297fb3 9550905 Author: avinogradov <avinogra...@gridgain.com> Authored: Fri Jan 30 11:33:01 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Fri Jan 30 11:33:01 2015 +0300 ---------------------------------------------------------------------- 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 +- .../ClientPropertiesConfigurationSelfTest.java | 4 +- .../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 +- .../processors/cache/GridCacheAdapter.java | 16 +- .../cache/GridCacheDeploymentManager.java | 2 +- .../cache/GridCacheMvccCandidate.java | 4 +- .../processors/cache/GridCacheStoreManager.java | 25 +- .../processors/cache/IgniteCacheProxy.java | 24 +- .../transactions/IgniteTxLocalAdapter.java | 42 +- .../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 +- .../service/GridServiceProcessor.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 +- .../visor/misc/VisorResolveHostNameTask.java | 2 +- .../visor/node/VisorNodeDataCollectorJob.java | 4 +- .../internal/visor/query/VisorQueryUtils.java | 4 +- .../ignite/lang/IgniteAsyncSupportAdapter.java | 27 +- .../optimized/IgniteOptimizedMarshaller.java | 2 +- .../communication/tcp/TcpCommunicationSpi.java | 24 +- .../IgniteExceptionHelpLinksSelfTest.java | 3 +- .../GridEventStorageCheckAllEventsSelfTest.java | 2 +- .../cache/GridCacheAbstractMetricsSelfTest.java | 10 +- .../GridCacheAbstractProjectionSelfTest.java | 50 + .../GridCacheReturnValueTransferSelfTest.java | 2 +- .../cache/IgniteCacheInvokeAbstractTest.java | 4 +- .../IgniteCrossCacheTxStoreSelfTest.java | 288 + ...GridCacheValueConsistencyAtomicSelfTest.java | 2 +- .../IgniteCacheTxStoreSessionTest.java | 11 +- ...IpcEndpointRegistrationAbstractSelfTest.java | 4 +- ...pcEndpointRegistrationOnWindowsSelfTest.java | 4 +- .../cache/GridCacheCommandHandlerSelfTest.java | 4 +- ...artupWithSpecifiedWorkDirectorySelfTest.java | 2 +- ...tartupWithUndefinedGridGainHomeSelfTest.java | 4 +- .../internal/util/GridTestClockTimer.java | 6 +- .../ignite/internal/util/GridUtilsSelfTest.java | 717 -- .../internal/util/IgniteUtilsSelfTest.java | 728 ++ ...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 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 1 + .../ignite/testsuites/IgniteFsTestSuite.java | 2 +- .../IgniteIpcSharedMemorySelfTestSuite.java | 7 +- .../testsuites/IgniteUtilSelfTestSuite.java | 2 +- .../internal/fs/hadoop/GridGgfsHadoopIpcIo.java | 10 +- .../GridHadoopExternalCommunication.java | 26 +- .../GridHadoopIpcToNioAdapter.java | 6 +- ...doop20FileSystemLoopbackPrimarySelfTest.java | 2 +- ...sHadoop20FileSystemShmemPrimarySelfTest.java | 2 +- .../GridGgfsHadoopFileSystemClientSelfTest.java | 2 +- ...idGgfsHadoopFileSystemHandshakeSelfTest.java | 2 +- ...ridGgfsHadoopFileSystemIpcCacheSelfTest.java | 2 +- ...adoopFileSystemLoopbackAbstractSelfTest.java | 2 +- ...fsHadoopFileSystemShmemAbstractSelfTest.java | 8 +- .../fs/GridGgfsNearOnlyMultiNodeSelfTest.java | 4 +- .../ignite/fs/IgniteFsEventsTestSuite.java | 4 +- .../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 | 20 +- .../visor/commands/gc/VisorGcCommandSpec.scala | 25 +- 158 files changed, 17135 insertions(+), 16542 deletions(-) ----------------------------------------------------------------------
