merge main

Author: pengpeng-lu

build.gradle

@@ -100,19 +100,22 @@ allprojects {
 
     // Configure JUnit tests
     tasks.withType(Test) {
-        reports.junitXml.destination = project.file("${->project.buildDir}/test-results")
+        reports.junitXml.outputLocation = project.file("${->project.buildDir}/test-results")
     }
 
+    def projectName = it.name
+    def projectVersion = it.version
+
     // Configure JAR generation
     tasks.jar.configure {
         description = "Produces a Jar with the main classes in .out/."
         manifest {
             attributes "Built-JDK": System.getProperty("java.version"),
-                    "Specification-Title": project.name,
-                    "Specification-Version": "${-> project.version}",
+                    "Specification-Title": projectName,
+                    "Specification-Version": "${-> projectVersion}",
                     "Specification-Vendor": "Apple Inc.",
-                    "Implementation-Title": project.name,
-                    "Implementation-Version": "${-> project.version}",
+                    "Implementation-Title": projectName,
+                    "Implementation-Version": "${-> projectVersion}",
                     "Implementation-Vendor": "Apple Inc."
         }
         doFirst {
@@ -182,8 +185,10 @@ allprojects {
 subprojects {
     apply from: rootProject.file('gradle/testing.gradle')
 
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+    java {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
 
     def publishBuild = Boolean.parseBoolean(findProperty('publishBuild') ?: 'false')
     def autoServiceVersion = publishBuild ? libs.versions.autoService.asProvider().get() : libs.versions.autoService.development.get()

docs/sphinx/source/ReleaseNotes.md

@@ -5,6 +5,98 @@ 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.3
+
+### 4.3.3.0
+
+<h4> New Features </h4>
+
+* Create throttled and retrying record iterator - [PR #3350](https://github.com/FoundationDB/fdb-record-layer/pull/3350)
+<h4> Performance Improvements </h4>
+
+* Reenable memoization of correlated-to sets - [PR #3371](https://github.com/FoundationDB/fdb-record-layer/pull/3371)
+
+
+**[Full Changelog (4.3.2.0...4.3.3.0)](https://github.com/FoundationDB/fdb-record-layer/compare/4.3.2.0...4.3.3.0)**
+
+#### Mixed Mode Test Results
+
+Mixed mode testing run against the following previous versions:
+
+✅`4.1.9.0`, ✅`4.1.10.0`, ✅`4.2.2.0`, ✅`4.2.2.1`, ❌`4.2.3.0`, ❌`4.2.4.0`, ✅`4.2.5.0`, ✅`4.2.6.0`, ✅`4.2.8.0`, ✅`4.3.2.0`
+
+[See full test run](https://github.com/FoundationDB/fdb-record-layer/actions/runs/15296431095)
+
+
+
+### 4.3.2.0
+
+<h4> Bug Fixes </h4>
+
+* Don't memoize correlation sets in planner objects - [PR #3365](https://github.com/FoundationDB/fdb-record-layer/pull/3365)
+
+<details>
+<summary>
+
+<h4> Build/Test/Documentation/Style Improvements (click to expand) </h4>
+
+</summary>
+
+* Fix deprecated Gradle syntax and configuration features - [PR #3358](https://github.com/FoundationDB/fdb-record-layer/pull/3358)
+
+</details>
+
+
+**[Full Changelog (4.3.1.0...4.3.2.0)](https://github.com/FoundationDB/fdb-record-layer/compare/4.3.1.0...4.3.2.0)**
+
+#### Mixed Mode Test Results
+
+Mixed mode testing run against the following previous versions:
+
+❌`4.1.8.0`, ✅`4.1.9.0`, ✅`4.1.10.0`, ✅`4.2.2.0`, ✅`4.2.2.1`, ❌`4.2.3.0`, ❌`4.2.4.0`, ✅`4.2.5.0`, ✅`4.2.6.0`, ✅`4.2.8.0`
+
+[See full test run](https://github.com/FoundationDB/fdb-record-layer/actions/runs/15267203964)
+
+
+
+### 4.3.1.0
+
+<h4> New Features </h4>
+
+* New planner rule added to push predicates down in the query representation - [PR #3324](https://github.com/FoundationDB/fdb-record-layer/pull/3324)
+* Create FutureManagerRunner and convert FDBDatabaseRunnerImpl to use it. - [PR #3347](https://github.com/FoundationDB/fdb-record-layer/pull/3347)
+* Implement Compilable SQL functions - [PR #3307](https://github.com/FoundationDB/fdb-record-layer/pull/3307)
+* Add RecordCountKey State - [PR #3334](https://github.com/FoundationDB/fdb-record-layer/pull/3334)
+* multi phase planning - [PR #3328](https://github.com/FoundationDB/fdb-record-layer/pull/3328)
+<h4> Bug Fixes </h4>
+
+* add minimize to RecordQueryPlan - [PR #3356](https://github.com/FoundationDB/fdb-record-layer/pull/3356)
+
+<details>
+<summary>
+
+<h4> Build/Test/Documentation/Style Improvements (click to expand) </h4>
+
+</summary>
+
+* ParameterizedTest utilities - [PR #3336](https://github.com/FoundationDB/fdb-record-layer/pull/3336)
+* Remove 4.2.7.0 release notes as build was never published - [PR #3345](https://github.com/FoundationDB/fdb-record-layer/pull/3345)
+
+</details>
+
+
+**[Full Changelog (4.2.8.0...4.3.1.0)](https://github.com/FoundationDB/fdb-record-layer/compare/4.2.8.0...4.3.1.0)**
+
+#### Mixed Mode Test Results
+
+Mixed mode testing run against the following previous versions:
+
+❌`4.1.8.0`, ✅`4.1.9.0`, ✅`4.1.10.0`, ✅`4.2.2.0`, ✅`4.2.2.1`, ❌`4.2.3.0`, ❌`4.2.4.0`, ✅`4.2.5.0`, ✅`4.2.6.0`, ✅`4.2.8.0`
+
+[See full test run](https://github.com/FoundationDB/fdb-record-layer/actions/runs/15223203009)
+
+
+
 ## 4.2
 
 ### 4.2.8.0

examples/examples.gradle

@@ -30,5 +30,7 @@ dependencies {
     runtimeOnly(libs.log4j.core) // library
 }
 
-mainClassName = 'com.apple.foundationdb.record.sample.Main'
-applicationDefaultJvmArgs = ["-Dlog4j.configurationFile=${projectDir}/src/main/resources/log4j2.properties"]
+application {
+    mainClass = 'com.apple.foundationdb.record.sample.Main'
+    applicationDefaultJvmArgs = ["-Dlog4j.configurationFile=${projectDir}/src/main/resources/log4j2.properties"]
+}

fdb-record-layer-core/src/main/java/com/apple/foundationdb/record/logging/LogMessageKeys.java

@@ -312,6 +312,7 @@ public enum LogMessageKeys {
     TOTAL_RECORDS_SCANNED,
     TOTAL_RECORDS_SCANNED_DURING_FAILURES,
     SCRUB_TYPE,
+    RETRY_COUNT,
 
     // time limits milliseconds
     TIME_LIMIT_MILLIS("time_limit_milliseconds"),

fdb-record-layer-core/src/main/java/com/apple/foundationdb/record/provider/foundationdb/FDBDatabase.java

@@ -740,7 +740,13 @@ public Executor getExecutor() {
         return factory.getExecutor();
     }
 
-    protected Executor newContextExecutor(@Nullable Map<String, String> mdcContext) {
+    /**
+     * Create a new executor for the database. This is used internally when creating a transaction or a new runner.
+     * @param mdcContext if present, the MDC context to be made available within the executors threads
+     * @return the new executor
+     */
+    @API(API.Status.INTERNAL)
+    public Executor newContextExecutor(@Nullable Map<String, String> mdcContext) {
         return factory.newContextExecutor(mdcContext);
     }