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 2017/03/01 14:58:35 UTC
[1/2] ignite git commit: Merge branches 'ignite-1.9' and 'master'.
Repository: ignite
Updated Branches:
refs/heads/master 78ce14b69 -> 2ba80057c
Merge branches 'ignite-1.9' and 'master'.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5a4c12b6
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5a4c12b6
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5a4c12b6
Branch: refs/heads/master
Commit: 5a4c12b68bc6acd82aab9bc031b500f16ca03426
Parents: cc6257f
Author: Alexey Kuznetsov <ak...@gridgain.com>
Authored: Wed Mar 1 21:56:21 2017 +0700
Committer: Alexey Kuznetsov <ak...@gridgain.com>
Committed: Wed Mar 1 21:56:21 2017 +0700
----------------------------------------------------------------------
.../ignite/internal/processors/query/h2/IgniteH2Indexing.java | 5 -----
1 file changed, 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/5a4c12b6/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 247b5a6..fbdcbf9 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
@@ -1286,11 +1286,6 @@ public class IgniteH2Indexing implements GridQueryIndexing {
runs.put(run.id(), run);
- GridRunningQueryInfo run = new GridRunningQueryInfo(qryIdGen.incrementAndGet(), qry, SQL, spaceName,
- U.currentTimeMillis(), null, true);
-
- runs.put(run.id(), run);
-
try {
ResultSet rs = executeSqlQueryWithTimer(spaceName, conn, sql, params, true, 0, cancel);
[2/2] ignite git commit: Merge remote-tracking branch 'origin/master'
Posted by ak...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2ba80057
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2ba80057
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2ba80057
Branch: refs/heads/master
Commit: 2ba80057ce30874db0e7db4d809b20693682b3f8
Parents: 5a4c12b 78ce14b
Author: Alexey Kuznetsov <ak...@gridgain.com>
Authored: Wed Mar 1 21:58:31 2017 +0700
Committer: Alexey Kuznetsov <ak...@gridgain.com>
Committed: Wed Mar 1 21:58:31 2017 +0700
----------------------------------------------------------------------
----------------------------------------------------------------------