Merge pull request #102 from pdet/function_mapping

Extra Function mapping

Author: pdet

src/from_substrait.cpp

@@ -30,7 +30,8 @@ const std::unordered_map<std::string, std::string> SubstraitToDuckDB::function_n
     {"modulus", "mod"},      {"std_dev", "stddev"},     {"starts_with", "prefix"},
     {"ends_with", "suffix"}, {"substring", "substr"},   {"char_length", "length"},
     {"is_nan", "isnan"},     {"is_finite", "isfinite"}, {"is_infinite", "isinf"},
-    {"like", "~~"},          {"extract", "date_part"}};
+    {"like", "~~"},          {"extract", "date_part"},  {"bitwise_and", "&"},
+    {"bitwise_or", "|"},     {"bitwise_xor", "xor"},    {"octet_length", "strlen"}};
 
 const case_insensitive_set_t SubstraitToDuckDB::valid_extract_subfields = {
     "year",    "month",       "day",          "decade", "century", "millenium",

src/to_substrait.cpp

@@ -38,7 +38,11 @@ const std::unordered_map<std::string, std::string> DuckDBToSubstrait::function_n
     {"+", "add"},
     {"/", "divide"},
     {"first", "any_value"},
-    {"!~~", "not_equal"}};
+    {"!~~", "not_equal"},
+    {"&", "bitwise_and"},
+    {"|", "bitwise_or"},
+    {"xor", "bitwise_xor"},
+    {"strlen", "octet_length"}};
 
 const case_insensitive_set_t DuckDBToSubstrait::valid_extract_subfields = {
     "year",    "month",       "day",          "decade", "century", "millenium",

test/sql/test_functions.test

@@ -0,0 +1,40 @@
+# name: test/sql/test_functions.test
+# description: Test functions roundtrip
+# group: [sql]
+
+require substrait
+
+statement ok
+PRAGMA enable_verification
+
+statement ok
+create table t as select 1 as a ,2 as b;
+
+# bitwise_and
+statement ok
+CALL get_substrait('select a & b from t', strict = true)
+
+# bitwise_or
+statement ok
+CALL get_substrait('select a | b from t', strict = true)
+
+# bitwise_xor
+statement ok
+CALL get_substrait('select xor(a,b) from t', strict = true)
+
+# strlen gets transformed to octet_length
+statement ok
+CALL get_substrait('select strlen(a::varchar) from t', strict = true)
+
+# coalesce
+statement ok
+CALL get_substrait('select coalesce(a) from t', strict = true)
+
+# acosh
+# asinh
+# atanh
+# cosh
+# sinh
+# tanh
+statement ok
+CALL get_substrait('select acosh(a),asinh(a),atanh(a),cosh(a),sinh(a),tanh(a) from t', strict = true)