Merge branch 'main' into update-4.1.6.0

FoundationDB · Feb 14, 2025 · cb6ab61 · cb6ab61
2 parents 3916c66 + e0f181d
commit cb6ab61
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 54 deletions.
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -6,6 +6,7 @@ on:
 
 jobs:
   gradle:
+    if: github.repository == 'FoundationDB/fdb-record-layer'
     runs-on: ubuntu-latest
     steps:
     - name: Checkout sources

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -139,13 +139,12 @@ jobs:
           name: coverage-report
           path: |
             ${{ github.workspace }}/.out/reports/jacoco/codeCoverageReport/
-      - name: Save Pull Request Number
-        run: echo ${{ github.event.number }} >.pr_number
-      - name: Upload Pull Request Number
-        uses: actions/[email protected]
+      - name: Add Coverage Summary
+        uses: madrapps/jacoco-report@e4bbaf00a0b8920cb86a448ae3ec0fc6f6bfeacc
         with:
-          name: pull-request-number
-          path: |
-            ${{ github.workspace }}/.pr_number
-          include-hidden-files: true
-          retention-days: 1
+          paths: |
+            ${{ github.workspace }}/.out/reports/jacoco/codeCoverageReport/codeCoverageReport.xml
+          token: ${{ secrets.GITHUB_TOKEN }}
+          comment-type: summary
+          min-coverage-overall: 75
+          min-coverage-changed-files: 80
diff --git a/.github/workflows/pull_request_comments.yml b/.github/workflows/pull_request_comments.yml
diff --git a/docs/ReleaseNotes.md b/docs/ReleaseNotes.md
@@ -32,9 +32,9 @@ Users performing online updates are encouraged to update from [4.0.559.4](#40559
 * **Feature** Feature 1 [(Issue #NNN)](https://github.com/FoundationDB/fdb-record-layer/issues/NNN)
 * **Feature** Feature 2 [(Issue #NNN)](https://github.com/FoundationDB/fdb-record-layer/issues/NNN)
 * **Feature** Feature 3 [(Issue #NNN)](https://github.com/FoundationDB/fdb-record-layer/issues/NNN)
-* **Feature** Feature 4 [(Issue #NNN)](https://github.com/FoundationDB/fdb-record-layer/issues/NNN)
+* **Feature** FRL now respects PLAN_CACHE_*_MAX_ENTRIES options [(Issue #3155)](https://github.com/FoundationDB/fdb-record-layer/issues/3155)
 * **Feature** Feature 5 [(Issue #NNN)](https://github.com/FoundationDB/fdb-record-layer/issues/NNN)
-* **Breaking change** Change 1 [(Issue #NNN)](https://github.com/FoundationDB/fdb-record-layer/issues/NNN)
+e** Change 1 [(Issue #NNN)](https://github.com/FoundationDB/fdb-record-layer/issues/NNN)
 * **Breaking change** Change 2 [(Issue #NNN)](https://github.com/FoundationDB/fdb-record-layer/issues/NNN)
 * **Breaking change** Change 3 [(Issue #NNN)](https://github.com/FoundationDB/fdb-record-layer/issues/NNN)
 * **Breaking change** Change 4 [(Issue #NNN)](https://github.com/FoundationDB/fdb-record-layer/issues/NNN)

diff --git a/fdb-relational-server/src/main/java/com/apple/foundationdb/relational/server/FRL.java b/fdb-relational-server/src/main/java/com/apple/foundationdb/relational/server/FRL.java
@@ -115,8 +115,11 @@ public FRL(@Nonnull Options options) throws RelationalException {
                     ddlFactory,
                     RelationalPlanCache.newRelationalCacheBuilder()
                             .setTtl(options.getOption(Options.Name.PLAN_CACHE_PRIMARY_TIME_TO_LIVE_MILLIS))
+                            .setSize(options.getOption(Options.Name.PLAN_CACHE_PRIMARY_MAX_ENTRIES))
                             .setSecondaryTtl(options.getOption(Options.Name.PLAN_CACHE_SECONDARY_TIME_TO_LIVE_MILLIS))
+                            .setSecondarySize(options.getOption(Options.Name.PLAN_CACHE_SECONDARY_MAX_ENTRIES))
                             .setTertiaryTtl(options.getOption(Options.Name.PLAN_CACHE_TERTIARY_TIME_TO_LIVE_MILLIS))
+                            .setTertiarySize(options.getOption(Options.Name.PLAN_CACHE_TERTIARY_MAX_ENTRIES))
                             .build()));
 
             DriverManager.registerDriver(this.driver);

diff --git a/...sts/src/main/java/com/apple/foundationdb/relational/yamltests/configs/EmbeddedConfig.java b/...sts/src/main/java/com/apple/foundationdb/relational/yamltests/configs/EmbeddedConfig.java
@@ -44,6 +44,7 @@ public void beforeAll() throws Exception {
                 .withOption(Options.Name.PLAN_CACHE_PRIMARY_TIME_TO_LIVE_MILLIS, 3_600_000L)
                 .withOption(Options.Name.PLAN_CACHE_SECONDARY_TIME_TO_LIVE_MILLIS, 3_600_000L)
                 .withOption(Options.Name.PLAN_CACHE_TERTIARY_TIME_TO_LIVE_MILLIS, 3_600_000L)
+                .withOption(Options.Name.PLAN_CACHE_PRIMARY_MAX_ENTRIES, 10)
                 .build();
         frl = new FRL(options);
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,6 +6,7 @@ on: @@
     jobs:
       gradle:
+        if: github.repository == 'FoundationDB/fdb-record-layer'
         runs-on: ubuntu-latest
         steps:
         - name: Checkout sources
@@ Expand Down @@