fix lgraph_cli exception

ljcui · Oct 9, 2024 · fb0fa42 · fb0fa42
1 parent 0d55216
commit fb0fa42
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/src/bolt/pack_stream.h b/src/bolt/pack_stream.h
@@ -221,6 +221,10 @@ class PackStream {
         AppendStructMessage(BoltMsg::Ignored);
     }
 
+    void AppendReset() {
+        AppendStructMessage(BoltMsg::Reset);
+    }
+
     void AppendFailure(const std::unordered_map<std::string, std::any>& meta) {
         AppendStructMessage(BoltMsg::Failure, meta);
     }

diff --git a/toolkits/lgraph_cli.cpp b/toolkits/lgraph_cli.cpp
@@ -283,6 +283,23 @@ int main(int argc, char** argv) {
             asio::write(socket,
                         asio::const_buffer(ps.ConstBuffer().data(), ps.ConstBuffer().size()));
             bool ret = FetchRecords(socket, hydrator, of);
+            if (!ret) {
+                // reset connection
+                ps.Reset();
+                ps.AppendReset();
+                asio::write(socket,asio::const_buffer(ps.ConstBuffer().data(), ps.ConstBuffer().size()));
+                while(true) {
+                    auto m = ReadMessage(socket, hydrator);
+                    if (m.type() == typeid(bolt::Success*)) {
+                        break;
+                    } else if (m.type() == typeid(bolt::Ignored*)) {
+                        continue;
+                    } else {
+                        LOG_ERROR() << "unexpected bolt msg after reset";
+                        return -1;
+                    }
+                }
+            }
             if (is_terminal && ret) {
                 linenoiseHistoryAdd(statement.c_str());
                 linenoiseHistorySave(history_file);