ignite-sql-tests - minor
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3b8c8f05 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3b8c8f05 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3b8c8f05 Branch: refs/heads/ignite-sql-tests Commit: 3b8c8f05c2466ca1ff6a93feaa502ab8950c2e2b Parents: 197929e Author: S.Vladykin <svlady...@gridgain.com> Authored: Thu Mar 5 04:07:47 2015 +0300 Committer: S.Vladykin <svlady...@gridgain.com> Committed: Thu Mar 5 04:07:47 2015 +0300 ---------------------------------------------------------------------- .../internal/processors/query/h2/IgniteH2Indexing.java | 12 +++++------- .../query/h2/twostep/GridReduceQueryExecutor.java | 4 ++-- 2 files changed, 7 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3b8c8f05/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 1821c45..b2a54e4 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 @@ -172,20 +172,18 @@ public class IgniteH2Indexing implements GridQueryIndexing { } @Nullable @Override protected ConnectionWrapper initialValue() { - Connection c = null; + Connection c; try { c = DriverManager.getConnection(dbUrl); - - conns.add(c); - - return new ConnectionWrapper(c); } catch (SQLException e) { - U.close(c, log); - throw new IgniteException("Failed to initialize DB connection: " + dbUrl, e); } + + conns.add(c); + + return new ConnectionWrapper(c); } }; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3b8c8f05/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 2804d90..0fbb6d8 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 @@ -104,7 +104,7 @@ public class GridReduceQueryExecutor { QueryRun r = runs.get(msg.queryRequestId()); if (r != null && r.latch.getCount() != 0) { - r.rmtErr = msg.error(); + r.rmtErr = new CacheException("Failed to execute map query on the node: " + node.id(), msg.error()); while(r.latch.getCount() > 0) r.latch.countDown(); @@ -217,7 +217,7 @@ public class GridReduceQueryExecutor { } finally { if (!runs.remove(qryReqId, r)) - U.warn(log, "Query run was removed: " + qryReqId); + U.warn(log, "Query run was already removed: " + qryReqId); } }
