[FEA] ANSI SQL Operator JIT Support (1) : Refactor ROW IR

cpp/include/cudf/ast/detail/operator_functor.cuh

@@ -778,9 +778,9 @@ struct operator_functor<ast_operator::NULL_LOGICAL_OR, true> {
   }
 };
 
-constexpr bool flatten_predicate(possibly_null_value_t<bool, false> value) { return value; }
+constexpr bool predicate(possibly_null_value_t<bool, false> value) { return value; }
 
-constexpr bool flatten_predicate(possibly_null_value_t<bool, true> value)
+constexpr bool predicate(possibly_null_value_t<bool, true> value)
 {
   return value.has_value() && *value;
 }

cpp/include/cudf/ast/expressions.hpp

@@ -59,7 +59,7 @@ class expression_transformer;
  * This class is a part of a "visitor" pattern with the `expression_parser` class.
  * Expressions inheriting from this class can accept parsers as visitors.
  */
-struct expression {
+struct [[nodiscard]] expression {
   /**
    * @brief Accepts a visitor class.
    *
@@ -514,17 +514,17 @@ class operation : public expression {
 
 namespace detail {
 
-/// @brief An expression that represents a filter predicate.
+/// @brief An expression that represents a predicate.
 ///
 /// This is an internal expression used in filter operations. It is not intended to be used by
 /// external code and is not a part of the public API.
-class filter_predicate : public expression {
+class predicate : public expression {
  public:
   /**
    * @brief Construct a new filter predicate object
    * @param source The source expression from which the predicate value is taken
    */
-  filter_predicate(expression const& source) : source_{source} {}
+  predicate(expression const& source) : source_{source} {}
 
   /**
    * @copydoc expression::accept

cpp/src/ast/expressions.cpp

@@ -80,25 +80,24 @@ bool operation::may_evaluate_null(table_view const& left,
                      });
 };
 
-cudf::size_type detail::filter_predicate::accept(detail::expression_parser& visitor) const
+cudf::size_type detail::predicate::accept(detail::expression_parser& visitor) const
 {
-  CUDF_FAIL(
-    "filter_predicate is an internal expression and should not be visited by expression_parser",
-    std::invalid_argument);
+  CUDF_FAIL("predicate is an internal expression and should not be visited by expression_parser",
+            std::invalid_argument);
 }
 
-std::reference_wrapper<expression const> detail::filter_predicate::accept(
+std::reference_wrapper<expression const> detail::predicate::accept(
   detail::expression_transformer& visitor) const
 {
   CUDF_FAIL(
-    "filter_predicate is an internal expression and should not be visited by "
+    "predicate is an internal expression and should not be visited by "
     "expression_transformer",
     std::invalid_argument);
 }
 
-bool detail::filter_predicate::may_evaluate_null(table_view const& left,
-                                                 table_view const& right,
-                                                 rmm::cuda_stream_view stream) const
+bool detail::predicate::may_evaluate_null(table_view const& left,
+                                          table_view const& right,
+                                          rmm::cuda_stream_view stream) const
 {
   return false;
 }
@@ -135,7 +134,7 @@ std::unique_ptr<cudf::detail::row_ir::node> column_name_reference::accept(
     std::invalid_argument);
 }
 
-std::unique_ptr<cudf::detail::row_ir::node> detail::filter_predicate::accept(
+std::unique_ptr<cudf::detail::row_ir::node> detail::predicate::accept(
   cudf::detail::row_ir::ast_converter& converter) const
 {
   return converter.add_ir_node(*this);

cpp/src/jit/column_accessor.cuh

@@ -16,12 +16,13 @@
 namespace cudf {
 namespace jit {
 
-template <int32_t Index, typename Column, typename Element, bool AsScalar>
+template <int32_t Index, typename Column, typename Element, bool AsScalar, int32_t TableIndex>
 struct column_accessor {
-  static constexpr int32_t index = Index;
-  using column_type              = Column;
-  using element_type             = Element;
-  using optional_element_type    = cuda::std::optional<element_type>;
+  static constexpr int32_t index       = Index;
+  static constexpr int32_t table_index = TableIndex;
+  using column_type                    = Column;
+  using element_type                   = Element;
+  using optional_element_type          = cuda::std::optional<element_type>;
 
   static constexpr bool as_scalar = AsScalar;