digital-asset · mergify · Aug 18, 2021 · Aug 16, 2021 · Aug 16, 2021 · Aug 17, 2021
diff --git a/...n-api/src/main/resources/db/migration/h2database-appendonly/V1__Append_only_schema.sha256 b/...n-api/src/main/resources/db/migration/h2database-appendonly/V1__Append_only_schema.sha256
@@ -1 +1 @@
-0d8451829143e22581afc5b31930bb0ff8c5efab89a3eaca0ed2e57454fc6823
+d5d135c634d971cd4a4b67d81bb28da4a0ea01c94070675b24b990ffcf285321
diff --git a/...tion-api/src/main/resources/db/migration/h2database-appendonly/V1__Append_only_schema.sql b/...tion-api/src/main/resources/db/migration/h2database-appendonly/V1__Append_only_schema.sql
@@ -121,9 +121,18 @@ CREATE TABLE participant_command_completions (
     application_id VARCHAR NOT NULL,
     submitters ARRAY NOT NULL,
     command_id VARCHAR NOT NULL,
+    -- The transaction ID is `NULL` for rejected transactions.
     transaction_id VARCHAR,
-    status_code INTEGER,
-    status_message VARCHAR
+    -- The three columns below are `NULL` if the completion is for an accepted transaction.
+    -- The `rejection_status` contains a Protocol-Buffers-serialized message of type
+    -- `google.rpc.Status`, containing the code, message, and further details (decided by the ledger
+    -- driver).
+    -- The `rejection_status_code` and `rejection_status_message` columns will always be
+    -- `NULL` in an H2-backed index, as data is not persisted across ledger restarts. However, we
+    -- keep them for parity with old data in other databases.
+    rejection_status_code INTEGER,
+    rejection_status_message VARCHAR,
+    rejection_status BYTEA
 );
 
 CREATE INDEX participant_command_completion_offset_application_idx ON participant_command_completions (completion_offset, application_id);

diff --git a/...ation-api/src/main/resources/db/migration/oracle-appendonly/V1__Append_only_schema.sha256 b/...ation-api/src/main/resources/db/migration/oracle-appendonly/V1__Append_only_schema.sha256
@@ -1 +1 @@
-c6e4c74b1c854a51d9cd79d3c614b60a372ca60e88b8d69cbd90a7a674389080
+7cd06324d0b97f384401b77a0d0af4bf7e949427c812097bc5c565f68c8bfee6
diff --git a/...egration-api/src/main/resources/db/migration/oracle-appendonly/V1__Append_only_schema.sql b/...egration-api/src/main/resources/db/migration/oracle-appendonly/V1__Append_only_schema.sql
@@ -124,16 +124,17 @@ CREATE INDEX idx_party_entries ON party_entries(submission_id);
 
 CREATE TABLE participant_command_completions
 (
-    completion_offset VARCHAR2(4000)  not null,
-    record_time       TIMESTAMP       not null,
+    completion_offset           VARCHAR2(4000)  NOT NULL,
+    record_time                 TIMESTAMP       NOT NULL,
 
-    application_id    NVARCHAR2(1000) not null,
-    submitters        CLOB NOT NULL CONSTRAINT ensure_json_submitters CHECK (submitters IS JSON),
-    command_id        NVARCHAR2(1000) not null,
+    application_id              NVARCHAR2(1000) NOT NULL,
+    submitters                  CLOB NOT NULL CONSTRAINT ensure_json_submitters CHECK (submitters IS JSON),
+    command_id                  NVARCHAR2(1000) NOT NULL,
 
-    transaction_id    NVARCHAR2(1000), -- null if the command was rejected and checkpoints
-    status_code       INTEGER,         -- null for successful command and checkpoints
-    status_message    CLOB  -- null for successful command and checkpoints
+    transaction_id              NVARCHAR2(1000), -- null for rejected transactions and checkpoints
+    rejection_status_code       INTEGER,         -- null for accepted transactions and checkpoints
+    rejection_status_message    CLOB,            -- null for accepted transactions and checkpoints
+    rejection_status            BLOB             -- null for accepted transactions and checkpoints
 );
 
 CREATE INDEX participant_command_completions_idx ON participant_command_completions(completion_offset, application_id);

diff --git a/...resources/db/migration/postgres-appendonly/V106__add_rejection_status_proto_column.sha256 b/...resources/db/migration/postgres-appendonly/V106__add_rejection_status_proto_column.sha256
@@ -0,0 +1 @@
+e97a66e8f6431ff0dd19d48b46bbe1b90ef7d840be9145e73a567107de06db04
diff --git a/...in/resources/db/migration/postgres-appendonly/V106__add_rejection_status_proto_column.sql b/...in/resources/db/migration/postgres-appendonly/V106__add_rejection_status_proto_column.sql
@@ -0,0 +1,20 @@
+--  Copyright (c) 2021 Digital Asset (Switzerland) GmbH and/or its affiliates. All rights reserved.
+--  SPDX-License-Identifier: Apache-2.0
+
+-- Store the completion status as a serialized Protocol Buffers message of type `google.rpc.Status`.
+--
+-- The `rejection_status` contains a Protocol-Buffers-serialized message of type
+-- `google.rpc.Status`, containing the code, message, and further details (decided by the ledger
+-- driver).
+--
+-- We only rename the `rejection_status_code` and `rejection_status_message` columns, and so they
+-- may contain historical data. Readers of this table will therefore need to query for all three
+-- columns and either use the `google.rpc.Status` message in `rejection_status` if it exists, or
+-- construct one from the `rejection_status_code` and `rejection_status_message` if it does not.
+
+ALTER TABLE participant_command_completions
+    RENAME COLUMN status_code TO rejection_status_code;
+ALTER TABLE participant_command_completions
+    RENAME COLUMN status_message TO rejection_status_message;
+ALTER TABLE participant_command_completions
+    ADD COLUMN rejection_status BYTEA;
diff --git a/...participant-integration-api/src/main/scala/platform/store/CompletionFromTransaction.scala b/...participant-integration-api/src/main/scala/platform/store/CompletionFromTransaction.scala
@@ -10,60 +10,42 @@ import com.daml.ledger.api.v1.command_completion_service.{Checkpoint, Completion
 import com.daml.ledger.api.v1.completion.Completion
 import com.daml.ledger.api.v1.ledger_offset.LedgerOffset
 import com.daml.ledger.offset.Offset
-import com.daml.lf.data.Ref
 import com.daml.platform.ApiOffset.ApiOffsetConverter
-import com.daml.platform.store.Conversions.RejectionReasonOps
-import com.daml.platform.store.entries.LedgerEntry
-import com.google.rpc.status.Status
+import com.google.rpc.status.{Status => StatusProto}
+import io.grpc.Status
 
 // Turn a stream of transactions into a stream of completions for a given application and set of parties
 // TODO Restrict the scope of this to com.daml.platform.store.dao when
 // TODO - the in-memory sandbox is gone
 private[platform] object CompletionFromTransaction {
+  private val OkStatus = StatusProto.of(Status.Code.OK.value(), "", Seq.empty)
+  private val RejectionTransactionId = ""
 
-  def toApiCheckpoint(recordTime: Instant, offset: Offset): Some[Checkpoint] =
-    Some(
-      Checkpoint(
-        recordTime = Some(fromInstant(recordTime)),
-        offset = Some(LedgerOffset(LedgerOffset.Value.Absolute(offset.toApiString))),
-      )
+  def acceptedCompletion(
+      recordTime: Instant,
+      offset: Offset,
+      commandId: String,
+      transactionId: String,
+  ): CompletionStreamResponse =
+    CompletionStreamResponse.of(
+      checkpoint = Some(toApiCheckpoint(recordTime, offset)),
+      completions = Seq(Completion.of(commandId, Some(OkStatus), transactionId)),
     )
 
-  // Filter completions for transactions for which we have the full submitter information: appId, submitter, cmdId
-  // This doesn't make a difference for the sandbox (because it represents the ledger backend + api server in single package).
-  // But for an api server that is part of a distributed ledger network, we might see
-  // transactions that originated from some other api server. These transactions don't contain the submitter information,
-  // and therefore we don't emit CommandAccepted completions for those
-  def apply(
-      appId: Ref.ApplicationId,
-      parties: Set[Ref.Party],
-  ): PartialFunction[(Offset, LedgerEntry), (Offset, CompletionStreamResponse)] = {
-    case (
-          offset,
-          LedgerEntry.Transaction(
-            Some(commandId),
-            transactionId,
-            Some(`appId`),
-            _,
-            actAs,
-            _,
-            _,
-            recordTime,
-            _,
-            _,
-          ),
-        ) if actAs.exists(parties) =>
-      offset -> CompletionStreamResponse(
-        checkpoint = toApiCheckpoint(recordTime, offset),
-        Seq(Completion(commandId, Some(Status()), transactionId)),
-      )
+  def rejectedCompletion(
+      recordTime: Instant,
+      offset: Offset,
+      commandId: String,
+      status: StatusProto,
+  ): CompletionStreamResponse =
+    CompletionStreamResponse.of(
+      checkpoint = Some(toApiCheckpoint(recordTime, offset)),
+      completions = Seq(Completion.of(commandId, Some(status), RejectionTransactionId)),
+    )
 
-    case (offset, LedgerEntry.Rejection(recordTime, commandId, `appId`, _, actAs, reason))
-        if actAs.exists(parties) =>
-      val status = reason.toParticipantStateRejectionReason.status
-      offset -> CompletionStreamResponse(
-        checkpoint = toApiCheckpoint(recordTime, offset),
-        Seq(Completion(commandId, Some(status))),
-      )
-  }
+  private def toApiCheckpoint(recordTime: Instant, offset: Offset): Checkpoint =
+    Checkpoint.of(
+      recordTime = Some(fromInstant(recordTime)),
+      offset = Some(LedgerOffset.of(LedgerOffset.Value.Absolute(offset.toApiString))),
+    )
 }
diff --git a/ledger/participant-integration-api/src/main/scala/platform/store/backend/DbDto.scala b/ledger/participant-integration-api/src/main/scala/platform/store/backend/DbDto.scala
@@ -133,8 +133,7 @@ object DbDto {
       submitters: Set[String],
       command_id: String,
       transaction_id: Option[String],
-      status_code: Option[Int],
-      status_message: Option[String],
+      rejection_status: Option[Array[Byte]],
   ) extends DbDto
 
   final case class CommandDeduplication(deduplication_key: String) extends DbDto

diff --git a/ledger/participant-integration-api/src/main/scala/platform/store/backend/UpdateToDbDto.scala b/ledger/participant-integration-api/src/main/scala/platform/store/backend/UpdateToDbDto.scala
@@ -34,8 +34,7 @@ object UpdateToDbDto {
             submitters = u.completionInfo.actAs.toSet,
             command_id = u.completionInfo.commandId,
             transaction_id = None,
-            status_code = Some(u.reasonTemplate.code),
-            status_message = Some(u.reasonTemplate.message),
+            rejection_status = Some(u.reasonTemplate.status.toByteArray),
           ),
           DbDto.CommandDeduplication(
             DeduplicationKeyMaker.make(
@@ -269,8 +268,7 @@ object UpdateToDbDto {
             submitters = completionInfo.actAs.toSet,
             command_id = completionInfo.commandId,
             transaction_id = Some(u.transactionId),
-            status_code = None,
-            status_message = None,
+            rejection_status = None,
           )
         }
 

diff --git a/...n-api/src/main/scala/platform/store/backend/common/CompletionStorageBackendTemplate.scala b/...n-api/src/main/scala/platform/store/backend/common/CompletionStorageBackendTemplate.scala
@@ -6,42 +6,46 @@ package com.daml.platform.store.backend.common
 import java.sql.Connection
 import java.time.Instant
 
+import anorm.SqlParser.{binaryStream, int, str}
 import anorm.{RowParser, ~}
-import anorm.SqlParser.{int, str}
 import com.daml.ledger.api.v1.command_completion_service.CompletionStreamResponse
-import com.daml.ledger.api.v1.completion.Completion
 import com.daml.ledger.offset.Offset
 import com.daml.lf.data.Ref
 import com.daml.lf.data.Ref.Party
-import com.daml.platform.store.CompletionFromTransaction.toApiCheckpoint
+import com.daml.platform.store.CompletionFromTransaction
 import com.daml.platform.store.Conversions.{instant, offset}
 import com.daml.platform.store.backend.CompletionStorageBackend
-import com.google.rpc.status.Status
+import com.google.protobuf.CodedInputStream
+import com.google.rpc.status.{Status => StatusProto}
 
 trait CompletionStorageBackendTemplate extends CompletionStorageBackend {
 
   def queryStrategy: QueryStrategy
 
-  private val sharedCompletionColumns: RowParser[Offset ~ Instant ~ String] =
+  private val sharedColumns: RowParser[Offset ~ Instant ~ String] =
     offset("completion_offset") ~ instant("record_time") ~ str("command_id")
 
   private val acceptedCommandParser: RowParser[CompletionStreamResponse] =
-    sharedCompletionColumns ~ str("transaction_id") map {
+    sharedColumns ~ str("transaction_id") map {
       case offset ~ recordTime ~ commandId ~ transactionId =>
-        CompletionStreamResponse(
-          checkpoint = toApiCheckpoint(recordTime, offset),
-          completions = Seq(Completion(commandId, Some(Status()), transactionId)),
-        )
+        CompletionFromTransaction.acceptedCompletion(recordTime, offset, commandId, transactionId)
     }
 
-  private val rejectedCommandParser: RowParser[CompletionStreamResponse] =
-    sharedCompletionColumns ~ int("status_code") ~ str("status_message") map {
-      case offset ~ recordTime ~ commandId ~ statusCode ~ statusMessage =>
-        CompletionStreamResponse(
-          checkpoint = toApiCheckpoint(recordTime, offset),
-          completions = Seq(Completion(commandId, Some(Status(statusCode, statusMessage)))),
-        )
-    }
+  private val rejectedCommandParser: RowParser[CompletionStreamResponse] = {
+    val parserWithCodeAndMessage = sharedColumns ~
+      int("rejection_status_code") ~ str("rejection_status_message") map {
+        case offset ~ recordTime ~ commandId ~ rejectionStatusCode ~ rejectionStatusMessage =>
+          val status = StatusProto.of(rejectionStatusCode, rejectionStatusMessage, Seq.empty)
+          CompletionFromTransaction.rejectedCompletion(recordTime, offset, commandId, status)
+      }
+    val parserWithProtobufStatus = sharedColumns ~
+      binaryStream("rejection_status") map {
+        case offset ~ recordTime ~ commandId ~ rejectionStatusStream =>
+          val status = StatusProto.parseFrom(CodedInputStream.newInstance(rejectionStatusStream))
+          CompletionFromTransaction.rejectedCompletion(recordTime, offset, commandId, status)
+      }
+    parserWithCodeAndMessage | parserWithProtobufStatus
+  }
 
   private val completionParser: RowParser[CompletionStreamResponse] =
     acceptedCommandParser | rejectedCommandParser
@@ -61,8 +65,9 @@ trait CompletionStorageBackendTemplate extends CompletionStorageBackend {
           record_time,
           command_id,
           transaction_id,
-          status_code,
-          status_message
+          rejection_status_code,
+          rejection_status_message,
+          rejection_status
         FROM
           participant_command_completions
         WHERE

diff --git a/ledger/participant-integration-api/src/main/scala/platform/store/backend/common/Schema.scala b/ledger/participant-integration-api/src/main/scala/platform/store/backend/common/Schema.scala
@@ -225,8 +225,7 @@ private[backend] object AppendOnlySchema {
         "submitters" -> fieldStrategy.stringArray(_.submitters),
         "command_id" -> fieldStrategy.string(_.command_id),
         "transaction_id" -> fieldStrategy.stringOptional(_.transaction_id),
-        "status_code" -> fieldStrategy.intOptional(_.status_code),
-        "status_message" -> fieldStrategy.stringOptional(_.status_message),
+        "rejection_status" -> fieldStrategy.byteaOptional(_.rejection_status),
       )
 
     val commandSubmissionDeletes: Table[DbDto.CommandDeduplication] =

diff --git a/...rticipant-integration-api/src/main/scala/platform/store/dao/CommandCompletionsTable.scala b/...rticipant-integration-api/src/main/scala/platform/store/dao/CommandCompletionsTable.scala
@@ -7,13 +7,12 @@ import java.time.Instant
 
 import anorm.{Row, RowParser, SimpleSql, SqlParser, SqlStringInterpolation, ~}
 import com.daml.ledger.api.v1.command_completion_service.CompletionStreamResponse
-import com.daml.ledger.api.v1.completion.Completion
 import com.daml.ledger.offset.Offset
 import com.daml.lf.data.Ref
-import com.daml.platform.store.CompletionFromTransaction.toApiCheckpoint
+import com.daml.platform.store.CompletionFromTransaction
 import com.daml.platform.store.Conversions._
 import com.daml.platform.store.dao.events.SqlFunctions
-import com.google.rpc.status.Status
+import com.google.rpc.status.{Status => StatusProto}
 
 private[platform] object CommandCompletionsTable {
 
@@ -25,19 +24,14 @@ private[platform] object CommandCompletionsTable {
   private val acceptedCommandParser: RowParser[CompletionStreamResponse] =
     sharedColumns ~ str("transaction_id") map {
       case offset ~ recordTime ~ commandId ~ transactionId =>
-        CompletionStreamResponse(
-          checkpoint = toApiCheckpoint(recordTime, offset),
-          completions = Seq(Completion(commandId, Some(Status()), transactionId)),
-        )
+        CompletionFromTransaction.acceptedCompletion(recordTime, offset, commandId, transactionId)
     }
 
   private val rejectedCommandParser: RowParser[CompletionStreamResponse] =
     sharedColumns ~ int("status_code") ~ str("status_message") map {
       case offset ~ recordTime ~ commandId ~ statusCode ~ statusMessage =>
-        CompletionStreamResponse(
-          checkpoint = toApiCheckpoint(recordTime, offset),
-          completions = Seq(Completion(commandId, Some(Status(statusCode, statusMessage)))),
-        )
+        val status = StatusProto.of(statusCode, statusMessage, Seq.empty)
+        CompletionFromTransaction.rejectedCompletion(recordTime, offset, commandId, status)
     }
 
   val parser: RowParser[CompletionStreamResponse] = acceptedCommandParser | rejectedCommandParser
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		0d8451829143e22581afc5b31930bb0ff8c5efab89a3eaca0ed2e57454fc6823
		d5d135c634d971cd4a4b67d81bb28da4a0ea01c94070675b24b990ffcf285321
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		c6e4c74b1c854a51d9cd79d3c614b60a372ca60e88b8d69cbd90a7a674389080
		7cd06324d0b97f384401b77a0d0af4bf7e949427c812097bc5c565f68c8bfee6
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		e97a66e8f6431ff0dd19d48b46bbe1b90ef7d840be9145e73a567107de06db04