draft

Author: andyfengHKU

extension/duckdb/test/test_files/external_table.test

@@ -4,6 +4,40 @@
 
 -CASE ExternalDuckDBTable
 
+-STATEMENT load extension "${KUZU_ROOT_DIRECTORY}/extension/duckdb/build/libduckdb.kuzu_extension"
+---- ok
+-STATEMENT ATTACH '${KUZU_ROOT_DIRECTORY}/dataset/databases/duckdb_database/tinysnb.db' as tinysnb (dbtype duckdb, skip_unsupported_table = true);
+---- 1
+Attached database successfully.
+-STATEMENT BEGIN TRANSACTION;
+---- ok
+-STATEMENT CREATE EXTERNAL NODE TABLE duck_person AS tinysnb.person (PRIMARY KEY (ID));
+---- ok
+-STATEMENT COMMIT;
+---- ok
+-RELOADDB
+-STATEMENT CALL SHOW_TABLES() RETURN *;
+---- 1
+duck_person|EXTERNAL_NODE|local(kuzu)|
+-STATEMENT BEGIN TRANSACTION;
+---- ok
+-STATEMENT ALTER TABLE duck_person RENAME TO d_person;
+---- ok
+-STATEMENT COMMIT;
+---- ok
+-RELOADDB
+-STATEMENT CALL SHOW_TABLES() RETURN *;
+---- 1
+d_person|EXTERNAL_NODE|local(kuzu)|
+-STATEMENT BEGIN TRANSACTION;
+---- ok
+-STATEMENT DROP TABLE d_person;
+---- ok
+-STATEMENT COMMIT;
+---- ok
+-RELOADDB
+-STATEMENT CALL SHOW_TABLES() RETURN *;
+---- 0
 -STATEMENT load extension "${KUZU_ROOT_DIRECTORY}/extension/duckdb/build/libduckdb.kuzu_extension"
 ---- ok
 -STATEMENT ATTACH '${KUZU_ROOT_DIRECTORY}/dataset/databases/duckdb_database/tinysnb.db' as tinysnb (dbtype duckdb, skip_unsupported_table = true);

src/catalog/catalog_entry/catalog_entry.cpp

@@ -37,6 +37,7 @@ std::unique_ptr<CatalogEntry> CatalogEntry::deserialize(common::Deserializer& de
     std::unique_ptr<CatalogEntry> entry;
     switch (type) {
     case CatalogEntryType::NODE_TABLE_ENTRY:
+    case CatalogEntryType::EXTERNAL_NODE_TABLE_ENTRY:
     case CatalogEntryType::REL_TABLE_ENTRY:
     case CatalogEntryType::REL_GROUP_ENTRY:
     case CatalogEntryType::RDF_GRAPH_ENTRY: {

src/catalog/catalog_entry/external_table_catalog_entry.cpp

@@ -29,7 +29,7 @@ std::unique_ptr<ExternalTableCatalogEntry> ExternalTableCatalogEntry::deserializ
     std::string externalTableName;
     deserializer.deserializeValue(externalDBName);
     deserializer.deserializeValue(externalTableName);
-    auto physicalEntry = TableCatalogEntry::deserialize(deserializer, type);
+    auto physicalEntry = CatalogEntry::deserialize(deserializer);
     std::unique_ptr<ExternalTableCatalogEntry> entry;
     switch (type) {
     case CatalogEntryType::EXTERNAL_NODE_TABLE_ENTRY: {
@@ -40,7 +40,7 @@ std::unique_ptr<ExternalTableCatalogEntry> ExternalTableCatalogEntry::deserializ
     }
     entry->externalDBName = externalDBName;
     entry->externalTableName = externalTableName;
-    entry->physicalEntry = std::move(physicalEntry);
+    entry->physicalEntry = physicalEntry->ptrCast<TableCatalogEntry>()->copy();
     return entry;
 }
 

src/catalog/catalog_entry/table_catalog_entry.cpp

@@ -117,12 +117,12 @@ std::unique_ptr<TableCatalogEntry> TableCatalogEntry::deserialize(
     case CatalogEntryType::NODE_TABLE_ENTRY: {
         result = NodeTableCatalogEntry::deserialize(deserializer);
     } break;
-    case CatalogEntryType::REL_TABLE_ENTRY: {
-        result = RelTableCatalogEntry::deserialize(deserializer);
-    } break;
     case CatalogEntryType::EXTERNAL_NODE_TABLE_ENTRY: {
         result = ExternalTableCatalogEntry::deserialize(deserializer, type);
     } break ;
+    case CatalogEntryType::REL_TABLE_ENTRY: {
+        result = RelTableCatalogEntry::deserialize(deserializer);
+    } break;
     case CatalogEntryType::REL_GROUP_ENTRY: {
         result = RelGroupCatalogEntry::deserialize(deserializer);
     } break;

src/catalog/catalog_set.cpp

@@ -70,7 +70,6 @@ oid_t CatalogSet::createEntry(Transaction* transaction, std::unique_ptr<CatalogE
         std::lock_guard lck{mtx};
         oid = nextOID++;
         entry->setOID(oid);
-        // TODO(Guodong): Fix me
         if (entry->getType() == CatalogEntryType::EXTERNAL_NODE_TABLE_ENTRY) {
             entry->ptrCast<ExternalNodeTableCatalogEntry>()->getPhysicalEntry()->setOID(nextOID++);
         }
@@ -83,7 +82,6 @@ oid_t CatalogSet::createEntry(Transaction* transaction, std::unique_ptr<CatalogE
 
 CatalogEntry* CatalogSet::createEntryNoLock(const Transaction* transaction,
     std::unique_ptr<CatalogEntry> entry) {
-
     // LCOV_EXCL_START
     validateNotExistNoLock(transaction, entry->getName());
     // LCOV_EXCL_STOP
@@ -180,6 +178,7 @@ void CatalogSet::alterEntry(Transaction* transaction, const binder::BoundAlterIn
         // LCOV_EXCL_STOP
         entry = getEntryNoLock(transaction, alterInfo.tableName);
         KU_ASSERT(entry->getType() == CatalogEntryType::NODE_TABLE_ENTRY ||
+                  entry->getType() == CatalogEntryType::EXTERNAL_NODE_TABLE_ENTRY ||
                   entry->getType() == CatalogEntryType::REL_TABLE_ENTRY ||
                   entry->getType() == CatalogEntryType::REL_GROUP_ENTRY ||
                   entry->getType() == CatalogEntryType::RDF_GRAPH_ENTRY);

src/transaction/transaction.cpp

@@ -108,6 +108,7 @@ void Transaction::pushCatalogEntry(CatalogSet& catalogSet, CatalogEntry& catalog
         switch (catalogEntry.getType()) {
         // Eventually we probably want to merge these
         case CatalogEntryType::NODE_TABLE_ENTRY:
+        case CatalogEntryType::EXTERNAL_NODE_TABLE_ENTRY:
         case CatalogEntryType::REL_TABLE_ENTRY:
         case CatalogEntryType::REL_GROUP_ENTRY:
         case CatalogEntryType::RDF_GRAPH_ENTRY: {