Apply Scott's requested changes

Author: jjezra

docs/ReleaseNotes.md

@@ -15,7 +15,7 @@ Builds and releases have been moved to a new CI system. This includes the resump
 
 Users performing online updates are encouraged to update from [4.0.559.4](#405594). The continuations of some queries have changed in ways that may break if continued on other 4.0 builds. See: [Issue #3093](https://github.com/FoundationDB/fdb-record-layer/issues/3093), [PR #3092](https://github.com/FoundationDB/fdb-record-layer/pull/3092) fixing the issue, and [PR #3108](https://github.com/FoundationDB/fdb-record-layer/issues/3108) preparing 4.0.559.4 to accept newer continuations.
 
-< !--
+<!--
 // begin next release
 ### NEXT_RELEASE
 
@@ -33,7 +33,7 @@ Users performing online updates are encouraged to update from [4.0.559.4](#40559
 * **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** Add verifications to yaml-tests that assert on planner metrics regressions [(Issue #3113)](https://github.com/FoundationDB/fdb-record-layer/issues/3113)
-* **Feature** Support Lucene index scrubbing [(Issue #3008)](https://github.com/FoundationDB/fdb-record-layer/issues/3008)
+**Feature** Support Lucene index scrubbing [(Issue #3008)](https://github.com/FoundationDB/fdb-record-layer/issues/3008)
 * **Breaking change** 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** Changes to supprt CTE skips and limits can result in plan hash mismatches during online upgrades [(Issue #3100)](https://github.com/FoundationDB/fdb-record-layer/issues/3100)
@@ -51,7 +51,7 @@ Several "FDB relational" sub-projects have been added which present a new relati
 
 ### Breaking Changes
 
-The Apache Commons library has been removed as a dependency. There were a few locations where the `Pair` class from that library was exposed via the API. This has necessitated making API incompatible changes. These have mostly been replaced by classes defined in the repository, or with other JDK classes. 
+Our API stability annotations have been updated to reflect greater API instability. We have degraded existing `STABLE` and `MAINTAINED` APIs to `UNSTABLE`, and the `MAINTAINED` classification has been removed from the project. The new relational sub-projects' APIs are all `EXPERIMENTAL` (or `INTERNAL`). These APIs are expected to evolve in the future as more functionality is moved to the relational APIs. The API annotation class was moved to its own module, to avoid having the new sub-projects depend on the FDB java bindings.
 
 ### 4.0.575.0
 

fdb-record-layer-lucene/src/test/java/com/apple/foundationdb/record/lucene/LuceneIndexScrubbingTest.java

@@ -73,11 +73,6 @@ private static Stream<Arguments> threeBooleanArgs() {
                                 .map(isGrouped -> Arguments.of(isSynthetic, isGrouped, isPartitioned))));
     }
 
-    private boolean yinYang() {
-        flipBoolean = !flipBoolean;
-        return flipBoolean;
-    }
-
     @Nonnull
     protected FDBRecordStore.Builder getStoreBuilderWithRegistry(@Nonnull FDBRecordContext context,
                                                                  @Nonnull RecordMetaDataProvider metaData,
@@ -98,17 +93,11 @@ void luceneIndexScrubMissingDataModelNoIssues(boolean isSynthetic, boolean isGro
                 .build();
 
         for (int i = 0; i < 14; i++) {
-            dataModel.setReverseSaveOrder(yinYang());
             try (final FDBRecordContext context = openContext()) {
                 dataModel.saveRecords(7, context, i / 6);
                 context.commit();
             }
         }
-        try (FDBRecordContext context = openContext()) {
-            final FDBRecordStore recordStore = dataModel.createOrOpenRecordStore(context);
-            dataModel.sampleRecordsUnderTest().forEach(sampleRecord -> sampleRecord.deleteRecord(recordStore).join());
-            context.commit();
-        }
 
         try (final FDBRecordContext context = openContext()) {
             dataModel.explicitMergeIndex(context, timer);
@@ -184,36 +173,20 @@ void luceneIndexScrubMissingDataModel(boolean isSynthetic, boolean isGrouped, bo
         final InjectedFailureRepository injectedFailures = new InjectedFailureRepository();
         registry.overrideFactory(new MockedLuceneIndexMaintainerFactory(injectedFailures));
 
-        for (int i = 0; i < 14; i++) {
-            dataModel.setReverseSaveOrder(yinYang());
-            try (final FDBRecordContext context = openContext()) {
-                dataModel.saveRecords(7, context, i / 6);
-                context.commit();
-            }
-        }
-
-        try (final FDBRecordContext context = openContext()) {
-            dataModel.explicitMergeIndex(context, timer);
-            context.commit();
-        }
-
         try (final FDBRecordContext context = openContext()) {
             // Write some documents
-            dataModel.saveRecordsToAllGroups(7, context);
+            dataModel.saveRecordsToAllGroups(17, context);
             context.commit();
         }
 
-        try (FDBRecordContext context = openContext()) {
-            final FDBRecordStore recordStore = dataModel.createOrOpenRecordStore(context);
-            dataModel.sampleRecordsUnderTest().forEach(sampleRecord -> sampleRecord.deleteRecord(recordStore).join());
-            context.commit();
-        }
         try (final FDBRecordContext context = openContext()) {
             dataModel.explicitMergeIndex(context, timer);
             context.commit();
         }
 
         try (final FDBRecordContext context = openContext()) {
+            // By saving records with both setReverseSaveOrder true and false, we ensure that records
+            // are in the oldest and most-recent partitions (if there are partitions)
             dataModel.setReverseSaveOrder(true);
             dataModel.saveRecords(7, context, 1);
             dataModel.setReverseSaveOrder(false);