rebase to 2023/3/29

zhejiangxiaomai · Mar 30, 2023 · 4c6521e · 4c6521e
1 parent 462979e
commit 4c6521e
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/velox/functions/prestosql/registration/DateTimeFunctionsRegistration.cpp b/velox/functions/prestosql/registration/DateTimeFunctionsRegistration.cpp
@@ -32,10 +32,6 @@ void registerSimpleFunctions(const std::string& prefix) {
   registerFunction<YearFunction, int32_t, Date>({prefix + "year"});
   registerFunction<YearFunction, int32_t, TimestampWithTimezone>(
       {prefix + "year"});
-  registerFunction<YearFunction, int64_t, Timestamp>({prefix + "year"});
-  registerFunction<YearFunction, int64_t, Date>({prefix + "year"});
-  registerFunction<YearFunction, int64_t, TimestampWithTimezone>(
-      {prefix + "year"});
   registerFunction<WeekFunction, int64_t, Timestamp>(
       {prefix + "week", prefix + "week_of_year"});
   registerFunction<WeekFunction, int64_t, Date>(

diff --git a/velox/functions/sparksql/MightContain.cpp b/velox/functions/sparksql/MightContain.cpp
@@ -47,7 +47,7 @@ class BloomFilterMightContainFunction final : public exec::VectorFunction {
     HashStringAllocator allocator{context.pool()};
     if (serialized->isConstantMapping()) {
       BloomFilter output{StlAllocator<uint64_t>(&allocator)};
-      output.merge(serialized->valueAt<StringView>(0).data());
+      output.merge(serialized->valueAt<StringView>(0).str().c_str());
       rows.applyToSelected([&](int row) {
         auto contain = output.mayContain(
             folly::hasher<int64_t>()(value->valueAt<int64_t>(row)));
@@ -58,7 +58,7 @@ class BloomFilterMightContainFunction final : public exec::VectorFunction {
 
     rows.applyToSelected([&](int row) {
       BloomFilter output{StlAllocator<uint64_t>(&allocator)};
-      output.merge(serialized->valueAt<StringView>(0).data());
+      output.merge(serialized->valueAt<StringView>(0).str().c_str());
       auto contain = output.mayContain(
           folly::hasher<int64_t>()(value->valueAt<int64_t>(row)));
       result.set(row, contain);

diff --git a/velox/functions/sparksql/Register.cpp b/velox/functions/sparksql/Register.cpp
@@ -55,6 +55,7 @@ static void workAroundRegistrationMacro(const std::string& prefix) {
       udf_array_intersect, prefix + "array_intersect");
   // This is the semantics of spark.sql.ansi.enabled = false.
   VELOX_REGISTER_VECTOR_FUNCTION(udf_element_at, prefix + "element_at");
+  VELOX_REGISTER_VECTOR_FUNCTION(udf_concat_row, prefix + "named_struct");
   VELOX_REGISTER_VECTOR_FUNCTION(
       udf_map_allow_duplicates, prefix + "map_from_arrays");
   // String functions.
@@ -117,6 +118,8 @@ void registerFunctions(const std::string& prefix) {
       prefix + "greatest", greatestSignatures(), makeGreatest);
   exec::registerStatefulVectorFunction(
       prefix + "hash", hashSignatures(), makeHash);
+  exec::registerStatefulVectorFunction(
+      prefix + "murmur3hash", hashSignatures(), makeHash);
   exec::registerStatefulVectorFunction(
       prefix + "xxhash64", xxhash64Signatures(), makeXxHash64);
   VELOX_REGISTER_VECTOR_FUNCTION(udf_map, prefix + "map");

diff --git a/velox/functions/sparksql/aggregates/BloomFilterAggAggregate.cpp b/velox/functions/sparksql/aggregates/BloomFilterAggAggregate.cpp
@@ -165,7 +165,8 @@ class BloomFilterAggAggregate : public exec::Aggregate {
         continue;
       }
       if (StringView::isInline(size)) {
-        StringView serialized(size);
+        char buffer[StringView::kInlineSize];
+        StringView serialized = StringView(buffer, size);
         accumulator->serialize(serialized);
         flatResult->setNoCopy(i, serialized);
       } else {

diff --git a/velox/type/DecimalUtilOp.h b/velox/type/DecimalUtilOp.h
@@ -68,7 +68,7 @@ class DecimalUtilOp {
 
   inline static int128_t ConvertToInt128(int256_t in) {
     int128_t result;
-    int128_t INT128_MAX = int128_t(int128_t(-1L)) >> 1;
+    int128_t INT128_MAX_TMP = int128_t(int128_t(-1L)) >> 1;
     constexpr int256_t UINT128_MASK = std::numeric_limits<uint128_t>::max();
 
     int256_t in_abs = abs(in);
@@ -80,7 +80,7 @@ class DecimalUtilOp {
     if (in_abs > 0) {
       // we've shifted in by 128-bit, so nothing should be left.
       VELOX_FAIL("in_abs overflow");
-    } else if (unsignResult > INT128_MAX) {
+    } else if (unsignResult > INT128_MAX_TMP) {
       // the high-bit must not be set (signed 128-bit).
       VELOX_FAIL("in_abs > int128 max");
     } else {