diff --git a/pkg/txn/storage/tae/write.go b/pkg/txn/storage/tae/write.go index 6df15804ff90c..9b10c12dc141a 100644 --- a/pkg/txn/storage/tae/write.go +++ b/pkg/txn/storage/tae/write.go @@ -29,7 +29,7 @@ func (s *taeStorage) Write( //case uint32(apipb.OpCode_OpPreCommit): // return HandleWrite(ctx, txnMeta, payload, s.taeHandler.HandlePreCommitWrite) //case uint32(apipb.OpCode_OpCommitMerge): - return HandleWrite(ctx, txnMeta, payload, s.taeHandler.HandleCommitMerge) + //return HandleWrite(ctx, txnMeta, payload, s.taeHandler.HandleCommitMerge) //default: // return nil, moerr.NewNotSupportedf(ctx, "unknown write op: %v", op) //} diff --git a/pkg/vm/engine/tae/rpc/handle_2pc.go b/pkg/vm/engine/tae/rpc/handle_2pc.go index 704656cf66fd8..adb0e5cbd11e8 100644 --- a/pkg/vm/engine/tae/rpc/handle_2pc.go +++ b/pkg/vm/engine/tae/rpc/handle_2pc.go @@ -16,11 +16,11 @@ package rpc import ( "context" - "github.com/matrixorigin/matrixone/pkg/vm/engine/tae/iface/txnif" "github.com/matrixorigin/matrixone/pkg/container/types" "github.com/matrixorigin/matrixone/pkg/pb/timestamp" "github.com/matrixorigin/matrixone/pkg/pb/txn" + "github.com/matrixorigin/matrixone/pkg/vm/engine/tae/iface/txnif" ) /// diff --git a/pkg/vm/engine/test/testutil/tae_engine.go b/pkg/vm/engine/test/testutil/tae_engine.go index da33cf0dc8987..79783a06a3009 100644 --- a/pkg/vm/engine/test/testutil/tae_engine.go +++ b/pkg/vm/engine/test/testutil/tae_engine.go @@ -97,17 +97,6 @@ func (ts *TestTxnStorage) Commit(ctx context.Context, request *txn.TxnRequest, r resp.Txn = &req.Txn } - //if request.CommitRequest != nil { - // for _, req := range request.CommitRequest.Payload { - // //response is shared by all requests - // prepareResponse(req, response) - // err := ts.Write(ctx, req, response) - // if err != nil { - // return err - // } - // } - //} - prepareResponse(request, response) cts, err := ts.txnHandler.HandleCommit(ctx, request.Txn, response, request.CommitRequest)