# This is a combination of 2 commits.

# This is the 1st commit message:

Fix NPE when calling `Analyzer.getContext()` in partition pruning related logic.

# The commit message apache#2 will be skipped:

# Minor fix.

Author: wangshuo128

fe/fe-core/src/main/java/org/apache/doris/analysis/Analyzer.java

@@ -1757,6 +1757,8 @@ public String getSchemaTable() {
         return schemaTable;
     }
 
+    // TODO: `globalState.context` could be null, refactor return value type to
+    // `Optional<ConnectContext>`.
     public ConnectContext getContext() {
         return globalState.context;
     }

fe/fe-core/src/main/java/org/apache/doris/planner/OlapScanNode.java

@@ -426,15 +426,15 @@ private Collection<Long> partitionPrune(PartitionInfo partitionInfo, PartitionNa
         }
 
         if (partitionInfo.getType() == PartitionType.RANGE) {
-            if (analyzer.getContext().getSessionVariable().getPartitionPruneAlgorithmVersion() == 2) {
+            if (partitionPruneV2Enabled()) {
                 partitionPruner = new RangePartitionPrunerV2(keyItemMap,
                         partitionInfo.getPartitionColumns(), columnNameToRange);
             } else {
                 partitionPruner = new RangePartitionPruner(keyItemMap,
                         partitionInfo.getPartitionColumns(), columnFilters);
             }
         } else if (partitionInfo.getType() == PartitionType.LIST) {
-            if (analyzer.getContext().getSessionVariable().getPartitionPruneAlgorithmVersion() == 2) {
+            if (partitionPruneV2Enabled()) {
                 partitionPruner = new ListPartitionPrunerV2(keyItemMap, partitionInfo.getPartitionColumns(),
                     columnNameToRange);
             } else {
@@ -445,6 +445,12 @@ private Collection<Long> partitionPrune(PartitionInfo partitionInfo, PartitionNa
         return partitionPruner.prune();
     }
 
+    private boolean partitionPruneV2Enabled() {
+        ConnectContext context = analyzer.getContext();
+        return context != null &&
+            context.getSessionVariable().getPartitionPruneAlgorithmVersion() == 2;
+    }
+
     private Collection<Long> distributionPrune(
             MaterializedIndex table,
             DistributionInfo distributionInfo) throws AnalysisException {

fe/fe-core/src/main/java/org/apache/doris/planner/ScanNode.java

@@ -35,6 +35,7 @@
 import org.apache.doris.catalog.Column;
 import org.apache.doris.catalog.PrimitiveType;
 import org.apache.doris.common.UserException;
+import org.apache.doris.qe.ConnectContext;
 import org.apache.doris.thrift.TNetworkAddress;
 import org.apache.doris.thrift.TScanRangeLocations;
 
@@ -133,7 +134,12 @@ public void computeColumnFilter() {
                 columnFilters.put(column.getName(), keyFilter);
             }
 
-            if (analyzer.getContext().getSessionVariable().getPartitionPruneAlgorithmVersion() == 2) {
+            ConnectContext context = analyzer.getContext();
+            if (context == null) {
+                return;
+            }
+
+            if (context.getSessionVariable().getPartitionPruneAlgorithmVersion() == 2) {
                 ColumnRange columnRange = createColumnRange(slotDesc, conjuncts);
                 if (columnRange != null) {
                     columnNameToRange.put(column.getName(), columnRange);