You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2016/12/23 09:50:08 UTC
ignite git commit: IGNITE-4436 WIP
Repository: ignite
Updated Branches:
refs/heads/ignite-4436 [created] 79a1b1fdd
IGNITE-4436 WIP
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/79a1b1fd
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/79a1b1fd
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/79a1b1fd
Branch: refs/heads/ignite-4436
Commit: 79a1b1fdd1e47871e4adec2a6da2513f5ea85b9b
Parents: e2ac666
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Fri Dec 23 16:50:21 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Fri Dec 23 16:50:21 2016 +0700
----------------------------------------------------------------------
.../query/h2/twostep/GridReduceQueryExecutor.java | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/79a1b1fd/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 1f00ed2..cdae6ec 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
@@ -497,7 +497,8 @@ public class GridReduceQueryExecutor {
final String space = cctx.name();
- final QueryRun r = new QueryRun(h2.connectionForSpace(space), qry.mapQueries().size(), qry.pageSize());
+ final QueryRun r = new QueryRun(h2.connectionForSpace(space), qry.mapQueries().size(), qry.pageSize(),
+ System.currentTimeMillis(), cancel);
AffinityTopologyVersion topVer = h2.readyTopologyVersion();
@@ -1318,6 +1319,12 @@ public class GridReduceQueryExecutor {
/** */
private final int pageSize;
+ /** */
+ private final long start;
+
+ /** */
+ private final GridQueryCancel cancel;
+
/** Can be either CacheException in case of error or AffinityTopologyVersion to retry if needed. */
private final AtomicReference<Object> state = new AtomicReference<>();
@@ -1325,11 +1332,14 @@ public class GridReduceQueryExecutor {
* @param conn Connection.
* @param idxsCnt Number of indexes.
* @param pageSize Page size.
+ * @param start Start time.
*/
- private QueryRun(Connection conn, int idxsCnt, int pageSize) {
+ private QueryRun(Connection conn, int idxsCnt, int pageSize, long start, GridQueryCancel cancel) {
this.conn = (JdbcConnection)conn;
this.idxs = new ArrayList<>(idxsCnt);
this.pageSize = pageSize > 0 ? pageSize : GridCacheTwoStepQuery.DFLT_PAGE_SIZE;
+ this.start = start;
+ this.cancel = cancel;
}
/**
@@ -1384,4 +1394,4 @@ public class GridReduceQueryExecutor {
return copy(msg, n, partsMap);
}
}
-}
\ No newline at end of file
+}