This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a commit to branch SCB-665
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-saga.git
commit eae940b99500d31d7ee4780b11c920883ef6e508
Author: Willem Jiang <jiangni...@huawei.com>
AuthorDate: Tue Aug 21 09:59:02 2018 +0800
SCB-817 Updated the TCC grpc contract file
---
.../omega/transaction/tcc/TccEventService.java | 4 ++++
.../{TccStartEvent.java => ParticipatedEvent.java} | 22 +++++++++-------------
.../{TccEndEvent.java => TccEndedEvent.java} | 9 ++++++---
.../{TccStartEvent.java => TccStartedEvent.java} | 9 +++------
.../servicecomb/saga/common/TransactionStatus.java | 6 ++++--
.../src/main/proto/GrpcTccEvent.proto | 3 ++-
6 files changed, 28 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/TccEventService.java
new file mode 100644
index 0000000..1649620
--- /dev/null
+++
b/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccEventService.java
@@ -0,0 +1,4 @@
+package org.apache.servicecomb.saga.omega.transaction.tcc;
+
+public class TccService {
+}
diff --git
a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/events/TccStartEvent.java
b/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/events/ParticipatedEvent.java
similarity index 77%
copy from
omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/events/TccStartEvent.java
copy to
omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/events/ParticipatedEvent.java
index 416c182..73ede9c 100644
---
a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/events/TccStartEvent.java
+++
b/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/events/ParticipatedEvent.java
@@ -16,26 +16,22 @@
*/
package org.apache.servicecomb.saga.omega.transaction.tcc.events;
-public class TccStartEvent {
+
+public class ParticipateEvent {
+
private final String globalTxId;
private final String localTxId;
private final String parentTxId;
+ private final String confirmMethod;
+ private final String cancelMethod;
- public String getGlobalTxId() {
- return globalTxId;
- }
-
- public String getLocalTxId() {
- return localTxId;
- }
-
- public String getParentTxId() {
- return parentTxId;
- }
- public TccStartEvent(String globalTxId, String localTxId, String parentTxId)
{
+ public ParticipateEvent(String globalTxId, String localTxId, String
parentTxId, String confirmMethod,
+ String cancelMethod) {
this.globalTxId = globalTxId;
this.localTxId = localTxId;
this.parentTxId = parentTxId;
+ this.confirmMethod = confirmMethod;
+ this.cancelMethod = cancelMethod;
}
}
diff --git
a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/events/TccEndEvent.java
b/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/events/TccEndedEvent.java
similarity index 82%
rename from
omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/events/TccEndEvent.java
rename to
omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/events/TccEndedEvent.java
index 541489f..9107ab0 100644
---
a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/events/TccEndEvent.java
+++
b/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/events/TccEndedEvent.java
@@ -16,15 +16,18 @@
*/
package org.apache.servicecomb.saga.omega.transaction.tcc.events;
+import org.apache.servicecomb.saga.common.TransactionStatus;
+
public class TccEndEvent {
private final String globalTxId;
private final String localTxId;
- private final String parentTxId;
+ private final TransactionStatus status;
- public TccEndEvent(String globalTxId, String localTxId, String parentTxId) {
+ public TccEndEvent(String globalTxId, String localTxId,
+ TransactionStatus status) {
this.globalTxId = globalTxId;
this.localTxId = localTxId;
- this.parentTxId = parentTxId;
+ this.status = status;
}
}
diff --git
a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/events/TccStartEvent.java
b/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/events/TccStartedEvent.java
similarity index 84%
rename from
omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/events/TccStartEvent.java
rename to
omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/events/TccStartedEvent.java
index 416c182..64db3ea 100644
---
a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/events/TccStartEvent.java
+++
b/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/events/TccStartedEvent.java
@@ -19,7 +19,7 @@ package
org.apache.servicecomb.saga.omega.transaction.tcc.events;
public class TccStartEvent {
private final String globalTxId;
private final String localTxId;
- private final String parentTxId;
+
public String getGlobalTxId() {
return globalTxId;
@@ -29,13 +29,10 @@ public class TccStartEvent {
return localTxId;
}
- public String getParentTxId() {
- return parentTxId;
- }
- public TccStartEvent(String globalTxId, String localTxId, String parentTxId)
{
+
+ public TccStartEvent(String globalTxId, String localTxId) {
this.globalTxId = globalTxId;
this.localTxId = localTxId;
- this.parentTxId = parentTxId;
}
}
diff --git
a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/events/ParticipateEvent.java
b/pack-common/src/main/java/org/apache/servicecomb/saga/common/TransactionStatus.java
similarity index 89%
rename from
omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/events/ParticipateEvent.java
rename to
pack-common/src/main/java/org/apache/servicecomb/saga/common/TransactionStatus.java
index 83e910b..ea5a662 100644
---
a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/events/ParticipateEvent.java
+++
b/pack-common/src/main/java/org/apache/servicecomb/saga/common/TransactionStatus.java
@@ -14,8 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transaction.tcc.events;
+package org.apache.servicecomb.saga.common;
-public class ParticipateEvent {
+public enum TransactionStatus {
+ Succeed,
+ Failed
}
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 9e1752f..14801b2 100644
--- a/pack-contracts/pack-contract-grpc/src/main/proto/GrpcTccEvent.proto
+++ b/pack-contracts/pack-contract-grpc/src/main/proto/GrpcTccEvent.proto
@@ -47,6 +47,7 @@ message GrpcTccParticipateEvent {
string parentTxId = 4;
string confirmMethod = 6;
string cancelMethod = 7;
+ string status = 8;
}
message GrpcTccTransactionEndedEvent {
@@ -54,7 +55,7 @@ message GrpcTccTransactionEndedEvent {
string globalTxId = 2;
string localTxId = 3;
string parentTxId = 4;
- string type = 5;
+ string status = 5;
}
message GrpcTccCordinateCommand {
