dawidwys commented on code in PR #24219: URL: https://github.com/apache/flink/pull/24219#discussion_r1511101924
########## flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/testutils/RestoreTestCompleteness.java: ########## @@ -0,0 +1,129 @@ +/* + * 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.planner.plan.nodes.exec.testutils; + +import org.apache.flink.table.planner.plan.nodes.exec.ExecNode; +import org.apache.flink.table.planner.plan.nodes.exec.stream.StreamExecDropUpdateBefore; +import org.apache.flink.table.planner.plan.nodes.exec.stream.StreamExecExchange; +import org.apache.flink.table.planner.plan.nodes.exec.stream.StreamExecGlobalGroupAggregate; +import org.apache.flink.table.planner.plan.nodes.exec.stream.StreamExecGlobalWindowAggregate; +import org.apache.flink.table.planner.plan.nodes.exec.stream.StreamExecLocalGroupAggregate; +import org.apache.flink.table.planner.plan.nodes.exec.stream.StreamExecLocalWindowAggregate; +import org.apache.flink.table.planner.plan.nodes.exec.stream.StreamExecOverAggregate; +import org.apache.flink.table.planner.plan.nodes.exec.stream.StreamExecPythonCalc; +import org.apache.flink.table.planner.plan.nodes.exec.stream.StreamExecPythonCorrelate; +import org.apache.flink.table.planner.plan.nodes.exec.stream.StreamExecPythonGroupAggregate; +import org.apache.flink.table.planner.plan.nodes.exec.stream.StreamExecPythonGroupTableAggregate; +import org.apache.flink.table.planner.plan.nodes.exec.stream.StreamExecPythonGroupWindowAggregate; +import org.apache.flink.table.planner.plan.nodes.exec.stream.StreamExecPythonOverAggregate; +import org.apache.flink.table.planner.plan.nodes.exec.stream.StreamExecWindowAggregate; +import org.apache.flink.table.planner.plan.utils.ExecNodeMetadataUtil; +import org.apache.flink.table.planner.plan.utils.ExecNodeMetadataUtil.ExecNodeNameVersion; + +import org.apache.flink.shaded.guava31.com.google.common.reflect.ClassPath; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +import java.io.IOException; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; + +/** Validate restore tests exists for Exec Nodes. */ +public class RestoreTestCompleteness { + + private static final Set<Class<? extends ExecNode<?>>> SKIP_EXEC_NODES = + new HashSet<Class<? extends ExecNode<?>>>() { + { + /** Covered with {@link StreamExecGroupAggregate}. */ + add(StreamExecExchange.class); + + /** Covered with {@link StreamExecIncrementalGroupAggregate}. */ + add(StreamExecLocalGroupAggregate.class); + add(StreamExecGlobalGroupAggregate.class); + + /** Covered with {@link StreamExecWindowAggregate}. */ + add(StreamExecLocalWindowAggregate.class); + add(StreamExecGlobalWindowAggregate.class); + + /** Covered with {@link StreamExecChangelogNormalize}. */ + add(StreamExecDropUpdateBefore.class); + + /** TODO: Remove after FLINK-33676 is merged. */ + add(StreamExecWindowAggregate.class); + + /** TODO: Remove after FLINK-33805 is merged. */ + add(StreamExecOverAggregate.class); + + /** Ignoring python based exec nodes temporarily. */ + add(StreamExecPythonCalc.class); + add(StreamExecPythonCorrelate.class); + add(StreamExecPythonOverAggregate.class); + add(StreamExecPythonGroupAggregate.class); + add(StreamExecPythonGroupTableAggregate.class); + add(StreamExecPythonGroupWindowAggregate.class); + } + }; + + @Test + public void testMissingRestoreTest() + throws IOException, NoSuchMethodException, InstantiationException, + IllegalAccessException, InvocationTargetException { + Map<ExecNodeNameVersion, Class<? extends ExecNode<?>>> versionedExecNodes = + ExecNodeMetadataUtil.getVersionedExecNodes(); + + Set<ClassPath.ClassInfo> classesInPackage = + ClassPath.from(this.getClass().getClassLoader()) + .getTopLevelClassesRecursive( + "org.apache.flink.table.planner.plan.nodes.exec.stream") + .stream() + .filter(x -> x.getSimpleName().contains("RestoreTest")) Review Comment: Is it possible to rather check if classes extend from `RestoreTestBase`? ########## flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/testutils/RestoreTestCompleteness.java: ########## @@ -0,0 +1,129 @@ +/* + * 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.planner.plan.nodes.exec.testutils; + +import org.apache.flink.table.planner.plan.nodes.exec.ExecNode; +import org.apache.flink.table.planner.plan.nodes.exec.stream.StreamExecDropUpdateBefore; +import org.apache.flink.table.planner.plan.nodes.exec.stream.StreamExecExchange; +import org.apache.flink.table.planner.plan.nodes.exec.stream.StreamExecGlobalGroupAggregate; +import org.apache.flink.table.planner.plan.nodes.exec.stream.StreamExecGlobalWindowAggregate; +import org.apache.flink.table.planner.plan.nodes.exec.stream.StreamExecLocalGroupAggregate; +import org.apache.flink.table.planner.plan.nodes.exec.stream.StreamExecLocalWindowAggregate; +import org.apache.flink.table.planner.plan.nodes.exec.stream.StreamExecOverAggregate; +import org.apache.flink.table.planner.plan.nodes.exec.stream.StreamExecPythonCalc; +import org.apache.flink.table.planner.plan.nodes.exec.stream.StreamExecPythonCorrelate; +import org.apache.flink.table.planner.plan.nodes.exec.stream.StreamExecPythonGroupAggregate; +import org.apache.flink.table.planner.plan.nodes.exec.stream.StreamExecPythonGroupTableAggregate; +import org.apache.flink.table.planner.plan.nodes.exec.stream.StreamExecPythonGroupWindowAggregate; +import org.apache.flink.table.planner.plan.nodes.exec.stream.StreamExecPythonOverAggregate; +import org.apache.flink.table.planner.plan.nodes.exec.stream.StreamExecWindowAggregate; +import org.apache.flink.table.planner.plan.utils.ExecNodeMetadataUtil; +import org.apache.flink.table.planner.plan.utils.ExecNodeMetadataUtil.ExecNodeNameVersion; + +import org.apache.flink.shaded.guava31.com.google.common.reflect.ClassPath; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +import java.io.IOException; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; + +/** Validate restore tests exists for Exec Nodes. */ +public class RestoreTestCompleteness { + + private static final Set<Class<? extends ExecNode<?>>> SKIP_EXEC_NODES = + new HashSet<Class<? extends ExecNode<?>>>() { + { + /** Covered with {@link StreamExecGroupAggregate}. */ + add(StreamExecExchange.class); + + /** Covered with {@link StreamExecIncrementalGroupAggregate}. */ + add(StreamExecLocalGroupAggregate.class); + add(StreamExecGlobalGroupAggregate.class); + + /** Covered with {@link StreamExecWindowAggregate}. */ + add(StreamExecLocalWindowAggregate.class); + add(StreamExecGlobalWindowAggregate.class); Review Comment: WDYT, about rather extending the `RestoreTestBase` to accept a list of nodes under test? ########## flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/testutils/RestoreTestCompleteness.java: ########## @@ -0,0 +1,129 @@ +/* + * 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.planner.plan.nodes.exec.testutils; + +import org.apache.flink.table.planner.plan.nodes.exec.ExecNode; +import org.apache.flink.table.planner.plan.nodes.exec.stream.StreamExecDropUpdateBefore; +import org.apache.flink.table.planner.plan.nodes.exec.stream.StreamExecExchange; +import org.apache.flink.table.planner.plan.nodes.exec.stream.StreamExecGlobalGroupAggregate; +import org.apache.flink.table.planner.plan.nodes.exec.stream.StreamExecGlobalWindowAggregate; +import org.apache.flink.table.planner.plan.nodes.exec.stream.StreamExecLocalGroupAggregate; +import org.apache.flink.table.planner.plan.nodes.exec.stream.StreamExecLocalWindowAggregate; +import org.apache.flink.table.planner.plan.nodes.exec.stream.StreamExecOverAggregate; +import org.apache.flink.table.planner.plan.nodes.exec.stream.StreamExecPythonCalc; +import org.apache.flink.table.planner.plan.nodes.exec.stream.StreamExecPythonCorrelate; +import org.apache.flink.table.planner.plan.nodes.exec.stream.StreamExecPythonGroupAggregate; +import org.apache.flink.table.planner.plan.nodes.exec.stream.StreamExecPythonGroupTableAggregate; +import org.apache.flink.table.planner.plan.nodes.exec.stream.StreamExecPythonGroupWindowAggregate; +import org.apache.flink.table.planner.plan.nodes.exec.stream.StreamExecPythonOverAggregate; +import org.apache.flink.table.planner.plan.nodes.exec.stream.StreamExecWindowAggregate; +import org.apache.flink.table.planner.plan.utils.ExecNodeMetadataUtil; +import org.apache.flink.table.planner.plan.utils.ExecNodeMetadataUtil.ExecNodeNameVersion; + +import org.apache.flink.shaded.guava31.com.google.common.reflect.ClassPath; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +import java.io.IOException; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; + +/** Validate restore tests exists for Exec Nodes. */ +public class RestoreTestCompleteness { + + private static final Set<Class<? extends ExecNode<?>>> SKIP_EXEC_NODES = + new HashSet<Class<? extends ExecNode<?>>>() { + { + /** Covered with {@link StreamExecGroupAggregate}. */ + add(StreamExecExchange.class); + + /** Covered with {@link StreamExecIncrementalGroupAggregate}. */ + add(StreamExecLocalGroupAggregate.class); + add(StreamExecGlobalGroupAggregate.class); + + /** Covered with {@link StreamExecWindowAggregate}. */ + add(StreamExecLocalWindowAggregate.class); + add(StreamExecGlobalWindowAggregate.class); + + /** Covered with {@link StreamExecChangelogNormalize}. */ + add(StreamExecDropUpdateBefore.class); + + /** TODO: Remove after FLINK-33676 is merged. */ + add(StreamExecWindowAggregate.class); + + /** TODO: Remove after FLINK-33805 is merged. */ + add(StreamExecOverAggregate.class); + + /** Ignoring python based exec nodes temporarily. */ + add(StreamExecPythonCalc.class); + add(StreamExecPythonCorrelate.class); + add(StreamExecPythonOverAggregate.class); + add(StreamExecPythonGroupAggregate.class); + add(StreamExecPythonGroupTableAggregate.class); + add(StreamExecPythonGroupWindowAggregate.class); + } + }; + + @Test + public void testMissingRestoreTest() + throws IOException, NoSuchMethodException, InstantiationException, + IllegalAccessException, InvocationTargetException { + Map<ExecNodeNameVersion, Class<? extends ExecNode<?>>> versionedExecNodes = + ExecNodeMetadataUtil.getVersionedExecNodes(); + + Set<ClassPath.ClassInfo> classesInPackage = + ClassPath.from(this.getClass().getClassLoader()) + .getTopLevelClassesRecursive( + "org.apache.flink.table.planner.plan.nodes.exec.stream") + .stream() + .filter(x -> x.getSimpleName().contains("RestoreTest")) + .collect(Collectors.toSet()); + + Set<Class<? extends ExecNode<?>>> execNodesWithRestoreTests = new HashSet<>(); + + for (ClassPath.ClassInfo classInfo : classesInPackage) { + Class<?> restoreTest = classInfo.load(); + Method getExecNodeMethod = restoreTest.getMethod("getExecNode"); + Class<? extends ExecNode<?>> execNode = + (Class<? extends ExecNode<?>>) + getExecNodeMethod.invoke( + restoreTest.getDeclaredConstructor().newInstance()); + execNodesWithRestoreTests.add(execNode); + } + + for (Map.Entry<ExecNodeNameVersion, Class<? extends ExecNode<?>>> entry : + versionedExecNodes.entrySet()) { + ExecNodeNameVersion execNodeNameVersion = entry.getKey(); + Class<? extends ExecNode<?>> execNode = entry.getValue(); + if (!SKIP_EXEC_NODES.contains(execNode)) { + final String msg = + "Missing restore test for " + + execNodeNameVersion Review Comment: Is it fine that both the version and the exec node are part of the msg? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: issues-unsubscr...@flink.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
