svn commit: r1655131 - in /hive/branches/llap: common/src/java/org/apache/hadoop/hive/conf/HiveConf.java llap-server/src/java/org/apache/hadoop/hive/llap/cache/LowLevelCacheImpl.java ql/src/java/org/apache/hadoop/hive/ql/io/HiveInputFormat.java

[se...@apache.org]

Author: sershe
Date: Tue Jan 27 19:38:40 2015
New Revision: 1655131

URL: http://svn.apache.org/r1655131
Log:
Rename some config settings, fix issue

Modified:
    hive/branches/llap/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
    hive/branches/llap/llap-server/src/java/org/apache/hadoop/hive/llap/cache/LowLevelCacheImpl.java
    hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/io/HiveInputFormat.java

Modified: hive/branches/llap/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
URL: http://svn.apache.org/viewvc/hive/branches/llap/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java?rev=1655131&r1=1655130&r2=1655131&view=diff
==============================================================================
--- hive/branches/llap/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java (original)
+++ hive/branches/llap/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java Tue Jan 27 19:38:40 2015
@@ -2005,15 +2005,14 @@ public class HiveConf extends Configurat
         new TimeValidator(TimeUnit.SECONDS),
         "remote spark client JobHandle future timeout value in seconds."),
 
-    LLAP_ENABLED("hive.llap.enabled", false, ""),
-    LLAP_LOW_LEVEL_CACHE("hive.llap.use.lowlevel.cache", true, ""),
-    LLAP_ORC_CACHE_MIN_ALLOC("hive.llap.cache.orc.alloc.min", 128 * 1024, ""),
-    LLAP_ORC_CACHE_MAX_ALLOC("hive.llap.cache.orc.alloc.max", 16 * 1024 * 1024, ""),
-    LLAP_ORC_CACHE_ARENA_SIZE("hive.llap.cache.orc.arena.size", 128 * 1024 * 1024, ""),
-    LLAP_ORC_CACHE_MAX_SIZE("hive.llap.cache.orc.size", 1024L * 1024 * 1024, ""),
-    LLAP_REQUEST_THREAD_COUNT("hive.llap.request.thread.count", 16, ""),
-    LLAP_USE_LRFU("hive.llap.use.lrfu", false, ""),
-    LLAP_LRFU_LAMBDA("hive.llap.lrfu.lambda", 0.01f, "")
+    LLAP_IO_ENABLED("hive.llap.io.enabled", true, ""),
+    LLAP_LOW_LEVEL_CACHE("hive.llap.io.use.lowlevel.cache", true, ""),
+    LLAP_ORC_CACHE_MIN_ALLOC("hive.llap.io.cache.orc.alloc.min", 128 * 1024, ""),
+    LLAP_ORC_CACHE_MAX_ALLOC("hive.llap.io.cache.orc.alloc.max", 16 * 1024 * 1024, ""),
+    LLAP_ORC_CACHE_ARENA_SIZE("hive.llap.io.cache.orc.arena.size", 128 * 1024 * 1024, ""),
+    LLAP_ORC_CACHE_MAX_SIZE("hive.llap.io.cache.orc.size", 1024L * 1024 * 1024, ""),
+    LLAP_USE_LRFU("hive.llap.io.use.lrfu", false, ""),
+    LLAP_LRFU_LAMBDA("hive.llap.io.lrfu.lambda", 0.01f, "")
     ;
 
     public final String varname;

Modified: hive/branches/llap/llap-server/src/java/org/apache/hadoop/hive/llap/cache/LowLevelCacheImpl.java
URL: http://svn.apache.org/viewvc/hive/branches/llap/llap-server/src/java/org/apache/hadoop/hive/llap/cache/LowLevelCacheImpl.java?rev=1655131&r1=1655130&r2=1655131&view=diff
==============================================================================
--- hive/branches/llap/llap-server/src/java/org/apache/hadoop/hive/llap/cache/LowLevelCacheImpl.java (original)
+++ hive/branches/llap/llap-server/src/java/org/apache/hadoop/hive/llap/cache/LowLevelCacheImpl.java Tue Jan 27 19:38:40 2015
@@ -190,7 +190,7 @@ public class LowLevelCacheImpl implement
                   + oldVal.declaredLength + " vs " + buffer.declaredLength + " @" + offset);
             }
             // We found an old, valid block for this key in the cache.
-s            releaseBufferInternal(buffer);
+            releaseBufferInternal(buffer);
             buffers[i] = oldVal;
             if (result == null) {
               result = new long[align64(buffers.length) >>> 6];

Modified: hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/io/HiveInputFormat.java
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/io/HiveInputFormat.java?rev=1655131&r1=1655130&r2=1655131&view=diff
==============================================================================
--- hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/io/HiveInputFormat.java (original)
+++ hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/io/HiveInputFormat.java Tue Jan 27 19:38:40 2015
@@ -202,7 +202,7 @@ public class HiveInputFormat<K extends W
 
   public static InputFormat<WritableComparable, Writable> wrapForLlap(
       InputFormat<WritableComparable, Writable> inputFormat, Configuration conf) {
-    if (!HiveConf.getBoolVar(conf, ConfVars.LLAP_ENABLED)) {
+    if (!HiveConf.getBoolVar(conf, ConfVars.LLAP_IO_ENABLED)) {
       return inputFormat; // LLAP not enabled, no-op.
     }
     boolean isSupported = inputFormat instanceof LlapWrappableInputFormatInterface,