change kindEquals to equals

facebookincubator · Jun 7, 2022 · 6cc1be5 · 6cc1be5
1 parent e728f02
commit 6cc1be5
Show file tree

Hide file tree

Showing 15 changed files with 26 additions and 27 deletions.
diff --git a/velox/core/Expressions.h b/velox/core/Expressions.h
@@ -137,8 +137,7 @@ class ConstantTypedExpr : public ITypedExpr {
 
     if (this->hasValueVector()) {
       return casted->hasValueVector() &&
-          this->valueVector_->type()->kindEquals(
-              casted->valueVector_->type()) &&
+          this->valueVector_->type()->equals(*casted->valueVector_->type()) &&
           this->valueVector_->equalValueAt(casted->valueVector_.get(), 0, 0);
     }
 

diff --git a/velox/core/SimpleFunctionMetadata.h b/velox/core/SimpleFunctionMetadata.h
@@ -457,7 +457,7 @@ class SimpleFunctionMetadata : public ISimpleFunctionMetadata {
 
   void verifyReturnTypeCompatibility() {
     VELOX_USER_CHECK(
-        CppToType<TReturn>::create()->kindEquals(returnType_),
+        CppToType<TReturn>::create()->equals(*returnType_),
         "return type override mismatch");
   }
 

diff --git a/velox/exec/HashAggregation.cpp b/velox/exec/HashAggregation.cpp
@@ -116,7 +116,7 @@ HashAggregation::HashAggregation(
     const auto& aggResultType = aggregates[i]->resultType();
     const auto& expectedType = outputType_->childAt(numHashers + i);
     VELOX_CHECK(
-        aggResultType->kindEquals(expectedType),
+        aggResultType->equals(*expectedType),
         "Unexpected result type for an aggregation: {}, expected {}, step {}",
         aggResultType->toString(),
         expectedType->toString(),

diff --git a/velox/expression/ExprCompiler.cpp b/velox/expression/ExprCompiler.cpp
@@ -366,7 +366,7 @@ ExprPtr compileExpression(
             SimpleFunctions().resolveFunction(call->name(), inputTypes)) {
       auto metadata = simpleFunctionEntry->getMetadata();
       VELOX_USER_CHECK(
-          resultType->kindEquals(metadata->returnType()),
+          resultType->equals(*metadata->returnType()),
           "Found incompatible return types for '{}' ({} vs. {}) "
           "for input types ({}).",
           call->name(),

diff --git a/velox/expression/SignatureBinder.cpp b/velox/expression/SignatureBinder.cpp
@@ -38,7 +38,7 @@ bool SignatureBinder::tryBind() {
       if (actualTypes_.size() > formalArgsCnt) {
         auto& type = actualTypes_[formalArgsCnt - 1];
         for (auto i = formalArgsCnt; i < actualTypes_.size(); i++) {
-          if (!type->kindEquals(actualTypes_[i]) &&
+          if (!type->equals(*actualTypes_[i]) &&
               actualTypes_[i]->kind() != TypeKind::UNKNOWN) {
             return false;
           }
@@ -98,7 +98,7 @@ bool SignatureBinder::tryBind(
     return true;
   }
 
-  return it->second->kindEquals(actualType);
+  return it->second->equals(*actualType);
 }
 
 TypePtr SignatureBinder::tryResolveType(

diff --git a/velox/expression/tests/ExpressionFuzzer.cpp b/velox/expression/tests/ExpressionFuzzer.cpp
@@ -284,7 +284,7 @@ class ExpressionFuzzer {
           if (lhs.name == rhs.name) {
             if (lhs.args.size() == rhs.args.size()) {
               for (size_t i = 0; i < lhs.args.size(); ++i) {
-                if (!lhs.args[i]->kindEquals(rhs.args[i])) {
+                if (!lhs.args[i]->equals(*rhs.args[i])) {
                   return lhs.args[i]->toString() < rhs.args[i]->toString();
                 }
               }

diff --git a/velox/expression/tests/SignatureBinderTest.cpp b/velox/expression/tests/SignatureBinderTest.cpp
@@ -27,7 +27,7 @@ void testSignatureBinder(
 
   auto returnType = binder.tryResolveReturnType();
   ASSERT_TRUE(returnType != nullptr);
-  ASSERT_TRUE(expectedReturnType->kindEquals(returnType));
+  ASSERT_TRUE(expectedReturnType->equals(*returnType));
 }
 
 TEST(SignatureBinderTest, generics) {

diff --git a/velox/functions/prestosql/ArrayContains.cpp b/velox/functions/prestosql/ArrayContains.cpp
@@ -167,8 +167,8 @@ class ArrayContainsFunction : public exec::VectorFunction {
     const auto& searchVector = args[1];
 
     VELOX_CHECK(arrayVector->type()->isArray());
-    VELOX_CHECK(arrayVector->type()->asArray().elementType()->kindEquals(
-        searchVector->type()));
+    VELOX_CHECK(arrayVector->type()->asArray().elementType()->equals(
+        *searchVector->type()));
 
     BaseVector::ensureWritable(rows, BOOLEAN(), context->pool(), result);
     auto flatResult = (*result)->asFlatVector<bool>();

diff --git a/velox/functions/prestosql/ArrayIntersectExcept.cpp b/velox/functions/prestosql/ArrayIntersectExcept.cpp
@@ -374,7 +374,7 @@ void validateMatchingArrayTypes(
 
   for (auto& arg : inputArgs) {
     VELOX_USER_CHECK(
-        arrayType->kindEquals(arg.type),
+        arrayType->equals(*arg.type),
         "{} function requires all arguments of the same type: {} vs. {}",
         name,
         arg.type->toString(),

diff --git a/velox/functions/prestosql/ArrayPosition.cpp b/velox/functions/prestosql/ArrayPosition.cpp
@@ -349,8 +349,8 @@ class ArrayPositionFunction : public exec::VectorFunction {
     const auto& arrayVector = args[0];
     const auto& searchVector = args[1];
     VELOX_CHECK(arrayVector->type()->isArray());
-    VELOX_CHECK(arrayVector->type()->asArray().elementType()->kindEquals(
-        searchVector->type()));
+    VELOX_CHECK(arrayVector->type()->asArray().elementType()->equals(
+        *searchVector->type()));
 
     BaseVector::ensureWritable(rows, BIGINT(), context->pool(), result);
     auto flatResult = (*result)->asFlatVector<int64_t>();

diff --git a/velox/functions/prestosql/MapConcat.cpp b/velox/functions/prestosql/MapConcat.cpp
@@ -38,9 +38,9 @@ class MapConcatFunction : public exec::VectorFunction {
     auto mapType = args[0]->type();
     VELOX_CHECK_EQ(mapType->kind(), TypeKind::MAP);
     for (auto& arg : args) {
-      VELOX_CHECK(mapType->kindEquals(arg->type()));
+      VELOX_CHECK(mapType->equals(*arg->type()));
     }
-    VELOX_CHECK(mapType->kindEquals(outputType));
+    VELOX_CHECK(mapType->equals(*outputType));
 
     auto numArgs = args.size();
     exec::DecodedArgs decodedArgs(rows, args, context);

diff --git a/velox/functions/prestosql/benchmarks/ArrayPositionBasic.h b/velox/functions/prestosql/benchmarks/ArrayPositionBasic.h
@@ -212,8 +212,8 @@ class ArrayPositionFunctionBasic : public exec::VectorFunction {
     const auto& arrayVector = args[0];
     const auto& searchVector = args[1];
     VELOX_CHECK(arrayVector->type()->isArray());
-    VELOX_CHECK(arrayVector->type()->asArray().elementType()->kindEquals(
-        searchVector->type()));
+    VELOX_CHECK(arrayVector->type()->asArray().elementType()->equals(
+        *searchVector->type()));
 
     BaseVector::ensureWritable(rows, BIGINT(), context->pool(), result);
     auto flatResult = (*result)->asFlatVector<int64_t>();

diff --git a/velox/functions/prestosql/tests/MapKeysAndValuesTest.cpp b/velox/functions/prestosql/tests/MapKeysAndValuesTest.cpp
@@ -54,7 +54,7 @@ class MapKeysAndValuesTest : public FunctionBaseTest {
     auto expected = expectedFunc(mapVector);
 
     auto resultElements = result->elements();
-    ASSERT_TRUE(resultElements->type()->kindEquals(expected->type()));
+    ASSERT_TRUE(resultElements->type()->equals(*expected->type()));
 
     EXPECT_EQ(numRows_, result->size());
     for (vector_size_t i = 0; i < numRows_; ++i) {
@@ -85,7 +85,7 @@ class MapKeysAndValuesTest : public FunctionBaseTest {
     auto array = std::dynamic_pointer_cast<ArrayVector>(
         result->as<ConstantVector<ComplexType>>()->valueVector());
     auto elements = array->elements();
-    ASSERT_TRUE(elements->type()->kindEquals(expected->type()));
+    ASSERT_TRUE(elements->type()->equals(*expected->type()));
 
     EXPECT_EQ(numRows_, result->size());
     for (vector_size_t i = 0; i < elements->size(); ++i) {
@@ -115,7 +115,7 @@ class MapKeysAndValuesTest : public FunctionBaseTest {
     auto bExpected = expectedFunc(b);
 
     auto resultElements = result->elements();
-    ASSERT_TRUE(result->type()->childAt(0)->kindEquals(aExpected->type()));
+    ASSERT_TRUE(result->type()->childAt(0)->equals(*aExpected->type()));
 
     EXPECT_EQ(numRows_, result->size());
     for (vector_size_t i = 0; i < numRows_; ++i) {

diff --git a/velox/vector/ComplexVector.h b/velox/vector/ComplexVector.h
@@ -64,7 +64,7 @@ class RowVector : public BaseVector {
       const auto& child = children_[i];
       if (child) {
         VELOX_CHECK(
-            child->type()->kindEquals(type->childAt(i)),
+            child->type()->equals(*type->childAt(i)),
             "Got type {} for field `{}` at position {}, but expected {}.",
             child->type()->toString(),
             rowType->nameOf(i),
@@ -226,7 +226,7 @@ class ArrayVector : public BaseVector {
             pool)) {
     VELOX_CHECK_EQ(type->kind(), TypeKind::ARRAY);
     VELOX_CHECK(
-        elements_->type()->kindEquals(type->childAt(0)),
+        elements_->type()->equals(*type->childAt(0)),
         "Unexpected element type: {}. Expected: {}",
         elements_->type()->toString(),
         type->childAt(0)->toString());
@@ -430,12 +430,12 @@ class MapVector : public BaseVector {
     VELOX_CHECK_EQ(type->kind(), TypeKind::MAP);
 
     VELOX_CHECK(
-        keys_->type()->kindEquals(type->childAt(0)),
+        keys_->type()->equals(*type->childAt(0)),
         "Unexpected key type: {}. Expected: {}",
         keys_->type()->toString(),
         type->childAt(0)->toString());
     VELOX_CHECK(
-        values_->type()->kindEquals(type->childAt(1)),
+        values_->type()->equals(*type->childAt(1)),
         "Unexpected value type: {}. Expected: {}",
         values_->type()->toString(),
         type->childAt(1)->toString());

diff --git a/velox/vector/tests/EnsureWritableVectorTest.cpp b/velox/vector/tests/EnsureWritableVectorTest.cpp
@@ -441,7 +441,7 @@ TEST_F(EnsureWritableVectorTest, array) {
   VectorPtr result;
   BaseVector::ensureWritable(rows, ARRAY(INTEGER()), pool_.get(), &result);
   ASSERT_EQ(size, result->size());
-  ASSERT_TRUE(ARRAY(INTEGER())->kindEquals(result->type()));
+  ASSERT_TRUE(ARRAY(INTEGER())->equals(*result->type()));
   ASSERT_EQ(VectorEncoding::Simple::ARRAY, result->encoding());
 
   result->copy(a.get(), rows, nullptr);
@@ -567,7 +567,7 @@ TEST_F(EnsureWritableVectorTest, map) {
   BaseVector::ensureWritable(
       rows, MAP(INTEGER(), INTEGER()), pool_.get(), &result);
   ASSERT_EQ(size, result->size());
-  ASSERT_TRUE(MAP(INTEGER(), INTEGER())->kindEquals(result->type()));
+  ASSERT_TRUE(MAP(INTEGER(), INTEGER())->equals(*result->type()));
   ASSERT_EQ(VectorEncoding::Simple::MAP, result->encoding());
 
   result->copy(a.get(), rows, nullptr);