Merge branches 'ignite-2505' and 'master' of https://github.com/ilantukh/ignite into ignite-2505
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6e9d5cf5 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6e9d5cf5 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6e9d5cf5 Branch: refs/heads/ignite-2505 Commit: 6e9d5cf5e4e044a982696bb5642ee5b99c28243a Parents: a97084f 4035d40 Author: Ilya Lantukh <[email protected]> Authored: Tue Feb 2 17:01:20 2016 +0300 Committer: Ilya Lantukh <[email protected]> Committed: Tue Feb 2 17:01:20 2016 +0300 ---------------------------------------------------------------------- .gitignore | 1 + .../java/org/apache/ignite/IgniteCache.java | 45 +- .../ignite/binary/BinaryBasicIdMapper.java | 167 +++ .../ignite/binary/BinaryBasicNameMapper.java | 141 +++ .../apache/ignite/binary/BinaryIdMapper.java | 19 +- .../apache/ignite/binary/BinaryNameMapper.java | 47 + .../ignite/binary/BinaryTypeConfiguration.java | 23 +- .../configuration/BinaryConfiguration.java | 28 + .../configuration/IgniteConfiguration.java | 8 +- .../ignite/internal/IgniteNodeAttributes.java | 3 + .../org/apache/ignite/internal/IgnitionEx.java | 4 +- .../internal/binary/BinaryClassDescriptor.java | 23 +- .../ignite/internal/binary/BinaryContext.java | 347 ++++-- .../internal/binary/BinaryEnumObjectImpl.java | 13 +- .../internal/binary/BinaryInternalIdMapper.java | 161 --- .../internal/binary/BinaryInternalMapper.java | 131 ++ .../binary/BinaryMetadataCollector.java | 22 +- .../internal/binary/BinaryReaderExImpl.java | 14 +- .../internal/binary/BinaryWriterExImpl.java | 30 +- .../internal/binary/GridBinaryMarshaller.java | 28 +- .../binary/builder/BinaryBuilderSerializer.java | 16 +- .../binary/builder/BinaryObjectBuilderImpl.java | 2 +- .../processors/cache/CacheEntryImplEx.java | 14 +- .../processors/cache/CacheOperationContext.java | 43 +- .../processors/cache/GridCacheAdapter.java | 305 ++++- .../processors/cache/GridCacheContext.java | 33 +- .../processors/cache/GridCacheMapEntry.java | 8 +- .../processors/cache/GridCacheProcessor.java | 43 +- .../processors/cache/GridCacheProxyImpl.java | 62 +- .../processors/cache/IgniteCacheProxy.java | 94 +- .../processors/cache/IgniteInternalCache.java | 85 ++ .../binary/CacheObjectBinaryProcessorImpl.java | 123 +- .../dht/CacheDistributedGetFutureAdapter.java | 15 - .../distributed/dht/GridDhtCacheAdapter.java | 7 +- .../cache/distributed/dht/GridDhtGetFuture.java | 6 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 4 +- .../dht/GridPartitionedGetFuture.java | 38 +- .../dht/GridPartitionedSingleGetFuture.java | 17 +- .../dht/atomic/GridDhtAtomicCache.java | 190 ++- .../dht/atomic/GridNearAtomicUpdateFuture.java | 10 +- .../dht/atomic/GridNearAtomicUpdateRequest.java | 22 +- .../dht/colocated/GridDhtColocatedCache.java | 42 +- .../distributed/near/GridNearAtomicCache.java | 6 +- .../distributed/near/GridNearCacheAdapter.java | 6 +- .../distributed/near/GridNearCacheEntry.java | 3 +- .../distributed/near/GridNearGetFuture.java | 45 +- ...arOptimisticSerializableTxPrepareFuture.java | 2 +- .../near/GridNearOptimisticTxPrepareFuture.java | 4 + .../GridNearPessimisticTxPrepareFuture.java | 2 + .../near/GridNearTransactionalCache.java | 9 +- .../processors/cache/dr/GridCacheDrInfo.java | 49 +- .../local/atomic/GridLocalAtomicCache.java | 97 +- .../cache/transactions/IgniteTxEntry.java | 32 +- .../transactions/IgniteTxLocalAdapter.java | 277 +++-- .../cache/transactions/IgniteTxLocalEx.java | 3 +- .../cache/transactions/IgniteTxManager.java | 4 +- .../cache/version/GridCacheVersionManager.java | 23 +- .../processors/platform/PlatformIgnition.java | 6 +- .../platform/PlatformNoopProcessor.java | 15 + .../processors/platform/PlatformProcessor.java | 25 + .../platform/PlatformProcessorImpl.java | 34 +- .../platform/cache/PlatformCache.java | 16 +- .../cpp/PlatformCppConfigurationClosure.java | 32 + .../dotnet/PlatformDotNetCacheStore.java | 39 +- .../PlatformDotNetConfigurationClosure.java | 80 +- .../utils/PlatformConfigurationUtils.java | 621 ++++++++++ .../platform/utils/PlatformUtils.java | 52 +- .../processors/task/GridTaskProcessor.java | 2 +- .../ignite/internal/util/IgniteUtils.java | 7 + .../OptimizedObjectStreamRegistry.java | 4 +- .../PlatformDotNetCacheStoreFactoryNative.java | 58 + .../ignite/spi/discovery/tcp/ClientImpl.java | 6 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 11 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 1 - .../TcpDiscoveryMulticastIpFinder.java | 12 +- .../TcpDiscoveryCustomEventMessage.java | 10 +- .../binary/BinaryBasicIdMapperSelfTest.java | 51 + .../binary/BinaryBasicNameMapperSelfTest.java | 50 + .../BinaryConfigurationConsistencySelfTest.java | 231 ++++ .../internal/binary/BinaryEnumsSelfTest.java | 12 +- .../binary/BinaryMarshallerSelfTest.java | 508 ++++++-- .../BinaryObjectBuilderAdditionalSelfTest.java | 4 +- ...naryObjectBuilderDefaultMappersSelfTest.java | 1149 ++++++++++++++++++ .../binary/BinaryObjectBuilderSelfTest.java | 1108 ----------------- ...ilderSimpleNameLowerCaseMappersSelfTest.java | 41 + .../BinarySimpleNameTestPropertySelfTest.java | 94 ++ .../binary/GridBinaryMetaDataSelfTest.java | 371 ------ .../binary/GridBinaryWildcardsSelfTest.java | 338 +++++- ...aultBinaryMappersBinaryMetaDataSelfTest.java | 389 ++++++ ...CaseBinaryMappersBinaryMetaDataSelfTest.java | 41 + .../internal/binary/TestMappedObject.java | 25 + ...BuilderNonCompactDefaultMappersSelfTest.java | 30 + .../BinaryObjectBuilderNonCompactSelfTest.java | 30 - ...mpactSimpleNameLowerCaseMappersSelfTest.java | 31 + .../cache/CacheGetEntryAbstractTest.java | 803 ++++++++++++ ...GetEntryOptimisticReadCommittedSeltTest.java | 36 + ...etEntryOptimisticRepeatableReadSeltTest.java | 36 + ...eGetEntryOptimisticSerializableSeltTest.java | 36 + ...etEntryPessimisticReadCommittedSeltTest.java | 36 + ...tEntryPessimisticRepeatableReadSeltTest.java | 36 + ...GetEntryPessimisticSerializableSeltTest.java | 36 + .../cache/CacheReadThroughRestartSelfTest.java | 43 +- .../CacheSerializableTransactionsTest.java | 142 ++- .../cache/GridCacheAbstractFullApiSelfTest.java | 141 +++ .../GridCacheConditionalDeploymentSelfTest.java | 4 +- .../GridCacheDeploymentOffHeapSelfTest.java | 4 +- ...ridCacheDeploymentOffHeapValuesSelfTest.java | 41 + .../GridCacheInterceptorAbstractSelfTest.java | 172 ++- .../GridCacheBinaryObjectsAbstractSelfTest.java | 17 +- .../GridCacheBinaryStoreAbstractSelfTest.java | 10 + ...naryStoreBinariesDefaultMappersSelfTest.java | 81 ++ .../GridCacheBinaryStoreBinariesSelfTest.java | 66 - ...yStoreBinariesSimpleNameMappersSelfTest.java | 40 + ...GridCacheDhtEvictionNearReadersSelfTest.java | 2 +- .../GridCacheRebalancingSyncSelfTest.java | 8 + .../GridCacheReplicatedPreloadSelfTest.java | 108 ++ .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 3 +- .../config/GridTestProperties.java | 5 +- .../testframework/junits/GridAbstractTest.java | 26 +- .../multijvm/IgniteCacheProcessProxy.java | 59 +- .../ignite/testsuites/IgniteBasicTestSuite.java | 2 +- .../testsuites/IgniteBinaryBasicTestSuite.java | 95 ++ ...ctsSimpleNameMapperComputeGridTestSuite.java | 38 + .../IgniteBinaryObjectsTestSuite.java | 34 +- ...iteBinarySimpleNameMapperBasicTestSuite.java | 38 + ...rySimpleNameMapperCacheFullApiTestSuite.java | 39 + .../testsuites/IgniteCacheTestSuite3.java | 2 + .../testsuites/IgniteCacheTestSuite4.java | 12 + .../tests/p2p/CacheDeploymentTestEnumValue.java | 47 + .../p2p/CacheDeploymentTestStoreFactory.java | 113 ++ .../query/h2/opt/GridH2IndexBase.java | 5 +- .../query/h2/opt/GridH2TreeIndex.java | 2 +- .../IgniteBinaryCacheQueryTestSuite.java | 186 +-- ...narySimpleNameMapperCacheQueryTestSuite.java | 38 + modules/kafka/README.txt | 111 +- modules/kafka/pom.xml | 69 +- .../ignite/stream/kafka/KafkaStreamer.java | 2 +- .../kafka/connect/IgniteSinkConnector.java | 91 ++ .../kafka/connect/IgniteSinkConstants.java | 38 + .../stream/kafka/connect/IgniteSinkTask.java | 165 +++ .../kafka/IgniteKafkaStreamerSelfTestSuite.java | 9 +- .../stream/kafka/KafkaEmbeddedBroker.java | 387 ------ .../kafka/KafkaIgniteStreamerSelfTest.java | 13 +- .../ignite/stream/kafka/SimplePartitioner.java | 53 - .../ignite/stream/kafka/TestKafkaBroker.java | 237 ++++ .../kafka/connect/IgniteSinkConnectorTest.java | 250 ++++ .../kafka/src/test/resources/example-ignite.xml | 71 ++ .../cpp/common/include/ignite/common/exports.h | 3 + .../cpp/common/include/ignite/common/java.h | 9 + .../platforms/cpp/common/project/vs/module.def | 5 +- modules/platforms/cpp/common/src/exports.cpp | 12 + modules/platforms/cpp/common/src/java.cpp | 44 + .../Apache.Ignite.Core.Tests.csproj | 3 + .../Binary/BinarySelfTest.cs | 9 + .../Cache/CacheAbstractTest.cs | 2 +- .../Cache/CacheAffinityTest.cs | 2 +- .../Cache/CacheConfigurationTest.cs | 538 ++++++++ .../Cache/CacheDynamicStartTest.cs | 4 +- .../Cache/CacheTestAsyncWrapper.cs | 7 + .../Query/CacheQueriesCodeConfigurationTest.cs | 295 +++++ .../Cache/Query/CacheQueriesTest.cs | 2 +- .../Continuous/ContinuousQueryAbstractTest.cs | 2 +- .../Cache/Store/CacheStoreSessionTest.cs | 2 +- .../Cache/Store/CacheStoreTest.cs | 23 +- .../Config/Compute/compute-grid2.xml | 21 + .../Config/Compute/compute-grid3.xml | 31 +- .../Dataload/DataStreamerTest.cs | 4 +- .../Apache.Ignite.Core.Tests/ExceptionsTest.cs | 2 +- .../IgniteConfigurationTest.cs | 367 ++++++ .../Apache.Ignite.Core.Tests/MarshallerTest.cs | 4 +- .../SerializationTest.cs | 2 +- .../Apache.Ignite.Core.Tests/TestRunner.cs | 5 +- .../Apache.Ignite.Core.csproj | 29 +- .../Binary/BinaryConfiguration.cs | 27 +- .../Configuration/CacheAtomicWriteOrderMode.cs | 43 + .../Cache/Configuration/CacheAtomicityMode.cs | 54 + .../Cache/Configuration/CacheConfiguration.cs | 601 +++++++++ .../Cache/Configuration/CacheMemoryMode.cs | 60 + .../Cache/Configuration/CacheMode.cs | 52 + .../Cache/Configuration/CacheRebalanceMode.cs | 51 + .../CacheWriteSynchronizationMode.cs | 45 + .../Cache/Configuration/QueryAlias.cs | 59 + .../Cache/Configuration/QueryEntity.cs | 401 ++++++ .../Cache/Configuration/QueryField.cs | 109 ++ .../Cache/Configuration/QueryIndex.cs | 137 +++ .../Cache/Configuration/QueryIndexField.cs | 66 + .../Cache/Configuration/QueryIndexType.cs | 40 + .../Configuration/QuerySqlFieldAttribute.cs | 60 + .../Configuration/QueryTextFieldAttribute.cs | 36 + .../dotnet/Apache.Ignite.Core/Cache/ICache.cs | 6 + .../Apache.Ignite.Core/Common/IFactory.cs | 34 + .../Discovery/IDiscoverySpi.cs | 32 + .../Discovery/Tcp/ITcpDiscoveryIpFinder.cs | 34 + .../Multicast/TcpDiscoveryMulticastIpFinder.cs | 133 ++ .../Tcp/Static/TcpDiscoveryStaticIpFinder.cs | 84 ++ .../Discovery/Tcp/TcpDiscoveryIpFinderBase.cs | 78 ++ .../Discovery/Tcp/TcpDiscoverySpi.cs | 144 +++ .../dotnet/Apache.Ignite.Core/IIgnite.cs | 29 +- .../Apache.Ignite.Core/IgniteConfiguration.cs | 347 +++++- .../dotnet/Apache.Ignite.Core/Ignition.cs | 29 +- .../Apache.Ignite.Core/Impl/Binary/Binary.cs | 3 - .../Impl/Binary/BinaryReaderExtensions.cs | 19 + .../Apache.Ignite.Core/Impl/Binary/JavaTypes.cs | 92 ++ .../Impl/Binary/Marshaller.cs | 8 +- .../Apache.Ignite.Core/Impl/Cache/CacheImpl.cs | 9 +- .../Apache.Ignite.Core/Impl/Cache/CacheOp.cs | 3 +- .../Impl/Cache/Store/CacheStore.cs | 20 +- .../dotnet/Apache.Ignite.Core/Impl/Ignite.cs | 48 + .../Impl/IgniteConfigurationEx.cs | 57 - .../Apache.Ignite.Core/Impl/IgniteManager.cs | 5 +- .../Apache.Ignite.Core/Impl/IgniteProxy.cs | 18 +- .../Apache.Ignite.Core/Impl/IgniteUtils.cs | 2 +- .../Impl/Memory/PlatformRawMemory.cs | 2 +- .../Impl/Transactions/TransactionsImpl.cs | 2 +- .../Impl/Unmanaged/IgniteJniNativeMethods.cs | 11 +- .../Impl/Unmanaged/UnmanagedUtils.cs | 22 +- .../visor/commands/node/VisorNodeCommand.scala | 1 + .../commands/top/VisorTopologyCommand.scala | 5 +- .../scala/org/apache/ignite/visor/visor.scala | 3 +- .../config/benchmark-multicast.properties | 7 + .../org/apache/ignite/yardstick/IgniteNode.java | 3 + .../IgniteGetEntriesPutAllTxBenchmark.java | 73 ++ .../cache/IgnitePutGetEntryBenchmark.java | 47 + .../cache/IgnitePutGetEntryTxBenchmark.java | 73 ++ .../apache/ignite/yarn/ApplicationMaster.java | 12 +- .../apache/ignite/yarn/ClusterProperties.java | 144 ++- .../yarn/IgniteApplicationMasterSelfTest.java | 52 + parent/pom.xml | 121 +- pom.xml | 16 - 229 files changed, 14138 insertions(+), 3626 deletions(-) ----------------------------------------------------------------------
