Merge remote-tracking branch 'upstream/main' into variables

Author: arnaud-lacurie

build/create_release_notes.py

@@ -29,7 +29,7 @@
 import sys
 
 class Version:
-    minor_header = re.compile(r'^## (\d+\.\d)$')  # match all version headers, including major or minor headers
+    minor_header = re.compile(r'^## (\d+\.\d+)$')  # match all version headers, including major or minor headers
     precise_header = re.compile(r'^### (\d+\.\d+\.\d+\.\d+)$')  # match precise version headers
 
     def __init__(self, version: str):

docs/sphinx/source/ReleaseNotes.md

@@ -5,7 +5,42 @@ This document contains a log of changes to the FoundationDB Record Layer. It aim
 
 As the [versioning guide](Versioning.md) details, it cannot always be determined solely by looking at the version numbers whether one Record Layer version contains all changes included in another. In particular, bug fixes and backwards-compatible changes might be back-ported to or introduced as patches against older versions. To track when a patch version has been included in the main release train, some releases will say as a note that they contain all changes from a specific patch.
 
-## 4.10
+## 4.12
+
+### 4.12.5.0
+
+<h4> New Features </h4>
+
+* Name struct columns from parenthesised-star expressions after their source - [PR #4182](https://github.com/FoundationDB/fdb-record-layer/pull/4182)
+* Fix bug when SplitSelectExtractIndependentQuantifiersRule selects from an exploded primitive array - [PR #4007](https://github.com/FoundationDB/fdb-record-layer/pull/4007)
+<h4> Bug Fixes </h4>
+
+* Fix `RecordQueryRecursiveLevelUnionPlan#computeHashCodeWithoutChildren()` - [PR #4189](https://github.com/FoundationDB/fdb-record-layer/pull/4189)
+* Make `RelationalExpression#equalsWithoutChildren()` compare the result values where necessary - [PR #4185](https://github.com/FoundationDB/fdb-record-layer/pull/4185)
+
+<details>
+<summary>
+
+<h4> Build/Test/Documentation/Style Improvements (click to expand) </h4>
+
+</summary>
+
+* Allow ErrorCode enum names in yamsql error directives - [PR #4200](https://github.com/FoundationDB/fdb-record-layer/pull/4200)
+
+</details>
+
+
+**[Full Changelog (4.12.4.0...4.12.5.0)](https://github.com/FoundationDB/fdb-record-layer/compare/4.12.4.0...4.12.5.0)**
+
+#### Mixed Mode Test Results
+
+Mixed mode testing run against the following previous versions:
+
+✅`4.10.16.0`, ✅`4.10.17.0`, ✅`4.10.18.0`, ✅`4.10.19.0`, ✅`4.10.20.0`, ✅`4.11.1.0`, ✅`4.12.1.0`, ✅`4.12.2.0`, ✅`4.12.3.0`, ✅`4.12.4.0`
+
+[See full test run](https://github.com/FoundationDB/fdb-record-layer/actions/runs/26464186416)
+
+
 
 ### 4.12.4.0
 
@@ -178,6 +213,8 @@ Mixed mode testing run against the following previous versions:
 
 
 
+## 4.11
+
 ### 4.11.1.0
 
 <h4> Breaking Changes </h4>
@@ -225,6 +262,8 @@ Mixed mode testing run against the following previous versions:
 
 
 
+## 4.10
+
 ### 4.10.20.0
 
 <h4> New Features </h4>

fdb-record-layer-core/src/main/java/com/apple/foundationdb/record/query/plan/cascades/expressions/SelectExpression.java

@@ -128,7 +128,8 @@ public Value getResultValue() {
 
     @Nonnull
     public List<? extends Value> getResultValues() {
-        return Values.deconstructRecord(getResultValue());
+        final var resultValue = getResultValue();
+        return resultValue.getResultType().isRecord() ? Values.deconstructRecord(getResultValue()) : ImmutableList.of(resultValue);
     }
 
     @Nonnull

fdb-record-layer-core/src/main/java/com/apple/foundationdb/record/query/plan/cascades/rules/InComparisonToExplodeRule.java

@@ -194,7 +194,6 @@ public void onMatch(@Nonnull final ExplorationCascadesRuleCall call) {
         }
 
         transformedQuantifiers.addAll(bindings.getAll(innerQuantifierMatcher));
-
         call.yieldExploratoryExpression(new SelectExpression(selectExpression.getResultValue(),
                 transformedQuantifiers.build(),
                 transformedPredicates.build()));

fdb-record-layer-core/src/main/java/com/apple/foundationdb/record/query/plan/cascades/rules/PredicatePushDownRule.java

@@ -194,7 +194,9 @@ public void onMatch(@Nonnull final ExplorationCascadesRuleCall call) {
         final var bindings = call.getBindings();
 
         final var selectExpression = bindings.get(root);
-
+        if (!selectExpression.getResultValue().getResultType().isRecord()) {
+            return;
+        }
         //
         // This is the quantifier we are going to push predicates along.
         //

fdb-record-layer-core/src/main/java/com/apple/foundationdb/record/query/plan/cascades/rules/SplitSelectExtractIndependentQuantifiersRule.java

@@ -87,6 +87,7 @@ public void onMatch(@Nonnull final ExplorationCascadesRuleCall call) {
         final var bindings = call.getBindings();
 
         final var selectExpression = bindings.get(root);
+
         final Collection<? extends Quantifier.ForEach> explodeQuantifiers = bindings.get(explodeQuantifiersMatcher);
         if (explodeQuantifiers.isEmpty()) {
             return;

fdb-record-layer-core/src/main/java/com/apple/foundationdb/record/query/plan/plans/RecordQueryDeletePlan.java

@@ -165,7 +165,10 @@ public boolean equalsWithoutChildren(@Nonnull final RelationalExpression other,
         if (this == other) {
             return true;
         }
-        return getClass() == other.getClass();
+        if (getClass() != other.getClass()) {
+            return false;
+        }
+        return semanticEqualsForResults(other, equivalences);
     }
 
     @Override

fdb-record-layer-core/src/main/java/com/apple/foundationdb/record/query/plan/plans/RecordQueryFetchFromPartialRecordPlan.java

@@ -229,7 +229,9 @@ public boolean equalsWithoutChildren(@Nonnull final RelationalExpression otherEx
         if (getClass() != otherExpression.getClass()) {
             return false;
         }
-
+        if (!semanticEqualsForResults(otherExpression, equivalences)) {
+            return false;
+        }
         final var otherFetchPlan = (RecordQueryFetchFromPartialRecordPlan)otherExpression;
         return fetchIndexRecords == otherFetchPlan.fetchIndexRecords;
     }

fdb-record-layer-core/src/main/java/com/apple/foundationdb/record/query/plan/plans/RecordQueryFilterPlan.java

@@ -153,6 +153,9 @@ public boolean equalsWithoutChildren(@Nonnull RelationalExpression otherExpressi
         if (getClass() != otherExpression.getClass()) {
             return false;
         }
+        if (!semanticEqualsForResults(otherExpression, equivalencesMap)) {
+            return false;
+        }
         final RecordQueryFilterPlan otherPlan = (RecordQueryFilterPlan)otherExpression;
         return conjunctedFilter.equals(otherPlan.getConjunctedFilter());
     }

fdb-record-layer-core/src/main/java/com/apple/foundationdb/record/query/plan/plans/RecordQueryInJoinPlan.java

@@ -209,6 +209,9 @@ public boolean equalsWithoutChildren(@Nonnull RelationalExpression otherExpressi
         if (getClass() != otherExpression.getClass()) {
             return false;
         }
+        if (!semanticEqualsForResults(otherExpression, equivalencesMap)) {
+            return false;
+        }
         final RecordQueryInJoinPlan other = (RecordQueryInJoinPlan)otherExpression;
         return inSource.equals(other.inSource);
     }