Merge branch 'release/os/5.1' of https://github.com/corda/corda-api i…

…nto nandor/CORE-14025/find-existing-tx-backchain

.ci/dev/forward-merge/JenkinsInteropMerge

@@ -0,0 +1,31 @@
+@Library('[email protected]') _
+
+/*
+ * Forward merge any changes in current branch to the branch with following version.
+ *
+ * Please note, the branches names are intentionally separated as variables, to minimised conflicts
+ * during automated merges for this file.
+ *
+ * These variables should be updated when a new version is cut
+ */
+
+/**
+ * the branch name of origin branch, it should match the current branch
+ * and it acts as a fail-safe inside {@code forwardMerger} pipeline
+ */
+String originBranch = 'release/os/5.1'
+
+/**
+ * the branch name of target branch, it should be the branch with the next version
+ * after the one in current branch.
+ */
+String targetBranch = 'release/interop/syntax'
+
+/**
+ * Forward merge any changes between #originBranch and #targetBranch
+ */
+forwardMerger(
+    targetBranch: targetBranch,
+    originBranch: originBranch,
+    slackChannel: '#interop-forward-merge-bot-notifications',
+)

data/avro-schema/src/main/resources/avro/net/corda/data/persistence/EntityResponse.avsc

@@ -16,6 +16,12 @@
       "name": "metadata",
       "doc": "Metadata returned from the execution of the persistence operation",
       "type": "net.corda.data.KeyValuePairList"
+    },
+    {
+      "name": "resumePoint",
+      "doc": "Used by queries that support stable paging to return opaque data that indicates where the next page should resume from",
+      "type": ["null", "bytes"],
+      "default": null
     }
   ]
 }

data/avro-schema/src/main/resources/avro/net/corda/data/persistence/FindWithNamedQuery.avsc

@@ -1,7 +1,7 @@
 {
   "type": "record",
   "name": "FindWithNamedQuery",
-  "doc": "Find entities matched by a named query. Parameters for the query may be specified. Pagination is supported, but there's no guarantee of consistency if the underlying data changes. The data will not be sorted in Corda; if the database returns an unpredictable order that must be handled by the caller. FindWithNamedQuery can be used to enforce ordering if required. Replies with {@link EntityResponse}",
+  "doc": "Find entities matched by a named query. Parameters for the query may be specified. Pagination is supported, but there's no guarantee of consistency if the underlying data changes and using offset-based pagination. The data will not be sorted in Corda; if the database returns an unpredictable order that must be handled by the caller. FindWithNamedQuery can be used to enforce ordering if required. Replies with {@link EntityResponse}",
   "namespace": "net.corda.data.persistence",
   "fields": [
     {
@@ -26,6 +26,12 @@
         "name": "limit",
         "type": "int",
         "doc": "Limit number of rows in the output query results, after applying the offset. Use the maximum int value if you do not want a lower limit."
+    },
+    {
+      "name": "resumePoint",
+      "type": ["null", "bytes"],
+      "default": null,
+      "doc": "When a query supports stable paging, contains opaque data telling the query where to resume from when making queries for subsequent pages."
     }
   ]
 }

data/db-schema/src/main/java/net/corda/db/schema/DbSchema.java

@@ -38,6 +38,7 @@ private DbSchema() {
     public static final String VNODE_GROUP_PARAMETERS = "vnode_group_parameters";
     public static final String VNODE_GROUP_APPROVAL_RULES = "vnode_group_approval_rules";
     public static final String VNODE_PRE_AUTH_TOKENS = "vnode_pre_auth_tokens";
+    public static final String VNODE_PERSISTENCE_REQUEST_ID_TABLE = "vnode_persistence_request_id";
 
     public static final String LEDGER_CONSENSUAL_TRANSACTION_TABLE = "consensual_transaction";
     public static final String LEDGER_CONSENSUAL_TRANSACTION_STATUS_TABLE = "consensual_transaction_status";

data/db-schema/src/main/resources/net/corda/db/schema/vnode-vault/db.changelog-master.xml

@@ -5,6 +5,6 @@
     <include file="net/corda/db/schema/vnode-vault/migration/vnode-vault-creation-v1.0.xml"/>
     <include file="net/corda/db/schema/vnode-vault/migration/ledger-consensual-creation-v1.0.xml"/>
     <include file="net/corda/db/schema/vnode-vault/migration/ledger-utxo-creation-v1.0.xml"/>
-
+    <include file="net/corda/db/schema/vnode-vault/migration/ledger-utxo-creation-v5.1.xml"/>
     <include file="net/corda/db/schema/vnode-vault/migration/vnode-vault-creation-v5.1.xml"/>
 </databaseChangeLog>

data/db-schema/src/main/resources/net/corda/db/schema/vnode-vault/migration/ledger-utxo-creation-v5.1.xml

@@ -0,0 +1,20 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   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_transaction_output_idx_type"
+                tableName="utxo_transaction_output">
+            <column name="type"/>
+        </createIndex>
+    </changeSet>
+
+</databaseChangeLog>

data/db-schema/src/main/resources/net/corda/db/schema/vnode-vault/migration/vnode-vault-creation-v5.1.xml

@@ -6,5 +6,11 @@
         <addColumn tableName="vnode_member_info">
             <column name="is_deleted" type="BOOLEAN" defaultValueBoolean="false"/>
         </addColumn>
+
+        <createTable tableName="vnode_persistence_request_id">
+            <column name="request_id" type="NVARCHAR(255)">
+                <constraints nullable="false" primaryKey="true"/>
+            </column>
+        </createTable>
     </changeSet>
 </databaseChangeLog>

gradle.properties

@@ -9,7 +9,7 @@ cordaProductVersion = 5.1.0
 # NOTE: update this each time this module contains a breaking change
 ## NOTE: currently this is a top level revision, so all API versions will line up, but this could be moved to
 ##   a per module property in which case module versions can change independently.
-cordaApiRevision = 19
+cordaApiRevision = 20
 
 # Main
 kotlinVersion = 1.8.21