feat: upgrade substrait to 0.23.0

Author: chaojun-zhang

include/substrait/common/Exceptions.h

@@ -2,9 +2,9 @@
 
 #pragma once
 
+#include <fmt/format.h>
 #include <memory>
 #include <utility>
-#include <fmt/format.h>
 
 namespace io::substrait::common {
 namespace error_code {
@@ -93,44 +93,44 @@ std::string errorMessage(fmt::string_view fmt, const Args&... args) {
 
 #define SUBSTRAIT_THROW(exception, errorCode, ...)                   \
   {                                                                  \
-    auto message = substrait::common::errorMessage(__VA_ARGS__); \
+    auto message = ::io::substrait::common::errorMessage(__VA_ARGS__); \
     throw exception(errorCode, message);                             \
   }
 
 #define SUBSTRAIT_UNSUPPORTED(...)                       \
   SUBSTRAIT_THROW(                                       \
-      substrait::common::SubstraitUserError,       \
-      substrait::common::error_code::kUnsupported, \
+      ::io::substrait::common::SubstraitUserError,       \
+      ::io::substrait::common::error_code::kUnsupported, \
       ##__VA_ARGS__)
 
 #define SUBSTRAIT_UNREACHABLE(...)                           \
   SUBSTRAIT_THROW(                                           \
-      substrait::common::SubstraitRuntimeError,        \
-      substrait::common::error_code::kUnreachableCode, \
+      ::io::substrait::common::SubstraitRuntimeError,        \
+      ::io::substrait::common::error_code::kUnreachableCode, \
       ##__VA_ARGS__)
 
 #define SUBSTRAIT_FAIL(...)                               \
   SUBSTRAIT_THROW(                                        \
-      ::substrait::common::SubstraitRuntimeError,     \
-      ::substrait::common::error_code::kInvalidState, \
+      ::io::::substrait::common::SubstraitRuntimeError,     \
+      ::io::::substrait::common::error_code::kInvalidState, \
       ##__VA_ARGS__)
 
 #define SUBSTRAIT_USER_FAIL(...)                          \
   SUBSTRAIT_THROW(                                        \
-      substrait::common::SubstraitUserError,        \
-      substrait::common::error_code::kInvalidState, \
+      ::io::substrait::common::SubstraitUserError,        \
+      ::io::substrait::common::error_code::kInvalidState, \
       ##__VA_ARGS__)
 
 #define SUBSTRAIT_NYI(...)                                  \
   SUBSTRAIT_THROW(                                          \
-      substrait::common::SubstraitRuntimeError,       \
-      substrait::common::error_code::kNotImplemented, \
+      ::io::substrait::common::SubstraitRuntimeError,       \
+      ::io::substrait::common::error_code::kNotImplemented, \
       ##__VA_ARGS__)
 
 #define SUBSTRAIT_IVALID_ARGUMENT(...)                      \
   SUBSTRAIT_THROW(                                           \
-      substrait::common::SubstraitUserError,           \
-      substrait::common::error_code::kInvalidArgument, \
+      ::io::substrait::common::SubstraitUserError,           \
+      ::io::substrait::common::error_code::kInvalidArgument, \
       ##__VA_ARGS__)
 
 } // namespace io::substrait::common

substrait/function/tests/FunctionLookupTest.cpp

@@ -72,7 +72,7 @@ TEST_F(FunctionLookupTest, compare_function) {
 
 TEST_F(FunctionLookupTest, arithmetic_function) {
   testScalarFunctionLookup(
-      {"add", {TINYINT(), TINYINT()}, TINYINT()}, "add:opt_i8_i8");
+      {"add", {TINYINT(), TINYINT()}, TINYINT()}, "add:i8_i8");
 
   testScalarFunctionLookup(
       {"divide",
@@ -81,13 +81,13 @@ TEST_F(FunctionLookupTest, arithmetic_function) {
            FLOAT(),
        },
        FLOAT()},
-      "divide:opt_opt_opt_fp32_fp32");
+      "divide:fp32_fp32");
 }
 
 TEST_F(FunctionLookupTest, aggregate) {
   // for intermediate type
   testAggregateFunctionLookup(
-      {"avg", {STRUCT({DOUBLE(), BIGINT()})}, FLOAT()}, "avg:opt_fp32");
+      {"avg", {STRUCT({DOUBLE(), BIGINT()})}, FLOAT()}, "avg:fp32");
 }
 
 TEST_F(FunctionLookupTest, logical) {
@@ -102,10 +102,10 @@ TEST_F(FunctionLookupTest, logical) {
 
 TEST_F(FunctionLookupTest, string_function) {
   testScalarFunctionLookup(
-      {"like", {STRING(), STRING()}, BOOL()}, "like:opt_str_str");
+      {"like", {STRING(), STRING()}, BOOL()}, "like:str_str");
   testScalarFunctionLookup(
       {"like", {VARCHAR(3), VARCHAR(4)}, BOOL()},
-      "like:opt_vchar<L1>_vchar<L2>");
+      "like:vchar<L1>_vchar<L2>");
   testScalarFunctionLookup(
       {"substring", {STRING(), INTEGER(), INTEGER()}, STRING()},
       "substring:str_i32_i32");

substrait/type/tests/TypeTest.cpp

@@ -130,6 +130,7 @@ TEST_F(TypeTest, decodeTest) {
       "LIST?<any>",
       [](const std::shared_ptr<const ParameterizedList>& typePtr) {
         ASSERT_EQ(typePtr->signature(), "list<any>");
+        ASSERT_EQ(typePtr->nullable(),true);
       });
 
   testDecode<ParameterizedMap>(