Enable ORC stripe prunning based on the DECIMAL predicates

presto-hive/src/test/java/com/facebook/presto/hive/TestHiveIntegrationSmokeTest.java

@@ -822,7 +822,7 @@ public void testMaps()
     public void testRows()
             throws Exception
     {
-        assertUpdate("CREATE TABLE tmp_row1 AS SELECT test_row(1, CAST(NULL as BIGINT)) AS a", 1);
+        assertUpdate("CREATE TABLE tmp_row1 AS SELECT test_row(CAST(1 as BIGINT), CAST(NULL as BIGINT)) AS a", 1);
 
         assertQuery(
                 "SELECT a.col0, a.col1 FROM tmp_row1",

presto-main/src/main/java/com/facebook/presto/metadata/BoundVariables.java

@@ -16,21 +16,20 @@
 import com.facebook.presto.spi.type.Type;
 import com.google.common.collect.ImmutableMap;
 
+import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
-import java.util.OptionalLong;
 
 import static com.google.common.base.Preconditions.checkState;
-import static java.util.Collections.unmodifiableMap;
 import static java.util.Objects.requireNonNull;
 
 public class BoundVariables
 {
     private final Map<String, Type> typeVariables;
-    private final Map<String, OptionalLong> longVariables;
+    private final Map<String, Long> longVariables;
 
     public BoundVariables(Map<String, Type> typeVariables,
-            Map<String, OptionalLong> longVariables)
+            Map<String, Long> longVariables)
     {
         requireNonNull(typeVariables, "typeVariableBindings is null");
         requireNonNull(longVariables, "longVariableBindings is null");
@@ -50,10 +49,10 @@ public boolean containsTypeVariable(String variableName)
 
     public Map<String, Type> getTypeVariables()
     {
-        return unmodifiableMap(typeVariables);
+        return typeVariables;
     }
 
-    public OptionalLong getLongVariable(String variableName)
+    public Long getLongVariable(String variableName)
     {
         return getValue(longVariables, variableName);
     }
@@ -63,25 +62,32 @@ public boolean containsLongVariable(String variableName)
         return containsValue(longVariables, variableName);
     }
 
-    public Map<String, OptionalLong> getLongVariables()
+    public Map<String, Long> getLongVariables()
     {
-        return unmodifiableMap(longVariables);
+        return longVariables;
     }
 
-    private <T> T getValue(Map<String, T> map, String variableName)
+    private static <T> T getValue(Map<String, T> map, String variableName)
     {
         checkState(variableName != null, "variableName is null");
         T value = map.get(variableName);
         checkState(value != null, "value for variable '%s' is null", variableName);
         return value;
     }
 
-    private boolean containsValue(Map<String, ?> map, String variableName)
+    private static boolean containsValue(Map<String, ?> map, String variableName)
     {
         checkState(variableName != null, "variableName is null");
         return map.containsKey(variableName);
     }
 
+    private static <T> void setValue(Map<String, T> map, String variableName, T value)
+    {
+        checkState(variableName != null, "variableName is null");
+        checkState(value != null, "value for variable '%s' is null", variableName);
+        map.put(variableName, value);
+    }
+
     @Override
     public boolean equals(Object o)
     {
@@ -101,4 +107,62 @@ public int hashCode()
     {
         return Objects.hash(typeVariables, longVariables);
     }
+
+    public static Builder builder()
+    {
+        return new Builder();
+    }
+
+    public static class Builder
+    {
+        private final Map<String, Type> typeVariables = new HashMap<>();
+        private final Map<String, Long> longVariables = new HashMap<>();
+
+        public Type getTypeVariable(String variableName)
+        {
+            return getValue(typeVariables, variableName);
+        }
+
+        public Builder setTypeVariable(String variableName, Type variableValue)
+        {
+            setValue(typeVariables, variableName, variableValue);
+            return this;
+        }
+
+        public boolean containsTypeVariable(String variableName)
+        {
+            return containsValue(typeVariables, variableName);
+        }
+
+        public Map<String, Type> getTypeVariables()
+        {
+            return typeVariables;
+        }
+
+        public Long getLongVariable(String variableName)
+        {
+            return getValue(longVariables, variableName);
+        }
+
+        public Builder setLongVariable(String variableName, Long variableValue)
+        {
+            setValue(longVariables, variableName, variableValue);
+            return this;
+        }
+
+        public boolean containsLongVariable(String variableName)
+        {
+            return containsValue(longVariables, variableName);
+        }
+
+        public Map<String, Long> getLongVariables()
+        {
+            return longVariables;
+        }
+
+        public BoundVariables build()
+        {
+            return new BoundVariables(typeVariables, longVariables);
+        }
+    }
 }