Throw data_type_error for invalid dtype in conditional/mixed joins

rapidsai · Nov 4, 2024 · 88f7a08 · 88f7a08
1 parent e471ba7
commit 88f7a08
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 35 deletions.
diff --git a/cpp/include/cudf/join.hpp b/cpp/include/cudf/join.hpp
@@ -573,7 +573,7 @@ class distinct_hash_join {
  * Result: {{1}, {0}}
  * @endcode
  *
- * @throw cudf::logic_error if the binary predicate outputs a non-boolean result.
+ * @throw cudf::data_type_error if the binary predicate outputs a non-boolean result.
  *
  * @param left The left table
  * @param right The right table
@@ -620,7 +620,7 @@ conditional_inner_join(table_view const& left,
  * Result: {{0, 1, 2}, {None, 0, None}}
  * @endcode
  *
- * @throw cudf::logic_error if the binary predicate outputs a non-boolean result.
+ * @throw cudf::data_type_error if the binary predicate outputs a non-boolean result.
  *
  * @param left The left table
  * @param right The right table
@@ -666,7 +666,7 @@ conditional_left_join(table_view const& left,
  * Result: {{0, 1, 2, None, None}, {None, 0, None, 1, 2}}
  * @endcode
  *
- * @throw cudf::logic_error if the binary predicate outputs a non-boolean result.
+ * @throw cudf::data_type_error if the binary predicate outputs a non-boolean result.
  *
  * @param left The left table
  * @param right The right table
@@ -705,7 +705,7 @@ conditional_full_join(table_view const& left,
  * Result: {1}
  * @endcode
  *
- * @throw cudf::logic_error if the binary predicate outputs a non-boolean result.
+ * @throw cudf::data_type_error if the binary predicate outputs a non-boolean result.
  *
  * @param left The left table
  * @param right The right table
@@ -746,7 +746,7 @@ std::unique_ptr<rmm::device_uvector<size_type>> conditional_left_semi_join(
  * Result: {0, 2}
  * @endcode
  *
- * @throw cudf::logic_error if the binary predicate outputs a non-boolean result.
+ * @throw cudf::data_type_error if the binary predicate outputs a non-boolean result.
  *
  * @param left The left table
  * @param right The right table
@@ -793,7 +793,7 @@ std::unique_ptr<rmm::device_uvector<size_type>> conditional_left_anti_join(
  * Result: {{1}, {0}}
  * @endcode
  *
- * @throw cudf::logic_error If the binary predicate outputs a non-boolean result.
+ * @throw cudf::data_type_error If the binary predicate outputs a non-boolean result.
  * @throw cudf::logic_error If the number of rows in left_equality and left_conditional do not
  * match.
  * @throw cudf::logic_error If the number of rows in right_equality and right_conditional do not
@@ -855,7 +855,7 @@ mixed_inner_join(
  * Result: {{0, 1, 2}, {None, 0, None}}
  * @endcode
  *
- * @throw cudf::logic_error If the binary predicate outputs a non-boolean result.
+ * @throw cudf::data_type_error If the binary predicate outputs a non-boolean result.
  * @throw cudf::logic_error If the number of rows in left_equality and left_conditional do not
  * match.
  * @throw cudf::logic_error If the number of rows in right_equality and right_conditional do not
@@ -917,7 +917,7 @@ mixed_left_join(
  * Result: {{0, 1, 2, None, None}, {None, 0, None, 1, 2}}
  * @endcode
  *
- * @throw cudf::logic_error If the binary predicate outputs a non-boolean result.
+ * @throw cudf::data_type_error If the binary predicate outputs a non-boolean result.
  * @throw cudf::logic_error If the number of rows in left_equality and left_conditional do not
  * match.
  * @throw cudf::logic_error If the number of rows in right_equality and right_conditional do not
@@ -972,7 +972,7 @@ mixed_full_join(
  * Result: {1}
  * @endcode
  *
- * @throw cudf::logic_error If the binary predicate outputs a non-boolean result.
+ * @throw cudf::data_type_error If the binary predicate outputs a non-boolean result.
  * @throw cudf::logic_error If the number of rows in left_equality and left_conditional do not
  * match.
  * @throw cudf::logic_error If the number of rows in right_equality and right_conditional do not
@@ -1022,7 +1022,7 @@ std::unique_ptr<rmm::device_uvector<size_type>> mixed_left_semi_join(
  * Result: {0, 2}
  * @endcode
  *
- * @throw cudf::logic_error If the binary predicate outputs a non-boolean result.
+ * @throw cudf::data_type_error If the binary predicate outputs a non-boolean result.
  * @throw cudf::logic_error If the number of rows in left_equality and left_conditional do not
  * match.
  * @throw cudf::logic_error If the number of rows in right_equality and right_conditional do not
@@ -1061,7 +1061,7 @@ std::unique_ptr<rmm::device_uvector<size_type>> mixed_left_anti_join(
  * choose a suitable compare_nulls value AND use appropriate null-safe
  * operators in the expression.
  *
- * @throw cudf::logic_error If the binary predicate outputs a non-boolean result.
+ * @throw cudf::data_type_error If the binary predicate outputs a non-boolean result.
  * @throw cudf::logic_error If the number of rows in left_equality and left_conditional do not
  * match.
  * @throw cudf::logic_error If the number of rows in right_equality and right_conditional do not
@@ -1103,7 +1103,7 @@ std::pair<std::size_t, std::unique_ptr<rmm::device_uvector<size_type>>> mixed_in
  * choose a suitable compare_nulls value AND use appropriate null-safe
  * operators in the expression.
  *
- * @throw cudf::logic_error If the binary predicate outputs a non-boolean result.
+ * @throw cudf::data_type_error If the binary predicate outputs a non-boolean result.
  * @throw cudf::logic_error If the number of rows in left_equality and left_conditional do not
  * match.
  * @throw cudf::logic_error If the number of rows in right_equality and right_conditional do not
@@ -1142,7 +1142,7 @@ std::pair<std::size_t, std::unique_ptr<rmm::device_uvector<size_type>>> mixed_le
  * If the provided predicate returns NULL for a pair of rows
  * (left, right), that pair is not included in the output.
  *
- * @throw cudf::logic_error if the binary predicate outputs a non-boolean result.
+ * @throw cudf::data_type_error if the binary predicate outputs a non-boolean result.
  *
  * @param left The left table
  * @param right The right table
@@ -1167,7 +1167,7 @@ std::size_t conditional_inner_join_size(
  * If the provided predicate returns NULL for a pair of rows
  * (left, right), that pair is not included in the output.
  *
- * @throw cudf::logic_error if the binary predicate outputs a non-boolean result.
+ * @throw cudf::data_type_error if the binary predicate outputs a non-boolean result.
  *
  * @param left The left table
  * @param right The right table
@@ -1192,7 +1192,7 @@ std::size_t conditional_left_join_size(
  * If the provided predicate returns NULL for a pair of rows
  * (left, right), that pair is not included in the output.
  *
- * @throw cudf::logic_error if the binary predicate outputs a non-boolean result.
+ * @throw cudf::data_type_error if the binary predicate outputs a non-boolean result.
  *
  * @param left The left table
  * @param right The right table
@@ -1217,7 +1217,7 @@ std::size_t conditional_left_semi_join_size(
  * If the provided predicate returns NULL for a pair of rows
  * (left, right), that pair is not included in the output.
  *
- * @throw cudf::logic_error if the binary predicate outputs a non-boolean result.
+ * @throw cudf::data_type_error if the binary predicate outputs a non-boolean result.
  *
  * @param left The left table
  * @param right The right table

diff --git a/cpp/src/join/conditional_join.cu b/cpp/src/join/conditional_join.cu
@@ -28,6 +28,7 @@
 #include <cudf/table/table_device_view.cuh>
 #include <cudf/table/table_view.hpp>
 #include <cudf/types.hpp>
+#include <cudf/utilities/error.hpp>
 #include <cudf/utilities/memory_resource.hpp>
 
 #include <rmm/cuda_stream_view.hpp>
@@ -178,7 +179,8 @@ conditional_join(table_view const& left,
   auto const parser =
     ast::detail::expression_parser{binary_predicate, left, right, has_nulls, stream, mr};
   CUDF_EXPECTS(parser.output_type().id() == type_id::BOOL8,
-               "The expression must produce a boolean output.");
+               "The expression must produce a boolean output.",
+               cudf::data_type_error);
 
   auto left_table  = table_device_view::create(left, stream);
   auto right_table = table_device_view::create(right, stream);
@@ -330,7 +332,8 @@ std::size_t compute_conditional_join_output_size(table_view const& left,
   auto const parser =
     ast::detail::expression_parser{binary_predicate, left, right, has_nulls, stream, mr};
   CUDF_EXPECTS(parser.output_type().id() == type_id::BOOL8,
-               "The expression must produce a boolean output.");
+               "The expression must produce a boolean output.",
+               cudf::data_type_error);
 
   auto left_table  = table_device_view::create(left, stream);
   auto right_table = table_device_view::create(right, stream);

diff --git a/cpp/src/join/mixed_join.cu b/cpp/src/join/mixed_join.cu
@@ -28,6 +28,7 @@
 #include <cudf/table/table_device_view.cuh>
 #include <cudf/table/table_view.hpp>
 #include <cudf/types.hpp>
+#include <cudf/utilities/error.hpp>
 #include <cudf/utilities/memory_resource.hpp>
 #include <cudf/utilities/span.hpp>
 
@@ -115,7 +116,8 @@ mixed_join(
   auto const parser = ast::detail::expression_parser{
     binary_predicate, left_conditional, right_conditional, has_nulls, stream, mr};
   CUDF_EXPECTS(parser.output_type().id() == type_id::BOOL8,
-               "The expression must produce a boolean output.");
+               "The expression must produce a boolean output.",
+               cudf::data_type_error);
 
   // TODO: The non-conditional join impls start with a dictionary matching,
   // figure out what that is and what it's needed for (and if conditional joins
@@ -381,7 +383,8 @@ compute_mixed_join_output_size(table_view const& left_equality,
   auto const parser = ast::detail::expression_parser{
     binary_predicate, left_conditional, right_conditional, has_nulls, stream, mr};
   CUDF_EXPECTS(parser.output_type().id() == type_id::BOOL8,
-               "The expression must produce a boolean output.");
+               "The expression must produce a boolean output.",
+               cudf::data_type_error);
 
   // TODO: The non-conditional join impls start with a dictionary matching,
   // figure out what that is and what it's needed for (and if conditional joins

diff --git a/python/pylibcudf/pylibcudf/libcudf/join.pxd b/python/pylibcudf/pylibcudf/libcudf/join.pxd
@@ -6,6 +6,7 @@ from libcpp.memory cimport unique_ptr
 from libcpp.optional cimport optional
 from libcpp.pair cimport pair
 from libcpp.vector cimport vector
+from pylibcudf.exception_handler cimport libcudf_exception_handler
 from pylibcudf.libcudf.column.column cimport column
 from pylibcudf.libcudf.expressions cimport expression
 from pylibcudf.libcudf.table.table cimport table
@@ -82,66 +83,66 @@ cdef extern from "cudf/join.hpp" namespace "cudf" nogil:
         const table_view left,
         const table_view right,
         const expression binary_predicate,
-    ) except +
+    ) except +libcudf_exception_handler
 
     cdef gather_map_pair_type conditional_inner_join(
         const table_view left,
         const table_view right,
         const expression binary_predicate,
         optional[size_t] output_size
-    ) except +
+    ) except +libcudf_exception_handler
 
     cdef gather_map_pair_type conditional_left_join(
         const table_view left,
         const table_view right,
         const expression binary_predicate,
-    ) except +
+    ) except +libcudf_exception_handler
 
     cdef gather_map_pair_type conditional_left_join(
         const table_view left,
         const table_view right,
         const expression binary_predicate,
         optional[size_t] output_size
-    ) except +
+    ) except +libcudf_exception_handler
 
     cdef gather_map_pair_type conditional_full_join(
         const table_view left,
         const table_view right,
         const expression binary_predicate,
-    ) except +
+    ) except +libcudf_exception_handler
 
     cdef gather_map_pair_type conditional_full_join(
         const table_view left,
         const table_view right,
         const expression binary_predicate,
         optional[size_t] output_size
-    ) except +
+    ) except +libcudf_exception_handler
 
     cdef gather_map_type conditional_left_semi_join(
         const table_view left,
         const table_view right,
         const expression binary_predicate,
-    ) except +
+    ) except +libcudf_exception_handler
 
     cdef gather_map_type conditional_left_semi_join(
         const table_view left,
         const table_view right,
         const expression binary_predicate,
         optional[size_t] output_size
-    ) except +
+    ) except +libcudf_exception_handler
 
     cdef gather_map_type conditional_left_anti_join(
         const table_view left,
         const table_view right,
         const expression binary_predicate,
-    ) except +
+    ) except +libcudf_exception_handler
 
     cdef gather_map_type conditional_left_anti_join(
         const table_view left,
         const table_view right,
         const expression binary_predicate,
         optional[size_t] output_size
-    ) except +
+    ) except +libcudf_exception_handler
 
     cdef gather_map_pair_type mixed_inner_join(
         const table_view left_equality,
@@ -150,7 +151,7 @@ cdef extern from "cudf/join.hpp" namespace "cudf" nogil:
         const table_view right_conditional,
         const expression binary_predicate,
         null_equality compare_nulls
-    ) except +
+    ) except +libcudf_exception_handler
 
     cdef gather_map_pair_type mixed_left_join(
         const table_view left_equality,
@@ -159,7 +160,7 @@ cdef extern from "cudf/join.hpp" namespace "cudf" nogil:
         const table_view right_conditional,
         const expression binary_predicate,
         null_equality compare_nulls
-    ) except +
+    ) except +libcudf_exception_handler
 
     cdef gather_map_pair_type mixed_full_join(
         const table_view left_equality,
@@ -168,7 +169,7 @@ cdef extern from "cudf/join.hpp" namespace "cudf" nogil:
         const table_view right_conditional,
         const expression binary_predicate,
         null_equality compare_nulls
-    ) except +
+    ) except +libcudf_exception_handler
 
     cdef gather_map_type mixed_left_semi_join(
         const table_view left_equality,
@@ -177,7 +178,7 @@ cdef extern from "cudf/join.hpp" namespace "cudf" nogil:
         const table_view right_conditional,
         const expression binary_predicate,
         null_equality compare_nulls
-    ) except +
+    ) except +libcudf_exception_handler
 
     cdef gather_map_type mixed_left_anti_join(
         const table_view left_equality,
@@ -186,4 +187,4 @@ cdef extern from "cudf/join.hpp" namespace "cudf" nogil:
         const table_view right_conditional,
         const expression binary_predicate,
         null_equality compare_nulls
-    ) except +
+    ) except +libcudf_exception_handler