You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2016/02/15 10:57:28 UTC
[4/5] ignite git commit: Merge remote-tracking branch
'remotes/origin/master' into ignite-1232
Merge remote-tracking branch 'remotes/origin/master' into ignite-1232
Conflicts:
modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeIndex.java
modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeIndexUnsorted.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2252a86d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2252a86d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2252a86d
Branch: refs/heads/ignite-1232
Commit: 2252a86d69a682616af991f46595b3cf52b9bb4d
Parents: 76d5635 cfffa2c
Author: sboikov <sb...@gridgain.com>
Authored: Mon Feb 15 12:56:59 2016 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Feb 15 12:56:59 2016 +0300
----------------------------------------------------------------------
.../continuous/GridContinuousProcessor.java | 4 +-
.../GridCacheOffHeapValuesEvictionSelfTest.java | 26 ++++
.../query/h2/twostep/GridMergeIndex.java | 33 ++++-
.../h2/twostep/GridMergeIndexUnsorted.java | 19 ++-
.../query/h2/twostep/GridMergeTable.java | 16 +-
.../h2/twostep/GridReduceQueryExecutor.java | 2 +-
.../near/IgniteCacheQueryNodeFailTest.java | 148 +++++++++++++++++++
.../IgniteCacheQuerySelfTestSuite.java | 2 +
8 files changed, 219 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/2252a86d/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeIndex.java
----------------------------------------------------------------------
diff --cc modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeIndex.java
index d3537da,3914bd7..8b29618
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeIndex.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeIndex.java
@@@ -30,8 -28,8 +30,10 @@@ import java.util.concurrent.atomic.Atom
import java.util.concurrent.atomic.AtomicInteger;
import javax.cache.CacheException;
import org.apache.ignite.IgniteException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.processors.query.h2.opt.GridH2Cursor;
+ import org.apache.ignite.internal.GridKernalContext;
+ import org.h2.engine.Constants;
import org.h2.engine.Session;
import org.h2.index.BaseIndex;
import org.h2.index.Cursor;
http://git-wip-us.apache.org/repos/asf/ignite/blob/2252a86d/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeIndexUnsorted.java
----------------------------------------------------------------------
diff --cc modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeIndexUnsorted.java
index 352add1,5639340..1bc4c30
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeIndexUnsorted.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeIndexUnsorted.java
@@@ -24,8 -24,7 +24,9 @@@ import java.util.concurrent.BlockingQue
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeUnit;
import javax.cache.CacheException;
+import org.apache.ignite.internal.processors.query.h2.opt.GridH2Cursor;
+import org.apache.ignite.internal.processors.query.h2.opt.GridH2RowFactory;
+ import org.apache.ignite.internal.GridKernalContext;
import org.h2.index.Cursor;
import org.h2.index.IndexType;
import org.h2.result.Row;
http://git-wip-us.apache.org/repos/asf/ignite/blob/2252a86d/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeTable.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/2252a86d/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
----------------------------------------------------------------------
diff --cc modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
index 8b3de90,47ab083..6da1ef2
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
@@@ -579,12 -529,13 +579,12 @@@ public class GridReduceQueryExecutor
idx = tbl.getScanIndex(null);
- fakeTable(r.conn, tblIdx++).setInnerTable(tbl);
+ fakeTable(r.conn, tblIdx++).innerTable(tbl);
}
else
- idx = GridMergeIndexUnsorted.createDummy();
+ idx = GridMergeIndexUnsorted.createDummy(ctx);
- for (ClusterNode node : nodes)
- idx.addSource(node.id());
+ idx.setSources(nodes);
r.idxs.add(idx);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/2252a86d/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 01bb6e0,84a9a45..42e05a7
--- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
@@@ -154,7 -160,9 +155,8 @@@ public class IgniteCacheQuerySelfTestSu
suite.addTestSuite(IgniteCacheOffheapTieredMultithreadedSelfTest.class);
suite.addTestSuite(IgniteCacheQueryNodeRestartSelfTest.class);
suite.addTestSuite(IgniteCacheQueryNodeRestartSelfTest2.class);
+ suite.addTestSuite(IgniteCacheQueryNodeFailTest.class);
suite.addTestSuite(IgniteCacheClientQueryReplicatedNodeRestartSelfTest.class);
- suite.addTestSuite(GridCacheReduceQueryMultithreadedSelfTest.class);
suite.addTestSuite(GridCacheCrossCacheQuerySelfTest.class);
suite.addTestSuite(GridCacheQuerySerializationSelfTest.class);
suite.addTestSuite(IgniteBinaryObjectFieldsQuerySelfTest.class);