Fix browser server (#621)

* fix ha * fix list * fix list * fix browser submodule
TuGraph-family · Aug 9, 2024 · 154afa1 · 154afa1
1 parent aceb40d
commit 154afa1
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/deps/tugraph-db-browser b/deps/tugraph-db-browser
diff --git a/src/cypher/arithmetic/arithmetic_expression.cpp b/src/cypher/arithmetic/arithmetic_expression.cpp
@@ -1353,8 +1353,13 @@ cypher::FieldData BuiltinFunction::_ToList(RTContext *ctx, const Record &record,
     auto ret = cypher::FieldData::Array(0);
     for (auto &arg : args) {
         auto r = arg.Evaluate(ctx, record);
-        CYPHER_THROW_ASSERT(r.IsScalar());
-        ret.array->emplace_back(r.constant.scalar);
+        if (r.IsScalar()) {
+            ret.array->emplace_back(r.constant.scalar);
+        } else if (r.IsArray()) {
+            ret.array->emplace_back(*r.constant.array);
+        } else if (r.IsMap()) {
+            ret.array->emplace_back(*r.constant.map);
+        }
     }
     return ret;
 }

diff --git a/src/cypher/cypher_types.h b/src/cypher/cypher_types.h
@@ -365,7 +365,7 @@ struct FieldData {
 
     bool IsArray() const { return type == ARRAY; }
 
-    static FieldData Array(size_t n) { return FieldData(std::vector<::lgraph::FieldData>(n)); }
+    static FieldData Array(size_t n) { return FieldData(std::vector<cypher::FieldData>(n)); }
 
     bool IsMap() const { return type == MAP; }
 

diff --git a/src/cypher/procedure/procedure.cpp b/src/cypher/procedure/procedure.cpp
@@ -531,7 +531,7 @@ void BuiltinProcedure::DbUpsertVertex(RTContext *ctx, const Record *record,
         std::vector<size_t> field_ids;
         std::vector<lgraph_api::FieldData> fds;
         bool success = true;
-        if (line.IsMap()) {
+        if (!line.IsMap()) {
             THROW_CODE(InputError, "The type of the elements in the list must be map");
         }
         for (auto& item : *line.map) {
+1 −1		client/src/queries/schema.ts
+82 −85		client/src/services/schema/label.ts
+5 −10		client/src/services/schema/schema.ts