Merge pull request #32 from folio-org/current

Rename system schema to ldp_catalog
library-data-platform · Dec 12, 2019 · fade9a5 · fade9a5
2 parents 5c8c28a + 72f921f
commit fade9a5
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 15 deletions.
diff --git a/USER_GUIDE.md b/USER_GUIDE.md
@@ -60,8 +60,10 @@ ignored.
 
 The data in these tables are extracted from Okapi-based APIs and loaded
 into the database by the LDP data loader.  The data loader typically
-should be run once per day, and so the LDP database reflects the state
-of the source data as of sometime within the past 24 hours.
+runs once per day, and so the LDP database reflects the state of the
+source data as of sometime within the past 24 hours or so.  A table
+called `ldp_catalog.table_updates` records when each data table was last
+updated.
 
 
 2\. JSON queries

diff --git a/src/main.cpp b/src/main.cpp
@@ -58,14 +58,16 @@ static void initDB(const Options& opt, etymon::Postgres* db)
 {
     string sql;
 
-    sql = "CREATE SCHEMA IF NOT EXISTS ldp;";
+    sql = "CREATE SCHEMA IF NOT EXISTS ldp_catalog;";
     printSQL(Print::debug, opt, sql);
     { etymon::PostgresResult result(db, sql); }
 
     sql =
-        "CREATE TABLE IF NOT EXISTS ldp.table_updates (\n"
-        "    table_name VARCHAR(65535) NOT NULL PRIMARY KEY,\n"
-        "    updated TIMESTAMPTZ NOT NULL\n"
+        "CREATE TABLE IF NOT EXISTS ldp_catalog.table_updates (\n"
+        "    table_name VARCHAR(65535) NOT NULL,\n"
+        "    updated TIMESTAMPTZ NOT NULL,\n"
+        "    tenant_id SMALLINT NOT NULL,\n"
+        "    PRIMARY KEY (table_name, tenant_id)\n"
         ");";
     printSQL(Print::debug, opt, sql);
     { etymon::PostgresResult result(db, sql); }
@@ -83,11 +85,12 @@ static void updateDBPermissions(const Options& opt, etymon::Postgres* db)
 {
     string sql;
 
-    sql = "GRANT USAGE ON SCHEMA ldp TO " + opt.ldpUser + ";";
+    sql = "GRANT USAGE ON SCHEMA ldp_catalog TO " + opt.ldpUser + ";";
     printSQL(Print::debug, opt, sql);
     { etymon::PostgresResult result(db, sql); }
 
-    sql = "GRANT SELECT ON ALL TABLES IN SCHEMA ldp TO " + opt.ldpUser + ";";
+    sql = "GRANT SELECT ON ALL TABLES IN SCHEMA ldp_catalog TO " +
+        opt.ldpUser + ";";
     printSQL(Print::debug, opt, sql);
     { etymon::PostgresResult result(db, sql); }
 

diff --git a/src/merge.cpp b/src/merge.cpp
@@ -17,11 +17,24 @@ static void mergeTable(const Options& opt, const TableSchema& table,
         "    updated TIMESTAMPTZ NOT NULL,\n"
         "    tenant_id SMALLINT NOT NULL,\n"
         "    CONSTRAINT ldp_history_" + table.tableName + "_pkey\n"
-        "        PRIMARY KEY (tenant_id, id, updated)\n"
+        "        PRIMARY KEY (id, updated, tenant_id)\n"
         ");";
     printSQL(Print::debug, opt, sql);
     { etymon::PostgresResult result(db, sql); }
 
+    // Temporary: reorder primary key.
+    sql =
+        "ALTER TABLE " + historyTable + "\n"
+        "    DROP CONSTRAINT ldp_history_" + table.tableName + "_pkey;\n";
+    printSQL(Print::debug, opt, sql);
+    { etymon::PostgresResult result(db, sql); }
+    sql =
+        "ALTER TABLE " + historyTable + "\n"
+        "    ADD CONSTRAINT ldp_history_" + table.tableName + "_pkey\n"
+        "        PRIMARY KEY (id, updated, tenant_id);";
+    printSQL(Print::debug, opt, sql);
+    { etymon::PostgresResult result(db, sql); }
+
     string latestHistoryTable;
     latestHistoryTableName(table.tableName, &latestHistoryTable);
 
@@ -79,14 +92,15 @@ static void updateStatus(const Options& opt, const TableSchema& table,
         etymon::Postgres* db)
 {
     string sql =
-        "DELETE FROM ldp.table_updates WHERE table_name = '" +
-        table.tableName + "';";
+        "DELETE FROM ldp_catalog.table_updates WHERE table_name = '" +
+        table.tableName + "' AND tenant_id = 1;";
     printSQL(Print::debug, opt, sql);
     { etymon::PostgresResult result(db, sql); }
 
     sql =
-        "INSERT INTO ldp.table_updates (table_name, updated)\n"
-        "    VALUES ('" + table.tableName + "', 'now');";
+        "INSERT INTO ldp_catalog.table_updates\n"
+        "    (table_name, updated, tenant_id)\n"
+        "    VALUES ('" + table.tableName + "', 'now', 1);";
     printSQL(Print::debug, opt, sql);
     { etymon::PostgresResult result(db, sql); }
 }

diff --git a/src/names.cpp b/src/names.cpp
@@ -2,7 +2,7 @@
 
 void loadingTableName(const string& table, string* newtable)
 {
-    *newtable = "stage_" + table;
+    *newtable = "ldp_" + table;
 }
 
 void latestHistoryTableName(const string& table, string* newtable)

diff --git a/src/stage_json.cpp b/src/stage_json.cpp
@@ -567,7 +567,7 @@ static void createLoadingTable(const Options& opt, const TableSchema& table,
     sql += opt.dbtype.jsonType();
     sql += ",\n"
         "    tenant_id SMALLINT NOT NULL,\n"
-        "    PRIMARY KEY (tenant_id, id)\n"
+        "    PRIMARY KEY (id, tenant_id)\n"
         ");";
     printSQL(Print::debug, opt, sql);
     { etymon::PostgresResult result(db, sql); }