fix sanitize(type) in FuzzerUtil for IPPREFIX type

facebookincubator · Dec 13, 2024 · 37694e1 · 37694e1
1 parent d9a6012
commit 37694e1
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/velox/exec/fuzzer/FuzzerUtil.cpp b/velox/exec/fuzzer/FuzzerUtil.cpp
@@ -22,6 +22,7 @@
 #include "velox/dwio/catalog/fbhive/FileUtils.h"
 #include "velox/dwio/dwrf/writer/Writer.h"
 #include "velox/expression/SignatureBinder.h"
+#include "velox/functions/prestosql/types/IPPrefixType.h"
 
 using namespace facebook::velox::dwio::catalog::fbhive;
 
@@ -283,7 +284,7 @@ bool usesTypeName(
 // If 'type' is a RowType or contains RowTypes with empty field names, adds
 // default names to these fields in the RowTypes.
 TypePtr sanitize(const TypePtr& type) {
-  if (!type) {
+  if (!type || isIPPrefixType(type)) {
     return type;
   }
 

diff --git a/velox/expression/fuzzer/ArgumentTypeFuzzer.cpp b/velox/expression/fuzzer/ArgumentTypeFuzzer.cpp
@@ -22,6 +22,9 @@
 #include "velox/exec/fuzzer/FuzzerUtil.h"
 #include "velox/expression/ReverseSignatureBinder.h"
 #include "velox/expression/SignatureBinder.h"
+#include "velox/functions/prestosql/types/IPAddressType.h"
+#include "velox/functions/prestosql/types/IPPrefixType.h"
+#include "velox/functions/prestosql/types/JsonType.h"
 #include "velox/type/Type.h"
 #include "velox/vector/fuzzer/VectorFuzzer.h"
 
@@ -32,6 +35,12 @@ using exec::test::sanitizeTryResolveType;
 std::string typeToBaseName(const TypePtr& type) {
   if (type->isDecimal()) {
     return "decimal";
+  } else if (isIPPrefixType(type)) {
+    return "ipprefix";
+  } else if (isIPAddressType(type)) {
+    return "ipaddress";
+  } else if (isJsonType(type)) {
+    return "json";
   }
   return boost::algorithm::to_lower_copy(std::string{type->kindName()});
 }

diff --git a/velox/expression/fuzzer/CMakeLists.txt b/velox/expression/fuzzer/CMakeLists.txt
@@ -20,6 +20,7 @@ target_link_libraries(
   velox_type
   velox_expression_functions
   velox_fuzzer_util
+  velox_presto_types
   GTest::gtest)
 
 add_library(

diff --git a/velox/expression/fuzzer/ExpressionFuzzer.cpp b/velox/expression/fuzzer/ExpressionFuzzer.cpp
@@ -664,7 +664,6 @@ bool ExpressionFuzzer::isSupportedSignature(
   if (usesTypeName(signature, "opaque") ||
       usesTypeName(signature, "timestamp with time zone") ||
       usesTypeName(signature, "interval day to second") ||
-      usesTypeName(signature, "ipprefix") ||
       (!options_.enableDecimalType && usesTypeName(signature, "decimal")) ||
       (!options_.enableComplexTypes && useComplexType) ||
       (options_.enableComplexTypes && usesTypeName(signature, "unknown"))) {