fix coredump (#460)

TuGraph-family · Apr 8, 2024 · d6c556c · d6c556c
1 parent 7e3eb8c
commit d6c556c
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/src/cypher/parser/clause.h b/src/cypher/parser/clause.h
@@ -442,8 +442,10 @@ static lgraph::FieldData MakeFieldData(const Expression &expr) {
         }
     case Expression::PARAMETER:
         break;
+    case Expression::NULL_:
+        break;
     default:
-        LOG_WARN() << "[Warning] " << __func__ << ": Error Type";
+        LOG_WARN() << "Unhandled expression type " << expr.type;
     }
     return ld;
 }

diff --git a/src/server/server_main.cpp b/src/server/server_main.cpp
@@ -35,8 +35,13 @@ int main(int argc, char** argv) {
     // get config file path, if specified
     std::string config_file = "/usr/local/etc/lgraph.json";
     std::string cmd = "run";
-    if (!lgraph::GlobalConfig::PrintVersion(config_file, cmd, &argc, &argv)) {
-        return 0;
+    try {
+        if (!lgraph::GlobalConfig::PrintVersion(config_file, cmd, &argc, &argv)) {
+            return 0;
+        }
+    } catch (std::exception& e) {
+        LOG_ERROR() << e.what();
+        return -1;
     }
     // try to read the config file
     std::string json;

diff --git a/test/test_rpc.cpp b/test/test_rpc.cpp
@@ -1109,6 +1109,14 @@ void test_label_field(lgraph::RpcClient& client) {
     json_val = web::json::value::parse(str);
     UT_EXPECT_EQ(HasElement(json_val, "run", "name"), false);
     UT_EXPECT_EQ(HasElement(json_val, "jeep", "name"), false);
+    ret = client.CallCypher(str,
+                            "CALL db.alterLabelAddFields('vertex', 'animal', "
+                            "['null_string', string, null, true], "
+                            "['null_int8', int8, null, true])");
+    UT_EXPECT_TRUE(ret);
+    ret = client.CallCypher(str, "CALL db.alterLabelDelFields('vertex', 'animal', "
+                            "['null_string', 'null_int8'])");
+    UT_EXPECT_TRUE(ret);
 }
 
 void test_procedure(lgraph::RpcClient& client) {