diff --git a/easytrans-core/src/main/java/com/yiqiniu/easytrans/filter/MetaDataFilter.java b/easytrans-core/src/main/java/com/yiqiniu/easytrans/filter/MetaDataFilter.java index ad080da..8695f24 100644 --- a/easytrans-core/src/main/java/com/yiqiniu/easytrans/filter/MetaDataFilter.java +++ b/easytrans-core/src/main/java/com/yiqiniu/easytrans/filter/MetaDataFilter.java @@ -76,6 +76,10 @@ private int getTransactionStatus(String appId, String busCode ,String innerMetho } } + if(transactionStatus == null) { + throw new RuntimeException("can not determine the transaction status of " + appId + " " + busCode + " " + innerMethod); + } + return transactionStatus; } diff --git a/easytrans-core/src/main/java/com/yiqiniu/easytrans/log/vo/LogCollection.java b/easytrans-core/src/main/java/com/yiqiniu/easytrans/log/vo/LogCollection.java index 48a18c7..8655a07 100644 --- a/easytrans-core/src/main/java/com/yiqiniu/easytrans/log/vo/LogCollection.java +++ b/easytrans-core/src/main/java/com/yiqiniu/easytrans/log/vo/LogCollection.java @@ -18,6 +18,7 @@ public LogCollection(String appId, String busCode, long trxId, this.busCode = busCode; this.trxId = trxId; this.orderedContents = orderedContents; + this.createTime = createTime; } /** diff --git a/easytrans-demo/interface-call/pom.xml b/easytrans-demo/interface-call/pom.xml index fa109a8..179645b 100644 --- a/easytrans-demo/interface-call/pom.xml +++ b/easytrans-demo/interface-call/pom.xml @@ -19,7 +19,7 @@ UTF-8 UTF-8 1.8 - 1.1.0 + 1.1.1 diff --git a/easytrans-demo/rpc-dubbo/pom.xml b/easytrans-demo/rpc-dubbo/pom.xml index 9c589c5..053c60a 100644 --- a/easytrans-demo/rpc-dubbo/pom.xml +++ b/easytrans-demo/rpc-dubbo/pom.xml @@ -19,7 +19,7 @@ UTF-8 UTF-8 1.8 - 1.1.0 + 1.1.1 diff --git a/easytrans-demo/sagatcc/pom.xml b/easytrans-demo/sagatcc/pom.xml index bf6e304..1a5a735 100644 --- a/easytrans-demo/sagatcc/pom.xml +++ b/easytrans-demo/sagatcc/pom.xml @@ -19,7 +19,7 @@ UTF-8 UTF-8 1.8 - 1.1.0 + 1.1.1 diff --git a/easytrans-demo/tcc-and-msg/pom.xml b/easytrans-demo/tcc-and-msg/pom.xml index 84a275d..0a8b036 100644 --- a/easytrans-demo/tcc-and-msg/pom.xml +++ b/easytrans-demo/tcc-and-msg/pom.xml @@ -19,7 +19,7 @@ UTF-8 UTF-8 1.8 - 1.1.0 + 1.1.1 diff --git a/easytrans-demo/tcc-only/pom.xml b/easytrans-demo/tcc-only/pom.xml index 4838ce8..78d4db2 100644 --- a/easytrans-demo/tcc-only/pom.xml +++ b/easytrans-demo/tcc-only/pom.xml @@ -19,7 +19,7 @@ UTF-8 UTF-8 1.8 - 1.1.0 + 1.1.1 diff --git a/easytrans-log-database-starter/src/main/java/com/yiqiniu/easytrans/log/impl/database/DataBaseTransactionLogReaderImpl.java b/easytrans-log-database-starter/src/main/java/com/yiqiniu/easytrans/log/impl/database/DataBaseTransactionLogReaderImpl.java index 4b3002a..c95ebbb 100644 --- a/easytrans-log-database-starter/src/main/java/com/yiqiniu/easytrans/log/impl/database/DataBaseTransactionLogReaderImpl.java +++ b/easytrans-log-database-starter/src/main/java/com/yiqiniu/easytrans/log/impl/database/DataBaseTransactionLogReaderImpl.java @@ -1,6 +1,7 @@ package com.yiqiniu.easytrans.log.impl.database; import java.util.ArrayList; +import java.util.Arrays; import java.util.Date; import java.util.List; @@ -91,7 +92,7 @@ public List getUnfinishedLogs(LogCollection locationId, List currentContentList = new ArrayList(); byte[] currentId = null; for(DataBaseTransactionLogDetail detailDo:query){ - if(!detailDo.getTransLogId().equals(currentId)){ + if(!Arrays.equals(detailDo.getTransLogId(), currentId)){ addToResult(result, currentDoList, currentContentList); currentContentList.clear(); currentDoList.clear(); @@ -121,6 +122,5 @@ private void addToResult(List result, new ArrayList(currentContentList), first.getCreateTime())); } } - - + } diff --git a/easytrans-queue-kafka-starter/src/main/java/com/yiqiniu/easytrans/queue/impl/kafka/KafkaEasyTransMsgPublisherImpl.java b/easytrans-queue-kafka-starter/src/main/java/com/yiqiniu/easytrans/queue/impl/kafka/KafkaEasyTransMsgPublisherImpl.java index e402d65..45ea169 100644 --- a/easytrans-queue-kafka-starter/src/main/java/com/yiqiniu/easytrans/queue/impl/kafka/KafkaEasyTransMsgPublisherImpl.java +++ b/easytrans-queue-kafka-starter/src/main/java/com/yiqiniu/easytrans/queue/impl/kafka/KafkaEasyTransMsgPublisherImpl.java @@ -71,7 +71,7 @@ public EasyTransMsgPublishResult publish(String topic, String tag, String key, M public int calcMessagePartition(String kafkaTopic, TransactionId trxId) { List partitionMetaData = kafkaProducer.partitionsFor(kafkaTopic); int partitionSize = partitionMetaData.size(); - int partition = Math.abs(trxId.hashCode()) % partitionSize; + int partition = Math.abs(trxId.hashCode() % partitionSize); return partition; } diff --git a/easytrans-rpc-rest-ribbon-starter/src/main/java/com/yiqiniu/easytrans/rpc/impl/rest/RestRibbonEasyTransRpcProviderImpl.java b/easytrans-rpc-rest-ribbon-starter/src/main/java/com/yiqiniu/easytrans/rpc/impl/rest/RestRibbonEasyTransRpcProviderImpl.java index 319a3a4..481bfac 100644 --- a/easytrans-rpc-rest-ribbon-starter/src/main/java/com/yiqiniu/easytrans/rpc/impl/rest/RestRibbonEasyTransRpcProviderImpl.java +++ b/easytrans-rpc-rest-ribbon-starter/src/main/java/com/yiqiniu/easytrans/rpc/impl/rest/RestRibbonEasyTransRpcProviderImpl.java @@ -119,6 +119,8 @@ public EasyTransResult invoke(EasyTransFilterChain filterChain, MapUTF-8 UTF-8 1.8 - 1.1.0 + 1.1.1 diff --git a/readme-en.md b/readme-en.md index 2072545..5025d10 100644 --- a/readme-en.md +++ b/readme-en.md @@ -104,7 +104,7 @@ Business code can introduce EasyTransaction by maven com.yiqiniu.easytrans easytrans-starter - 1.1.0 + 1.1.1 This Starter contains several default implement, included: RDBS based distributed transaction log，Netflix-ribbon based http RPC implement，KAFKA based queue，if you want to replace it ,just exclude it. diff --git a/readme.md b/readme.md index 47d460b..7b8c0c8 100644 --- a/readme.md +++ b/readme.md @@ -90,7 +90,7 @@ com.yiqiniu.easytrans easytrans-starter - 1.1.0 + 1.1.1 Starter里包含了若干默认的组件实现:基于mysql的分布式事务日志存储，基于ribbon-rest的RPC实现，基于KAFKA的消息队列，若不需要或者要替换，可以EXCLUDE掉