Merge pull request #1043 from kuzudb/remove-unnessary-unit-tests

remove parser unit test and unstr related operators
kuzudb · Nov 18, 2022 · 021b89c · 021b89c
2 parents 3aff141 + a3e3742
commit 021b89c
Show file tree

Hide file tree

Showing 40 changed files with 12 additions and 934 deletions.
diff --git a/src/parser/expression/include/parsed_expression.h b/src/parser/expression/include/parsed_expression.h
@@ -36,12 +36,6 @@ class ParsedExpression {
 
     inline ParsedExpression* getChild(uint32_t idx) const { return children[idx].get(); }
 
-    virtual bool equals(const ParsedExpression& other) const;
-
-    bool operator==(const ParsedExpression& other) const { return equals(other); }
-
-    bool operator!=(const ParsedExpression& other) const { return !equals(other); }
-
 protected:
     ParsedExpression(ExpressionType type, string rawName) : type{type}, rawName{move(rawName)} {}
 

diff --git a/src/parser/expression/include/parsed_function_expression.h b/src/parser/expression/include/parsed_function_expression.h
@@ -29,12 +29,6 @@ class ParsedFunctionExpression : public ParsedExpression {
     // A function might have more than 2 parameters.
     void addChild(unique_ptr<ParsedExpression> child) { children.push_back(move(child)); }
 
-    bool equals(const ParsedExpression& other) const override {
-        auto& functionExpression = (ParsedFunctionExpression&)other;
-        return ParsedExpression::equals(other) && isDistinct == functionExpression.isDistinct &&
-               functionName == functionExpression.functionName;
-    }
-
 private:
     bool isDistinct;
     string functionName;

diff --git a/src/parser/expression/include/parsed_literal_expression.h b/src/parser/expression/include/parsed_literal_expression.h
@@ -15,12 +15,6 @@ class ParsedLiteralExpression : public ParsedExpression {
 
     inline Literal* getLiteral() const { return literal.get(); }
 
-    bool equals(const ParsedExpression& other) const override {
-        return ParsedExpression::equals(other) &&
-               TypeUtils::toString(*literal) ==
-                   TypeUtils::toString(*((ParsedLiteralExpression&)other).literal);
-    }
-
 private:
     unique_ptr<Literal> literal;
 };

diff --git a/src/parser/expression/include/parsed_parameter_expression.h b/src/parser/expression/include/parsed_parameter_expression.h
@@ -13,11 +13,6 @@ class ParsedParameterExpression : public ParsedExpression {
 
     inline string getParameterName() const { return parameterName; }
 
-    bool equals(const ParsedExpression& other) const override {
-        return ParsedExpression::equals(other) &&
-               parameterName == ((ParsedParameterExpression&)other).parameterName;
-    }
-
 private:
     string parameterName;
 };

diff --git a/src/parser/expression/include/parsed_property_expression.h b/src/parser/expression/include/parsed_property_expression.h
@@ -14,11 +14,6 @@ class ParsedPropertyExpression : public ParsedExpression {
 
     inline string getPropertyName() const { return propertyName; }
 
-    bool equals(const ParsedExpression& other) const override {
-        return ParsedExpression::equals(other) &&
-               propertyName == ((ParsedPropertyExpression&)other).propertyName;
-    }
-
 private:
     string propertyName;
 };

diff --git a/src/parser/expression/include/parsed_subquery_expression.h b/src/parser/expression/include/parsed_subquery_expression.h
@@ -23,23 +23,6 @@ class ParsedSubqueryExpression : public ParsedExpression {
     inline bool hasWhereClause() const { return whereClause != nullptr; }
     inline ParsedExpression* getWhereClause() const { return whereClause.get(); }
 
-    bool equals(const ParsedExpression& other) const override {
-        auto& otherSubquery = (ParsedSubqueryExpression&)other;
-        if (!ParsedExpression::equals(other) ||
-            patternElements.size() != otherSubquery.patternElements.size()) {
-            return false;
-        }
-        if (hasWhereClause() && *whereClause != *otherSubquery.whereClause) {
-            return false;
-        }
-        for (auto i = 0u; i < patternElements.size(); ++i) {
-            if (*patternElements[i] != *otherSubquery.patternElements[i]) {
-                return false;
-            }
-        }
-        return true;
-    }
-
 private:
     vector<unique_ptr<PatternElement>> patternElements;
     unique_ptr<ParsedExpression> whereClause;

diff --git a/src/parser/expression/include/parsed_variable_expression.h b/src/parser/expression/include/parsed_variable_expression.h
@@ -13,11 +13,6 @@ class ParsedVariableExpression : public ParsedExpression {
 
     inline string getVariableName() const { return variableName; }
 
-    bool equals(const ParsedExpression& other) const override {
-        return ParsedExpression::equals(other) &&
-               variableName == ((ParsedVariableExpression&)other).variableName;
-    }
-
 private:
     string variableName;
 };

diff --git a/src/parser/expression/parsed_expression.cpp b/src/parser/expression/parsed_expression.cpp
@@ -16,17 +16,5 @@ ParsedExpression::ParsedExpression(ExpressionType type, unique_ptr<ParsedExpress
     children.push_back(move(right));
 }
 
-bool ParsedExpression::equals(const ParsedExpression& other) const {
-    if (type != other.type || alias != other.alias || children.size() != other.children.size()) {
-        return false;
-    }
-    for (auto i = 0u; i < children.size(); ++i) {
-        if (*children[i] != *other.children[i]) {
-            return false;
-        }
-    }
-    return true;
-}
-
 } // namespace parser
 } // namespace kuzu
diff --git a/src/parser/query/graph_pattern/BUILD.bazel b/src/parser/query/graph_pattern/BUILD.bazel
@@ -1,8 +1,5 @@
 cc_library(
     name = "graph_pattern",
-    srcs = glob([
-        "*.cpp",
-    ]),
     hdrs = glob([
         "include/*.h",
     ]),

diff --git a/src/parser/query/graph_pattern/include/node_pattern.h b/src/parser/query/graph_pattern/include/node_pattern.h
@@ -31,25 +31,6 @@ class NodePattern {
         return make_pair(propertyKeyValPairs[idx].first, propertyKeyValPairs[idx].second.get());
     }
 
-    virtual bool equals(const NodePattern& other) const {
-        if (!(variableName == other.variableName && tableName == other.tableName &&
-                propertyKeyValPairs.size() == other.propertyKeyValPairs.size())) {
-            return false;
-        }
-        for (auto i = 0u; i < propertyKeyValPairs.size(); ++i) {
-            auto& [name, expression] = propertyKeyValPairs[i];
-            auto& [otherName, otherExpression] = other.propertyKeyValPairs[i];
-            if (!(name == otherName && *expression == *otherExpression)) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    bool operator==(const NodePattern& other) const { return equals(other); }
-
-    bool operator!=(const NodePattern& other) const { return !equals(other); }
-
 private:
     string variableName;
     string tableName;

diff --git a/src/parser/query/graph_pattern/include/pattern_element.h b/src/parser/query/graph_pattern/include/pattern_element.h
@@ -29,10 +29,6 @@ class PatternElement {
         return patternElementChains[idx].get();
     }
 
-    bool operator==(const PatternElement& other) const;
-
-    bool operator!=(const PatternElement& other) const { return !operator==(other); }
-
 private:
     unique_ptr<NodePattern> nodePattern;
     vector<unique_ptr<PatternElementChain>> patternElementChains;

diff --git a/src/parser/query/graph_pattern/include/pattern_element_chain.h b/src/parser/query/graph_pattern/include/pattern_element_chain.h
@@ -20,12 +20,6 @@ class PatternElementChain {
 
     inline NodePattern* getNodePattern() const { return nodePattern.get(); }
 
-    bool operator==(const PatternElementChain& other) const {
-        return *relPattern == *other.relPattern;
-    }
-
-    bool operator!=(const PatternElementChain& other) const { return !operator==(other); }
-
 private:
     unique_ptr<RelPattern> relPattern;
     unique_ptr<NodePattern> nodePattern;

diff --git a/src/parser/query/graph_pattern/include/rel_pattern.h b/src/parser/query/graph_pattern/include/rel_pattern.h
@@ -28,12 +28,6 @@ class RelPattern : public NodePattern {
 
     inline ArrowDirection getDirection() const { return arrowDirection; }
 
-    bool equals(const kuzu::parser::NodePattern& other) const override {
-        auto& otherRel = (RelPattern&)other;
-        return NodePattern::equals(other) && lowerBound == otherRel.lowerBound &&
-               upperBound == otherRel.upperBound && arrowDirection == otherRel.arrowDirection;
-    }
-
 private:
     string lowerBound;
     string upperBound;

diff --git a/src/parser/query/graph_pattern/pattern_element.cpp b/src/parser/query/graph_pattern/pattern_element.cpp
diff --git a/src/parser/query/include/query_part.h b/src/parser/query/include/query_part.h
@@ -30,10 +30,6 @@ class QueryPart {
 
     inline WithClause* getWithClause() const { return withClause.get(); }
 
-    bool operator==(const QueryPart& other) const;
-
-    bool operator!=(const QueryPart& other) const { return !operator==(other); }
-
 private:
     vector<unique_ptr<ReadingClause>> readingClauses;
     vector<unique_ptr<UpdatingClause>> updatingClauses;

diff --git a/src/parser/query/include/single_query.h b/src/parser/query/include/single_query.h
@@ -39,8 +39,6 @@ class SingleQuery {
 
     bool isFirstReadingClauseOptionalMatch() const;
 
-    bool operator==(const SingleQuery& other) const;
-
 private:
     vector<unique_ptr<QueryPart>> queryParts;
     vector<unique_ptr<ReadingClause>> readingClauses;

diff --git a/src/parser/query/query_part.cpp b/src/parser/query/query_part.cpp
diff --git a/src/parser/query/reading_clause/BUILD.bazel b/src/parser/query/reading_clause/BUILD.bazel
@@ -2,9 +2,6 @@ load("@rules_cc//cc:defs.bzl", "cc_library")
 
 cc_library(
     name = "reading_clause",
-    srcs = glob([
-        "*.cpp",
-    ]),
     hdrs = glob([
         "include/*.h",
     ]),

diff --git a/src/parser/query/reading_clause/include/match_clause.h b/src/parser/query/reading_clause/include/match_clause.h
@@ -29,8 +29,6 @@ class MatchClause : public ReadingClause {
 
     inline bool getIsOptional() const { return isOptional; }
 
-    bool equals(const ReadingClause& other) const override;
-
 private:
     vector<unique_ptr<PatternElement>> patternElements;
     unique_ptr<ParsedExpression> whereClause;

diff --git a/src/parser/query/reading_clause/include/reading_clause.h b/src/parser/query/reading_clause/include/reading_clause.h
@@ -14,12 +14,6 @@ class ReadingClause {
 
     inline ClauseType getClauseType() const { return clauseType; }
 
-    virtual bool equals(const ReadingClause& other) const { return clauseType == other.clauseType; }
-
-    bool operator==(const ReadingClause& other) const { return equals(other); }
-
-    bool operator!=(const ReadingClause& other) const { return equals(other); }
-
 private:
     ClauseType clauseType;
 };

diff --git a/src/parser/query/reading_clause/include/unwind_clause.h b/src/parser/query/reading_clause/include/unwind_clause.h
@@ -19,8 +19,6 @@ class UnwindClause : public ReadingClause {
 
     inline const string getAlias() const { return alias; }
 
-    bool equals(const ReadingClause& other) const override;
-
 private:
     unique_ptr<ParsedExpression> expression;
     string alias;

diff --git a/src/parser/query/reading_clause/match_clause.cpp b/src/parser/query/reading_clause/match_clause.cpp
diff --git a/src/parser/query/reading_clause/unwind_clause.cpp b/src/parser/query/reading_clause/unwind_clause.cpp
diff --git a/src/parser/query/return_with_clause/BUILD.bazel b/src/parser/query/return_with_clause/BUILD.bazel
@@ -2,9 +2,6 @@ load("@rules_cc//cc:defs.bzl", "cc_library")
 
 cc_library(
     name = "return_with_clause",
-    srcs = glob([
-        "*.cpp",
-    ]),
     hdrs = glob([
         "include/*.h",
     ]),

diff --git a/src/parser/query/return_with_clause/include/projection_body.h b/src/parser/query/return_with_clause/include/projection_body.h
@@ -53,10 +53,6 @@ class ProjectionBody {
 
     inline ParsedExpression* getLimitExpression() const { return limitExpression.get(); }
 
-    bool operator==(const ProjectionBody& other) const;
-
-    bool operator!=(const ProjectionBody& other) const { return !operator==(other); }
-
 private:
     bool isDistinct;
     bool containsStar;

diff --git a/src/parser/query/return_with_clause/include/return_clause.h b/src/parser/query/return_with_clause/include/return_clause.h
@@ -15,12 +15,6 @@ class ReturnClause {
 
     inline ProjectionBody* getProjectionBody() const { return projectionBody.get(); }
 
-    bool operator==(const ReturnClause& other) const {
-        return *projectionBody == *other.projectionBody;
-    }
-
-    bool operator!=(const ReturnClause& other) const { return !operator==(other); }
-
 private:
     unique_ptr<ProjectionBody> projectionBody;
 };

diff --git a/src/parser/query/return_with_clause/include/with_clause.h b/src/parser/query/return_with_clause/include/with_clause.h
@@ -21,8 +21,6 @@ class WithClause : public ReturnClause {
 
     inline ParsedExpression* getWhereExpression() const { return whereExpression.get(); }
 
-    bool operator==(const WithClause& other) const;
-
 private:
     unique_ptr<ParsedExpression> whereExpression;
 };