refactor(special form): use constants for special form names (#11617)

Summary: Pull Request resolved: #11617 Reviewed By: kevinwilfong, xiaoxmeng Differential Revision: D66309395 fbshipit-source-id: 66ec11d278e31f7e68d0ea5c7a2901799e35d9dd
facebookincubator · Dec 11, 2024 · f6b9f22 · f6b9f22
1 parent 78bb289
commit f6b9f22
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 10 deletions.
diff --git a/velox/expression/ConjunctExpr.h b/velox/expression/ConjunctExpr.h
@@ -21,6 +21,9 @@
 
 namespace facebook::velox::exec {
 
+constexpr const char* kAnd = "and";
+constexpr const char* kOr = "or";
+
 class ConjunctExpr : public SpecialForm {
  public:
   ConjunctExpr(
@@ -31,7 +34,7 @@ class ConjunctExpr : public SpecialForm {
       : SpecialForm(
             std::move(type),
             std::move(inputs),
-            isAnd ? "and" : "or",
+            isAnd ? kAnd : kOr,
             inputsSupportFlatNoNullsFastPath,
             false /* trackCpuUsage */),
         isAnd_(isAnd) {

diff --git a/velox/expression/RegisterSpecialForm.cpp b/velox/expression/RegisterSpecialForm.cpp
@@ -29,21 +29,21 @@
 namespace facebook::velox::exec {
 void registerFunctionCallToSpecialForms() {
   registerFunctionCallToSpecialForm(
-      "and", std::make_unique<ConjunctCallToSpecialForm>(true /* isAnd */));
+      kAnd, std::make_unique<ConjunctCallToSpecialForm>(true /* isAnd */));
   registerFunctionCallToSpecialForm(
-      "cast", std::make_unique<CastCallToSpecialForm>());
+      kCast.str(), std::make_unique<CastCallToSpecialForm>());
   registerFunctionCallToSpecialForm(
-      "try_cast", std::make_unique<TryCastCallToSpecialForm>());
+      kTryCast.str(), std::make_unique<TryCastCallToSpecialForm>());
   registerFunctionCallToSpecialForm(
-      "coalesce", std::make_unique<CoalesceCallToSpecialForm>());
+      kCoalesce, std::make_unique<CoalesceCallToSpecialForm>());
   registerFunctionCallToSpecialForm(
-      "if", std::make_unique<IfCallToSpecialForm>());
+      kIf, std::make_unique<IfCallToSpecialForm>());
   registerFunctionCallToSpecialForm(
-      "or", std::make_unique<ConjunctCallToSpecialForm>(false /* isAnd */));
+      kOr, std::make_unique<ConjunctCallToSpecialForm>(false /* isAnd */));
   registerFunctionCallToSpecialForm(
-      "switch", std::make_unique<SwitchCallToSpecialForm>());
+      kSwitch, std::make_unique<SwitchCallToSpecialForm>());
   registerFunctionCallToSpecialForm(
-      "try", std::make_unique<TryCallToSpecialForm>());
+      kTry, std::make_unique<TryCallToSpecialForm>());
   registerFunctionCallToSpecialForm(
       RowConstructorCallToSpecialForm::kRowConstructor,
       std::make_unique<RowConstructorCallToSpecialForm>());

diff --git a/velox/expression/SwitchExpr.h b/velox/expression/SwitchExpr.h
@@ -20,6 +20,9 @@
 
 namespace facebook::velox::exec {
 
+constexpr const char* kIf = "if";
+constexpr const char* kSwitch = "switch";
+
 /// CASE expression:
 ///
 /// case

diff --git a/velox/expression/TryExpr.h b/velox/expression/TryExpr.h
@@ -20,14 +20,16 @@
 
 namespace facebook::velox::exec {
 
+constexpr const char* kTry = "try";
+
 class TryExpr : public SpecialForm {
  public:
   /// Try expression adds nulls, hence, doesn't support flat-no-nulls fast path.
   TryExpr(TypePtr type, ExprPtr&& input)
       : SpecialForm(
             std::move(type),
             {std::move(input)},
-            "try",
+            kTry,
             false /* supportsFlatNoNullsFastPath */,
             false /* trackCpuUsage */) {}