Updating per NP feedback

helium · Oct 20, 2023 · 892ff03 · 892ff03
1 parent d9fe121
commit 892ff03
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 11 deletions.
diff --git a/packages/account-postgres-sink-service/index_config_example.json b/packages/account-postgres-sink-service/index_config_example.json
@@ -0,0 +1,7 @@
+{
+  "configs": [
+    "CREATE UNIQUE INDEX IF NOT EXISTS key_to_asset_asset_index ON key_to_assets(asset);",
+    "CREATE UNIQUE INDEX IF NOT EXISTS iot_hotspot_infos_asset_index ON iot_hotspot_infos(asset);",
+    "CREATE UNIQUE INDEX IF NOT EXISTS mobile_hotspot_infos_asset_index ON mobile_hotspot_infos(asset);"
+  ]
+}
diff --git a/packages/account-postgres-sink-service/src/env.ts b/packages/account-postgres-sink-service/src/env.ts
@@ -9,6 +9,8 @@ export const PROGRAM_ACCOUNT_CONFIGS =
   process.env.PROGRAM_ACCOUNT_CONFIGS ||
   `${__dirname}/../program_account_configs_example.json`;
 
+export const INDEX_CONFIGS = process.env.INDEX_CONFIGS;
+
 export const HELIUS_AUTH_SECRET = process.env.HELIUS_AUTH_SECRET;
 
 export const RUN_JOBS_AT_STARTUP = process.env.RUN_JOBS_AT_STARTUP === 'true';
diff --git a/packages/account-postgres-sink-service/src/server.ts b/packages/account-postgres-sink-service/src/server.ts
@@ -7,6 +7,7 @@ import { PublicKey } from "@solana/web3.js";
 import {
   HELIUS_AUTH_SECRET,
   PROGRAM_ACCOUNT_CONFIGS,
+  INDEX_CONFIGS,
   RUN_JOBS_AT_STARTUP,
 } from "./env";
 import database from "./utils/database";
@@ -33,6 +34,16 @@ if (!HELIUS_AUTH_SECRET) {
     return accountConfigs ? accountConfigs.configs : [];
   })();
 
+  const indexConfigs = (() => {
+    let configs: null | { configs: string[] } = null;
+
+    if (INDEX_CONFIGS) {
+      configs = JSON.parse(fs.readFileSync(INDEX_CONFIGS, "utf8"));
+    }
+
+    return configs ? configs.configs : [];
+  })();
+
   const customJobs = configs
     .filter((x) => !!x.crons)
     .flatMap(({ programId, crons = [] }) =>
@@ -209,7 +220,7 @@ if (!HELIUS_AUTH_SECRET) {
     // models are defined on boot, and updated in refresh-accounts
     await database.sync();
     await defineAllIdlModels({ configs, sequelize: database });
-    await createPgIndexes({ sequelize: database });
+    await createPgIndexes({ indexConfigs, sequelize: database });
     await server.listen({ port: 3000, host: "0.0.0.0" });
     const address = server.server.address();
     const port = typeof address === "string" ? address : address?.port;

diff --git a/packages/account-postgres-sink-service/src/utils/createPgIndexes.ts b/packages/account-postgres-sink-service/src/utils/createPgIndexes.ts
@@ -1,20 +1,20 @@
 import { Sequelize } from "sequelize";
 
 export const createPgIndexes = async ({
-  sequelize,
+  indexConfigs,
+  sequelize
 }: {
+  indexConfigs: string[],
   sequelize: Sequelize;
 }) => {
   try {
-    await sequelize.query(`
-    CREATE UNIQUE INDEX IF NOT EXISTS key_to_asset_asset_index ON key_to_assets(asset);
-    `);
-    await sequelize.query(`
-      CREATE UNIQUE INDEX IF NOT EXISTS iot_hotspot_infos_asset_index ON iot_hotspot_infos(asset);
-    `);
-    await sequelize.query(`
-      CREATE UNIQUE INDEX IF NOT EXISTS mobile_hotspot_infos_asset_index ON mobile_hotspot_infos(asset);
-    `);
+    const indexPromises = indexConfigs.map((config) => {
+      return sequelize.query(config);
+    });
+
+    await Promise.all(indexPromises);
+
+    console.log("createPgIndexes: Indexes created!");
   } catch (err) {
     console.error("createPgIndexes: Index creation failed");
     console.error(err);