Merge remote-tracking branch 'remotes/origin/master' into ignite-1232
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/45ce0fd7 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/45ce0fd7 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/45ce0fd7 Branch: refs/heads/ignite-1232 Commit: 45ce0fd7da4bfa7d2655f5f837af50f06476e0a5 Parents: 3fd608e 77bcabc Author: sboikov <[email protected]> Authored: Thu Jul 7 08:59:47 2016 +0300 Committer: sboikov <[email protected]> Committed: Thu Jul 7 08:59:47 2016 +0300 ---------------------------------------------------------------------- assembly/LICENSE_FABRIC | 8 +- assembly/LICENSE_HADOOP | 6 - bin/include/hadoop-classpath.bat | 73 -- bin/include/hadoop-classpath.sh | 65 -- bin/include/setenv.bat | 4 +- bin/include/setenv.sh | 25 +- examples/pom-standalone-lgpl.xml | 6 +- examples/pom-standalone.xml | 6 +- examples/pom.xml | 6 +- examples/schema-import/pom-standalone.xml | 6 +- examples/schema-import/pom.xml | 6 +- modules/cassandra/pom.xml | 4 +- .../store/cassandra/common/package-info.java | 21 + .../cassandra/datasource/package-info.java | 21 + .../cache/store/cassandra/package-info.java | 21 + .../cassandra/persistence/package-info.java | 21 + .../cassandra/serializer/package-info.java | 21 + .../store/cassandra/session/package-info.java | 21 + .../cassandra/session/pool/package-info.java | 21 + .../store/cassandra/utils/package-info.java | 21 + .../tests/load/cassandra/package-info.java | 21 + .../ignite/tests/load/ignite/package-info.java | 21 + .../apache/ignite/tests/load/package-info.java | 21 + .../org/apache/ignite/tests/package-info.java | 21 + .../apache/ignite/tests/pojos/package-info.java | 21 + .../apache/ignite/tests/utils/package-info.java | 21 + .../integration/ClientAbstractSelfTest.java | 4 +- modules/core/pom.xml | 6 +- .../org/apache/ignite/IgniteDataStreamer.java | 5 +- .../apache/ignite/IgniteSystemProperties.java | 3 + .../ignite/binary/BinaryObjectBuilder.java | 11 + .../configuration/HadoopConfiguration.java | 4 +- .../apache/ignite/internal/IgniteKernal.java | 73 +- .../ignite/internal/binary/BinaryContext.java | 85 +- .../internal/binary/BinaryEnumObjectImpl.java | 9 +- .../ignite/internal/binary/BinaryObjectEx.java | 11 + .../internal/binary/BinaryObjectExImpl.java | 4 +- .../internal/binary/BinaryObjectImpl.java | 8 +- .../binary/BinaryObjectOffheapImpl.java | 8 +- .../ignite/internal/binary/BinaryTypeProxy.java | 111 ++ .../ignite/internal/binary/BinaryUtils.java | 35 +- .../processors/cache/GridCacheAdapter.java | 4 + .../processors/cache/GridCacheIoManager.java | 150 ++- .../processors/cache/GridCacheMessage.java | 9 + .../GridCachePartitionExchangeManager.java | 103 ++ .../cache/GridCacheSharedContext.java | 68 ++ .../processors/cache/GridCacheUtils.java | 21 + .../binary/CacheObjectBinaryProcessorImpl.java | 3 +- .../distributed/GridCacheTxRecoveryFuture.java | 70 +- .../distributed/GridCacheTxRecoveryRequest.java | 7 + .../GridCacheTxRecoveryResponse.java | 7 + .../distributed/GridDistributedLockRequest.java | 6 + .../GridDistributedLockResponse.java | 6 + .../GridDistributedTxFinishRequest.java | 7 + .../GridDistributedTxFinishResponse.java | 7 + .../GridDistributedTxPrepareRequest.java | 6 + .../GridDistributedTxPrepareResponse.java | 7 + .../GridDistributedUnlockRequest.java | 6 + .../distributed/dht/GridDhtLockFuture.java | 59 +- .../dht/GridDhtPartitionTopologyImpl.java | 2 +- .../dht/GridDhtTransactionalCacheAdapter.java | 77 +- .../distributed/dht/GridDhtTxFinishFuture.java | 92 +- .../cache/distributed/dht/GridDhtTxLocal.java | 27 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 122 +- .../dht/atomic/GridDhtAtomicCache.java | 138 ++- .../GridDhtAtomicDeferredUpdateResponse.java | 7 + .../dht/atomic/GridDhtAtomicUpdateFuture.java | 47 +- .../dht/atomic/GridDhtAtomicUpdateRequest.java | 6 + .../dht/atomic/GridDhtAtomicUpdateResponse.java | 6 + .../GridNearAtomicAbstractUpdateFuture.java | 7 +- .../GridNearAtomicSingleUpdateFuture.java | 30 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 45 +- .../dht/atomic/GridNearAtomicUpdateRequest.java | 6 + .../atomic/GridNearAtomicUpdateResponse.java | 6 + .../dht/colocated/GridDhtColocatedCache.java | 10 + .../colocated/GridDhtColocatedLockFuture.java | 71 +- .../GridDhtPartitionsExchangeFuture.java | 3 + .../near/GridNearOptimisticTxPrepareFuture.java | 33 + .../GridNearPessimisticTxPrepareFuture.java | 34 +- .../near/GridNearTxFinishFuture.java | 91 +- .../near/GridNearTxPrepareFutureAdapter.java | 7 +- .../cache/transactions/IgniteTxHandler.java | 286 +++-- .../processors/hadoop/HadoopNoopProcessor.java | 5 + .../hadoop/HadoopProcessorAdapter.java | 7 + .../platform/PlatformAbstractBootstrap.java | 5 + .../processors/platform/PlatformBootstrap.java | 6 + .../processors/platform/PlatformIgnition.java | 7 +- .../affinity/PlatformAffinityFunction.java | 154 ++- .../PlatformAffinityFunctionTarget.java | 113 ++ .../cache/affinity/PlatformAffinityUtils.java | 113 ++ .../callback/PlatformCallbackGateway.java | 16 +- .../callback/PlatformCallbackUtils.java | 13 +- .../dotnet/PlatformDotNetBootstrap.java | 12 + .../PlatformDotNetConfigurationClosure.java | 8 +- .../dotnet/PlatformDotNetConsoleStream.java | 54 + .../utils/PlatformConfigurationUtils.java | 96 +- .../processors/query/GridQueryProcessor.java | 3 +- .../service/GridServiceProcessor.java | 2 +- .../util/nio/GridNioRecoveryDescriptor.java | 19 +- .../ignite/internal/util/nio/GridNioServer.java | 47 +- .../util/nio/GridSelectorNioSessionImpl.java | 7 + .../visor/cache/VisorCachePartitionsTask.java | 2 +- .../visor/compute/VisorGatewayTask.java | 2 +- .../ignite/internal/visor/igfs/VisorIgfs.java | 2 +- .../internal/visor/igfs/VisorIgfsMetrics.java | 11 +- .../visor/node/VisorNodeDataCollectorTask.java | 26 - .../dotnet/PlatformDotNetAffinityFunction.java | 89 +- .../communication/tcp/TcpCommunicationSpi.java | 163 ++- .../ignite/spi/discovery/tcp/ClientImpl.java | 2 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 109 +- .../tcp/internal/TcpDiscoveryStatistics.java | 45 +- .../resources/META-INF/classnames.properties | 165 ++- modules/core/src/test/config/log4j-test.xml | 6 + .../IgniteCountDownLatchAbstractSelfTest.java | 2 - ...gniteCacheMessageRecoveryIdleConnection.java | 154 +++ .../service/IgniteServiceReassignmentTest.java | 250 ++++ .../tcp/TcpDiscoveryMultiThreadedTest.java | 222 ++++ .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 63 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 2 + .../testsuites/IgniteKernalSelfTestSuite.java | 2 + modules/flume/README.txt | 2 +- .../IgniteHadoopClientProtocolProvider.java | 1 + .../processors/hadoop/HadoopAttributes.java | 168 +++ .../processors/hadoop/HadoopClassLoader.java | 73 +- .../processors/hadoop/HadoopClasspathMain.java | 44 + .../processors/hadoop/HadoopClasspathUtils.java | 295 +++++ .../processors/hadoop/HadoopLocations.java | 123 ++ .../processors/hadoop/HadoopProcessor.java | 118 +- modules/kafka/README.txt | 4 +- .../include/ignite/binary/binary_containers.h | 6 +- .../include/ignite/binary/binary_raw_reader.h | 6 +- .../include/ignite/binary/binary_reader.h | 6 +- .../ignite/impl/binary/binary_reader_impl.h | 11 +- .../ignite/impl/binary/binary_writer_impl.h | 2 +- modules/platforms/cpp/common/Makefile.am | 5 +- .../platforms/cpp/common/include/Makefile.am | 19 +- .../common/include/ignite/common/big_integer.h | 523 +++++++++ .../cpp/common/include/ignite/common/bits.h | 218 ++++ .../cpp/common/include/ignite/common/decimal.h | 527 +++++++++ .../include/ignite/common/default_allocator.h | 95 ++ .../include/ignite/common/dynamic_size_array.h | 415 +++++++ .../include/ignite/common/fixed_size_array.h | 288 +++++ .../cpp/common/include/ignite/common/utils.h | 81 +- .../platforms/cpp/common/include/ignite/guid.h | 4 +- .../cpp/common/os/win/src/common/utils.cpp | 21 - .../cpp/common/project/vs/common.vcxproj | 17 +- .../common/project/vs/common.vcxproj.filters | 27 + .../cpp/common/src/common/big_integer.cpp | 830 +++++++++++++ .../platforms/cpp/common/src/common/bits.cpp | 233 ++++ .../platforms/cpp/common/src/common/decimal.cpp | 275 +++++ modules/platforms/cpp/core-test/Makefile.am | 4 + .../cpp/core-test/project/vs/core-test.vcxproj | 9 +- .../project/vs/core-test.vcxproj.filters | 14 +- .../platforms/cpp/core-test/src/bits_test.cpp | 124 ++ .../cpp/core-test/src/decimal_test.cpp | 1101 ++++++++++++++++++ .../core-test/src/dynamic_size_array_test.cpp | 360 ++++++ .../cpp/core-test/src/fixed_size_array_test.cpp | 208 ++++ .../cpp/core/include/ignite/cache/cache_entry.h | 2 +- .../cpp/jni/include/ignite/jni/exports.h | 3 + .../platforms/cpp/jni/include/ignite/jni/java.h | 10 +- modules/platforms/cpp/jni/project/vs/module.def | 2 + modules/platforms/cpp/jni/src/exports.cpp | 8 + modules/platforms/cpp/jni/src/java.cpp | 64 +- modules/platforms/cpp/odbc-test/Makefile.am | 1 - .../cpp/odbc-test/project/vs/odbc-test.vcxproj | 1 - .../project/vs/odbc-test.vcxproj.filters | 3 - .../src/application_data_buffer_test.cpp | 35 +- .../platforms/cpp/odbc-test/src/row_test.cpp | 5 +- modules/platforms/cpp/odbc/Makefile.am | 1 - modules/platforms/cpp/odbc/include/Makefile.am | 1 - .../ignite/odbc/app/application_data_buffer.h | 11 +- .../cpp/odbc/include/ignite/odbc/decimal.h | 137 --- .../cpp/odbc/include/ignite/odbc/utility.h | 12 +- .../platforms/cpp/odbc/project/vs/odbc.vcxproj | 2 - .../cpp/odbc/project/vs/odbc.vcxproj.filters | 6 - .../odbc/src/app/application_data_buffer.cpp | 165 ++- .../platforms/cpp/odbc/src/app/parameter.cpp | 6 +- modules/platforms/cpp/odbc/src/column.cpp | 6 +- modules/platforms/cpp/odbc/src/connection.cpp | 1 - modules/platforms/cpp/odbc/src/decimal.cpp | 135 --- modules/platforms/cpp/odbc/src/odbc.cpp | 3 - modules/platforms/cpp/odbc/src/utility.cpp | 25 +- .../Apache.Ignite.Core.Tests.csproj | 1 + .../Affinity/AffinityFunctionSpringTest.cs | 64 +- .../Cache/Affinity/AffinityFunctionTest.cs | 209 +++- .../Config/Cache/Affinity/affinity-function.xml | 40 + .../ConsoleRedirectTest.cs | 177 +++ .../Apache.Ignite.Core.Tests/DeploymentTest.cs | 4 +- .../Apache.Ignite.Core.Tests/TestRunner.cs | 23 +- .../Apache.Ignite.Core.csproj | 3 + .../Cache/Affinity/AffinityFunctionBase.cs | 126 +- .../Cache/Affinity/AffinityFunctionContext.cs | 14 +- .../Cache/Affinity/Fair/FairAffinityFunction.cs | 4 + .../Rendezvous/RendezvousAffinityFunction.cs | 4 + .../Cache/Configuration/CacheConfiguration.cs | 5 +- .../dotnet/Apache.Ignite.Core/Ignition.cs | 6 +- .../Impl/Binary/BinaryReaderExtensions.cs | 14 + .../Impl/Binary/Marshaller.cs | 1 + .../Affinity/AffinityFunctionSerializer.cs | 277 +++++ .../Cache/Affinity/PlatformAffinityFunction.cs | 74 ++ .../Impl/Common/ObjectInfoHolder.cs | 86 ++ .../Apache.Ignite.Core/Impl/IgniteUtils.cs | 21 + .../Impl/Unmanaged/IgniteJniNativeMethods.cs | 6 + .../Impl/Unmanaged/UnmanagedCallbacks.cs | 87 +- .../Impl/Unmanaged/UnmanagedUtils.cs | 16 + modules/yardstick/pom.xml | 46 +- .../IgniteCacheRandomOperationBenchmark.java | 147 ++- .../yardstick/cache/load/model/ModelUtil.java | 6 +- parent/pom.xml | 1 - 209 files changed, 11239 insertions(+), 1714 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/45ce0fd7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/45ce0fd7/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/45ce0fd7/parent/pom.xml ----------------------------------------------------------------------
