This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-3.0 by this push:
new 5b9701e6f24 branch-3.0: [fix](external)using saved member variables
#46156 (#46311)
5b9701e6f24 is described below
commit 5b9701e6f2425feb94ae00cc3bda68579ea874d1
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Fri Jan 3 12:06:32 2025 +0800
branch-3.0: [fix](external)using saved member variables #46156 (#46311)
Cherry-picked from #46156
Co-authored-by: wuwenchi <[email protected]>
---
.../main/java/org/apache/doris/datasource/FileQueryScanNode.java | 7 +++----
.../java/org/apache/doris/datasource/hive/source/HiveScanNode.java | 2 +-
.../java/org/apache/doris/datasource/hudi/source/HudiScanNode.java | 3 +--
3 files changed, 5 insertions(+), 7 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/datasource/FileQueryScanNode.java
b/fe/fe-core/src/main/java/org/apache/doris/datasource/FileQueryScanNode.java
index 2fdd8b9de3a..dedbedeafa3 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/datasource/FileQueryScanNode.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/datasource/FileQueryScanNode.java
@@ -338,7 +338,7 @@ public abstract class FileQueryScanNode extends
FileScanNode {
FileSplit fileSplit = (FileSplit) splitAssignment.getSampleSplit();
TFileType locationType = fileSplit.getLocationType();
totalFileSize = fileSplit.getLength() * selectedSplitNum;
- long maxWaitTime =
ConnectContext.get().getSessionVariable().getFetchSplitsMaxWaitTime();
+ long maxWaitTime = sessionVariable.getFetchSplitsMaxWaitTime();
// Not accurate, only used to estimate concurrency.
// Here, we must take the max of 1, because
// in the case of multiple BEs, `numApproximateSplits() /
backendPolicy.numBackends()` may be 0,
@@ -563,9 +563,8 @@ public abstract class FileQueryScanNode extends
FileScanNode {
@Override
public int getNumInstances() {
- if (ConnectContext.get() != null
- &&
ConnectContext.get().getSessionVariable().isIgnoreStorageDataDistribution()) {
- return
ConnectContext.get().getSessionVariable().getParallelExecInstanceNum();
+ if (sessionVariable.isIgnoreStorageDataDistribution()) {
+ return sessionVariable.getParallelExecInstanceNum();
}
return scanRangeLocations.size();
}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/datasource/hive/source/HiveScanNode.java
b/fe/fe-core/src/main/java/org/apache/doris/datasource/hive/source/HiveScanNode.java
index 3a8ab722fb6..0c53f971ea4 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/datasource/hive/source/HiveScanNode.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/datasource/hive/source/HiveScanNode.java
@@ -254,7 +254,7 @@ public class HiveScanNode extends FileQueryScanNode {
}
partitionInit = true;
}
- int numPartitions =
ConnectContext.get().getSessionVariable().getNumPartitionsInBatchMode();
+ int numPartitions = sessionVariable.getNumPartitionsInBatchMode();
return numPartitions >= 0 && prunedPartitions.size() >= numPartitions;
}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/datasource/hudi/source/HudiScanNode.java
b/fe/fe-core/src/main/java/org/apache/doris/datasource/hudi/source/HudiScanNode.java
index 5962cd7b26f..a6156924e27 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/datasource/hudi/source/HudiScanNode.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/datasource/hudi/source/HudiScanNode.java
@@ -38,7 +38,6 @@ import org.apache.doris.datasource.hive.HivePartition;
import org.apache.doris.datasource.hive.source.HiveScanNode;
import org.apache.doris.datasource.hudi.HudiSchemaCacheValue;
import org.apache.doris.planner.PlanNodeId;
-import org.apache.doris.qe.ConnectContext;
import org.apache.doris.qe.SessionVariable;
import org.apache.doris.spi.Split;
import org.apache.doris.statistics.StatisticalType;
@@ -448,7 +447,7 @@ public class HudiScanNode extends HiveScanNode {
}
partitionInit = true;
}
- int numPartitions =
ConnectContext.get().getSessionVariable().getNumPartitionsInBatchMode();
+ int numPartitions = sessionVariable.getNumPartitionsInBatchMode();
return numPartitions >= 0 && prunedPartitions.size() >= numPartitions;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
