ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject ignite git commit: ignite-sql-cache-stmt
Date Tue, 24 Nov 2015 16:30:35 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-sql-cache-stmt f495cba81 -> 1213f2c00


ignite-sql-cache-stmt


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

Branch: refs/heads/ignite-sql-cache-stmt
Commit: 1213f2c00f473f331ce88a475c54419010780bfc
Parents: f495cba
Author: sboikov <sboikov@gridgain.com>
Authored: Tue Nov 24 19:27:04 2015 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Tue Nov 24 19:27:04 2015 +0300

----------------------------------------------------------------------
 .../processors/cache/query/GridCacheTwoStepQuery.java     | 10 +---------
 .../internal/processors/query/h2/IgniteH2Indexing.java    |  1 +
 .../internal/processors/query/h2/sql/GridSqlSelect.java   |  4 +++-
 3 files changed, 5 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/1213f2c0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheTwoStepQuery.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheTwoStepQuery.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheTwoStepQuery.java
index e500fa1..da59c18 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheTwoStepQuery.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheTwoStepQuery.java
@@ -48,7 +48,7 @@ public class GridCacheTwoStepQuery {
     private Set<String> spaces;
 
     /** */
-    private boolean skipMergeTbl;
+    private final boolean skipMergeTbl;
 
     /**
      * @param spaces All spaces accessed in query.
@@ -71,14 +71,6 @@ public class GridCacheTwoStepQuery {
     }
 
     /**
-     * @param skipMergeTbl {@code True} if reduce query can skip merge table creation and
get
-     *      data directly from merge index.
-     */
-    public void skipMergeTable(boolean skipMergeTbl) {
-        this.skipMergeTbl = skipMergeTbl;
-    }
-
-    /**
      * @return If this is explain query.
      */
     public boolean explain() {

http://git-wip-us.apache.org/repos/asf/ignite/blob/1213f2c0/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 76e538f..57f8d3a 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
@@ -253,6 +253,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
 
                 set(c);
 
+                // Reset statement cache when new connection is created.
                 stmtCache.get().clear();
             }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/1213f2c0/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java
index ff57362..ae522da 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java
@@ -103,10 +103,12 @@ public class GridSqlSelect extends GridSqlQuery {
     }
 
     /**
-     * @return {@code True} if this simple select.
+     * @return {@code True} if this simple SQL query like 'SELECT A, B, C from SOME_TABLE'
without any conditions
+     *      and expressions.
      */
     public boolean simpleQuery() {
         boolean simple = !distinct &&
+            from instanceof GridSqlTable &&
             where == null &&
             grpCols == null &&
             havingCol < 0 &&


Mime
View raw message