From 152f934d3530009c41339d15f3b8c6a40ec69c03 Mon Sep 17 00:00:00 2001 From: Niels Pardon Date: Sun, 13 Jul 2025 11:56:19 +0200 Subject: [PATCH] chore: remove dead code Signed-off-by: Niels Pardon --- .../expression/ExpressionCreator.java | 16 ---------- .../extension/ExtensionCollector.java | 2 -- .../extension/ImmutableExtensionLookup.java | 2 -- .../substrait/extension/SimpleExtension.java | 2 -- .../substrait/relation/ProtoRelConverter.java | 10 ------- .../proto/ParameterizedProtoConverter.java | 6 ---- .../substrait/type/parser/TestTypeParser.java | 1 - .../isthmus/SubstraitRelNodeConverter.java | 9 ------ .../isthmus/expression/FunctionMatch.java | 30 ------------------- .../expression/ListSqlOperatorFunctions.java | 7 +---- .../isthmus/expression/LiteralConverter.java | 17 ----------- 11 files changed, 1 insertion(+), 101 deletions(-) delete mode 100644 isthmus/src/main/java/io/substrait/isthmus/expression/FunctionMatch.java diff --git a/core/src/main/java/io/substrait/expression/ExpressionCreator.java b/core/src/main/java/io/substrait/expression/ExpressionCreator.java index 650089a78..4a18026ab 100644 --- a/core/src/main/java/io/substrait/expression/ExpressionCreator.java +++ b/core/src/main/java/io/substrait/expression/ExpressionCreator.java @@ -488,20 +488,4 @@ public static Expression cast( .failureBehavior(failureBehavior) .build(); } - - private static ByteString padLeftIfNeeded(byte[] value, int length) { - - if (length < value.length) { - throw new IllegalArgumentException( - "Byte values should either be at or below the expected length."); - } - - if (length == value.length) { - return ByteString.copyFrom(value); - } - - byte[] newArray = new byte[length]; - System.arraycopy(value, 0, newArray, length - value.length, value.length); - return ByteString.copyFrom(newArray); - } } diff --git a/core/src/main/java/io/substrait/extension/ExtensionCollector.java b/core/src/main/java/io/substrait/extension/ExtensionCollector.java index 36897835f..741f3980f 100644 --- a/core/src/main/java/io/substrait/extension/ExtensionCollector.java +++ b/core/src/main/java/io/substrait/extension/ExtensionCollector.java @@ -17,7 +17,6 @@ public class ExtensionCollector extends AbstractExtensionLookup { private final BidiMap funcMap; private final BidiMap typeMap; - private final BidiMap uriMap; // start at 0 to make sure functionAnchors start with 1 according to spec private int counter = 0; @@ -26,7 +25,6 @@ public ExtensionCollector() { super(new HashMap<>(), new HashMap<>()); funcMap = new BidiMap<>(functionAnchorMap); typeMap = new BidiMap<>(typeAnchorMap); - uriMap = new BidiMap<>(new HashMap<>()); } public int getFunctionReference(SimpleExtension.Function declaration) { diff --git a/core/src/main/java/io/substrait/extension/ImmutableExtensionLookup.java b/core/src/main/java/io/substrait/extension/ImmutableExtensionLookup.java index 3a9ae17f6..6ac4fe922 100644 --- a/core/src/main/java/io/substrait/extension/ImmutableExtensionLookup.java +++ b/core/src/main/java/io/substrait/extension/ImmutableExtensionLookup.java @@ -15,8 +15,6 @@ */ public class ImmutableExtensionLookup extends AbstractExtensionLookup { - private int counter = -1; - private ImmutableExtensionLookup( Map functionMap, Map typeMap) { diff --git a/core/src/main/java/io/substrait/extension/SimpleExtension.java b/core/src/main/java/io/substrait/extension/SimpleExtension.java index 9f7d64e6b..3cd658e3d 100644 --- a/core/src/main/java/io/substrait/extension/SimpleExtension.java +++ b/core/src/main/java/io/substrait/extension/SimpleExtension.java @@ -303,8 +303,6 @@ public static String constructKey(String name, List arguments) { public Util.IntRange getRange() { // end range is exclusive so add one to size. - - long optionalCount = args().stream().filter(t -> !t.required()).count(); int max = variadic() .map( diff --git a/core/src/main/java/io/substrait/relation/ProtoRelConverter.java b/core/src/main/java/io/substrait/relation/ProtoRelConverter.java index 37b45d9ce..9ea7511bf 100644 --- a/core/src/main/java/io/substrait/relation/ProtoRelConverter.java +++ b/core/src/main/java/io/substrait/relation/ProtoRelConverter.java @@ -1,7 +1,6 @@ package io.substrait.relation; import io.substrait.expression.Expression; -import io.substrait.expression.FunctionArg; import io.substrait.expression.proto.ProtoExpressionConverter; import io.substrait.extension.AdvancedExtension; import io.substrait.extension.ExtensionLookup; @@ -42,7 +41,6 @@ import java.util.List; import java.util.Optional; import java.util.stream.Collectors; -import java.util.stream.IntStream; /** Converts from {@link io.substrait.proto.Rel} to {@link io.substrait.relation.Rel} */ public class ProtoRelConverter { @@ -633,15 +631,7 @@ protected Aggregate newAggregate(AggregateRel rel) { .build()); } List measures = new ArrayList<>(rel.getMeasuresCount()); - FunctionArg.ProtoFrom pF = new FunctionArg.ProtoFrom(protoExprConverter, protoTypeConverter); for (AggregateRel.Measure measure : rel.getMeasuresList()) { - io.substrait.proto.AggregateFunction func = measure.getMeasure(); - SimpleExtension.AggregateFunctionVariant funcDecl = - lookup.getAggregateFunction(func.getFunctionReference(), extensions); - List args = - IntStream.range(0, measure.getMeasure().getArgumentsCount()) - .mapToObj(i -> pF.convert(funcDecl, i, measure.getMeasure().getArguments(i))) - .collect(java.util.stream.Collectors.toList()); measures.add( Aggregate.Measure.builder() .function(protoAggrFuncConverter.from(measure.getMeasure())) diff --git a/core/src/main/java/io/substrait/type/proto/ParameterizedProtoConverter.java b/core/src/main/java/io/substrait/type/proto/ParameterizedProtoConverter.java index 0265f4722..0c6d30d34 100644 --- a/core/src/main/java/io/substrait/type/proto/ParameterizedProtoConverter.java +++ b/core/src/main/java/io/substrait/type/proto/ParameterizedProtoConverter.java @@ -152,12 +152,6 @@ protected ParameterizedType.IntegerOption i(int len) { return ParameterizedType.IntegerOption.newBuilder().setLiteral(len).build(); } - private static ParameterizedType.IntegerOption i(String param) { - return ParameterizedType.IntegerOption.newBuilder() - .setParameter(ParameterizedType.IntegerParameter.newBuilder().setName(param)) - .build(); - } - public ParameterizedType varChar(ParameterizedType.IntegerOption len) { return wrap( ParameterizedType.ParameterizedVarChar.newBuilder() diff --git a/core/src/test/java/io/substrait/type/parser/TestTypeParser.java b/core/src/test/java/io/substrait/type/parser/TestTypeParser.java index 90e8c964a..03fc2989b 100644 --- a/core/src/test/java/io/substrait/type/parser/TestTypeParser.java +++ b/core/src/test/java/io/substrait/type/parser/TestTypeParser.java @@ -14,7 +14,6 @@ public class TestTypeParser { private final TypeCreator r = TypeCreator.REQUIRED; private final TypeExpressionCreator eo = TypeExpressionCreator.REQUIRED; - private final TypeExpressionCreator en = TypeExpressionCreator.NULLABLE; private final ParameterizedTypeCreator pr = ParameterizedTypeCreator.REQUIRED; private final ParameterizedTypeCreator pn = ParameterizedTypeCreator.NULLABLE; diff --git a/isthmus/src/main/java/io/substrait/isthmus/SubstraitRelNodeConverter.java b/isthmus/src/main/java/io/substrait/isthmus/SubstraitRelNodeConverter.java index 804244c22..29fd3247a 100644 --- a/isthmus/src/main/java/io/substrait/isthmus/SubstraitRelNodeConverter.java +++ b/isthmus/src/main/java/io/substrait/isthmus/SubstraitRelNodeConverter.java @@ -499,15 +499,6 @@ private RelNode applyRemap(RelNode relNode, Rel.Remap remap) { return relBuilder.push(relNode).project(rexList).build(); } - private void checkRexInputRefOnly(RexNode rexNode, String context, String aggName) { - if (!(rexNode instanceof RexInputRef)) { - throw new UnsupportedOperationException( - String.format( - "Compound expression %s in %s of agg function %s is not implemented yet.", - rexNode, context, aggName)); - } - } - public static class Context implements VisitationContext { public static Context newContext() { return new Context(); diff --git a/isthmus/src/main/java/io/substrait/isthmus/expression/FunctionMatch.java b/isthmus/src/main/java/io/substrait/isthmus/expression/FunctionMatch.java deleted file mode 100644 index eec0f28b2..000000000 --- a/isthmus/src/main/java/io/substrait/isthmus/expression/FunctionMatch.java +++ /dev/null @@ -1,30 +0,0 @@ -package io.substrait.isthmus.expression; - -import org.apache.calcite.sql.SqlOperator; -import org.apache.calcite.sql.fun.SqlStdOperatorTable; - -public class FunctionMatch { - - public static void load() { - - Matcher m = - new Matcher() { - - { - m("add", SqlStdOperatorTable.SUM); - m("avg", SqlStdOperatorTable.AVG); - m("count", SqlStdOperatorTable.COUNT); - m("+", SqlStdOperatorTable.PLUS); - m("+", SqlStdOperatorTable.DATETIME_PLUS); - m("-", SqlStdOperatorTable.MINUS); - m("*", SqlStdOperatorTable.MULTIPLY); - m("/", SqlStdOperatorTable.DIVIDE); - } - }; - } - - static class Matcher { - - void m(String functionName, SqlOperator calciteOperator) {} - } -} diff --git a/isthmus/src/main/java/io/substrait/isthmus/expression/ListSqlOperatorFunctions.java b/isthmus/src/main/java/io/substrait/isthmus/expression/ListSqlOperatorFunctions.java index 713b26037..90a4f67f1 100644 --- a/isthmus/src/main/java/io/substrait/isthmus/expression/ListSqlOperatorFunctions.java +++ b/isthmus/src/main/java/io/substrait/isthmus/expression/ListSqlOperatorFunctions.java @@ -26,12 +26,7 @@ public static void main(String[] args) { return false; } - try { - SqlOperator op = (SqlOperator) f.get(null); - return true; - } catch (IllegalAccessException e) { - throw new RuntimeException(e); - } + return true; }) .filter(f -> Modifier.isStatic(f.getModifiers()) && Modifier.isPublic(f.getModifiers())) .collect(Collectors.toMap(Field::getName, ListSqlOperatorFunctions::toOp)); diff --git a/isthmus/src/main/java/io/substrait/isthmus/expression/LiteralConverter.java b/isthmus/src/main/java/io/substrait/isthmus/expression/LiteralConverter.java index 2a0e50395..a6392c02c 100644 --- a/isthmus/src/main/java/io/substrait/isthmus/expression/LiteralConverter.java +++ b/isthmus/src/main/java/io/substrait/isthmus/expression/LiteralConverter.java @@ -50,23 +50,6 @@ public LiteralConverter(TypeConverter typeConverter) { .append(CALCITE_LOCAL_TIME_FORMATTER) .toFormatter(); - private static final DateTimeFormatter CALCITE_TIMESTAMP_WITH_ZONE_FORMATTER = - new DateTimeFormatterBuilder() - .parseCaseInsensitive() - .append(CALCITE_LOCAL_DATE_FORMATTER) - .appendLiteral(' ') - .append(CALCITE_LOCAL_TIME_FORMATTER) - .appendLiteral(' ') - .appendZoneId() - .toFormatter(); - - private static final ZoneOffset SYSTEM_TIMEZONE = - OffsetDateTime.now(ZoneId.systemDefault()).getOffset(); - - private Expression nullOf(RexLiteral literal) { - return null; - } - private static BigDecimal i(RexLiteral literal) { return bd(literal).setScale(0, RoundingMode.HALF_UP); }