You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2017/02/06 14:56:33 UTC
[8/8] ignite git commit: Merge branch 'master' into ignite-2.0
Merge branch 'master' into ignite-2.0
# Conflicts:
# modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/af98efd5
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/af98efd5
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/af98efd5
Branch: refs/heads/ignite-2.0
Commit: af98efd5487dc2f6177b245d3d4c369f8ec4fe81
Parents: aa46bc7 0726d32
Author: devozerov <vo...@gridgain.com>
Authored: Mon Feb 6 17:55:58 2017 +0300
Committer: devozerov <vo...@gridgain.com>
Committed: Mon Feb 6 17:55:58 2017 +0300
----------------------------------------------------------------------
assembly/LICENSE_FABRIC | 35 +++--
assembly/LICENSE_HADOOP | 17 ++-
examples/schema-import/bin/h2-server.bat | 2 +-
examples/schema-import/bin/h2-server.sh | 4 +-
.../schema-import/bin/schema-import.properties | 2 +-
.../src/main/resources/META-INF/licenses.txt.vm | 7 +-
.../apache/ignite/IgniteSystemProperties.java | 8 ++
.../ignite/lang/IgniteProductVersion.java | 2 +-
.../processors/query/h2/IgniteH2Indexing.java | 8 +-
.../h2/twostep/GridReduceQueryExecutor.java | 2 +-
.../IgniteSqlEntryCacheModeAgnosticTest.java | 140 +++++++++++++++++++
.../IgniteCacheQuerySelfTestSuite.java | 2 +
.../Cache/CacheAbstractTransactionalTest.cs | 105 +++++++-------
.../Apache.Ignite.Core/Impl/Cache/CacheImpl.cs | 9 +-
.../views/templates/agent-download.jade | 2 +-
modules/web-console/web-agent/README.txt | 2 +-
.../cache/IgnitePutRemoveBenchmark.java | 42 ++++++
.../cache/IgnitePutRemoveTxBenchmark.java | 30 ++++
18 files changed, 323 insertions(+), 96 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/af98efd5/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/af98efd5/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
----------------------------------------------------------------------
diff --cc modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
index 49fb269,d85e111..ed3d1e8
--- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
@@@ -95,7 -95,7 +95,8 @@@ import org.apache.ignite.internal.proce
import org.apache.ignite.internal.processors.cache.query.IgniteCacheQueryCacheDestroySelfTest;
import org.apache.ignite.internal.processors.cache.query.IndexingSpiQuerySelfTest;
import org.apache.ignite.internal.processors.cache.query.IndexingSpiQueryTxSelfTest;
+import org.apache.ignite.internal.processors.query.IgniteSqlQueryDedicatedPoolTest;
+ import org.apache.ignite.internal.processors.query.IgniteSqlEntryCacheModeAgnosticTest;
import org.apache.ignite.internal.processors.query.IgniteSqlSchemaIndexingTest;
import org.apache.ignite.internal.processors.query.IgniteSqlSplitterSelfTest;
import org.apache.ignite.internal.processors.query.h2.GridH2IndexRebuildTest;
@@@ -241,7 -241,7 +242,8 @@@ public class IgniteCacheQuerySelfTestSu
suite.addTestSuite(CacheOffheapBatchIndexingSingleTypeTest.class);
suite.addTestSuite(CacheSqlQueryValueCopySelfTest.class);
suite.addTestSuite(IgniteCacheQueryCacheDestroySelfTest.class);
+ suite.addTestSuite(IgniteSqlQueryDedicatedPoolTest.class);
+ suite.addTestSuite(IgniteSqlEntryCacheModeAgnosticTest.class);
return suite;
}