You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by zh...@apache.org on 2019/01/14 06:25:57 UTC

[servicecomb-pack] 01/01: Merge pull request #378 from zhanglongchun/SCB-1103

This is an automated email from the ASF dual-hosted git repository.

zhaojun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git

commit b30ff5db2015dc1b62b72fa0043b8f77680c01f9
Merge: 0a8d7a4 8d7692d
Author: zhaojun <zh...@126.com>
AuthorDate: Mon Jan 14 14:25:52 2019 +0800

    Merge pull request #378 from zhanglongchun/SCB-1103
    
    Scb 1103

 .../resources/pack_tcc_cancel_scenario.feature     |  6 +-
 .../resources/pack_tcc_confirm_scenario.feature    |  6 +-
 .../pack/alpha/server/tcc/GrpcTccEventService.java | 24 +++----
 .../server/tcc/callback/TccCallbackEngine.java     |  1 +
 .../pack/alpha/server/tcc/jpa/EventConverter.java  | 43 ++++++++++---
 .../tcc/jpa/ParticipatedEventRepository.java       | 16 +++++
 .../pack/alpha/server/tcc/jpa/TccTxEvent.java      |  4 ++
 .../pack/alpha/server/tcc/jpa/TccTxType.java       |  3 +-
 .../tcc/service/MemoryTxEventRepository.java       |  7 +-
 .../server/tcc/service/RDBTxEventRepository.java   |  8 +++
 .../server/tcc/service/TccTxEventRepository.java   |  2 +
 .../server/tcc/service/TccTxEventService.java      | 24 ++++++-
 .../alpha/server/tcc/AlphaTccServerTestBase.java   | 63 ++++++++++++------
 .../alpha/server/tcc/TccCallbackEngineTest.java    | 13 ++--
 .../tcc/service/MemoryEventRegistryTest.java       | 22 ++++---
 .../server/tcc/service/TccTxEventServiceTest.java  | 37 +++++++----
 .../service/TccTxEventServiceTransactionTest.java  |  2 +-
 .../grpc/tcc/GrpcTccClientMessageSender.java       | 50 +++++++++------
 .../connector/grpc/tcc/TccLoadBalanceSender.java   | 29 +++++++--
 .../grpc/tcc/GrpcTccClientMessageSenderTest.java   | 55 ++++++++++------
 .../connector/grpc/tcc/MyTccEventServiceImpl.java  | 25 +++++---
 .../grpc/tcc/TccLoadBalanceSenderTest.java         | 39 +++++------
 .../omega/transaction/spring/MessageConfig.java    | 15 +++--
 .../transaction/spring/TccInterceptorTest.java     | 21 +++---
 .../omega/transaction/tcc/TccEventService.java     |  4 +-
 .../omega/transaction/tcc/TccMessageSender.java    |  7 +-
 .../transaction/tcc/TccParticipatorAspect.java     | 13 ++--
 .../tcc/events/ParticipationEndedEvent.java        | 75 ++++++++++++++++++++++
 ...edEvent.java => ParticipationStartedEvent.java} | 18 ++----
 .../tcc/CoordinateMessageHandlerTest.java          | 12 ++--
 .../transaction/tcc/TccParticipatorAspectTest.java | 50 ++++++++-------
 .../tcc/TccStartAnnotationProcessorTest.java       | 12 ++--
 .../omega/transaction/tcc/TccStartAspectTest.java  | 12 ++--
 .../src/main/proto/GrpcTccEvent.proto              | 16 ++++-
 34 files changed, 506 insertions(+), 228 deletions(-)