Merge branch 'ignite-1.5' into ignite-2100
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6ca1f1d1 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6ca1f1d1 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6ca1f1d1 Branch: refs/heads/ignite-2100 Commit: 6ca1f1d1309ba25344846ced19ff1144644ad92b Parents: 0692b70 ea64f3a Author: vozerov-gridgain <voze...@gridgain.com> Authored: Wed Dec 16 15:26:31 2015 +0300 Committer: vozerov-gridgain <voze...@gridgain.com> Committed: Wed Dec 16 15:26:31 2015 +0300 ---------------------------------------------------------------------- .../store/auto/CacheBinaryAutoStoreExample.java | 9 +- .../examples/ScalarSnowflakeSchemaExample.scala | 31 ++- modules/core/pom.xml | 5 + .../src/main/java/org/apache/ignite/Ignite.java | 19 ++ .../java/org/apache/ignite/IgniteCache.java | 8 +- .../org/apache/ignite/binary/BinaryObject.java | 15 ++ .../store/jdbc/CacheAbstractJdbcStore.java | 2 +- .../configuration/CacheConfiguration.java | 19 +- .../apache/ignite/internal/IgniteKernal.java | 3 +- .../internal/binary/BinaryEnumObjectImpl.java | 7 + .../internal/binary/BinaryObjectExImpl.java | 7 + .../binary/BinaryObjectOffheapImpl.java | 7 + .../processors/cache/GridCacheProcessor.java | 4 +- .../cache/store/CacheOsStoreManager.java | 2 +- .../transactions/IgniteTxLocalAdapter.java | 23 +- .../service/GridServiceProcessor.java | 30 ++- .../internal/visor/query/VisorQueryJob.java | 4 +- .../ignite/spi/discovery/tcp/ClientImpl.java | 2 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 4 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 42 ++- .../core/src/main/resources/ignite.properties | 1 + .../CacheSerializableTransactionsTest.java | 8 + ...IgniteCacheBinaryEntryProcessorSelfTest.java | 255 +++++++++++++++++++ .../GridCacheBinaryStoreAbstractSelfTest.java | 2 +- .../BinaryTxCacheLocalEntriesSelfTest.java | 2 +- .../GridServiceProcessorProxySelfTest.java | 3 +- .../ServicePredicateAccessCacheTest.java | 155 +++++++++++ .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 16 +- .../testsuites/IgniteKernalSelfTestSuite.java | 2 + .../common/include/ignite/common/concurrent.h | 2 +- .../cpp/common/include/ignite/common/utils.h | 1 - .../cpp/common/os/win/src/concurrent_os.cpp | 26 +- modules/platforms/cpp/common/src/java.cpp | 20 +- .../platforms/cpp/core-test/src/cache_test.cpp | 4 +- modules/platforms/cpp/core/impl/doxygen.h | 53 ++++ .../core/include/ignite/binary/binary_type.h | 4 +- .../cpp/core/include/ignite/cache/cache.h | 12 +- .../include/ignite/cache/query/query_scan.h | 28 +- .../include/ignite/cache/query/query_text.h | 38 +-- .../cpp/core/include/ignite/ignition.h | 10 +- .../core/include/ignite/impl/cache/cache_impl.h | 6 +- .../cpp/core/include/ignite/impl/operations.h | 8 +- modules/platforms/cpp/cpp.dxg | 4 +- .../native-client-test-cache-parallel-store.xml | 2 +- .../Config/native-client-test-cache-store.xml | 6 +- .../Examples/ExamplesTest.cs | 4 +- .../Apache.Ignite.Core.csproj | 1 + .../dotnet/Apache.Ignite.Core/Index.cs | 31 +++ modules/platforms/dotnet/Apache.Ignite.sln | 1 + .../Apache.Ignite.Examples.csproj | 1 - .../Datagrid/CrossPlatformExample.cs | 205 --------------- .../scala/org/apache/ignite/scalar/scalar.scala | 11 +- parent/pom.xml | 1 + 53 files changed, 816 insertions(+), 350 deletions(-) ----------------------------------------------------------------------