[hotfix] Introduce InputTypeStrategies#repeatingSequence
diff --git a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/types/inference/InputTypeStrategies.java b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/types/inference/InputTypeStrategies.java
index 3689e6f..a9d1251 100644
--- a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/types/inference/InputTypeStrategies.java
+++ b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/types/inference/InputTypeStrategies.java
@@ -34,6 +34,7 @@
import org.apache.flink.table.types.inference.strategies.OrArgumentTypeStrategy;
import org.apache.flink.table.types.inference.strategies.OrInputTypeStrategy;
import org.apache.flink.table.types.inference.strategies.OutputArgumentTypeStrategy;
+import org.apache.flink.table.types.inference.strategies.RepeatingSequenceInputTypeStrategy;
import org.apache.flink.table.types.inference.strategies.RootArgumentTypeStrategy;
import org.apache.flink.table.types.inference.strategies.SequenceInputTypeStrategy;
import org.apache.flink.table.types.inference.strategies.SubsequenceInputTypeStrategy.SubsequenceStrategyBuilder;
@@ -107,6 +108,11 @@
Arrays.asList(strategies), Arrays.asList(argumentNames));
}
+ /** Arbitrarily often repeating sequence of argument type strategies. */
+ public static InputTypeStrategy repeatingSequence(ArgumentTypeStrategy... strategies) {
+ return new RepeatingSequenceInputTypeStrategy(Arrays.asList(strategies));
+ }
+
/**
* Strategy for a function signature of explicitly defined types like {@code f(STRING, INT)}.
* Implicit casts will be inserted if possible.
diff --git a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/types/inference/strategies/RepeatingSequenceInputTypeStrategy.java b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/types/inference/strategies/RepeatingSequenceInputTypeStrategy.java
new file mode 100644
index 0000000..41b88bd
--- /dev/null
+++ b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/types/inference/strategies/RepeatingSequenceInputTypeStrategy.java
@@ -0,0 +1,125 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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 org.apache.flink.table.types.inference.strategies;
+
+import org.apache.flink.annotation.Internal;
+import org.apache.flink.table.functions.FunctionDefinition;
+import org.apache.flink.table.types.DataType;
+import org.apache.flink.table.types.inference.ArgumentCount;
+import org.apache.flink.table.types.inference.ArgumentTypeStrategy;
+import org.apache.flink.table.types.inference.CallContext;
+import org.apache.flink.table.types.inference.InputTypeStrategy;
+import org.apache.flink.table.types.inference.Signature;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+
+/**
+ * {@link InputTypeStrategy} composed of an arbitrarily often repeating list of {@link
+ * ArgumentTypeStrategy}s.
+ */
+@Internal
+public class RepeatingSequenceInputTypeStrategy implements InputTypeStrategy {
+
+ private final List<ArgumentTypeStrategy> argumentStrategies;
+
+ public RepeatingSequenceInputTypeStrategy(List<ArgumentTypeStrategy> argumentStrategies) {
+ this.argumentStrategies = argumentStrategies;
+ }
+
+ @Override
+ public ArgumentCount getArgumentCount() {
+ return new ArgumentCount() {
+ @Override
+ public boolean isValidCount(int count) {
+ return count % argumentStrategies.size() == 0;
+ }
+
+ @Override
+ public Optional<Integer> getMinCount() {
+ return Optional.empty();
+ }
+
+ @Override
+ public Optional<Integer> getMaxCount() {
+ return Optional.empty();
+ }
+ };
+ }
+
+ @Override
+ public Optional<List<DataType>> inferInputTypes(
+ CallContext callContext, boolean throwOnFailure) {
+ final List<DataType> dataTypes = callContext.getArgumentDataTypes();
+ final List<DataType> inferredDataTypes = new ArrayList<>(dataTypes.size());
+
+ for (int i = 0; i < callContext.getArgumentDataTypes().size(); i++) {
+ final ArgumentTypeStrategy argumentStrategy =
+ argumentStrategies.get(i % argumentStrategies.size());
+
+ final Optional<DataType> inferredDataType =
+ argumentStrategy.inferArgumentType(callContext, i, throwOnFailure);
+ if (!inferredDataType.isPresent()) {
+ return Optional.empty();
+ }
+
+ inferredDataTypes.add(inferredDataType.get());
+ }
+
+ return Optional.of(inferredDataTypes);
+ }
+
+ @Override
+ public List<Signature> getExpectedSignatures(FunctionDefinition definition) {
+ final List<Signature.Argument> arguments = new ArrayList<>();
+ for (int i = 0; i < argumentStrategies.size(); i++) {
+ final Signature.Argument argument =
+ argumentStrategies.get(i).getExpectedArgument(definition, i);
+ arguments.add(argument);
+ }
+
+ // Unfortunately there is no way to represent the repetition in the signature
+ final Signature signature = Signature.of(arguments);
+ return Collections.singletonList(signature);
+ }
+
+ // ---------------------------------------------------------------------------------------------
+
+ @Override
+ public boolean equals(Object other) {
+ if (this == other) {
+ return true;
+ }
+
+ if (other == null || getClass() != other.getClass()) {
+ return false;
+ }
+
+ final RepeatingSequenceInputTypeStrategy that = (RepeatingSequenceInputTypeStrategy) other;
+ return Objects.equals(argumentStrategies, that.argumentStrategies);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(argumentStrategies);
+ }
+}
diff --git a/flink-table/flink-table-common/src/test/java/org/apache/flink/table/types/inference/strategies/RepeatingSequenceInputTypeStrategyTest.java b/flink-table/flink-table-common/src/test/java/org/apache/flink/table/types/inference/strategies/RepeatingSequenceInputTypeStrategyTest.java
new file mode 100644
index 0000000..5941d49
--- /dev/null
+++ b/flink-table/flink-table-common/src/test/java/org/apache/flink/table/types/inference/strategies/RepeatingSequenceInputTypeStrategyTest.java
@@ -0,0 +1,64 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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 org.apache.flink.table.types.inference.strategies;
+
+import org.apache.flink.table.types.inference.InputTypeStrategiesTestBase;
+
+import org.junit.runners.Parameterized;
+
+import java.util.List;
+
+import static java.util.Arrays.asList;
+import static org.apache.flink.table.api.DataTypes.INT;
+import static org.apache.flink.table.api.DataTypes.STRING;
+import static org.apache.flink.table.types.inference.InputTypeStrategies.explicit;
+import static org.apache.flink.table.types.inference.InputTypeStrategies.repeatingSequence;
+
+/** Tests for {@link RepeatingSequenceInputTypeStrategy}. */
+public class RepeatingSequenceInputTypeStrategyTest extends InputTypeStrategiesTestBase {
+
+ @Parameterized.Parameters(name = "{index}: {0}")
+ public static List<TestSpec> testData() {
+ return asList(
+ TestSpec.forStrategy(
+ "Single occurrence",
+ repeatingSequence(explicit(INT()), explicit(STRING())))
+ .calledWithArgumentTypes(INT(), STRING())
+ .expectArgumentTypes(INT(), STRING()),
+ TestSpec.forStrategy(
+ "Multiple occurrences",
+ repeatingSequence(explicit(INT()), explicit(STRING())))
+ .calledWithArgumentTypes(INT(), STRING(), INT(), STRING(), INT(), STRING())
+ .expectArgumentTypes(INT(), STRING(), INT(), STRING(), INT(), STRING()),
+ TestSpec.forStrategy(
+ "Incorrect order of sequence",
+ repeatingSequence(explicit(INT()), explicit(STRING())))
+ .calledWithArgumentTypes(STRING(), INT())
+ .expectErrorMessage(
+ String.format(
+ "Invalid input arguments. Expected signatures are:%nf(INT, STRING)")),
+ TestSpec.forStrategy(
+ "Incorrect number of arguments",
+ repeatingSequence(explicit(INT()), explicit(STRING())))
+ .calledWithArgumentTypes(INT())
+ .expectErrorMessage(
+ String.format(
+ "Invalid input arguments. Expected signatures are:%nf(INT, STRING)")));
+ }
+}
