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/05/17 14:01:38 UTC
[4/9] ignite git commit: Compilable.
Compilable.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f71dac50
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f71dac50
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f71dac50
Branch: refs/heads/ignite-5054-splitter-2
Commit: f71dac505f1c645f7f8a8baf224e7b60444b1a9a
Parents: 78259fe
Author: devozerov <vo...@gridgain.com>
Authored: Wed May 17 14:07:34 2017 +0300
Committer: devozerov <vo...@gridgain.com>
Committed: Wed May 17 14:07:34 2017 +0300
----------------------------------------------------------------------
.../cache/query/GridCacheTwoStepQuery.java | 6 +-----
.../processors/query/h2/IgniteH2Indexing.java | 10 +---------
.../query/h2/twostep/GridMapQueryExecutor.java | 15 ++++++++-------
.../query/h2/twostep/GridReduceQueryExecutor.java | 1 -
.../query/h2/twostep/msg/GridH2QueryRequest.java | 9 +++++----
5 files changed, 15 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/f71dac50/modules/indexing/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheTwoStepQuery.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheTwoStepQuery.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheTwoStepQuery.java
index cb4f06b..80ba0ff 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheTwoStepQuery.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheTwoStepQuery.java
@@ -250,11 +250,7 @@ public class GridCacheTwoStepQuery {
/**
* @return Tables.
*/
- public Set<String> tables() {
- return tbls;
- }
-
- public Set<QueryTable> tables0() {
+ public Set<QueryTable> tables() {
return tbls;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f71dac50/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
index 122917c..f545fd8 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
@@ -1684,7 +1684,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
if (tblCnt > 0) {
caches0.add(cctx.cacheId());
- for (QueryTable table : twoStepQry.tables0()) {
+ for (QueryTable table : twoStepQry.tables()) {
String cacheName = cacheNameForSchemaAndTable(table.schema(), table.table());
int cacheId = CU.cacheId(cacheName);
@@ -2014,14 +2014,6 @@ public class IgniteH2Indexing implements GridQueryIndexing {
}
/**
- * @param identifier Table identifier.
- * @return Data table.
- */
- public GridH2Table dataTable(String identifier) {
- return dataTables.get(identifier);
- }
-
- /**
* Find table by name in given schema.
*
* @param schemaName Schema name.
http://git-wip-us.apache.org/repos/asf/ignite/blob/f71dac50/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java
index 45d8f50..80bad5c 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java
@@ -56,6 +56,7 @@ import org.apache.ignite.internal.processors.cache.distributed.dht.GridReservabl
import org.apache.ignite.internal.processors.cache.query.CacheQueryType;
import org.apache.ignite.internal.processors.cache.query.GridCacheQueryMarshallable;
import org.apache.ignite.internal.processors.cache.query.GridCacheSqlQuery;
+import org.apache.ignite.internal.processors.cache.query.QueryTable;
import org.apache.ignite.internal.processors.query.GridQueryCancel;
import org.apache.ignite.internal.processors.query.h2.IgniteH2Indexing;
import org.apache.ignite.internal.processors.query.h2.opt.DistributedJoinMode;
@@ -101,7 +102,7 @@ public class GridMapQueryExecutor {
/** */
private static final Field RESULT_FIELD;
- /**
+ /*
* Initialize.
*/
static {
@@ -514,7 +515,7 @@ public class GridMapQueryExecutor {
AffinityTopologyVersion topVer,
Map<UUID, int[]> partsMap,
int[] parts,
- Collection<String> tbls,
+ Collection<QueryTable> tbls,
int pageSize,
DistributedJoinMode distributedJoinMode,
boolean enforceJoinOrder,
@@ -567,14 +568,14 @@ public class GridMapQueryExecutor {
if (!F.isEmpty(tbls)) {
snapshotedTbls = new ArrayList<>(tbls.size());
- for (String identifier : tbls) {
- GridH2Table tbl = h2.dataTable(identifier);
+ for (QueryTable tbl : tbls) {
+ GridH2Table h2Tbl = h2.dataTable(tbl.schema(), tbl.table());
- Objects.requireNonNull(tbl, identifier);
+ Objects.requireNonNull(h2Tbl, tbl.toString());
- tbl.snapshotIndexes(qctx);
+ h2Tbl.snapshotIndexes(qctx);
- snapshotedTbls.add(tbl);
+ snapshotedTbls.add(h2Tbl);
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f71dac50/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
----------------------------------------------------------------------
diff --git 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
index 56fc090..1e07fee 100644
--- 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
@@ -83,7 +83,6 @@ import org.apache.ignite.internal.util.typedef.X;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.lang.IgniteBiClosure;
import org.apache.ignite.lang.IgniteFuture;
-import org.apache.ignite.lang.IgnitePredicate;
import org.apache.ignite.plugin.extensions.communication.Message;
import org.h2.command.ddl.CreateTableData;
import org.h2.engine.Session;
http://git-wip-us.apache.org/repos/asf/ignite/blob/f71dac50/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2QueryRequest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2QueryRequest.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2QueryRequest.java
index 17bb9f6..7ffb6bc 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2QueryRequest.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2QueryRequest.java
@@ -33,6 +33,7 @@ import org.apache.ignite.internal.binary.BinaryMarshaller;
import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
import org.apache.ignite.internal.processors.cache.query.GridCacheQueryMarshallable;
import org.apache.ignite.internal.processors.cache.query.GridCacheSqlQuery;
+import org.apache.ignite.internal.processors.cache.query.QueryTable;
import org.apache.ignite.internal.util.tostring.GridToStringInclude;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
@@ -110,8 +111,8 @@ public class GridH2QueryRequest implements Message, GridCacheQueryMarshallable {
/** */
@GridToStringInclude
- @GridDirectCollection(String.class)
- private Collection<String> tbls;
+ @GridDirectCollection(QueryTable.class)
+ private Collection<QueryTable> tbls;
/** */
private int timeout;
@@ -173,7 +174,7 @@ public class GridH2QueryRequest implements Message, GridCacheQueryMarshallable {
* @param tbls Tables.
* @return {@code this}.
*/
- public GridH2QueryRequest tables(Collection<String> tbls) {
+ public GridH2QueryRequest tables(Collection<QueryTable> tbls) {
this.tbls = tbls;
return this;
@@ -182,7 +183,7 @@ public class GridH2QueryRequest implements Message, GridCacheQueryMarshallable {
/**
* @return Tables.
*/
- public Collection<String> tables() {
+ public Collection<QueryTable> tables() {
return tbls;
}