Add missing pair_unique in output of dbms.graph.getGraphSchema() (#707

)
TuGraph-family · Oct 17, 2024 · 113dbc0 · 113dbc0
1 parent 65635dd
commit 113dbc0
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 16 deletions.
diff --git a/src/core/edge_index.h b/src/core/edge_index.h
@@ -475,7 +475,10 @@ class EdgeIndex {
     }
 
     bool IsUnique() const {
-        return type_ == IndexType::GlobalUniqueIndex || type_ == IndexType::PairUniqueIndex;
+        return type_ == IndexType::GlobalUniqueIndex;
+    }
+    bool IsPairUnique() const {
+        return type_ == IndexType::PairUniqueIndex;
     }
     IndexType GetType() const { return type_; }
 

diff --git a/src/core/schema.cpp b/src/core/schema.cpp
@@ -281,20 +281,6 @@ void Schema::DeleteCreatedEdgeIndex(KvTransaction& txn, const EdgeUid& euid, con
     }
 }
 
-bool Schema::EdgeUniqueIndexConflict(KvTransaction& txn, const Value& record) {
-    for (auto& idx : indexed_fields_) {
-        auto& fe = fields_[idx];
-        EdgeIndex* index = fe.GetEdgeIndex();
-        FMA_ASSERT(index);
-        if (!index->IsUnique()) continue;
-        if (fe.GetIsNull(record)) continue;
-        if (index->UniqueIndexConflict(txn, fe.GetConstRef(record))) {
-            return true;
-        }
-    }
-    return false;
-}
-
 void Schema::AddEdgeToIndex(KvTransaction& txn, const EdgeUid& euid, const Value& record,
                             std::vector<size_t>& created) {
     created.reserve(fields_.size());

diff --git a/src/core/schema.h b/src/core/schema.h
@@ -499,7 +499,6 @@ class Schema {
 
     void AddEdgeToIndex(KvTransaction& txn, const EdgeUid& euid, const Value& record,
                         std::vector<size_t>& created);
-    bool EdgeUniqueIndexConflict(KvTransaction& txn, const Value& record);
 
     void AddVectorToVectorIndex(KvTransaction& txn, VertexId vid, const Value& record);
 

diff --git a/src/cypher/procedure/procedure.cpp b/src/cypher/procedure/procedure.cpp
@@ -2241,6 +2241,7 @@ void BuiltinProcedure::DbmsGraphGetGraphSchema(RTContext *ctx, const Record *rec
             if (vi) {
                 property["index"] = true;
                 property["unique"] = vi->IsUnique();
+                property["pair_unique"] = vi->IsPairUnique();
             }
             edge["properties"].push_back(property);
         }