>From Michael Blow <[email protected]>:
Michael Blow has uploaded this change for review. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20367?usp=email )
Change subject: Merge branch 'gerrit/phoenix' into 'master'
......................................................................
Merge branch 'gerrit/phoenix' into 'master'
* [NO ISSUE][HYR][MISC] Update commons-lang3 to 3.18.0 for CVE-2025-48924
* [NO ISSUE][OTH] Update parquet version
* [NO ISSUE][HYR] Update Jackson to 2.19.2 to address CVEs
* [NO ISSUE][*DB][TEST] avoid exceptions on duplicate s3mock shutdowns
* [NO ISSUE][MISC] Update nimbus-jose-jwt to 10.0.2 to address CVE
* [NO ISSUE] Reset operators after join selectivity estimation
* [NO ISSUE][EXT] Upgrage Delta Kernel API to v4.0.0
* [ASTERIXDB-3633][EXT] Support file splits while reading delta tables
* [ASTERIXDB-3636][STO] Add ColumnBufferPool to prevent OOM during high-volume
column ingestion
* [NO ISSUE][OTH] Add extensions for drop transaction pre-commit
* [NO ISSUE][STO] Delete masked files before reading resource files
* [ASTERIXDB-3638][COMP] Consolidate same scan operators
* [ASTERIXDB-3639]: add datasetName for index
* [NO ISSUE] Add missing licenses
Change-Id: I97f224b07f35e671e16547b6b89521044ea25545
---
M
asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/cbo/Stats.java
2 files changed, 27 insertions(+), 11 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/67/20367/1
diff --git
a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/cbo/Stats.java
b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/cbo/Stats.java
index 20c826b..7ffffd5 100644
---
a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/cbo/Stats.java
+++
b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/cbo/Stats.java
@@ -276,16 +276,9 @@
private double findJoinSelFromSamples(ILogicalOperator left,
ILogicalOperator right, Index index1, Index index2,
AbstractFunctionCallExpression joinExpr, JoinOperator join) throws
AlgebricksException {
AbstractBinaryJoinOperator abjoin = join.getAbstractJoinOp();
-<<<<<<< HEAD (6bf5bf [ASTERIXDB-3637][COMP] Simplify Index-only plan)
Pair<ILogicalOperator, Double> leftOutput =
replaceDataSourceWithSample(left, index1, joinExpr);
- ILogicalOperator originalLeft, originalRight;
- originalLeft = abjoin.getInputs().get(0).getValue();
- originalRight = abjoin.getInputs().get(1).getValue();
-=======
- Pair<ILogicalOperator, Double> leftOutput =
replaceDataSourceWithSample(left, index1);
ILogicalOperator originalLeft = abjoin.getInputs().get(0).getValue();
ILogicalOperator originalRight = abjoin.getInputs().get(1).getValue();
->>>>>>> BRANCH (f244d4 Merge branch 'gerrit/ionic' into 'gerrit/phoenix')
abjoin.getInputs().get(0).setValue(leftOutput.getFirst());
Pair<ILogicalOperator, Double> rightOutput =
replaceDataSourceWithSample(right, index2, joinExpr);
abjoin.getInputs().get(1).setValue(rightOutput.getFirst());
@@ -296,10 +289,6 @@
abjoin.getInputs().get(0).setValue(originalLeft);
abjoin.getInputs().get(1).setValue(originalRight);
-<<<<<<< HEAD (6bf5bf [ASTERIXDB-3637][COMP] Simplify Index-only plan)
-
-=======
->>>>>>> BRANCH (f244d4 Merge branch 'gerrit/ionic' into 'gerrit/phoenix')
return sel;
}
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20367?usp=email
To unsubscribe, or for help writing mail filters, visit
https://asterix-gerrit.ics.uci.edu/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Change-Id: I97f224b07f35e671e16547b6b89521044ea25545
Gerrit-Change-Number: 20367
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <[email protected]>
