add unlabeled support

kuzudb · Dec 12, 2022 · fa08d5b · fa08d5b
1 parent 5a685bf
commit fa08d5b
Show file tree

Hide file tree

Showing 7 changed files with 62 additions and 27 deletions.
diff --git a/src/binder/bind/bind_graph_pattern.cpp b/src/binder/bind/bind_graph_pattern.cpp
@@ -118,8 +118,12 @@ shared_ptr<NodeExpression> Binder::bindQueryNode(
         auto prevVariable = variablesInScope.at(parsedName);
         ExpressionBinder::validateExpectedDataType(*prevVariable, NODE);
         queryNode = static_pointer_cast<NodeExpression>(prevVariable);
-        auto otherTableIDs = bindNodeTableIDs(nodePattern.getTableNames());
-        queryNode->addTableIDs(otherTableIDs);
+        // E.g. MATCH (a:person) MATCH (a:organisation)
+        // We bind to single node a with both labels
+        if (!nodePattern.getTableNames().empty()) {
+            auto otherTableIDs = bindNodeTableIDs(nodePattern.getTableNames());
+            queryNode->addTableIDs(otherTableIDs);
+        }
     } else {
         queryNode = createQueryNode(nodePattern);
     }
@@ -152,11 +156,23 @@ vector<table_id_t> Binder::bindTableIDs(
     unordered_set<table_id_t> result;
     switch (nodeOrRelType) {
     case NODE: {
-        for (auto& tableName : tableNames) {
-            result.insert(bindNodeTableID(tableName));
+        if (tableNames.empty()) {
+            for (auto tableID : catalog.getReadOnlyVersion()->getNodeTableIDs()) {
+                result.insert(tableID);
+            }
+        } else {
+            for (auto& tableName : tableNames) {
+                result.insert(bindNodeTableID(tableName));
+            }
         }
+
     } break;
     case REL: {
+        if (tableNames.empty()) {
+            for (auto tableID : catalog.getReadOnlyVersion()->getRelTableIDs()) {
+                result.insert(tableID);
+            }
+        }
         for (auto& tableName : tableNames) {
             result.insert(bindRelTableID(tableName));
         }
@@ -165,11 +181,6 @@ vector<table_id_t> Binder::bindTableIDs(
         throw NotImplementedException(
             "bindTableIDs(" + Types::dataTypeToString(nodeOrRelType) + ").");
     }
-    for (auto& tableID : result) {
-        if (tableID == ANY_TABLE_ID) {
-            throw BinderException("Any-table is not supported.");
-        }
-    }
     return vector<table_id_t>{result.begin(), result.end()};
 }
 

diff --git a/src/binder/binder.cpp b/src/binder/binder.cpp
@@ -32,19 +32,13 @@ shared_ptr<Expression> Binder::bindWhereExpression(const ParsedExpression& parse
 }
 
 table_id_t Binder::bindRelTableID(const string& tableName) const {
-    if (tableName.empty()) {
-        return ANY_TABLE_ID;
-    }
     if (!catalog.getReadOnlyVersion()->containRelTable(tableName)) {
         throw BinderException("Rel table " + tableName + " does not exist.");
     }
     return catalog.getReadOnlyVersion()->getRelTableIDFromName(tableName);
 }
 
 table_id_t Binder::bindNodeTableID(const string& tableName) const {
-    if (tableName.empty()) {
-        return ANY_TABLE_ID;
-    }
     if (!catalog.getReadOnlyVersion()->containNodeTable(tableName)) {
         throw BinderException("Node table " + tableName + " does not exist.");
     }

diff --git a/src/include/binder/expression/node_rel_expression.h b/src/include/binder/expression/node_rel_expression.h
@@ -7,7 +7,8 @@ namespace binder {
 
 class NodeOrRelExpression : public Expression {
 public:
-    NodeOrRelExpression(DataTypeID dataTypeID, const string& uniqueName, vector<table_id_t> tableIDs)
+    NodeOrRelExpression(
+        DataTypeID dataTypeID, const string& uniqueName, vector<table_id_t> tableIDs)
         : Expression{VARIABLE, dataTypeID, uniqueName}, tableIDs{std::move(tableIDs)} {}
 
     inline void addTableIDs(const vector<table_id_t>& tableIDsToAdd) {

diff --git a/src/include/binder/query/reading_clause/query_graph.h b/src/include/binder/query/reading_clause/query_graph.h
@@ -8,7 +8,6 @@
 namespace kuzu {
 namespace binder {
 
-const table_id_t ANY_TABLE_ID = numeric_limits<uint32_t>::max();
 const uint8_t MAX_NUM_VARIABLES = 64;
 
 class QueryGraph;

diff --git a/src/include/catalog/catalog.h b/src/include/catalog/catalog.h
@@ -95,6 +95,20 @@ class CatalogContent {
     inline const vector<Property>& getRelProperties(table_id_t tableID) const {
         return relTableSchemas.at(tableID)->properties;
     }
+    inline vector<table_id_t> getNodeTableIDs() const {
+        vector<table_id_t> nodeTableIDs;
+        for (auto& [tableID, _] : nodeTableSchemas) {
+            nodeTableIDs.push_back(tableID);
+        }
+        return nodeTableIDs;
+    }
+    inline vector<table_id_t> getRelTableIDs() const {
+        vector<table_id_t> relTableIDs;
+        for (auto& [tableID, _] : relTableSchemas) {
+            relTableIDs.push_back(tableID);
+        }
+        return relTableIDs;
+    }
     inline unordered_map<table_id_t, unique_ptr<NodeTableSchema>>& getNodeTableSchemas() {
         return nodeTableSchemas;
     }

diff --git a/test/test_files/tinysnb/match/multi_label.test b/test/test_files/tinysnb/match/multi_label.test
@@ -1,3 +1,29 @@
+-NAME UnLabelTest
+-QUERY MATCH () RETURN COUNT(*)
+---- 1
+14
+
+-NAME MultiLabelNodeTest
+-QUERY MATCH (a:organisation:person) RETURN COUNT(*)
+---- 1
+11
+
+-NAME MultiLabelNodeTest
+-QUERY MATCH (a:organisation:person) MATCH (a:movies) RETURN COUNT(*)
+---- 1
+14
+
+-NAME MultiLabelCrossProductTest
+-QUERY MATCH (a:person), (b:person), (c:person:movies) RETURN COUNT(*)
+-ENUMERATE
+---- 1
+704
+
+-NAME UnLabelOneHopTest
+-QUERY MATCH ()-[]->() RETURN COUNT(*)
+---- 1
+40
+
 -NAME MultiLabelOneHopTest1
 -QUERY MATCH (a:person)-[e:knows|:marries]->(b:person) RETURN COUNT(*)
 ---- 1

diff --git a/test/test_files/tinysnb/match/node.test b/test/test_files/tinysnb/match/node.test
@@ -8,13 +8,3 @@
 ---- 1
 3
 
--NAME node3
--QUERY MATCH (a:organisation:person) RETURN COUNT(*)
----- 1
-11
-
--NAME nodeCrossProductTest
--QUERY MATCH (a:person), (b:person), (c:person:movies) RETURN COUNT(*)
--ENUMERATE
----- 1
-704