From 2ec320acecd030e5c0040cf5a440980e21f6ebca Mon Sep 17 00:00:00 2001 From: Alexis Sellier Date: Wed, 19 Oct 2022 22:33:57 +0200 Subject: [PATCH] Use 'primary key' constraint instead of index Signed-off-by: Alexis Sellier --- radicle-node/src/client.rs | 12 +++++++++--- radicle-node/src/service/routing/schema.sql | 4 +--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/radicle-node/src/client.rs b/radicle-node/src/client.rs index cf8f8200..f0417f18 100644 --- a/radicle-node/src/client.rs +++ b/radicle-node/src/client.rs @@ -104,9 +104,15 @@ impl Client { let time = LocalTime::now(); let storage = self.profile.storage; let signer = self.profile.signer; - let addresses = - address::Book::open(self.profile.home.join(NODE_DIR).join(ADDRESS_DB_FILE))?; - let routing = routing::Table::open(self.profile.home.join(NODE_DIR).join(ROUTING_DB_FILE))?; + let node_dir = self.profile.home.join(NODE_DIR); + let address_db = node_dir.join(ADDRESS_DB_FILE); + let routing_db = node_dir.join(ROUTING_DB_FILE); + + log::info!("Opening address book {}..", address_db.display()); + let addresses = address::Book::open(address_db)?; + + log::info!("Opening routing table {}..", routing_db.display()); + let routing = routing::Table::open(routing_db)?; log::info!("Initializing client ({:?})..", network); diff --git a/radicle-node/src/service/routing/schema.sql b/radicle-node/src/service/routing/schema.sql index bf0486c8..7f600dff 100644 --- a/radicle-node/src/service/routing/schema.sql +++ b/radicle-node/src/service/routing/schema.sql @@ -2,7 +2,6 @@ -- Routing table SQL schema. -- create table if not exists "routing" ( - "id" integer primary key, -- Resource being seeded. "resource" text not null, -- Node ID. @@ -10,6 +9,5 @@ create table if not exists "routing" ( -- UNIX time at which this entry was added or refreshed. "time" integer not null, - unique("resource", "node") + primary key ("resource", "node") ); -create index "routing_index" on routing ("resource", "node");