Fix NPE when predicate column is not contained in domain

felixliang · Apr 7, 2021 · d5ffc06 · d5ffc06
1 parent dd0a6fb
commit d5ffc06
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/HiveSplitManager.java b/presto-hive/src/main/java/com/facebook/presto/hive/HiveSplitManager.java
@@ -553,8 +553,9 @@ private Map<String, PartitionSplitInfo> getPartitionSplitInfo(
                 for (Map.Entry<String, HiveColumnHandle> predicateColumnEntry : predicateColumns.entrySet()) {
                     if (columnStatistics.containsKey(predicateColumnEntry.getKey())) {
                         Optional<ValueSet> columnsStatisticsValueSet = getColumnStatisticsValueSet(columnStatistics.get(predicateColumnEntry.getKey()), predicateColumnEntry.getValue().getHiveType());
-                        if (columnsStatisticsValueSet.isPresent()) {
-                            ValueSet columnPredicateValueSet = domains.get().get(new Subfield(predicateColumnEntry.getKey())).getValues();
+                        Subfield subfield = new Subfield(predicateColumnEntry.getKey());
+                        if (columnsStatisticsValueSet.isPresent() && domains.get().containsKey(subfield)) {
+                            ValueSet columnPredicateValueSet = domains.get().get(subfield).getValues();
                             if (!columnPredicateValueSet.overlaps(columnsStatisticsValueSet.get())) {
                                 pruned = true;
                                 break;