Skip to content

Commit bb4ee8c

Browse files
authored
Delete some fatal and CHECK (#5439)
1 parent f4d5b42 commit bb4ee8c

4 files changed

+8
-10
lines changed

src/graph/visitor/DeduceTypeVisitor.cpp

-3
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,6 @@ void DeduceTypeVisitor::visit(UnaryExpression *expr) {
219219
break;
220220
}
221221
default: {
222-
DLOG(FATAL) << "Invalid unary expression kind: " << static_cast<uint8_t>(expr->kind());
223222
std::stringstream ss;
224223
ss << "`" << expr->toString() << "' is invalid unary expression, kind is "
225224
<< static_cast<uint8_t>(expr->kind()) << ".";
@@ -284,7 +283,6 @@ void DeduceTypeVisitor::visit(ArithmeticExpression *expr) {
284283
break;
285284
}
286285
default: {
287-
DLOG(FATAL) << "Invalid arithmetic expression kind: " << static_cast<uint8_t>(expr->kind());
288286
std::stringstream ss;
289287
ss << "`" << expr->toString() << "' is invalid arithmetic expression, kind is "
290288
<< static_cast<uint8_t>(expr->kind()) << ".";
@@ -430,7 +428,6 @@ void DeduceTypeVisitor::visit(LogicalExpression *expr) {
430428
break;
431429
}
432430
default: {
433-
DLOG(FATAL) << "Invalid logical expression kind: " << static_cast<uint8_t>(expr->kind());
434431
std::stringstream ss;
435432
ss << "`" << expr->toString() << "' is invalid logical expression, kind is "
436433
<< static_cast<uint8_t>(expr->kind()) << ".";

src/graph/visitor/ExtractPropExprVisitor.cpp

-3
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ void ExtractPropExprVisitor::visit(UnaryExpression* expr) {
9191
break;
9292
}
9393
default: {
94-
DLOG(FATAL) << "Invalid Kind " << expr->kind();
9594
reportError(expr);
9695
}
9796
}
@@ -109,7 +108,6 @@ void ExtractPropExprVisitor::visitPropertyExpr(PropertyExpression* expr) {
109108
break;
110109
}
111110
default: {
112-
DLOG(FATAL) << "Invalid Kind " << expr->kind();
113111
reportError(expr);
114112
return;
115113
}
@@ -163,7 +161,6 @@ void ExtractPropExprVisitor::visitVertexEdgePropExpr(PropertyExpression* expr) {
163161
break;
164162
}
165163
default: {
166-
DLOG(FATAL) << "Invalid Kind " << expr->kind();
167164
reportError(expr);
168165
return;
169166
}

src/graph/visitor/PrunePropertiesVisitor.cpp

+7-3
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,8 @@ void PrunePropertiesVisitor::visit(Traverse *node) {
215215

216216
void PrunePropertiesVisitor::visitCurrent(Traverse *node) {
217217
auto &colNames = node->colNames();
218+
// The number of output columns of the Traverse operator is at least two(starting point and edge),
219+
// which is by design.
218220
DCHECK_GE(colNames.size(), 2);
219221
auto &nodeAlias = colNames[colNames.size() - 2];
220222
auto &edgeAlias = colNames.back();
@@ -237,6 +239,8 @@ void PrunePropertiesVisitor::visitCurrent(Traverse *node) {
237239

238240
void PrunePropertiesVisitor::pruneCurrent(Traverse *node) {
239241
auto &colNames = node->colNames();
242+
// The number of output columns of the Traverse operator is at least two(starting point and edge),
243+
// which is by design.
240244
DCHECK_GE(colNames.size(), 2);
241245
auto &nodeAlias = colNames[colNames.size() - 2];
242246
auto &edgeAlias = colNames.back();
@@ -447,11 +451,11 @@ void PrunePropertiesVisitor::visit(HashJoin *node) {
447451
}
448452

449453
void PrunePropertiesVisitor::visit(CrossJoin *node) {
450-
status_ = pruneMultiBranch(node->dependencies());
454+
status_ = pruneBinaryBranch(node->dependencies());
451455
}
452456

453457
void PrunePropertiesVisitor::visit(Union *node) {
454-
status_ = pruneMultiBranch(node->dependencies());
458+
status_ = pruneBinaryBranch(node->dependencies());
455459
}
456460

457461
void PrunePropertiesVisitor::visit(Unwind *node) {
@@ -473,7 +477,7 @@ void PrunePropertiesVisitor::visitCurrent(Unwind *node) {
473477
}
474478
}
475479

476-
Status PrunePropertiesVisitor::pruneMultiBranch(std::vector<const PlanNode *> &dependencies) {
480+
Status PrunePropertiesVisitor::pruneBinaryBranch(std::vector<const PlanNode *> &dependencies) {
477481
DCHECK_EQ(dependencies.size(), 2);
478482
auto rightPropsUsed = propsUsed_;
479483
auto *leftDep = dependencies.front();

src/graph/visitor/PrunePropertiesVisitor.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ class PrunePropertiesVisitor final : public PlanNodeVisitor {
7676

7777
private:
7878
Status depsPruneProperties(std::vector<const PlanNode *> &dependencies);
79-
Status pruneMultiBranch(std::vector<const PlanNode *> &dependencies);
79+
Status pruneBinaryBranch(std::vector<const PlanNode *> &dependencies);
8080
Status extractPropsFromExpr(const Expression *expr, const std::string &entityAlias = "");
8181

8282
PropertyTracker &propsUsed_;

0 commit comments

Comments
 (0)