You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by av...@apache.org on 2017/03/01 14:36:34 UTC
ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-1.9'
Repository: ignite
Updated Branches:
refs/heads/master cc6257f8c -> 78ce14b69
Merge remote-tracking branch 'remotes/origin/ignite-1.9'
# Conflicts:
# modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryIndexing.java
# modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
# modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
# modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
# modules/kubernetes/config/Dockerfile
# modules/kubernetes/config/ignite-deployment.yaml
# modules/kubernetes/config/ignite-service.yaml
# pom.xml
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/78ce14b6
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/78ce14b6
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/78ce14b6
Branch: refs/heads/master
Commit: 78ce14b696fe191fe3c12d0285a15fc52d2e2748
Parents: cc6257f
Author: Anton Vinogradov <av...@apache.org>
Authored: Wed Mar 1 17:36:24 2017 +0300
Committer: Anton Vinogradov <av...@apache.org>
Committed: Wed Mar 1 17:36:24 2017 +0300
----------------------------------------------------------------------
.../ignite/internal/processors/query/h2/IgniteH2Indexing.java | 5 -----
1 file changed, 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/78ce14b6/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);