Skip to content

[query] GetTransactionStatus #148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[query] GetTransactionStatus #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
342 changes: 248 additions & 94 deletions api/protoqueryservice/query.pb.go
View file
Open in desktop

Large diffs are not rendered by default.

11 changes: 11 additions & 0 deletions api/protoqueryservice/query.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ option go_package = "github.com/hyperledger/fabric-x-committer/api/protoqueryser
package protoqueryservice;

import "api/protoblocktx/block_tx.proto";
import "api/protonotify/notify.proto";
import "google/protobuf/empty.proto";

service QueryService {
Expand All @@ -19,6 +20,7 @@ service QueryService {
rpc EndView(View) returns (View) {};
rpc GetNamespacePolicies(google.protobuf.Empty) returns (protoblocktx.NamespacePolicies) {};
rpc GetConfigTransaction(google.protobuf.Empty) returns (protoblocktx.ConfigTransaction) {};
rpc GetTransactionStatus(TxStatusQuery) returns (TxStatusResponse) {};
}

message View {
Expand Down Expand Up @@ -62,3 +64,12 @@ message Row {
bytes value = 2;
uint64 version = 3;
}

message TxStatusQuery {
optional View view = 1;
repeated string tx_ids = 2; // List of transaction IDs.
}

message TxStatusResponse {
repeated protonotify.TxStatusEvent statuses = 1;
}
37 changes: 37 additions & 0 deletions api/protoqueryservice/query_grpc.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

142 changes: 85 additions & 57 deletions integration/test/query_service_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,10 @@ import (
"github.com/stretchr/testify/require"

"github.com/hyperledger/fabric-x-committer/api/protoblocktx"
"github.com/hyperledger/fabric-x-committer/api/protonotify"
"github.com/hyperledger/fabric-x-committer/api/protoqueryservice"
"github.com/hyperledger/fabric-x-committer/integration/runner"
"github.com/hyperledger/fabric-x-committer/utils/test"
)

func TestQueryService(t *testing.T) {
Expand All @@ -33,8 +35,9 @@ func TestQueryService(t *testing.T) {
ctx, cancel := context.WithTimeout(t.Context(), time.Minute*5)
t.Cleanup(cancel)

c.MakeAndSendTransactionsToOrderer(t, [][]*protoblocktx.TxNamespace{{
{
t.Log("Insert TXs")
txIDs := c.MakeAndSendTransactionsToOrderer(t, [][]*protoblocktx.TxNamespace{
{{
NsId: "1",
NsVersion: 0,
BlindWrites: []*protoblocktx.Write{
Expand All @@ -47,8 +50,8 @@ func TestQueryService(t *testing.T) {
Value: []byte("v2"),
},
},
},
{
}},
{{
NsId: "2",
NsVersion: 0,
BlindWrites: []*protoblocktx.Write{
Expand All @@ -61,72 +64,97 @@ func TestQueryService(t *testing.T) {
Value: []byte("v4"),
},
},
}},
}, []protoblocktx.Status{protoblocktx.Status_COMMITTED, protoblocktx.Status_COMMITTED})
require.Len(t, txIDs, 2)

t.Log("Query TXs status")
status, err := c.QueryServiceClient.GetTransactionStatus(ctx, &protoqueryservice.TxStatusQuery{
TxIds: txIDs,
})
require.NoError(t, err)
require.Len(t, status.Statuses, len(txIDs))
test.RequireProtoElementsMatch(t, []*protonotify.TxStatusEvent{
{
TxId: txIDs[0],
StatusWithHeight: &protoblocktx.StatusWithHeight{
Code: protoblocktx.Status_COMMITTED,
TxNumber: uint32(0),
BlockNumber: uint64(2),
},
},
}}, []protoblocktx.Status{protoblocktx.Status_COMMITTED})
{
TxId: txIDs[1],
StatusWithHeight: &protoblocktx.StatusWithHeight{
Code: protoblocktx.Status_COMMITTED,
TxNumber: uint32(1),
BlockNumber: uint64(2),
},
},
}, status.Statuses)

t.Run("Query-GetRows-Both-Namespaces", func(t *testing.T) {
ret, err := c.QueryServiceClient.GetRows(
ctx,
&protoqueryservice.Query{
Namespaces: []*protoqueryservice.QueryNamespace{
{
NsId: "1",
Keys: [][]byte{
[]byte("k1"), []byte("k2"),
},
t.Log("Query Rows")
ret, err := c.QueryServiceClient.GetRows(
ctx,
&protoqueryservice.Query{
Namespaces: []*protoqueryservice.QueryNamespace{
{
NsId: "1",
Keys: [][]byte{
[]byte("k1"), []byte("k2"),
},
{
NsId: "2",
Keys: [][]byte{
[]byte("k3"), []byte("k4"),
},
},
{
NsId: "2",
Keys: [][]byte{
[]byte("k3"), []byte("k4"),
},
},
},
)
require.NoError(t, err)
},
)
require.NoError(t, err)

testItemsVersion := uint64(0)
testItemsVersion := uint64(0)

requiredItems := []*protoqueryservice.RowsNamespace{
{
NsId: "1",
Rows: []*protoqueryservice.Row{
{
Key: []byte("k1"),
Value: []byte("v1"),
Version: testItemsVersion,
},
{
Key: []byte("k2"),
Value: []byte("v2"),
Version: testItemsVersion,
},
requiredItems := []*protoqueryservice.RowsNamespace{
{
NsId: "1",
Rows: []*protoqueryservice.Row{
{
Key: []byte("k1"),
Value: []byte("v1"),
Version: testItemsVersion,
},
{
Key: []byte("k2"),
Value: []byte("v2"),
Version: testItemsVersion,
},
},
{
NsId: "2",
Rows: []*protoqueryservice.Row{
{
Key: []byte("k3"),
Value: []byte("v3"),
Version: testItemsVersion,
},
{
Key: []byte("k4"),
Value: []byte("v4"),
Version: testItemsVersion,
},
},
{
NsId: "2",
Rows: []*protoqueryservice.Row{
{
Key: []byte("k3"),
Value: []byte("v3"),
Version: testItemsVersion,
},
{
Key: []byte("k4"),
Value: []byte("v4"),
Version: testItemsVersion,
},
},
}
},
}

requireQueryResults(
t,
requiredItems,
ret.Namespaces,
)
})
requireQueryResults(
t,
requiredItems,
ret.Namespaces,
)
}

// requireQueryResults requires that the items retrieved by the Query service
Expand Down
Loading