Optimized Txn publish fetch query (#546)

* Optimized Txn fetch query
* Fixed SNS publish batch-size issue
* fixed sns msg id

Author: hirenkp2000

CHANGELOG.md

@@ -1,3 +1,7 @@
+## Naksha_1.1.4
+
+- Optimized Txn fetch query to avoid long-running query issue against space with very old last published transaction Id 
+
 ## Naksha_1.1.3
 
 - Increased DB Pool size of Naksha Admin DB from 10 to 25 to allow additional sequencer/publisher jobs to run in parallel.

pom.xml

@@ -41,7 +41,7 @@
 
   <groupId>com.here.xyz</groupId>
   <artifactId>xyz-hub</artifactId>
-  <version>1.1.3</version>
+  <version>1.1.4</version>
   <packaging>pom</packaging>
 
   <modules>

xyz-connectors/pom.xml

@@ -25,7 +25,7 @@
     <groupId>com.here.xyz</groupId>
     <artifactId>xyz-hub</artifactId>
     <relativePath>../</relativePath>
-    <version>1.1.3</version>
+    <version>1.1.4</version>
   </parent>
 
   <licenses>

xyz-hub-service/pom.xml

@@ -25,7 +25,7 @@
     <groupId>com.here.xyz</groupId>
     <artifactId>xyz-hub</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.1.3</version>
+    <version>1.1.4</version>
   </parent>
 
   <licenses>

xyz-hub-test/pom.xml

@@ -25,7 +25,7 @@
     <groupId>com.here.xyz</groupId>
     <artifactId>xyz-hub</artifactId>
     <relativePath>../</relativePath>
-    <version>1.1.3</version>
+    <version>1.1.4</version>
   </parent>
 
   <licenses>

xyz-models/pom.xml

@@ -25,7 +25,7 @@
     <groupId>com.here.xyz</groupId>
     <artifactId>xyz-hub</artifactId>
     <relativePath>../</relativePath>
-    <version>1.1.3</version>
+    <version>1.1.4</version>
   </parent>
 
   <licenses>

xyz-psql-connector/pom.xml

@@ -25,7 +25,7 @@
     <groupId>com.here.xyz</groupId>
     <artifactId>xyz-hub</artifactId>
     <relativePath>../</relativePath>
-    <version>1.1.3</version>
+    <version>1.1.4</version>
   </parent>
 
   <licenses>

xyz-psql-connector/src/main/resources/naksha_ext.sql

@@ -1494,6 +1494,7 @@ CREATE OR REPLACE FUNCTION xyz_config.naksha_fetch_newer_transactions( in_hst_sc
 AS
 $BODY$
 DECLARE
+    table_name          TEXT;
     txn_stmt            TEXT;
     txn_record          RECORD;
     crt_txn_rec_id      int8;
@@ -1502,12 +1503,17 @@ DECLARE
     fetched_count       int;
 BEGIN
     -- Statement to fetch newer transaction Id(s) from Transactions table for a given space
+	-- We use "schema" and "table" based query (instead of space) to hit the right index
+    --txn_stmt:= format('SELECT t.id, t.txn FROM xyz_config.transactions t '
+    --                ||'WHERE t.space = $1 AND t.id >= $2 ORDER BY t.id ASC LIMIT %s', in_limit_rows+1);
     txn_stmt:= format('SELECT t.id, t.txn FROM xyz_config.transactions t '
-                    ||'WHERE t.space = $1 AND t.id >= $2 ORDER BY t.id ASC LIMIT %s', in_limit_rows+1);
+                    ||'WHERE t."schema" = $1 AND t."table" = $2 AND t.id >= $3 ORDER BY t.id ASC LIMIT %s', in_limit_rows+1);
 
+    table_name := replace(in_hst_table, '_hst', '');
     fetched_count := 0;
     -- Fetch transaction Id(s)
-    FOR txn_record IN EXECUTE txn_stmt USING in_space, in_last_txn_id LOOP
+    --FOR txn_record IN EXECUTE txn_stmt USING in_space, in_last_txn_id LOOP
+    FOR txn_record IN EXECUTE txn_stmt USING in_hst_schema, table_name, in_last_txn_id LOOP
         EXIT WHEN fetched_count >= in_limit_rows;
         --RAISE NOTICE 'Transaction fetched is %', txn_record;
 

xyz-txn-handler/pom.xml

@@ -25,7 +25,7 @@
         <groupId>com.here.xyz</groupId>
         <artifactId>xyz-hub</artifactId>
         <relativePath>../</relativePath>
-        <version>1.1.3</version>
+        <version>1.1.4</version>
     </parent>
 
     <licenses>