This is an automated email from the ASF dual-hosted git repository. mblow pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 9ffb423df3a92c2a8f432a66274f16f9854d8931 Merge: 32007cff27 55743604d4 Author: Michael Blow <[email protected]> AuthorDate: Mon Jun 2 22:37:22 2025 -0400 Merge branch 'gerrit/neo' into 'gerrit/trinity' Ext-ref: MB-66663,MB-66818 Change-Id: I94ba023ac9b3a8a007f8fdac4216b758f7733835 .../api/http/server/NCQueryServiceServlet.java | 11 +++-- .../http/server/QueryServiceRequestParameters.java | 9 ++-- .../input/record/reader/aws/AwsS3InputStream.java | 3 +- .../reader/azure/blob/AzureBlobInputStream.java | 3 +- .../azure/datalake/AzureDataLakeInputStream.java | 3 +- .../input/record/reader/gcs/GCSInputStream.java | 3 +- .../record/reader/stream/AvailableInputStream.java | 57 ++++++++++++++++++++++ .../apache/hyracks/control/cc/job/JobManager.java | 7 +-- .../VariableDeletableTupleMemoryManager.java | 4 +- .../std/group/HashSpillableTableFactory.java | 12 ++--- .../OptimizedHybridHashJoinOperatorDescriptor.java | 54 ++++++++------------ .../std/sort/AbstractExternalSortRunMerger.java | 13 ++--- 12 files changed, 109 insertions(+), 70 deletions(-) diff --cc asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/input/record/reader/aws/AwsS3InputStream.java index 77897ea9d9,45a40b0940..6b921ac026 --- a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/input/record/reader/aws/AwsS3InputStream.java +++ b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/input/record/reader/aws/AwsS3InputStream.java @@@ -30,8 -31,9 +30,9 @@@ import org.apache.asterix.common.except import org.apache.asterix.common.exceptions.ErrorCode; import org.apache.asterix.common.exceptions.RuntimeDataException; import org.apache.asterix.external.input.record.reader.abstracts.AbstractExternalInputStream; + import org.apache.asterix.external.input.record.reader.stream.AvailableInputStream; import org.apache.asterix.external.util.ExternalDataConstants; -import org.apache.asterix.external.util.ExternalDataUtils; +import org.apache.asterix.external.util.aws.s3.S3Utils; import org.apache.commons.lang3.StringUtils; import org.apache.hyracks.api.exceptions.HyracksDataException; import org.apache.hyracks.api.util.CleanupUtils; diff --cc asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/input/record/reader/azure/blob/AzureBlobInputStream.java index bbfece2dc0,567ceb78d9..bf2a717de6 --- a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/input/record/reader/azure/blob/AzureBlobInputStream.java +++ b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/input/record/reader/azure/blob/AzureBlobInputStream.java @@@ -31,7 -30,9 +31,8 @@@ import org.apache.asterix.common.except import org.apache.asterix.common.exceptions.ErrorCode; import org.apache.asterix.common.exceptions.RuntimeDataException; import org.apache.asterix.external.input.record.reader.abstracts.AbstractExternalInputStream; + import org.apache.asterix.external.input.record.reader.stream.AvailableInputStream; import org.apache.asterix.external.util.ExternalDataConstants; -import org.apache.asterix.external.util.ExternalDataUtils; import org.apache.hyracks.api.exceptions.HyracksDataException; import org.apache.hyracks.util.LogRedactionUtil; diff --cc asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/input/record/reader/azure/datalake/AzureDataLakeInputStream.java index 7a95222bfd,5fa8fd8ab2..ce6c0e13aa --- a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/input/record/reader/azure/datalake/AzureDataLakeInputStream.java +++ b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/input/record/reader/azure/datalake/AzureDataLakeInputStream.java @@@ -31,7 -30,9 +31,8 @@@ import org.apache.asterix.common.except import org.apache.asterix.common.exceptions.ErrorCode; import org.apache.asterix.common.exceptions.RuntimeDataException; import org.apache.asterix.external.input.record.reader.abstracts.AbstractExternalInputStream; + import org.apache.asterix.external.input.record.reader.stream.AvailableInputStream; import org.apache.asterix.external.util.ExternalDataConstants; -import org.apache.asterix.external.util.ExternalDataUtils; import org.apache.hyracks.api.exceptions.HyracksDataException; import org.apache.hyracks.util.LogRedactionUtil; diff --cc asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/input/record/reader/gcs/GCSInputStream.java index 4657bd09db,f154ee8f9c..7d3fb2f0a0 --- a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/input/record/reader/gcs/GCSInputStream.java +++ b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/input/record/reader/gcs/GCSInputStream.java @@@ -31,8 -31,9 +31,9 @@@ import org.apache.asterix.common.except import org.apache.asterix.common.exceptions.ErrorCode; import org.apache.asterix.common.exceptions.RuntimeDataException; import org.apache.asterix.external.input.record.reader.abstracts.AbstractExternalInputStream; + import org.apache.asterix.external.input.record.reader.stream.AvailableInputStream; import org.apache.asterix.external.util.ExternalDataConstants; -import org.apache.asterix.external.util.ExternalDataUtils; +import org.apache.asterix.external.util.google.gcs.GCSUtils; import org.apache.commons.lang3.StringUtils; import org.apache.hyracks.api.exceptions.HyracksDataException; import org.apache.hyracks.api.util.CleanupUtils; diff --cc hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/join/OptimizedHybridHashJoinOperatorDescriptor.java index 91e94dcaa2,6fc9124451..f3aebd5062 --- a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/join/OptimizedHybridHashJoinOperatorDescriptor.java +++ b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/join/OptimizedHybridHashJoinOperatorDescriptor.java @@@ -509,16 -489,11 +509,14 @@@ public class OptimizedHybridHashJoinOpe long buildPartSize = (long) Math.ceil((double) buildSideReader.getFileSize() / (double) frameSize); long probePartSize = (long) Math.ceil((double) probeSideReader.getFileSize() / (double) frameSize); int beforeMax = Math.max(buildSizeInTuple, probeSizeInTuple); + if (stats.getLevel().get() < level) { + stats.getLevel().set(level); + } - if (LOGGER.isDebugEnabled()) { - LOGGER.debug("\n>>>Joining Partition Pairs (thread_id " + Thread.currentThread().getId() - + ") (pid " + ") - (level " + level + ")" + " - BuildSize:\t" + buildPartSize - + "\tProbeSize:\t" + probePartSize + " - MemForJoin " + (state.memForJoin) - + " - LeftOuter is " + isLeftOuter); - } + LOGGER.trace( + "\n>>>Joining Partition Pairs (thread_id {}) (pid ) - (level {}) - BuildSize:\t{}\tProbeSize:\t{} - MemForJoin {} - LeftOuter is {}", + Thread.currentThread().getId(), level, buildPartSize, probePartSize, state.memForJoin, + isLeftOuter); // Calculate the expected hash table size for the both side. long expectedHashTableSizeForBuildInFrame =
