Some minor cleanup after I looked through the code

Author: ScottDugas

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

@@ -568,16 +568,14 @@ default List<ResolvedKeySpacePath> listSubdirectory(@Nonnull FDBRecordContext co
     String toString(@Nonnull Tuple tuple);
 
     /**
-     * Export all data stored under this KeySpacePath and return it in a RecordCursor.
-     * This method scans all keys that have this path as a prefix and returns the key-value pairs.
-     * Supports continuation to resume scanning from a previous position.
+     * Exports all data stored under this {@code KeySpacePath} and returns it in a {@link RecordCursor}.
      *
      * @param context the transaction context in which to perform the data export
-     * @param continuation optional continuation from a previous export operation, or null to start from the beginning
+     * @param continuation continuation from a previous export operation, or null to start from the beginning
      * @param scanProperties properties controlling how the scan should be performed
-     * @return a RecordCursor that iterates over all KeyValue pairs under this path
+     * @return a {link RecordCursor} that provides all the data under this path
      */
-    @API(API.Status.UNSTABLE)
+    @API(API.Status.EXPERIMENTAL)
     @Nonnull
     RecordCursor<DataInKeySpacePath> exportAllData(@Nonnull FDBRecordContext context,
                                                    @Nullable byte[] continuation,

fdb-record-layer-core/src/test/java/com/apple/foundationdb/record/provider/foundationdb/keyspace/EnvironmentKeySpace.java

@@ -93,12 +93,12 @@ static EnvironmentKeySpace setupSampleData(@Nonnull final FDBDatabase database)
             DataPath dataUser2App1 = app1User2.dataStore();
 
             // Store data records with additional tuple elements after the KeySpacePath
-            tr.set(dataUser1App1.toTuple(context).add("record1").pack(), Tuple.from("user100_app1_data1").pack());
-            tr.set(dataUser1App1.toTuple(context).add("record2").add(0).pack(), Tuple.from("user100_app1_data2_0").pack());
-            tr.set(dataUser1App1.toTuple(context).add("record2").add(1).pack(), Tuple.from("user100_app1_data2_1").pack());
-            tr.set(metaUser1App1.toTuple(context).add("config1").pack(), Tuple.from("user100_app1_meta1").pack());
-            tr.set(dataUser1App2.toTuple(context).add("record3").pack(), Tuple.from("user100_app2_data3").pack());
-            tr.set(dataUser2App1.toTuple(context).add("record4").pack(), Tuple.from("user200_app1_data4").pack());
+            tr.set(dataUser1App1.toSubspace(context).pack(Tuple.from("record1")), Tuple.from("user100_app1_data1").pack());
+            tr.set(dataUser1App1.toSubspace(context).pack(Tuple.from("record2", 0)), Tuple.from("user100_app1_data2_0").pack());
+            tr.set(dataUser1App1.toSubspace(context).pack(Tuple.from("record2", 1)), Tuple.from("user100_app1_data2_1").pack());
+            tr.set(metaUser1App1.toSubspace(context).pack(Tuple.from("config1")), Tuple.from("user100_app1_meta1").pack());
+            tr.set(dataUser1App2.toSubspace(context).pack(Tuple.from("record3")), Tuple.from("user100_app2_data3").pack());
+            tr.set(dataUser2App1.toSubspace(context).pack(Tuple.from("record4")), Tuple.from("user200_app1_data4").pack());
 
             context.commit();
         }

fdb-record-layer-core/src/test/java/com/apple/foundationdb/record/provider/foundationdb/keyspace/KeySpacePathDataExportTest.java

@@ -31,6 +31,7 @@
 import com.apple.foundationdb.record.provider.foundationdb.FDBRecordContext;
 import com.apple.foundationdb.record.provider.foundationdb.keyspace.KeySpaceDirectory.KeyType;
 import com.apple.foundationdb.record.test.FDBDatabaseExtension;
+import com.apple.foundationdb.subspace.Subspace;
 import com.apple.foundationdb.tuple.Tuple;
 import com.apple.test.Tags;
 import org.assertj.core.api.Assertions;
@@ -56,8 +57,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
- * Tests for the new KeySpacePath data export feature that fetches all data stored under a KeySpacePath
- * and returns it in a {@code RecordCursor<KeyValue>}.
+ * Tests for {@link KeySpacePath#exportAllData}.
  */
 @Tag(Tags.RequiresFDB)
 class KeySpacePathDataExportTest {
@@ -79,13 +79,11 @@ void exportAllDataFromSimplePath() {
 
             // Add data at different levels
             for (int i = 0; i < 5; i++) {
-                Tuple key = basePath.add("level1", (long) i).toTuple(context);
-                tr.set(key.pack(), Tuple.from("value" + i).pack());
+                final Subspace subspace = basePath.add("level1", (long)i).toSubspace(context);
 
                 // Add some sub-data under each key
                 for (int j = 0; j < 3; j++) {
-                    Tuple subKey = key.add("sub" + j);
-                    tr.set(subKey.pack(), Tuple.from("subvalue" + i + "_" + j).pack());
+                    tr.set(subspace.pack("sub" + j), Tuple.from("subvalue" + i + "_" + j).pack());
                 }
             }
             context.commit();
@@ -96,8 +94,8 @@ void exportAllDataFromSimplePath() {
             KeySpacePath rootPath = root.path("root");
             final List<KeyValue> allData = exportAllData(rootPath, context);
 
-            // Should have 5 main entries + 15 sub-entries = 20 total
-            assertEquals(20, allData.size());
+            // Should have 15 sub-entries = 20 total
+            assertEquals(15, allData.size());
 
             // Verify the data is sorted by key
             for (int i = 1; i < allData.size(); i++) {
@@ -126,8 +124,8 @@ void exportAllDataFromSpecificSubPath() {
 
                 // Add data for each user
                 for (int i = 0; i < 4; i++) {
-                    Tuple key = dataPath.toTuple(context).add("record" + i);
-                    tr.set(key.pack(), Tuple.from("user" + userId + "_data" + i).pack());
+                    byte[] key = dataPath.toSubspace(context).pack("record" + i);
+                    tr.set(key, Tuple.from("user" + userId + "_data" + i).pack());
                 }
             }
             context.commit();
@@ -168,10 +166,10 @@ void exportAllDataWithDirectoryLayer() {
             String[] services = {"auth", "storage", "compute"};
             for (String service : services) {
                 KeySpacePath servicePath = basePath.add("service", service);
-                Tuple serviceKey = servicePath.toTuple(context);
+                Subspace serviceKey = servicePath.toSubspace(context);
 
                 for (int i = 0; i < 2; i++) {
-                    tr.set(serviceKey.add("config" + i).pack(),
+                    tr.set(serviceKey.pack("config" + i),
                             Tuple.from(service + "_config_" + i).pack());
                 }
             }
@@ -263,11 +261,11 @@ void exportAllDataWithConstantValues() {
             Transaction tr = context.ensureActive();
 
             KeySpacePath dataPath = root.path("app").add("version").add("data");
-            Tuple baseKey = dataPath.toTuple(context);
+            Subspace baseKey = dataPath.toSubspace(context);
 
             // Add multiple records under the constant path
             for (int i = 0; i < 4; i++) {
-                tr.set(baseKey.add("record" + i).pack(),
+                tr.set(baseKey.pack("record" + i),
                         Tuple.from("constant_path_data_" + i).pack());
             }
             context.commit();
@@ -333,10 +331,10 @@ void exportAllDataWithDeepNestedStructure() {
                                 .add("member", memberId)
                                 .add("data");
 
-                        Tuple key = memberPath.toTuple(context);
-                        tr.set(key.add("profile").pack(),
+                        Subspace key = memberPath.toSubspace(context);
+                        tr.set(key.pack("profile"),
                                 Tuple.from(dept + "_team" + team + "_member" + member).pack());
-                        tr.set(key.add("settings").pack(),
+                        tr.set(key.pack("settings"),
                                 Tuple.from("settings_" + member).pack());
                     }
                 }