Merge commit 'b9c776a8' into ignite-1.7.3
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2a09d221 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2a09d221 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2a09d221 Branch: refs/heads/ignite-4110 Commit: 2a09d22182ad065f1ee449441d41825c87cd55ea Parents: 3fa0124 b9c776a Author: vozerov-gridgain <[email protected]> Authored: Mon Oct 24 10:51:09 2016 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Mon Oct 24 10:51:09 2016 +0300 ---------------------------------------------------------------------- .../internal/jdbc2/JdbcResultSetSelfTest.java | 91 +++++++++- .../configuration/CacheConfiguration.java | 13 +- .../configuration/IgniteConfiguration.java | 18 +- .../ignite/internal/GridKernalContextImpl.java | 4 +- .../org/apache/ignite/internal/IgnitionEx.java | 86 +++++----- .../ignite/internal/MarshallerContextImpl.java | 5 +- .../processors/cluster/GridUpdateNotifier.java | 108 +++--------- .../processors/hadoop/HadoopHelper.java | 7 + .../internal/processors/hadoop/HadoopJob.java | 5 + .../processors/hadoop/HadoopNoopHelper.java | 5 + .../internal/processors/igfs/IgfsServer.java | 5 +- .../processors/igfs/IgfsThreadFactory.java | 61 +++++++ .../cpp/PlatformCppConfigurationClosure.java | 13 +- .../PlatformDotNetConfigurationClosure.java | 13 +- .../platform/utils/PlatformUtils.java | 8 +- .../processors/query/GridQueryProcessor.java | 71 ++++---- .../ignite/internal/util/IgniteUtils.java | 92 +++++----- .../shmem/IpcSharedMemoryServerEndpoint.java | 15 +- .../apache/ignite/logger/java/JavaLogger.java | 14 +- .../logger/java/JavaLoggerFileHandler.java | 10 +- .../sharedfs/SharedFsCheckpointSpi.java | 3 +- .../communication/tcp/TcpCommunicationSpi.java | 4 +- .../sharedfs/TcpDiscoverySharedFsIpFinder.java | 2 +- .../spi/swapspace/file/FileSwapSpaceSpi.java | 2 +- .../MarshallerContextLockingSelfTest.java | 2 +- .../MarshallerCacheJobRunNodeRestartTest.java | 2 +- .../handlers/log/GridLogCommandHandlerTest.java | 5 +- ...artupWithSpecifiedWorkDirectorySelfTest.java | 166 ------------------- .../ipc/shmem/IgfsSharedMemoryTestServer.java | 4 +- .../IpcSharedMemoryCrashDetectionSelfTest.java | 9 +- .../IpcSharedMemoryBenchmarkReader.java | 2 +- .../ignite/logger/java/JavaLoggerTest.java | 3 +- .../OptimizedMarshallerNodeFailoverTest.java | 4 - ...heckpointSpiMultipleDirectoriesSelfTest.java | 6 +- .../GridAbstractCommunicationSelfTest.java | 2 - ...cpCommunicationSpiMultithreadedSelfTest.java | 2 - .../GridSwapSpaceSpiAbstractSelfTest.java | 2 - .../testframework/junits/GridAbstractTest.java | 2 +- .../ignite/testframework/junits/IgniteMock.java | 10 ++ .../junits/IgniteTestResources.java | 2 - .../junits/spi/GridSpiAbstractTest.java | 2 - .../testsuites/IgniteBinaryBasicTestSuite.java | 2 - .../testsuites/IgniteKernalSelfTestSuite.java | 2 - .../CacheNoValueClassOnServerTestClient.java | 2 - .../CacheConfigurationP2PTestClient.java | 2 - .../processors/hadoop/HadoopHelperImpl.java | 13 ++ .../processors/hadoop/impl/HadoopUtils.java | 11 +- .../HadoopBasicFileSystemFactoryDelegate.java | 16 +- ...HadoopKerberosFileSystemFactoryDelegate.java | 7 +- .../processors/hadoop/impl/v2/HadoopV2Job.java | 13 +- .../hadoop/impl/v2/HadoopV2TaskContext.java | 4 +- .../external/HadoopExternalTaskExecutor.java | 13 +- .../child/HadoopExternalProcessStarter.java | 10 +- .../HadoopExternalCommunication.java | 10 +- .../hadoop/impl/HadoopPlannerMockJob.java | 7 + .../impl/igfs/Hadoop1DualAbstractTest.java | 12 +- ...oopSecondaryFileSystemConfigurationTest.java | 12 ++ .../HadoopExternalCommunicationSelfTest.java | 2 +- .../cache/CacheConfigurationP2PTestServer.java | 2 - .../IgniteConfigurationTest.cs | 24 ++- .../Apache.Ignite.Core/Impl/IgniteUtils.cs | 2 +- .../spi/deployment/uri/UriDeploymentSpi.java | 2 +- .../scala/org/apache/ignite/visor/visor.scala | 2 +- 63 files changed, 549 insertions(+), 501 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/2a09d221/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/2a09d221/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetConfigurationClosure.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/2a09d221/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformUtils.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/2a09d221/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/2a09d221/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/2a09d221/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/2a09d221/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteConfigurationTest.cs ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/2a09d221/modules/platforms/dotnet/Apache.Ignite.Core/Impl/IgniteUtils.cs ----------------------------------------------------------------------
