Skip to content

Commit e220b7f

Browse files
committed
Merge remote-tracking branch 'origin/main' into drop-pg16-support
2 parents 2cf9e84 + 63ecadf commit e220b7f

4 files changed

Lines changed: 4 additions & 7 deletions

File tree

cpp/deeplake_pg/extension_init.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -643,7 +643,6 @@ static void process_utility(PlannedStmt* pstmt,
643643
}
644644
}
645645

646-
// DROP SCHEMA propagation is handled by DDL WAL logging post-hook.
647646
}
648647
} else if (stmt->removeType == OBJECT_DATABASE) {
649648
const char* query = "SELECT nspname, relname "

cpp/deeplake_pg/pg_deeplake.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -265,8 +265,6 @@ void save_index_metadata(Oid oid)
265265
if (SPI_execute(buf.data, false, 0) != SPI_OK_INSERT) {
266266
ereport(ERROR, (errcode(ERRCODE_INTERNAL_ERROR), errmsg("Failed to save metadata")));
267267
}
268-
269-
// Cross-instance propagation is driven by DDL WAL logging in ProcessUtility.
270268
}
271269

272270
void load_index_metadata()

cpp/deeplake_pg/sync_worker.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@ extern "C" {
3232
#include "table_storage.hpp"
3333
#include "utils.hpp"
3434

35+
#include <async/promise.hpp>
36+
#include <deeplake_api/catalog_table.hpp>
37+
#include <icm/vector.hpp>
38+
3539
#include <algorithm>
3640
#include <cstdio>
3741
#include <cstring>
@@ -550,7 +554,6 @@ PGDLLEXPORT void deeplake_sync_worker_main(Datum main_arg)
550554
std::unordered_map<std::string, int64_t> last_db_seqs;
551555
load_wal_checkpoints(last_db_seqs);
552556

553-
554557
while (!got_sigterm) {
555558
// Process pending interrupts (including ProcSignalBarrier from DROP DATABASE)
556559
CHECK_FOR_INTERRUPTS();

cpp/deeplake_pg/table_storage.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -240,8 +240,6 @@ void table_storage::save_table_metadata(const pg::table_data& table_data)
240240
}
241241
return true;
242242
});
243-
244-
// Stateless sync uses DDL WAL replay from __wal_table.
245243
}
246244

247245
void table_storage::load_table_metadata()
@@ -855,7 +853,6 @@ void table_storage::drop_table(const std::string& table_name)
855853
auto& table_data = get_table_data(table_name);
856854
auto creds = session_credentials::get_credentials();
857855

858-
// Stateless propagation is handled by DDL WAL logging in ProcessUtility hook.
859856

860857
try {
861858
table_data.commit(); // Ensure all changes are committed before deletion

0 commit comments

Comments
 (0)