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 ce391fdcda..3681f64e46 100644 --- a/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java +++ b/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java @@ -1389,6 +1389,11 @@ private static void populateLlapDaemonVarsSet(Set llapDaemonVarsSetLocal "references for the cached object. Setting this to true can help avoid out of memory\n" + "issues under memory pressure (in some cases) at the cost of slight unpredictability in\n" + "overall query performance."), + HIVE_IO_SARG_CACHE_SIZE("hive.io.sarg.cache.size", 1000, + "The maximum number of entries allowed in the SearchArgument Cache. Set to 0, to disable the cache."), + HIVE_IO_SARG_CACHE_MAX_WEIGHT_MB("hive.io.sarg.cache.max.weight.mb", 10, + "The max weight allowed for the SearchArgument Cache. By default, the cache allows a max-weight of 10MB, " + + "after which entries will be evicted."), HIVE_LAZYSIMPLE_EXTENDED_BOOLEAN_LITERAL("hive.lazysimple.extended_boolean_literal", false, "LazySimpleSerde uses this property to determine if it treats 'T', 't', 'F', 'f',\n" + diff --git a/ql/src/java/org/apache/hadoop/hive/ql/io/sarg/ConvertAstToSearchArg.java b/ql/src/java/org/apache/hadoop/hive/ql/io/sarg/ConvertAstToSearchArg.java index 997334b0de..6937560a2e 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/io/sarg/ConvertAstToSearchArg.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/io/sarg/ConvertAstToSearchArg.java @@ -21,13 +21,16 @@ import java.sql.Date; import java.sql.Timestamp; import java.util.List; +import java.util.concurrent.ExecutionException; +import com.google.common.cache.Cache; +import com.google.common.cache.CacheBuilder; import org.apache.commons.codec.binary.Base64; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hive.common.type.HiveChar; import org.apache.hadoop.hive.common.type.HiveDecimal; +import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.hive.ql.exec.SerializationUtilities; -import org.apache.hadoop.hive.ql.io.sarg.LiteralDelegate; import org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc; import org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc; import org.apache.hadoop.hive.ql.plan.ExprNodeDesc; @@ -436,14 +439,63 @@ private void parse(ExprNodeDesc expression) { } } - public static final String SARG_PUSHDOWN = "sarg.pushdown"; + private static volatile Cache sargsCache = null; + + private static synchronized Cache initializeAndGetSargsCache(Configuration conf) { + if (sargsCache == null) { + sargsCache = CacheBuilder.newBuilder() + .maximumSize( + HiveConf.getIntVar(conf, + HiveConf.ConfVars.HIVE_IO_SARG_CACHE_SIZE)) + .weigher((String key, SearchArgument value) -> key.length()) + .maximumWeight( + HiveConf.getIntVar(conf, + HiveConf.ConfVars.HIVE_IO_SARG_CACHE_MAX_WEIGHT_MB) * 1024 *1024 + ) + .build(); // Can't use CacheLoader because SearchArguments may be built either from Kryo strings, + // or from expressions. + } + return sargsCache; + } + + private static Cache getSargsCache(Configuration conf) { + return sargsCache == null? initializeAndGetSargsCache(conf) : sargsCache; + } + + private static boolean isSargsCacheEnabled(Configuration conf) { + return HiveConf.getIntVar(conf, HiveConf.ConfVars.HIVE_IO_SARG_CACHE_SIZE) > 0; + } + + private static SearchArgument getSearchArgumentFromString(Configuration conf, String sargString) { + + try { + return isSargsCacheEnabled(conf)? getSargsCache(conf).get(sargString, () -> create(sargString)) + : create(sargString); + } + catch (ExecutionException exception) { + throw new RuntimeException(exception); + } + } + + private static SearchArgument getSearchArgumentFromExpression(Configuration conf, String sargString) { + + try { + return isSargsCacheEnabled(conf)? + getSargsCache(conf).get(sargString, + () -> create(conf, SerializationUtilities.deserializeExpression(sargString))) + : create(conf, SerializationUtilities.deserializeExpression(sargString)); + } + catch (ExecutionException exception) { + throw new RuntimeException(exception); + } + } + public static SearchArgument create(Configuration conf, ExprNodeGenericFuncDesc expression) { return new ConvertAstToSearchArg(conf, expression).buildSearchArgument(); } - private final static ThreadLocal kryo = new ThreadLocal() { protected Kryo initialValue() { return new Kryo(); } }; @@ -459,9 +511,9 @@ public static SearchArgument create(byte[] kryoBytes) { public static SearchArgument createFromConf(Configuration conf) { String sargString; if ((sargString = conf.get(TableScanDesc.FILTER_EXPR_CONF_STR)) != null) { - return create(conf, SerializationUtilities.deserializeExpression(sargString)); + return getSearchArgumentFromExpression(conf, sargString); } else if ((sargString = conf.get(SARG_PUSHDOWN)) != null) { - return create(sargString); + return getSearchArgumentFromString(conf, sargString); } return null; }