From f806cd3e4a3ad3d2d6a324986299bc7626e9fd14 Mon Sep 17 00:00:00 2001 From: Noah Levitt Date: Wed, 23 Sep 2015 00:32:39 +0000 Subject: [PATCH] use Rethinker.dbname to avoid conflict with rethinkdb.db --- warcprox/bigtable.py | 8 ++++---- warcprox/dedup.py | 8 ++++---- warcprox/stats.py | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/warcprox/bigtable.py b/warcprox/bigtable.py index 3c610e4..ec75360 100644 --- a/warcprox/bigtable.py +++ b/warcprox/bigtable.py @@ -24,12 +24,12 @@ class RethinkCaptures: def _ensure_db_table(self): dbs = self.r.db_list().run() - if not self.r.db in dbs: - self.logger.info("creating rethinkdb database %s", repr(self.r.db)) - self.r.db_create(self.r.db).run() + if not self.r.dbname in dbs: + self.logger.info("creating rethinkdb database %s", repr(self.r.dbname)) + self.r.db_create(self.r.dbname).run() tables = self.r.table_list().run() if not self.table in tables: - self.logger.info("creating rethinkdb table %s in database %s", repr(self.table), repr(self.r.db)) + self.logger.info("creating rethinkdb table %s in database %s", repr(self.table), repr(self.r.dbname)) self.r.table_create(self.table, shards=self.shards, replicas=self.replicas).run() self.r.table(self.table).index_create("abbr_canon_surt_timesamp", [self.r.row["abbr_canon_surt"], self.r.row["timestamp"]]).run() self.r.table(self.table).index_create("sha1_warc_type", [self.r.row["sha1base32"], self.r.row["warc_type"], self.r.row["bucket"]]).run() diff --git a/warcprox/dedup.py b/warcprox/dedup.py index 358af05..942ee9f 100644 --- a/warcprox/dedup.py +++ b/warcprox/dedup.py @@ -93,13 +93,13 @@ class RethinkDedupDb: def _ensure_db_table(self): dbs = self.r.db_list().run() - if not self.r.db in dbs: - self.logger.info("creating rethinkdb database %s", repr(self.r.db)) - self.r.db_create(self.r.db).run() + if not self.r.dbname in dbs: + self.logger.info("creating rethinkdb database %s", repr(self.r.dbname)) + self.r.db_create(self.r.dbname).run() tables = self.r.table_list().run() if not self.table in tables: self.logger.info("creating rethinkdb table %s in database %s shards=%s replicas=%s", - repr(self.table), repr(self.r.db), self.shards, self.replicas) + repr(self.table), repr(self.r.dbname), self.shards, self.replicas) self.r.table_create(self.table, primary_key="key", shards=self.shards, replicas=self.replicas).run() def close(self): diff --git a/warcprox/stats.py b/warcprox/stats.py index a6e5dbf..b27c021 100644 --- a/warcprox/stats.py +++ b/warcprox/stats.py @@ -122,13 +122,13 @@ class RethinkStatsDb: def _ensure_db_table(self): dbs = self.r.db_list().run() - if not self.r.db in dbs: - self.logger.info("creating rethinkdb database %s", repr(self.r.db)) - self.r.db_create(self.r.db).run() + if not self.r.dbname in dbs: + self.logger.info("creating rethinkdb database %s", repr(self.r.dbname)) + self.r.db_create(self.r.dbname).run() tables = self.r.table_list().run() if not self.table in tables: self.logger.info("creating rethinkdb table %s in database %s shards=%s replicas=%s", - repr(self.table), repr(self.r.db), self.shards, self.replicas) + repr(self.table), repr(self.r.dbname), self.shards, self.replicas) self.r.table_create(self.table, primary_key="bucket", shards=self.shards, replicas=self.replicas).run() def close(self):