eric/duckdb-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #19 from duckdb/yl/minor-cleanup

Browse Source 
Minor cleanup
This commit is contained in:
Y.
2025-03-11 11:54:36 -04:00
committed by GitHub
parent 3295b7ab4c f6a4077188
commit e3c77d410a
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/http_server.cpp
View File

@@ -40,20 +40,23 @@ void HttpServer::UpdateDatabaseInstanceIfRunning(
void HttpServer::UpdateDatabaseInstance( void HttpServer::UpdateDatabaseInstance(
shared_ptr<DatabaseInstance> context_db) { shared_ptr<DatabaseInstance> context_db) {
const auto current_db = server_instance->LockDatabaseInstance(); const auto current_db = server_instance->LockDatabaseInstance();
if (current_db != context_db) { if (current_db == context_db) {
auto watcher_stopped = false; return;
if (server_instance->watcher) { }
bool has_watcher = !!server_instance->watcher;
if (has_watcher) {
server_instance->watcher->Stop(); server_instance->watcher->Stop();
server_instance->watcher = nullptr; server_instance->watcher = nullptr;
watcher_stopped = true;
} }
server_instance->ddb_instance = context_db; server_instance->ddb_instance = context_db;
if (watcher_stopped) {
if (has_watcher) {
server_instance->watcher = make_uniq<Watcher>(*this); server_instance->watcher = make_uniq<Watcher>(*this);
server_instance->watcher->Start(); server_instance->watcher->Start();
} }
} }
}
bool HttpServer::IsRunningOnMachine(ClientContext &context) { bool HttpServer::IsRunningOnMachine(ClientContext &context) {
if (Started()) { if (Started()) {
@@ -64,11 +67,7 @@ bool HttpServer::IsRunningOnMachine(ClientContext &context) {
auto local_url = StringUtil::Format("http://localhost:%d", local_port); auto local_url = StringUtil::Format("http://localhost:%d", local_port);
httplib::Client client(local_url); httplib::Client client(local_url);
auto result = client.Get("/info"); return client.Get("/info");
if (result) {
return true;
}
return false;
} }
bool HttpServer::Started() { bool HttpServer::Started() {
@@ -204,6 +203,7 @@ void HttpServer::HandleGetLocalEvents(const httplib::Request &req,
if (event_dispatcher->WaitEvent(&sink)) { if (event_dispatcher->WaitEvent(&sink)) {
return true; return true;
} }
sink.done(); sink.done();
return false; return false;
}); });

2
src/watcher.cpp
View File

@@ -9,7 +9,7 @@
namespace duckdb { namespace duckdb {
namespace ui { namespace ui {
Watcher::Watcher(HttpServer &_server) : server(_server), should_run(false) {} Watcher::Watcher(HttpServer &_server) : should_run(false), server(_server) {}
bool WasCatalogUpdated(DatabaseInstance &db, Connection &connection, bool WasCatalogUpdated(DatabaseInstance &db, Connection &connection,
CatalogState &last_state) { CatalogState &last_state) {