Merge remote-tracking branch 'origin/ignite-843-rc2' 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/0f2bc67a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0f2bc67a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0f2bc67a Branch: refs/heads/ignite-843-rc2 Commit: 0f2bc67a27c27b5c016f70b21f9f734dde1a3028 Parents: 2d2f44e debb326 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Thu Dec 17 20:39:05 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Thu Dec 17 20:39:05 2015 +0700 ---------------------------------------------------------------------- .../store/auto/CacheBinaryAutoStoreExample.java | 2 +- .../store/dummy/CacheDummyPersonStore.java | 113 ----- .../store/dummy/CacheDummyStoreExample.java | 133 ------ .../datagrid/store/dummy/package-info.java | 22 - .../store/jdbc/CacheJdbcPersonStore.java | 43 +- .../store/jdbc/CacheJdbcStoreExample.java | 24 +- .../store/spring/CacheSpringPersonStore.java | 131 ----- .../store/spring/CacheSpringStoreExample.java | 147 ------ .../datagrid/store/spring/package-info.java | 22 - .../examples/ScalarSnowflakeSchemaExample.scala | 31 +- .../ignite/examples/CacheExamplesSelfTest.java | 10 +- .../handlers/DatabaseMetadataExtractor.java | 4 + .../ignite/agent/handlers/RestExecutor.java | 11 +- .../agent/testdrive/AgentMetadataTestDrive.java | 12 +- .../agent/testdrive/AgentSqlTestDrive.java | 8 +- modules/control-center-web/DEVNOTES.txt | 2 +- .../src/main/js/agents/agent-manager.js | 8 + modules/control-center-web/src/main/js/app.js | 2 - .../main/js/controllers/clusters-controller.js | 4 +- .../src/main/js/controllers/common-module.js | 23 +- .../main/js/controllers/metadata-controller.js | 149 +++--- .../src/main/js/controllers/models/caches.json | 4 +- .../main/js/controllers/models/metadata.json | 8 +- modules/control-center-web/src/main/js/db.js | 15 +- .../src/main/js/gulpfile.js/tasks/connect.js | 1 + .../main/js/helpers/generator/generator-java.js | 242 ++++++---- .../helpers/generator/generator-properties.js | 2 +- .../main/js/helpers/generator/generator-xml.js | 60 +-- .../src/main/js/public/stylesheets/style.scss | 5 + .../src/main/js/routes/agent.js | 16 +- .../src/main/js/routes/presets.js | 68 --- .../src/main/js/views/configuration/caches.jade | 2 +- .../main/js/views/configuration/clusters.jade | 2 +- .../src/main/js/views/configuration/igfs.jade | 2 +- .../main/js/views/configuration/summary.jade | 2 +- .../src/main/js/views/includes/controls.jade | 9 +- .../src/main/js/views/sql/sql.jade | 6 +- .../main/js/views/templates/agent-download.jade | 3 +- 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 | 12 +- .../cache/GridCacheSharedContext.java | 20 + .../dht/CacheDistributedGetFutureAdapter.java | 2 +- .../dht/GridPartitionedGetFuture.java | 15 +- .../dht/GridPartitionedSingleGetFuture.java | 8 + .../dht/atomic/GridNearAtomicUpdateFuture.java | 10 +- .../colocated/GridDhtColocatedLockFuture.java | 2 +- .../distributed/near/GridNearGetFuture.java | 17 +- .../distributed/near/GridNearLockFuture.java | 30 +- ...ridNearOptimisticTxPrepareFutureAdapter.java | 6 +- .../cache/store/CacheOsStoreManager.java | 2 +- .../transactions/IgniteTxLocalAdapter.java | 23 +- .../cache/transactions/IgniteTxManager.java | 6 +- .../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 ++++++++++ .../cache/IgniteCacheNearLockValueSelfTest.java | 11 +- .../IgniteCacheStoreValueAbstractTest.java | 2 +- .../IgniteStartCacheInTransactionSelfTest.java | 39 +- .../GridCacheBinaryStoreAbstractSelfTest.java | 2 +- .../CacheGetInsideLockChangingTopologyTest.java | 475 +++++++++++++++++++ .../BinaryTxCacheLocalEntriesSelfTest.java | 2 +- .../GridServiceProcessorProxySelfTest.java | 3 +- .../ServicePredicateAccessCacheTest.java | 155 ++++++ .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 16 +- .../IgniteCacheFailoverTestSuite3.java | 2 + .../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 | 19 + .../Apache.Ignite.Core/Binary/Package-Info.cs | 26 + .../Cache/Event/Package-Info.cs | 26 + .../Cache/Expiry/Package-Info.cs | 26 + .../Apache.Ignite.Core/Cache/Package-Info.cs | 26 + .../Cache/Query/Continuous/Package-Info.cs | 26 + .../Cache/Query/Package-Info.cs | 26 + .../Cache/Store/Package-Info.cs | 26 + .../Apache.Ignite.Core/Cluster/Package-Info.cs | 26 + .../Apache.Ignite.Core/Common/Package-Info.cs | 26 + .../Apache.Ignite.Core/Compute/IComputeTask.cs | 11 +- .../Apache.Ignite.Core/Compute/Package-Info.cs | 26 + .../DataStructures/Package-Info.cs | 26 + .../Datastream/Package-Info.cs | 26 + .../Apache.Ignite.Core/Events/Package-Info.cs | 26 + .../dotnet/Apache.Ignite.Core/Impl/Ignite.cs | 8 - .../Lifecycle/Package-Info.cs | 26 + .../Messaging/Package-Info.cs | 26 + .../dotnet/Apache.Ignite.Core/Package-Info.cs | 36 ++ .../Apache.Ignite.Core/Resource/Package-Info.cs | 26 + .../Apache.Ignite.Core/Services/Package-Info.cs | 26 + .../Transactions/Package-Info.cs | 26 + 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 + 124 files changed, 2291 insertions(+), 1346 deletions(-) ----------------------------------------------------------------------
