diff --git a/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java b/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java index 26e08e4..67e22f6 100644 --- a/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java +++ b/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java @@ -3707,6 +3707,27 @@ private static void populateLlapDaemonVarsSet(Set llapDaemonVarsSetLocal HIVE_EXEC_INPUT_LISTING_MAX_THREADS("hive.exec.input.listing.max.threads", 0, new SizeValidator(0L, true, 1024L, true), "Maximum number of threads that Hive uses to list file information from file systems (recommended > 1 for blobstore)."), + HIVE_QUERY_RESULTS_CACHE_ENABLED("hive.query.results.cache.enabled", true, + "If the query results cache is enabled. This will keep results of previously executed queries " + + "to be reused if the same query is executed again."), + + HIVE_QUERY_RESULTS_CACHE_DIRECTORY("hive.query.results.cache.directory", + "/tmp/hive/_resultscache_", + "Location of the query results cache directory. Temporary results from queries " + + "will be moved to this location."), + + HIVE_QUERY_RESULTS_CACHE_MAX_ENTRY_LIFETIME("hive.query.results.cache.max.entry.lifetime", "3600s", + new TimeValidator(TimeUnit.SECONDS), + "Maximum lifetime in seconds for an entry in the query results cache. A nonpositive value means infinite."), + + HIVE_QUERY_RESULTS_CACHE_MAX_SIZE("hive.query.results.cache.max.size", + (long) 2 * 1024 * 1024 * 1024, + "Maximum total size in bytes that the query results cache directory is allowed to use on the filesystem."), + + HIVE_QUERY_RESULTS_CACHE_MAX_ENTRY_SIZE("hive.query.results.cache.max.entry.size", + (long) 10 * 1024 * 1024, + "Maximum size in bytes that a single query result is allowed to use in the results cache directory"), + /* BLOBSTORE section */ HIVE_BLOBSTORE_SUPPORTED_SCHEMES("hive.blobstore.supported.schemes", "s3,s3a,s3n", diff --git a/common/src/java/org/apache/hadoop/hive/ql/log/PerfLogger.java b/common/src/java/org/apache/hadoop/hive/ql/log/PerfLogger.java index 2767bca..764a832 100644 --- a/common/src/java/org/apache/hadoop/hive/ql/log/PerfLogger.java +++ b/common/src/java/org/apache/hadoop/hive/ql/log/PerfLogger.java @@ -71,6 +71,7 @@ public static final String TEZ_INIT_OPERATORS = "TezInitializeOperators"; public static final String LOAD_HASHTABLE = "LoadHashtable"; public static final String TEZ_GET_SESSION = "TezGetSession"; + public static final String SAVE_TO_RESULTS_CACHE = "saveToResultsCache"; public static final String SPARK_SUBMIT_TO_RUNNING = "SparkSubmitToRunning"; public static final String SPARK_BUILD_PLAN = "SparkBuildPlan"; diff --git a/data/conf/hive-site.xml b/data/conf/hive-site.xml index 01f83d1..b56cbd2 100644 --- a/data/conf/hive-site.xml +++ b/data/conf/hive-site.xml @@ -328,4 +328,9 @@ 99 + + hive.query.results.cache.enabled + false + + diff --git a/data/conf/llap/hive-site.xml b/data/conf/llap/hive-site.xml index cdda875..c4c299c 100644 --- a/data/conf/llap/hive-site.xml +++ b/data/conf/llap/hive-site.xml @@ -348,4 +348,9 @@ 99 + + hive.query.results.cache.enabled + false + + diff --git a/data/conf/perf-reg/spark/hive-site.xml b/data/conf/perf-reg/spark/hive-site.xml index 497a61f..5ca660d 100644 --- a/data/conf/perf-reg/spark/hive-site.xml +++ b/data/conf/perf-reg/spark/hive-site.xml @@ -265,4 +265,9 @@ org.apache.hadoop.hive.metastore.ObjectStore + + hive.query.results.cache.enabled + false + + diff --git a/data/conf/perf-reg/tez/hive-site.xml b/data/conf/perf-reg/tez/hive-site.xml index 012369f..62ecb74 100644 --- a/data/conf/perf-reg/tez/hive-site.xml +++ b/data/conf/perf-reg/tez/hive-site.xml @@ -282,4 +282,9 @@ true + + hive.query.results.cache.enabled + false + + diff --git a/data/conf/rlist/hive-site.xml b/data/conf/rlist/hive-site.xml index 9de00e5..630e481 100644 --- a/data/conf/rlist/hive-site.xml +++ b/data/conf/rlist/hive-site.xml @@ -319,4 +319,9 @@ 99 + + hive.query.results.cache.enabled + false + + diff --git a/data/conf/spark/local/hive-site.xml b/data/conf/spark/local/hive-site.xml index fd0e6a0..8ff6256 100644 --- a/data/conf/spark/local/hive-site.xml +++ b/data/conf/spark/local/hive-site.xml @@ -261,4 +261,9 @@ false + + hive.query.results.cache.enabled + false + + diff --git a/data/conf/spark/standalone/hive-site.xml b/data/conf/spark/standalone/hive-site.xml index 7095979..84851c7 100644 --- a/data/conf/spark/standalone/hive-site.xml +++ b/data/conf/spark/standalone/hive-site.xml @@ -266,4 +266,9 @@ false + + hive.query.results.cache.enabled + false + + diff --git a/data/conf/spark/yarn-client/hive-site.xml b/data/conf/spark/yarn-client/hive-site.xml index a9a788b..6c63362 100644 --- a/data/conf/spark/yarn-client/hive-site.xml +++ b/data/conf/spark/yarn-client/hive-site.xml @@ -306,4 +306,9 @@ false + + hive.query.results.cache.enabled + false + + diff --git a/data/conf/tez/hive-site.xml b/data/conf/tez/hive-site.xml index 4519678..236adc7 100644 --- a/data/conf/tez/hive-site.xml +++ b/data/conf/tez/hive-site.xml @@ -293,4 +293,9 @@ 99 + + hive.query.results.cache.enabled + false + + diff --git a/itests/hive-blobstore/src/test/resources/hive-site.xml b/itests/hive-blobstore/src/test/resources/hive-site.xml index 038db0d..775c559 100644 --- a/itests/hive-blobstore/src/test/resources/hive-site.xml +++ b/itests/hive-blobstore/src/test/resources/hive-site.xml @@ -284,6 +284,11 @@ hdfs,pfile,file,s3,s3a,pblob + + hive.query.results.cache.enabled + false + +