Merge branch 'master' into fix_unwind_crash

vesoft-inc · Dec 3, 2021 · b7d8d30 · b7d8d30
2 parents fb4d3bf + 69bd48f
commit b7d8d30
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -126,12 +126,10 @@ jobs:
               -DENABLE_COVERAGE=on \
               -B build
           echo "::set-output name=j::8"
-          echo "::set-output name=t::6"
       - name: Make
         run: |
           ccache -z
-          cmake --build build/ -j ${{ steps.cmake.outputs.j }} --target nebula-metad nebula-storaged nebula-graphd
-          cmake --build build/ -j ${{ steps.cmake.outputs.t }}
+          cmake --build build/ -j $(nproc)
           ccache -s
       - name: CTest
         env:

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -97,7 +97,6 @@ jobs:
                   -DENABLE_TESTING=on \
                   -B build
               echo "::set-output name=j::10"
-              echo "::set-output name=t::$(nproc)"
               ;;
             ubuntu2004)
               # build with Debug type
@@ -109,7 +108,6 @@ jobs:
                   -DENABLE_COVERAGE=on \
                   -B build
               echo "::set-output name=j::10"
-              echo "::set-output name=t::6"
               ;;
             esac
             ;;
@@ -123,14 +121,12 @@ jobs:
                 -DENABLE_TESTING=on \
                 -B build
             echo "::set-output name=j::6"
-            echo "::set-output name=t::10"
             ;;
           esac
       - name: Make
         run: |
           ccache -z
-          cmake --build build/ -j $(nproc) --target nebula-metad nebula-storaged nebula-graphd
-          cmake --build build/ -j ${{ steps.cmake.outputs.t }}
+          cmake --build build/ -j $(nproc)
           ccache -s
       - name: CTest
         env:

diff --git a/src/graph/visitor/EvaluableExprVisitor.h b/src/graph/visitor/EvaluableExprVisitor.h
@@ -56,6 +56,14 @@ class EvaluableExprVisitor : public ExprVisitorImpl {
 
   void visit(SubscriptRangeExpression *) override { isEvaluable_ = false; }
 
+  void visitBinaryExpr(BinaryExpression *expr) override {
+    expr->left()->accept(this);
+    // Evaluable sub-expression should be obscured by the non-evaluable sub-expression.
+    if (isEvaluable_) {
+      expr->right()->accept(this);
+    }
+  }
+
   bool isEvaluable_{true};
 };