Implement sort index hints for postgres eventstore

reimagined · Jan 18, 2022 · bcfde5c · bcfde5c
1 parent 71e76ad
commit bcfde5c
Showing 1 changed file with 19 additions and 14 deletions.
diff --git a/packages/runtime/adapters/eventstore-adapters/eventstore-postgresql/src/create-load-query.ts b/packages/runtime/adapters/eventstore-adapters/eventstore-postgresql/src/create-load-query.ts
@@ -36,20 +36,25 @@ const createLoadQuery = (
 
   if (limit !== undefined) {
     return [
-      `SELECT "unitedEvents".* FROM (
-        ${vectorConditions
-          .map(
-            (threadCounter, threadId) =>
-              `(${[
-                `SELECT * FROM ${databaseNameAsId}.${eventsTableAsId}`,
-                `WHERE (${resultQueryCondition}) AND "threadId" = ${threadId} AND "threadCounter" >= ${threadCounter}::${INT8_SQL_TYPE}`,
-                `LIMIT ${limit}`,
-              ].join(' ')})`
-          )
-          .join(' UNION ALL \n')}
-        ) "unitedEvents"`,
-      `ORDER BY "unitedEvents"."timestamp" ASC, "unitedEvents"."threadCounter" ASC, "unitedEvents"."threadId" ASC`,
-      `LIMIT ${+limit}`,
+      `SELECT "sortedEvents".* FROM (`,
+      `  SELECT "unitedEvents".* FROM (`,
+      vectorConditions
+        .map(
+          (threadCounter, threadId) =>
+            `(${[
+              `SELECT * FROM ${databaseNameAsId}.${eventsTableAsId}`,
+              `WHERE (${resultQueryCondition}) AND "threadId" = ${threadId} AND "threadCounter" >= ${threadCounter}::${INT8_SQL_TYPE}`,
+              `ORDER BY "threadCounter" ASC`,
+              `LIMIT ${limit}`,
+            ].join(' ')})`
+        )
+        .join(' UNION ALL \n'),
+      `  ) "unitedEvents"`,
+      `  ORDER BY "unitedEvents"."timestamp" ASC`,
+      `  LIMIT ${+limit}`,
+      `) "sortedEvents"`,
+      `ORDER BY "sortedEvents"."threadCounter" ASC,`,
+      `"sortedEvents"."threadId" ASC`,
     ].join('\n')
   } else {
     const resultVectorConditions = `${vectorConditions