From 7c916f6b02e7bd0a86c12ca36afa512281b3788a Mon Sep 17 00:00:00 2001
From: Filipe Oliveira <filipe.oliveira@r3.com>
Date: Wed, 4 Oct 2023 15:18:37 +0100
Subject: [PATCH 1/2] CORE-17471 - Apply indexing to frequently used columns of
 the db table `utxo_transaction_output`

---
 .../migration/ledger-utxo-creation-v5.1.xml   | 34 ++++++++++++++++---
 1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/data/db-schema/src/main/resources/net/corda/db/schema/vnode-vault/migration/ledger-utxo-creation-v5.1.xml b/data/db-schema/src/main/resources/net/corda/db/schema/vnode-vault/migration/ledger-utxo-creation-v5.1.xml
index e46d4e1b59..b82f27eafb 100644
--- a/data/db-schema/src/main/resources/net/corda/db/schema/vnode-vault/migration/ledger-utxo-creation-v5.1.xml
+++ b/data/db-schema/src/main/resources/net/corda/db/schema/vnode-vault/migration/ledger-utxo-creation-v5.1.xml
@@ -4,17 +4,41 @@
                    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.3.xsd">
 
     <changeSet author="R3.Corda" id="ledger-utxo-creation-v5.1">
-       <createIndex
-           indexName="utxo_visible_transaction_state_idx_consumed"
-           tableName="utxo_visible_transaction_state">
-           <column name="consumed"/>
-       </createIndex>
+        <createIndex
+                indexName="utxo_visible_transaction_state_idx_consumed"
+                tableName="utxo_visible_transaction_state">
+            <column name="consumed"/>
+        </createIndex>
 
         <createIndex
                 indexName="utxo_transaction_output_idx_type"
                 tableName="utxo_transaction_output">
             <column name="type"/>
         </createIndex>
+
+        <createIndex
+                indexName="utxo_transaction_output_idx_token_type"
+                tableName="utxo_transaction_output">
+            <column name="token_type"/>
+        </createIndex>
+
+        <createIndex
+                indexName="utxo_transaction_output_idx_token_issuer_hash"
+                tableName="utxo_transaction_output">
+            <column name="token_issuer_hash"/>
+        </createIndex>
+
+        <createIndex
+                indexName="utxo_transaction_output_idx_token_symbol"
+                tableName="utxo_transaction_output">
+            <column name="token_symbol"/>
+        </createIndex>
+
+        <createIndex
+                indexName="utxo_transaction_output_idx_token_notary_x500_name"
+                tableName="utxo_transaction_output">
+            <column name="token_notary_x500_name"/>
+        </createIndex>
     </changeSet>
 
 </databaseChangeLog>
\ No newline at end of file

From cf363934ae378ca74824a5d428ee340554982bdc Mon Sep 17 00:00:00 2001
From: Filipe Oliveira <filipe.oliveira@r3.com>
Date: Thu, 5 Oct 2023 10:22:48 +0100
Subject: [PATCH 2/2] Updated the styling as suggested in the PR.

---
 .../migration/ledger-utxo-creation-v5.1.xml   | 30 ++++++++-----------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/data/db-schema/src/main/resources/net/corda/db/schema/vnode-vault/migration/ledger-utxo-creation-v5.1.xml b/data/db-schema/src/main/resources/net/corda/db/schema/vnode-vault/migration/ledger-utxo-creation-v5.1.xml
index b82f27eafb..23df1c6f79 100644
--- a/data/db-schema/src/main/resources/net/corda/db/schema/vnode-vault/migration/ledger-utxo-creation-v5.1.xml
+++ b/data/db-schema/src/main/resources/net/corda/db/schema/vnode-vault/migration/ledger-utxo-creation-v5.1.xml
@@ -4,39 +4,33 @@
                    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.3.xsd">
 
     <changeSet author="R3.Corda" id="ledger-utxo-creation-v5.1">
-        <createIndex
-                indexName="utxo_visible_transaction_state_idx_consumed"
-                tableName="utxo_visible_transaction_state">
+        <createIndex indexName="utxo_visible_transaction_state_idx_consumed"
+                     tableName="utxo_visible_transaction_state">
             <column name="consumed"/>
         </createIndex>
 
-        <createIndex
-                indexName="utxo_transaction_output_idx_type"
-                tableName="utxo_transaction_output">
+        <createIndex indexName="utxo_transaction_output_idx_type"
+                     tableName="utxo_transaction_output">
             <column name="type"/>
         </createIndex>
 
-        <createIndex
-                indexName="utxo_transaction_output_idx_token_type"
-                tableName="utxo_transaction_output">
+        <createIndex indexName="utxo_transaction_output_idx_token_type"
+                     tableName="utxo_transaction_output">
             <column name="token_type"/>
         </createIndex>
 
-        <createIndex
-                indexName="utxo_transaction_output_idx_token_issuer_hash"
-                tableName="utxo_transaction_output">
+        <createIndex indexName="utxo_transaction_output_idx_token_issuer_hash"
+                     tableName="utxo_transaction_output">
             <column name="token_issuer_hash"/>
         </createIndex>
 
-        <createIndex
-                indexName="utxo_transaction_output_idx_token_symbol"
-                tableName="utxo_transaction_output">
+        <createIndex indexName="utxo_transaction_output_idx_token_symbol"
+                     tableName="utxo_transaction_output">
             <column name="token_symbol"/>
         </createIndex>
 
-        <createIndex
-                indexName="utxo_transaction_output_idx_token_notary_x500_name"
-                tableName="utxo_transaction_output">
+        <createIndex indexName="utxo_transaction_output_idx_token_notary_x500_name"
+                     tableName="utxo_transaction_output">
             <column name="token_notary_x500_name"/>
         </createIndex>
     </changeSet>