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/08/14 10:30:14 UTC

[04/50] ignite git commit: Started working on result target.

Started working on result target.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e000fb08
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e000fb08
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e000fb08

Branch: refs/heads/ignite-5991-6019
Commit: e000fb08f50c1bd5154c96e14ffc5070da1d147d
Parents: d2c86a7
Author: devozerov <vo...@gridgain.com>
Authored: Wed Aug 9 15:48:50 2017 +0300
Committer: devozerov <vo...@gridgain.com>
Committed: Wed Aug 9 15:48:50 2017 +0300

----------------------------------------------------------------------
 .../processors/query/h2/IgniteH2Indexing.java   | 27 +++-----------------
 .../twostep/MapQueryStreamingResultTarget.java  | 24 +++++++++++++++++
 2 files changed, 27 insertions(+), 24 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/e000fb08/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 68551f4..661bf3e 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
@@ -111,6 +111,7 @@ import org.apache.ignite.internal.processors.query.h2.sql.GridSqlQueryParser;
 import org.apache.ignite.internal.processors.query.h2.sql.GridSqlQuerySplitter;
 import org.apache.ignite.internal.processors.query.h2.twostep.GridMapQueryExecutor;
 import org.apache.ignite.internal.processors.query.h2.twostep.GridReduceQueryExecutor;
+import org.apache.ignite.internal.processors.query.h2.twostep.MapQueryStreamingResultTarget;
 import org.apache.ignite.internal.processors.query.schema.SchemaIndexCacheVisitor;
 import org.apache.ignite.internal.processors.query.schema.SchemaIndexCacheVisitorClosure;
 import org.apache.ignite.internal.processors.timeout.GridTimeoutProcessor;
@@ -146,12 +147,10 @@ import org.h2.engine.SysProperties;
 import org.h2.index.Index;
 import org.h2.jdbc.JdbcPreparedStatement;
 import org.h2.jdbc.JdbcStatement;
-import org.h2.result.ResultTarget;
 import org.h2.server.web.WebServer;
 import org.h2.table.IndexColumn;
 import org.h2.tools.Server;
 import org.h2.util.JdbcUtils;
-import org.h2.value.Value;
 import org.jetbrains.annotations.Nullable;
 import org.jsr166.ConcurrentHashMap8;
 
@@ -972,33 +971,13 @@ public class IgniteH2Indexing implements GridQueryIndexing {
      */
     public void executeSqlStreaming(Connection conn, String sql, @Nullable Collection<Object> params)
         throws IgniteCheckedException {
-        JdbcPreparedStatement stmt = (JdbcPreparedStatement)preparedStatementWithParams(conn, sql, params, false);
+        JdbcPreparedStatement stmt = (JdbcPreparedStatement) preparedStatementWithParams(conn, sql, params, false);
 
         CommandContainer cmd = U.field(stmt, "command");
 
         Select select = U.field(cmd, "prepared");
 
-        select.query(0, new IgniteResultTarget());
-    }
-
-    /**
-     * Hacked result target.
-     */
-    private static class IgniteResultTarget implements ResultTarget {
-        /** Row count. */
-        private int rowCnt;
-
-        /** {@inheritDoc} */
-        @Override public void addRow(Value[] values) {
-            System.out.println("ADD ROW: " + Arrays.toString(values));
-
-            rowCnt++;
-        }
-
-        /** {@inheritDoc} */
-        @Override public int getRowCount() {
-            return rowCnt;
-        }
+        select.query(0, new MapQueryStreamingResultTarget());
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/ignite/blob/e000fb08/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/MapQueryStreamingResultTarget.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/MapQueryStreamingResultTarget.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/MapQueryStreamingResultTarget.java
new file mode 100644
index 0000000..2310506
--- /dev/null
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/MapQueryStreamingResultTarget.java
@@ -0,0 +1,24 @@
+package org.apache.ignite.internal.processors.query.h2.twostep;
+
+import org.h2.result.ResultTarget;
+import org.h2.value.Value;
+
+/**
+ * Map query streaming result target.
+ */
+public class MapQueryStreamingResultTarget implements ResultTarget {
+    /** Row counter. */
+    private int rowCnt;
+
+    /** {@inheritDoc} */
+    @Override public void addRow(Value[] vals) {
+        for (Value val : vals) {
+            // TODO: Implement.
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override public int getRowCount() {
+        return rowCnt;
+    }
+}