This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a commit to branch SCB-817
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-saga.git
commit 588059d6ae6bc0c2106034bb49ea0d3b5a6a24e3
Author: Willem Jiang <jiangni...@huawei.com>
AuthorDate: Mon Aug 27 15:46:49 2018 +0800
SCB-817 Updated the TCC protocol for CoordinatedEvent
---
.../{TccEventService.java => MessageHandler.java} | 24 ++--------------------
.../omega/transaction/tcc/TccEventService.java | 8 +++++---
.../transaction/tcc/events/CoordinatedEvent.java | 4 ++++
.../src/main/proto/GrpcTccEvent.proto | 12 +++++++++++
4 files changed, 23 insertions(+), 25 deletions(-)
diff --git
a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccEventService.java
b/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/MessageHandler.java
similarity index 55%
copy from
omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccEventService.java
copy to
omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/MessageHandler.java
index 48ad743..8758954 100644
---
a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccEventService.java
+++
b/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/MessageHandler.java
@@ -17,26 +17,6 @@
package org.apache.servicecomb.saga.omega.transaction.tcc;
-import org.apache.servicecomb.saga.omega.transaction.AlphaResponse;
-import org.apache.servicecomb.saga.omega.transaction.TxEvent;
-import
org.apache.servicecomb.saga.omega.transaction.tcc.events.ParticipatedEvent;
-import org.apache.servicecomb.saga.omega.transaction.tcc.events.TccEndedEvent;
-import
org.apache.servicecomb.saga.omega.transaction.tcc.events.TccStartedEvent;
-
-public interface TccEventService {
-
- void onConnected();
-
- void onDisconnected();
-
- void close();
-
- String target();
-
- AlphaResponse participate(ParticipatedEvent participateEvent);
-
- AlphaResponse TccTransactionStart(TccStartedEvent tccStartEvent);
-
- AlphaResponse TccTransactionStop(TccEndedEvent tccEndEvent);
-
+public interface MessageHandler {
+ void onReceive(String globalTxId, String localTxId, String parentTxId,
String method);
}
diff --git
a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccEventService.java
b/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccEventService.java
index 48ad743..f5bdcfd 100644
---
a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccEventService.java
+++
b/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccEventService.java
@@ -18,7 +18,7 @@
package org.apache.servicecomb.saga.omega.transaction.tcc;
import org.apache.servicecomb.saga.omega.transaction.AlphaResponse;
-import org.apache.servicecomb.saga.omega.transaction.TxEvent;
+import
org.apache.servicecomb.saga.omega.transaction.tcc.events.CoordinatedEvent;
import
org.apache.servicecomb.saga.omega.transaction.tcc.events.ParticipatedEvent;
import org.apache.servicecomb.saga.omega.transaction.tcc.events.TccEndedEvent;
import
org.apache.servicecomb.saga.omega.transaction.tcc.events.TccStartedEvent;
@@ -35,8 +35,10 @@ public interface TccEventService {
AlphaResponse participate(ParticipatedEvent participateEvent);
- AlphaResponse TccTransactionStart(TccStartedEvent tccStartEvent);
+ AlphaResponse tccTransactionStart(TccStartedEvent tccStartEvent);
- AlphaResponse TccTransactionStop(TccEndedEvent tccEndEvent);
+ AlphaResponse tccTransactionStop(TccEndedEvent tccEndEvent);
+
+ AlphaResponse coordinate(CoordinatedEvent coordinatedEvent);
}
diff --git
a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/events/CoordinatedEvent.java
b/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/events/CoordinatedEvent.java
new file mode 100644
index 0000000..6d88924
--- /dev/null
+++
b/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/events/CoordinatedEvent.java
@@ -0,0 +1,4 @@
+package org.apache.servicecomb.saga.omega.transaction.tcc.events;
+
+public class CoordinatedEvent {
+}
diff --git
a/pack-contracts/pack-contract-grpc/src/main/proto/GrpcTccEvent.proto
b/pack-contracts/pack-contract-grpc/src/main/proto/GrpcTccEvent.proto
index 64731b0..7977b7a 100644
--- a/pack-contracts/pack-contract-grpc/src/main/proto/GrpcTccEvent.proto
+++ b/pack-contracts/pack-contract-grpc/src/main/proto/GrpcTccEvent.proto
@@ -29,6 +29,7 @@ service TccEventService {
rpc participate(GrpcTccParticipatedEvent) returns (GrpcAck) {}
rpc OnTccTransactionStarted (GrpcTccTransactionStartedEvent) returns
(GrpcAck) {}
rpc OnTccTransactionEnded (GrpcTccTransactionEndedEvent) returns (GrpcAck) {}
+ rpc OnTccCoordinated(GrpcTccCoordinatedEvent) returns(GrpcAck) {}
rpc OnDisconnected (GrpcServiceConfig) returns (GrpcAck) {
}
}
@@ -64,6 +65,17 @@ message GrpcTccTransactionEndedEvent {
string status = 7;
}
+message GrpcTccCoordinatedEvent {
+ int64 timestamp = 1;
+ string globalTxId = 2;
+ string localTxId = 3;
+ string parentTxId = 4;
+ string serviceName = 5;
+ string instanceId = 6;
+ string methodName = 7;
+ string status = 8;
+}
+
message GrpcTccCoordinateCommand {
string globalTxId = 1;
string localTxId = 2;
