From 361cd678cbae3a0c496eb992f4bebbf4382db51e Mon Sep 17 00:00:00 2001
From: Jose Coll <jose.coll@r3.com>
Date: Thu, 2 Nov 2023 18:31:43 +0000
Subject: [PATCH] ENT-10531 Add additional index on distribution records
 tables. Sync table names. (#7548)

---
 .../migration/node-core.changelog-v25.xml     | 28 +++++++++++++++----
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/node/src/main/resources/migration/node-core.changelog-v25.xml b/node/src/main/resources/migration/node-core.changelog-v25.xml
index bc31223fe7..dee14a6fa2 100644
--- a/node/src/main/resources/migration/node-core.changelog-v25.xml
+++ b/node/src/main/resources/migration/node-core.changelog-v25.xml
@@ -10,7 +10,7 @@
         <dropColumn tableName="node_transactions" columnName="states_to_record"/>
     </changeSet>
 
-    <changeSet author="R3.Corda" id="create_sender_distribution_records_table">
+    <changeSet author="R3.Corda" id="create_sender_distr_recs_table">
         <createTable tableName="node_sender_distr_recs">
             <column name="timestamp" type="TIMESTAMP">
                 <constraints nullable="false"/>
@@ -34,11 +34,19 @@
     </changeSet>
 
     <changeSet author="R3.Corda" id="node_sender_distr_recs_pkey">
-        <addPrimaryKey columnNames="peer_party_id, timestamp, timestamp_discriminator" constraintName="node_sender_distr_recs_pkey"
+        <addPrimaryKey columnNames="peer_party_id, timestamp, timestamp_discriminator, transaction_id" constraintName="node_sender_distr_recs_pkey"
                        tableName="node_sender_distr_recs"/>
     </changeSet>
 
-    <changeSet author="R3.Corda" id="create_receiver_distribution_records_table">
+    <changeSet author="R3.Corda" id="node_sender_distr_recs_add_indexes">
+        <createIndex indexName="node_sender_distr_recs_keyinfo_idx" tableName="node_sender_distr_recs">
+            <column name="transaction_id"/>
+            <column name="timestamp"/>
+            <column name="timestamp_discriminator"/>
+        </createIndex>
+    </changeSet>
+
+    <changeSet author="R3.Corda" id="create_receiver_distr_recs_table">
         <createTable tableName="node_receiver_distr_recs">
             <column name="timestamp" type="TIMESTAMP">
                 <constraints nullable="false"/>
@@ -62,10 +70,18 @@
     </changeSet>
 
     <changeSet author="R3.Corda" id="node_receiver_distr_recs_pkey">
-        <addPrimaryKey columnNames="peer_party_id, timestamp, timestamp_discriminator" constraintName="node_receiver_distr_recs_pkey"
+        <addPrimaryKey columnNames="peer_party_id, timestamp, timestamp_discriminator, transaction_id" constraintName="node_receiver_distr_recs_pkey"
                        tableName="node_receiver_distr_recs"/>
     </changeSet>
 
+    <changeSet author="R3.Corda" id="node_receiver_distr_recs_add_indexes">
+        <createIndex indexName="node_receiver_distr_recs_keyinfo_idx" tableName="node_receiver_distr_recs">
+            <column name="transaction_id"/>
+            <column name="timestamp"/>
+            <column name="timestamp_discriminator"/>
+        </createIndex>
+    </changeSet>
+
     <changeSet author="R3.Corda" id="create_recovery_party_info_table">
         <createTable tableName="node_recovery_party_info">
             <column name="party_id" type="NVARCHAR(144)">
@@ -81,13 +97,13 @@
         <addPrimaryKey columnNames="party_id" constraintName="node_recovery_party_info_pkey" tableName="node_recovery_party_info"/>
     </changeSet>
 
-    <changeSet author="R3.Corda" id="FK__sender_distribution_records__peer_party_id">
+    <changeSet author="R3.Corda" id="FK__sender_distr_recs__peer_party_id">
         <addForeignKeyConstraint baseColumnNames="peer_party_id" baseTableName="node_sender_distr_recs"
                                  constraintName="FK__send_distr__peer_party_id"
                                  referencedColumnNames="party_id" referencedTableName="node_recovery_party_info"/>
     </changeSet>
 
-    <changeSet author="R3.Corda" id="FK__receiver_distribution_records__peer_party_id">
+    <changeSet author="R3.Corda" id="FK__receiver_distr_recs__peer_party_id">
         <addForeignKeyConstraint baseColumnNames="peer_party_id" baseTableName="node_receiver_distr_recs"
                                  constraintName="FK__recv_distr__peer_party_id"
                                  referencedColumnNames="party_id" referencedTableName="node_recovery_party_info"/>