Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incu…

…bator-phoenix
ramkrish86 · Feb 4, 2014 · bc21d8e · bc21d8e
2 parents 0b469d4 + d40c506
commit bc21d8e
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 2 deletions.
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/compile/QueryCompiler.java b/phoenix-core/src/main/java/org/apache/phoenix/compile/QueryCompiler.java
@@ -120,7 +120,8 @@ protected QueryPlan compile(SelectStatement select, Scan scan, boolean asSubquer
         // TODO: do this normalization outside of this so as it's not repeated by the optimizer
         select = StatementNormalizer.normalize(select, resolver);
         StatementContext context = new StatementContext(statement, resolver, binds, scan);
-
+        context.setScanHints(select.getHint());
+
         if (select.getFrom().size() == 1)
             return compileSingleQuery(context, select, binds, parallelIteratorFactory);
 

diff --git a/phoenix-core/src/main/java/org/apache/phoenix/compile/StatementContext.java b/phoenix-core/src/main/java/org/apache/phoenix/compile/StatementContext.java
@@ -27,6 +27,8 @@
 import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
 import org.apache.phoenix.jdbc.PhoenixConnection;
 import org.apache.phoenix.jdbc.PhoenixStatement;
+import org.apache.phoenix.parse.HintNode;
+import org.apache.phoenix.parse.HintNode.Hint;
 import org.apache.phoenix.query.KeyRange;
 import org.apache.phoenix.query.QueryConstants;
 import org.apache.phoenix.query.QueryServices;
@@ -140,6 +142,12 @@ public ScanRanges getScanRanges() {
         return this.scanRanges;
     }
 
+    public void setScanHints(HintNode hints) {
+        if (hints.hasHint(Hint.NO_CACHE)) {
+            scan.setCacheBlocks(false);
+        }
+    }
+
     public void setScanRanges(ScanRanges scanRanges) {
         setScanRanges(scanRanges, null);
     }

diff --git a/phoenix-core/src/main/java/org/apache/phoenix/parse/HintNode.java b/phoenix-core/src/main/java/org/apache/phoenix/parse/HintNode.java
@@ -75,6 +75,10 @@ public enum Hint {
         * the data table when optimizing.
         */
        USE_INDEX_OVER_DATA_TABLE,
+       /**
+        * Avoid caching any HBase blocks loaded by this query.
+        */
+       NO_CACHE,
     };
 
     private final Map<Hint,String> hints;

diff --git a/phoenix-core/src/test/java/org/apache/phoenix/compile/QueryCompileTest.java b/phoenix-core/src/test/java/org/apache/phoenix/compile/QueryCompileTest.java
@@ -26,6 +26,7 @@
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.fail;
 
 import java.sql.Connection;
@@ -1282,5 +1283,16 @@ public void testInvalidNextValueFor() throws Exception {
             }
         }
     }
-
+
+    @Test
+    public void testNoCachingHint() throws Exception {
+        List<Object> binds = Collections.emptyList();
+        Scan scan = compileQuery("select val from ptsdb", binds);
+        assertTrue(scan.getCacheBlocks());
+        scan = compileQuery("select /*+ NO_CACHE */ val from ptsdb", binds);
+        assertFalse(scan.getCacheBlocks());
+        scan = compileQuery("select /*+ NO_CACHE */ p1.val from ptsdb p1 inner join ptsdb p2 on p1.inst = p2.inst", binds);
+        assertFalse(scan.getCacheBlocks());
+    }
+
 }