test: move find_in_set coverage to string extras

Author: 2010YOUY01

datafusion/sqllogictest/test_files/string/README.md

@@ -35,8 +35,13 @@ string/
     - large_string.slt          // the entrypoint for large_string type
     - string_view.slt           // the entrypoint for string_view type and the string_view specific tests
     - string_literal.slt        // the tests for string literal
+    - string_extra.slt          // tests that need custom data or table setup
 ```
 
+The type-based entry point files run common setup for all tests, which makes
+additional per-test data or table setup harder to add. Tests that need custom
+setup should be placed in `string_extra.slt`.
+
 ## Pattern for Test Entry Point Files
 
 Any entry point file should include `init_data.slt.part` and `string_query.slt.part`.

datafusion/sqllogictest/test_files/string/string_extra.slt

@@ -0,0 +1,76 @@
+# 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.
+
+# Type-based string entry points run common setup for all tests, which makes
+# custom per-test data or table setup harder to add. Such tests belong here.
+
+# find_in_set with an array on the left and a literal on the right
+query III
+SELECT
+  find_in_set(arrow_cast(column1, 'Utf8'), arrow_cast('a,b,c', 'Utf8')),
+  find_in_set(arrow_cast(column1, 'LargeUtf8'), arrow_cast('a,b,c', 'LargeUtf8')),
+  find_in_set(arrow_cast(column1, 'Utf8View'), arrow_cast('a,b,c', 'Utf8View'))
+FROM (VALUES ('b'), ('x'), (NULL)) AS t(column1);
+----
+2 2 2
+0 0 0
+NULL NULL NULL
+
+# find_in_set with a literal on the left and an array on the right
+query III
+SELECT
+  find_in_set(arrow_cast('b', 'Utf8'), arrow_cast(column1, 'Utf8')),
+  find_in_set(arrow_cast('b', 'LargeUtf8'), arrow_cast(column1, 'LargeUtf8')),
+  find_in_set(arrow_cast('b', 'Utf8View'), arrow_cast(column1, 'Utf8View'))
+FROM (VALUES ('a,b,c'), ('x,y'), (NULL)) AS t(column1);
+----
+2 2 2
+0 0 0
+NULL NULL NULL
+
+# find_in_set with arrays on both sides
+query III
+SELECT
+  find_in_set(arrow_cast(column1, 'Utf8'), arrow_cast(column2, 'Utf8')),
+  find_in_set(arrow_cast(column1, 'LargeUtf8'), arrow_cast(column2, 'LargeUtf8')),
+  find_in_set(arrow_cast(column1, 'Utf8View'), arrow_cast(column2, 'Utf8View'))
+FROM (VALUES ('b', 'a,b,c'), ('x', 'x,y'), (NULL, 'a,b'), ('a', NULL)) AS t(column1, column2);
+----
+2 2 2
+1 1 1
+NULL NULL NULL
+NULL NULL NULL
+
+# null literals paired with arrays
+query II
+SELECT
+  find_in_set(arrow_cast(column1, 'Utf8'), arrow_cast(NULL, 'Utf8')),
+  find_in_set(arrow_cast(NULL, 'LargeUtf8'), arrow_cast(column1, 'LargeUtf8'))
+FROM (VALUES ('a,b'), (NULL)) AS t(column1);
+----
+NULL NULL
+NULL NULL
+
+# invalid argument count and type
+query error 'find_in_set' does not support zero arguments
+SELECT find_in_set();
+
+query error No function matches the given name and argument types 'find_in_set\(Utf8\)'
+SELECT find_in_set('a');
+
+query error No function matches the given name and argument types 'find_in_set\(Utf8, Utf8, Utf8\)'
+SELECT find_in_set('a', 'a,b', 'extra');

datafusion/sqllogictest/test_files/string/string_literal.slt

@@ -933,63 +933,6 @@ SELECT find_in_set(arrow_cast('', 'Utf8View'), arrow_cast('a,b,c,d,a', 'Utf8View
 ----
 0
 
-# find_in_set with an array on the left and a literal on the right
-query III
-SELECT
-  find_in_set(arrow_cast(column1, 'Utf8'), arrow_cast('a,b,c', 'Utf8')),
-  find_in_set(arrow_cast(column1, 'LargeUtf8'), arrow_cast('a,b,c', 'LargeUtf8')),
-  find_in_set(arrow_cast(column1, 'Utf8View'), arrow_cast('a,b,c', 'Utf8View'))
-FROM (VALUES ('b'), ('x'), (NULL)) AS t(column1);
-----
-2 2 2
-0 0 0
-NULL NULL NULL
-
-# find_in_set with a literal on the left and an array on the right
-query III
-SELECT
-  find_in_set(arrow_cast('b', 'Utf8'), arrow_cast(column1, 'Utf8')),
-  find_in_set(arrow_cast('b', 'LargeUtf8'), arrow_cast(column1, 'LargeUtf8')),
-  find_in_set(arrow_cast('b', 'Utf8View'), arrow_cast(column1, 'Utf8View'))
-FROM (VALUES ('a,b,c'), ('x,y'), (NULL)) AS t(column1);
-----
-2 2 2
-0 0 0
-NULL NULL NULL
-
-# find_in_set with arrays on both sides
-query III
-SELECT
-  find_in_set(arrow_cast(column1, 'Utf8'), arrow_cast(column2, 'Utf8')),
-  find_in_set(arrow_cast(column1, 'LargeUtf8'), arrow_cast(column2, 'LargeUtf8')),
-  find_in_set(arrow_cast(column1, 'Utf8View'), arrow_cast(column2, 'Utf8View'))
-FROM (VALUES ('b', 'a,b,c'), ('x', 'x,y'), (NULL, 'a,b'), ('a', NULL)) AS t(column1, column2);
-----
-2 2 2
-1 1 1
-NULL NULL NULL
-NULL NULL NULL
-
-# null literals paired with arrays
-query II
-SELECT
-  find_in_set(arrow_cast(column1, 'Utf8'), arrow_cast(NULL, 'Utf8')),
-  find_in_set(arrow_cast(NULL, 'LargeUtf8'), arrow_cast(column1, 'LargeUtf8'))
-FROM (VALUES ('a,b'), (NULL)) AS t(column1);
-----
-NULL NULL
-NULL NULL
-
-# invalid argument count and type
-query error DataFusion error:
-SELECT find_in_set();
-
-query error DataFusion error:
-SELECT find_in_set('a');
-
-query error DataFusion error:
-SELECT find_in_set('a', 'a,b', 'extra');
-
 
 query T
 SELECT split_part('foo_bar', '_', 2)