Rebase and fix conflict.

vesoft-inc · Nov 29, 2019 · b0f8f37 · b0f8f37
1 parent 5855039
commit b0f8f37
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/common/filter/Expressions.cpp b/src/common/filter/Expressions.cpp
@@ -118,11 +118,16 @@ Expression::decode(folly::StringPiece buffer) noexcept {
 std::string AliasPropertyExpression::toString() const {
     std::string buf;
     buf.reserve(64);
-    if (ref_ != nullptr && *ref_ != "" && *ref_ != VAR_REF) {
+    if (ref_ != nullptr) {
         buf += *ref_;
     }
-    if (alias_ != nullptr && *alias_ != "") {
+    if (*ref_ != "" && *ref_ != VAR_REF) {
+        buf += ".";
+    }
+    if (alias_ != nullptr) {
         buf += *alias_;
+    }
+    if (*alias_ != "") {
         buf += ".";
     }
     if (prop_ != nullptr) {

diff --git a/src/graph/GoExecutor.cpp b/src/graph/GoExecutor.cpp
@@ -431,7 +431,7 @@ void GoExecutor::stepOut() {
         // TODO: not support filter pushdown in reversely traversal now.
         filterPushdown = whereWrapper_->filterPushdown_;
     }
-    auto future  = ectx()->storage()->getNeighbors(spaceId,
+    auto future  = ectx()->getStorageClient()->getNeighbors(spaceId,
                                                    starts_,
                                                    edgeTypes_,
                                                    filterPushdown,