Merge branches 'ignite-1.5' and 'ignite-843-rc2' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-843-rc2
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/981ea7d7 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/981ea7d7 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/981ea7d7 Branch: refs/heads/ignite-843-rc2 Commit: 981ea7d794f822604d34cde89bdb3646de523b7a Parents: 99c19a8 df08d3d Author: Alexey Kuznetsov <akuznet...@apache.org> Authored: Wed Dec 16 11:05:22 2015 +0700 Committer: Alexey Kuznetsov <akuznet...@apache.org> Committed: Wed Dec 16 11:05:22 2015 +0700 ---------------------------------------------------------------------- bin/ignitevisorcmd.bat | 1 + .../store/auto/CacheBinaryAutoStoreExample.java | 9 +- .../examples/ScalarSnowflakeSchemaExample.scala | 31 +- modules/clients/pom.xml | 2 +- .../src/main/java/org/apache/ignite/Ignite.java | 19 + .../java/org/apache/ignite/IgniteCache.java | 8 +- .../org/apache/ignite/binary/BinaryObject.java | 15 + .../org/apache/ignite/cache/CacheManager.java | 2 + .../store/jdbc/CacheAbstractJdbcStore.java | 2 +- .../configuration/CacheConfiguration.java | 19 +- .../internal/binary/BinaryEnumObjectImpl.java | 7 + .../internal/binary/BinaryObjectExImpl.java | 7 + .../binary/BinaryObjectOffheapImpl.java | 7 + .../processors/cache/GridCacheProcessor.java | 4 +- .../CacheDataStructuresManager.java | 5 +- .../distributed/dht/GridDhtCacheAdapter.java | 7 +- .../dht/GridPartitionedSingleGetFuture.java | 7 +- .../dht/atomic/GridDhtAtomicUpdateRequest.java | 10 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 36 +- .../dht/atomic/GridNearAtomicUpdateRequest.java | 25 + .../distributed/near/GridNearAtomicCache.java | 3 + .../cache/query/GridCacheQueryRequest.java | 12 +- .../cache/store/CacheOsStoreManager.java | 2 +- .../CacheSerializableTransactionsTest.java | 8 + .../cache/GridCacheAbstractFullApiSelfTest.java | 8 + ...IgniteCacheAtomicPutAllFailoverSelfTest.java | 1 + ...IgniteCacheBinaryEntryProcessorSelfTest.java | 255 +++ .../GridCacheBinaryStoreAbstractSelfTest.java | 2 +- ...ntNodeBinaryObjectMetadataMultinodeTest.java | 8 +- .../GridCacheQueueApiSelfAbstractTest.java | 86 +- ...gniteAtomicLongChangingTopologySelfTest.java | 8 +- ...omicMultiNodeP2PDisabledFullApiSelfTest.java | 5 - ...ledFairAffinityMultiNodeFullApiSelfTest.java | 5 - .../near/NearCacheSyncUpdateTest.java | 167 ++ .../GridCacheRebalancingSyncSelfTest.java | 12 +- .../BinaryTxCacheLocalEntriesSelfTest.java | 2 +- ...dTcpCommunicationSpiRecoveryAckSelfTest.java | 30 +- ...CommunicationRecoveryAckClosureSelfTest.java | 39 +- .../testframework/junits/GridAbstractTest.java | 10 +- .../testsuites/IgniteCacheTestSuite2.java | 2 + .../IgniteSpiDiscoverySelfTestSuite.java | 6 + modules/platforms/cpp/cpp.dxg | 2 +- .../native-client-test-cache-parallel-store.xml | 2 +- .../Config/native-client-test-cache-store.xml | 6 +- modules/platforms/dotnet/Apache.Ignite.dxg | 2 +- modules/platforms/dotnet/dotnet.dxg | 1795 ------------------ .../Compute/ClosureExample.cs | 2 +- .../Compute/TaskExample.cs | 2 +- .../Datagrid/ContinuousQueryExample.cs | 2 +- .../Datagrid/DataStreamerExample.cs | 2 +- .../Datagrid/PutGetExample.cs | 2 +- .../Datagrid/QueryExample.cs | 2 +- .../Datagrid/StoreExample.cs | 2 +- .../Datagrid/TransactionExample.cs | 2 +- .../Events/EventsExample.cs | 2 +- .../Services/ServicesExample.cs | 2 +- .../scala/org/apache/ignite/scalar/scalar.scala | 11 +- .../cache/IgnitePutGetBatchBenchmark.java | 60 + .../cache/IgnitePutGetTxBatchBenchmark.java | 86 + 59 files changed, 920 insertions(+), 1958 deletions(-) ----------------------------------------------------------------------
