Reuse isPositiveInteger function

rui-mo · Apr 11, 2024 · 8138675 · 8138675
1 parent cef85a1
commit 8138675
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 35 deletions.
diff --git a/velox/expression/CMakeLists.txt b/velox/expression/CMakeLists.txt
@@ -21,8 +21,8 @@ add_library(
                              ReverseSignatureBinder.cpp)
 
 target_link_libraries(
-  velox_expression_functions velox_common_base velox_type_calculation
-  velox_type_signature velox_signature_parser)
+  velox_expression_functions velox_type_parser velox_common_base
+  velox_type_calculation velox_type_signature velox_signature_parser)
 
 add_library(
   velox_expression

diff --git a/velox/expression/FunctionSignature.cpp b/velox/expression/FunctionSignature.cpp
@@ -19,6 +19,7 @@
 #include "velox/common/base/Exceptions.h"
 #include "velox/expression/FunctionSignature.h"
 #include "velox/type/Type.h"
+#include "velox/type/parser/ParserUtil.h"
 
 namespace facebook::velox::exec {
 
@@ -93,14 +94,6 @@ size_t findNextComma(const std::string& str, size_t start) {
 }
 
 namespace {
-/// Returns true only if 'str' contains digits.
-bool isPositiveInteger(const std::string& str) {
-  return !str.empty() &&
-      std::find_if(str.begin(), str.end(), [](unsigned char c) {
-        return !std::isdigit(c);
-      }) == str.end();
-}
-
 void validateBaseTypeAndCollectTypeParams(
     const std::unordered_map<std::string, SignatureVariable>& variables,
     const TypeSignature& arg,

diff --git a/velox/expression/SignatureBinder.cpp b/velox/expression/SignatureBinder.cpp
@@ -19,6 +19,7 @@
 #include "velox/expression/SignatureBinder.h"
 #include "velox/expression/type_calculation/TypeCalculation.h"
 #include "velox/type/Type.h"
+#include "velox/type/parser/ParserUtil.h"
 
 namespace facebook::velox::exec {
 
@@ -27,14 +28,6 @@ bool isAny(const TypeSignature& typeSignature) {
   return typeSignature.baseName() == "any";
 }
 
-/// Returns true only if 'str' contains digits.
-bool isPositiveInteger(const std::string& str) {
-  return !str.empty() &&
-      std::find_if(str.begin(), str.end(), [](unsigned char c) {
-        return !std::isdigit(c);
-      }) == str.end();
-}
-
 std::string buildCalculation(
     const std::string& variable,
     const std::string& calculation) {

diff --git a/velox/expression/tests/utils/ArgumentTypeFuzzer.cpp b/velox/expression/tests/utils/ArgumentTypeFuzzer.cpp
@@ -22,6 +22,7 @@
 #include "velox/expression/ReverseSignatureBinder.h"
 #include "velox/expression/SignatureBinder.h"
 #include "velox/type/Type.h"
+#include "velox/type/parser/ParserUtil.h"
 #include "velox/vector/fuzzer/VectorFuzzer.h"
 
 namespace facebook::velox::test {
@@ -45,15 +46,6 @@ bool isDecimalBaseName(const std::string& typeName) {
 
   return normalized == "decimal";
 }
-
-/// Returns true only if 'str' contains digits.
-bool isPositiveInteger(const std::string& str) {
-  return !str.empty() &&
-      std::find_if(str.begin(), str.end(), [](unsigned char c) {
-        return !std::isdigit(c);
-      }) == str.end();
-}
-
 } // namespace
 
 void ArgumentTypeFuzzer::determineUnboundedIntegerVariables(

diff --git a/velox/type/fbhive/CMakeLists.txt b/velox/type/fbhive/CMakeLists.txt
@@ -14,7 +14,7 @@
 
 add_library(velox_type_fbhive HiveTypeParser.cpp HiveTypeSerializer.cpp)
 
-target_link_libraries(velox_type_fbhive velox_type)
+target_link_libraries(velox_type_fbhive velox_type velox_type_parser)
 
 if(${VELOX_BUILD_TESTING})
   add_subdirectory(tests)

diff --git a/velox/type/fbhive/HiveTypeParser.cpp b/velox/type/fbhive/HiveTypeParser.cpp
@@ -22,18 +22,12 @@
 #include <utility>
 
 #include "velox/common/base/Exceptions.h"
+#include "velox/type/parser/ParserUtil.h"
 
 using facebook::velox::Type;
 using facebook::velox::TypeKind;
 
 namespace {
-/// Returns true only if 'str' contains digits.
-bool isPositiveInteger(const std::string& str) {
-  return !str.empty() &&
-      std::find_if(str.begin(), str.end(), [](unsigned char c) {
-        return !std::isdigit(c);
-      }) == str.end();
-}
 
 bool isSupportedSpecialChar(char c) {
   static std::unordered_set<char> supported{'_', '$', '#'};

diff --git a/velox/type/parser/ParserUtil.cpp b/velox/type/parser/ParserUtil.cpp
@@ -52,4 +52,10 @@ std::pair<std::string, std::shared_ptr<const Type>> inferTypeWithSpaces(
       fieldName, typeFromString(allWords.substr(fieldName.size() + 1)));
 }
 
+bool isPositiveInteger(const std::string& str) {
+  return !str.empty() &&
+      std::find_if(str.begin(), str.end(), [](unsigned char c) {
+        return !std::isdigit(c);
+      }) == str.end();
+}
 } // namespace facebook::velox
diff --git a/velox/type/parser/ParserUtil.h b/velox/type/parser/ParserUtil.h
@@ -36,4 +36,7 @@ std::pair<std::string, TypePtr> inferTypeWithSpaces(
     std::vector<std::string>& words,
     bool cannotHaveFieldName = false);
 
+/// Returns true only if 'str' contains digits.
+bool isPositiveInteger(const std::string& str);
+
 } // namespace facebook::velox