Issue 6091: Remove Facebook collections library

NOTICES

@@ -95,10 +95,6 @@ Logback (ch.qos.logback:logback-*:1.*)
 - Eclipse Public License 1.0
 - GNU Lesser General Public License, version 2.1
 
-Facebook Jcommon collections (com.facebook.jcommon:collections:0.*)
-
-- Apache License, Version 2.0
-
 Guava: Google Core Libraries For Java (com.google.guava:guava:33.*)
 
 - Apache License, Version 2.0
@@ -425,12 +421,13 @@ Maven Plugins (org.apache.maven.plugins:maven-*-plugin:3.*)
 - Apache License, Version 2.0
 
 
+The file java/core/src/main/java/sleeper/core/schema/type/ByteArray.java contains code that is heavily based on
+ByteArray from the Facebook JCommon Collections library, licensed under the Apache License, Version 2.0.
 
 The file java/sketches/src/main/java/sleeper/sketches/SketchSerialiser.java contains code that is heavily based
 on ArrayOfStringsSerDe from the Apache DataSketches library, licensed under the Apache License, Version 2.0.
 
 
-
 Sleeper also contains a Python module. This has the following dependencies.
 
 pyarrow:

java/athena/src/main/java/sleeper/athena/record/FieldAsString.java

@@ -0,0 +1,25 @@
+/*
+ * Copyright 2022-2025 Crown Copyright
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package sleeper.athena.record;
+
+/**
+ * Value for a field, held as a string along with the name of the field.
+ *
+ * @param fieldName the field name
+ * @param value     a string representation of the value
+ */
+public record FieldAsString(String fieldName, String value) {
+}

java/athena/src/main/java/sleeper/athena/record/FieldAtDimension.java

@@ -0,0 +1,26 @@
+/*
+ * Copyright 2022-2025 Crown Copyright
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package sleeper.athena.record;
+
+/**
+ * The value for a row key field, held along with the dimension of the row key.
+ * The dimension is its index in the list of row keys within the schema.
+ *
+ * @param dimension the index of the row key in the schema
+ * @param value     the value
+ */
+public record FieldAtDimension(int dimension, Object value) {
+}

java/athena/src/main/java/sleeper/athena/record/IteratorApplyingRecordHandler.java

@@ -21,7 +21,6 @@
 import com.amazonaws.athena.connector.lambda.domain.predicate.SortedRangeSet;
 import com.amazonaws.athena.connector.lambda.domain.predicate.ValueSet;
 import com.amazonaws.athena.connector.lambda.records.ReadRecordsRequest;
-import com.facebook.collections.Pair;
 import com.google.gson.Gson;
 import org.apache.arrow.vector.types.Types;
 import org.apache.arrow.vector.types.pojo.ArrowType;
@@ -55,7 +54,6 @@
 import sleeper.query.core.rowretrieval.RowRetrievalException;
 import sleeper.query.runner.rowretrieval.LeafPartitionRowRetrieverImpl;
 
-import java.io.Serializable;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -128,9 +126,9 @@ protected CloseableIterator<Row> createRowIterator(ReadRecordsRequest recordsReq
         Set<String> relevantFiles = new HashSet<>(new Gson().fromJson(split.getProperty(RELEVANT_FILES_FIELD), List.class));
         List<Field> rowKeyFields = schema.getRowKeyFields();
 
-        List<Pair<String, String>> rowKeys = split.getProperties().entrySet().stream()
+        List<FieldAsString> rowKeys = split.getProperties().entrySet().stream()
                 .filter(entry -> ROW_KEY_PREFIX_TEST.test(entry.getKey()))
-                .map(entry -> Pair.of(entry.getKey(), entry.getValue()))
+                .map(entry -> new FieldAsString(entry.getKey(), entry.getValue()))
                 .collect(Collectors.toList());
 
         List<Object> minRowKeys = getRowKey(rowKeys, rowKeyFields, "Min");
@@ -139,33 +137,33 @@ protected CloseableIterator<Row> createRowIterator(ReadRecordsRequest recordsReq
         return createIterator(relevantFiles, minRowKeys, maxRowKeys, schema, tableProperties, recordsRequest.getConstraints().getSummary());
     }
 
-    private List<Object> getRowKey(List<Pair<String, String>> rowKeyStream, List<Field> rowKeyFields, String indicator) {
+    private List<Object> getRowKey(List<FieldAsString> rowKeyStream, List<Field> rowKeyFields, String indicator) {
         List<Object> rowKey = new ArrayList<>();
         for (int i = 0; i < rowKeyFields.size(); i++) {
             rowKey.add(null);
         }
 
         rowKeyStream.stream()
-                .filter(entry -> entry.getFirst().contains(indicator))
-                .map(entry -> getIndexToObjectPair(rowKeyFields, entry))
-                .forEach(pair -> rowKey.set(pair.getFirst(), pair.getSecond()));
+                .filter(entry -> entry.fieldName().contains(indicator))
+                .map(entry -> getFieldAtDimension(rowKeyFields, entry))
+                .forEach(valueWithIndex -> rowKey.set(valueWithIndex.dimension(), valueWithIndex.value()));
 
         return rowKey;
     }
 
-    private Pair<Integer, ? extends Serializable> getIndexToObjectPair(List<Field> rowKeyFields, Pair<String, String> entry) {
-        String key = entry.getFirst();
+    private FieldAtDimension getFieldAtDimension(List<Field> rowKeyFields, FieldAsString entry) {
+        String key = entry.fieldName();
         Integer index = Integer.valueOf(key.substring(key.lastIndexOf("RowKey") + 6));
-        String stringValue = entry.getSecond();
+        String stringValue = entry.value();
         Type type = rowKeyFields.get(index).getType();
         if (type instanceof StringType) {
-            return Pair.of(index, stringValue);
+            return new FieldAtDimension(index, stringValue);
         } else if (type instanceof ByteArrayType) {
-            return Pair.of(index, BinaryUtils.fromBase64(stringValue));
+            return new FieldAtDimension(index, BinaryUtils.fromBase64(stringValue));
         } else if (type instanceof IntType) {
-            return Pair.of(index, Integer.parseInt(stringValue));
+            return new FieldAtDimension(index, Integer.parseInt(stringValue));
         } else if (type instanceof LongType) {
-            return Pair.of(index, Long.parseLong(stringValue));
+            return new FieldAtDimension(index, Long.parseLong(stringValue));
         } else {
             throw new RuntimeException("Unexpected Primitive type: " + type);
         }
@@ -258,4 +256,5 @@ private CloseableIterator<Row> applyCompactionIterators(CloseableIterator<Row> m
                 .getIterator(IteratorConfig.from(tableProperties), schema)
                 .applyTransform(mergingIterator);
     }
+
 }

java/clients/src/main/java/sleeper/clients/table/partition/EstimateSplitPoints.java

@@ -15,12 +15,12 @@
  */
 package sleeper.clients.table.partition;
 
-import com.facebook.collections.ByteArray;
 import org.apache.datasketches.quantiles.ItemsSketch;
 
 import sleeper.core.row.Row;
 import sleeper.core.schema.Field;
 import sleeper.core.schema.Schema;
+import sleeper.core.schema.type.ByteArray;
 import sleeper.core.schema.type.ByteArrayType;
 import sleeper.sketches.Sketches;
 

java/clients/src/main/java/sleeper/clients/table/partition/ExportSplitPoints.java

@@ -15,7 +15,6 @@
  */
 package sleeper.clients.table.partition;
 
-import com.facebook.collections.ByteArray;
 import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
 import software.amazon.awssdk.services.s3.S3Client;
 
@@ -27,6 +26,7 @@
 import sleeper.core.properties.table.TablePropertiesProvider;
 import sleeper.core.range.Range;
 import sleeper.core.schema.Schema;
+import sleeper.core.schema.type.ByteArray;
 import sleeper.core.schema.type.ByteArrayType;
 import sleeper.core.schema.type.IntType;
 import sleeper.core.schema.type.LongType;

java/compaction/compaction-job-execution/src/test/java/sleeper/compaction/job/execution/testutils/CompactionRunnerTestData.java

@@ -15,12 +15,12 @@
  */
 package sleeper.compaction.job.execution.testutils;
 
-import com.facebook.collections.ByteArray;
 import org.apache.hadoop.fs.Path;
 import org.apache.parquet.hadoop.ParquetWriter;
 
 import sleeper.core.row.Row;
 import sleeper.core.schema.Schema;
+import sleeper.core.schema.type.ByteArray;
 import sleeper.core.statestore.FileReference;
 import sleeper.core.statestore.FileReferenceFactory;
 import sleeper.core.statestore.StateStore;

java/core/pom.xml

@@ -26,10 +26,6 @@
     <artifactId>core</artifactId>
 
     <dependencies>
-        <dependency>
-            <groupId>com.facebook.jcommon</groupId>
-            <artifactId>collections</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>

java/core/src/main/java/sleeper/core/key/Key.java

@@ -15,7 +15,7 @@
  */
 package sleeper.core.key;
 
-import com.facebook.collections.ByteArray;
+import sleeper.core.schema.type.ByteArray;
 
 import java.util.ArrayList;
 import java.util.Collections;

java/core/src/main/java/sleeper/core/partition/PartitionsFromSplitPoints.java

@@ -15,7 +15,6 @@
  */
 package sleeper.core.partition;
 
-import com.facebook.collections.ByteArray;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -24,6 +23,7 @@
 import sleeper.core.range.Region;
 import sleeper.core.schema.Field;
 import sleeper.core.schema.Schema;
+import sleeper.core.schema.type.ByteArray;
 import sleeper.core.schema.type.ByteArrayType;
 import sleeper.core.schema.type.IntType;
 import sleeper.core.schema.type.LongType;

java/core/src/main/java/sleeper/core/properties/local/WriteSplitPoints.java

@@ -15,9 +15,10 @@
  */
 package sleeper.core.properties.local;
 
-import com.facebook.collections.ByteArray;
 import org.apache.commons.codec.binary.Base64;
 
+import sleeper.core.schema.type.ByteArray;
+
 import java.io.IOException;
 import java.io.StringWriter;
 import java.io.UncheckedIOException;

java/core/src/main/java/sleeper/core/range/Range.java

@@ -15,10 +15,9 @@
  */
 package sleeper.core.range;
 
-import com.facebook.collections.ByteArray;
-
 import sleeper.core.schema.Field;
 import sleeper.core.schema.Schema;
+import sleeper.core.schema.type.ByteArray;
 import sleeper.core.schema.type.ByteArrayType;
 import sleeper.core.schema.type.PrimitiveType;
 import sleeper.core.schema.type.Type;

java/core/src/main/java/sleeper/core/row/Row.java

@@ -15,11 +15,10 @@
  */
 package sleeper.core.row;
 
-import com.facebook.collections.ByteArray;
-
 import sleeper.core.key.Key;
 import sleeper.core.schema.Field;
 import sleeper.core.schema.Schema;
+import sleeper.core.schema.type.ByteArray;
 import sleeper.core.schema.type.ByteArrayType;
 
 import java.util.ArrayList;