From bc8be3f12257059ab8233c0ae68fa84c2eeeb1ae Mon Sep 17 00:00:00 2001 From: prajwalpoojari04 <215350137+prajwalpoojari04@users.noreply.github.com> Date: Thu, 19 Nov 2026 00:44:19 +0530 Subject: [PATCH] Extract duplicated string literals into constants in reader (java:S1192) Refs #738 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .../dfa1/vortex/reader/compute/Compute.java | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/compute/Compute.java b/reader/src/main/java/io/github/dfa1/vortex/reader/compute/Compute.java index 39d508b37..4928c16dc 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/compute/Compute.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/compute/Compute.java @@ -29,6 +29,9 @@ /// rows return the identity (`0`), while `MIN` and `MAX` return `null`. public final class Compute { + private static final String CHUNK_PARAMETER_NAME = "chunk"; + private static final String FILTER_PARAMETER_NAME = "filter"; + private Compute() { } @@ -52,8 +55,8 @@ private Compute() { /// @param aggColumn the column to reduce over the selected rows, or `null` to count rows only /// @return the fold over the rows `filter` selects public static FilteredAggregate filteredAggregate(Chunk chunk, ScanFilter filter, ColumnName aggColumn) { - Objects.requireNonNull(chunk, "chunk"); - Objects.requireNonNull(filter, "filter"); + Objects.requireNonNull(chunk, CHUNK_PARAMETER_NAME); + Objects.requireNonNull(filter, FILTER_PARAMETER_NAME); return FusedFilterAggregate.aggregate(chunk, filter, aggColumn); } @@ -72,8 +75,8 @@ public static FilteredAggregate filteredAggregate(Chunk chunk, ScanFilter filter /// @param row the zero-based row to test /// @return `true` if `row` satisfies `filter` public static boolean matches(Chunk chunk, ScanFilter filter, long row) { - Objects.requireNonNull(chunk, "chunk"); - Objects.requireNonNull(filter, "filter"); + Objects.requireNonNull(chunk, CHUNK_PARAMETER_NAME); + Objects.requireNonNull(filter, FILTER_PARAMETER_NAME); return evaluate(chunk, filter, row); } @@ -90,7 +93,7 @@ public static boolean matches(Chunk chunk, ScanFilter filter, long row) { /// @param filter the whole predicate: an n-ary `AND` of column-bound leaves, or a single leaf /// @return the rows of `chunk` that `filter` selects, valid while `chunk` is open public static RowSelection matcher(Chunk chunk, ScanFilter filter) { - Objects.requireNonNull(chunk, "chunk"); + Objects.requireNonNull(chunk, CHUNK_PARAMETER_NAME); return matcher(filter).apply(chunk); } @@ -101,9 +104,9 @@ public static RowSelection matcher(Chunk chunk, ScanFilter filter) { /// @param filter the whole predicate: an n-ary `AND` of column-bound leaves, or a single leaf /// @return a function from a chunk to the rows it selects, each valid while its chunk is open public static Function matcher(ScanFilter filter) { - Objects.requireNonNull(filter, "filter"); + Objects.requireNonNull(filter, FILTER_PARAMETER_NAME); FusedFilterAggregate.DictMemo memo = new FusedFilterAggregate.DictMemo(); - return chunk -> FusedFilterAggregate.rowTest(Objects.requireNonNull(chunk, "chunk"), filter, memo); + return chunk -> FusedFilterAggregate.rowTest(Objects.requireNonNull(chunk, CHUNK_PARAMETER_NAME), filter, memo); } /// Folds `aggColumn` per value of `groupColumn` over the rows `filter` selects: the per-group @@ -129,7 +132,7 @@ public static Function matcher(ScanFilter filter) { /// @return the fold per group value, or empty when the columns do not qualify public static Optional> groupedAggregate(Chunk chunk, ColumnName groupColumn, ScanFilter filter, ColumnName aggColumn) { - Objects.requireNonNull(chunk, "chunk"); + Objects.requireNonNull(chunk, CHUNK_PARAMETER_NAME); Objects.requireNonNull(groupColumn, "groupColumn"); return GroupedAggregate.aggregate(chunk, groupColumn, filter, aggColumn); }