diff --git a/src/demo/java/org/fisco/bcos/sdk/demo/perf/parallel/DagPrecompiledDemo.java b/src/demo/java/org/fisco/bcos/sdk/demo/perf/parallel/DagPrecompiledDemo.java index 0d3e67823..e32b3994d 100644 --- a/src/demo/java/org/fisco/bcos/sdk/demo/perf/parallel/DagPrecompiledDemo.java +++ b/src/demo/java/org/fisco/bcos/sdk/demo/perf/parallel/DagPrecompiledDemo.java @@ -87,6 +87,7 @@ public void run() { callback.setUser(dtu); try { callback.recordStartTime(); + callback.setTimeout(0); dagTransfer.userAdd(user, amount, callback); int current = sended.incrementAndGet(); if (current >= area && ((current % area) == 0)) { diff --git a/src/main/java/org/fisco/bcos/sdk/contract/precompiled/crud/TableCRUDService.java b/src/main/java/org/fisco/bcos/sdk/contract/precompiled/crud/TableCRUDService.java index ead60e69a..8f6320be2 100644 --- a/src/main/java/org/fisco/bcos/sdk/contract/precompiled/crud/TableCRUDService.java +++ b/src/main/java/org/fisco/bcos/sdk/contract/precompiled/crud/TableCRUDService.java @@ -177,17 +177,26 @@ public static List> parseSelectResult(String selectResult) private List> getTableDescLessThan230Version( EnumNodeVersion.Version enumNodeVersion, String tableName) throws ContractException { + List> tableDesc = new ArrayList<>(); if (enumNodeVersion.getMajor() == 2 && enumNodeVersion.getMinor() < 2) { - return select( - PrecompiledConstant.SYS_TABLE, - PrecompiledConstant.USER_TABLE_PREFIX + tableName, - new Condition()); + tableDesc = + select( + PrecompiledConstant.SYS_TABLE, + PrecompiledConstant.USER_TABLE_PREFIX + tableName, + new Condition()); } else { - return select( - PrecompiledConstant.SYS_TABLE, - PrecompiledConstant.USER_TABLE_PREFIX_2_2_0_VERSION + tableName, - new Condition()); + tableDesc = + select( + PrecompiledConstant.SYS_TABLE, + PrecompiledConstant.USER_TABLE_PREFIX_2_2_0_VERSION + tableName, + new Condition()); } + for (Map item : tableDesc) { + if (item.containsKey(PrecompiledConstant.TABLE_NAME_FIELD)) { + item.remove(PrecompiledConstant.TABLE_NAME_FIELD); + } + } + return tableDesc; } private List> getTableDesc(String tableName) throws ContractException { diff --git a/src/main/java/org/fisco/bcos/sdk/contract/precompiled/model/PrecompiledConstant.java b/src/main/java/org/fisco/bcos/sdk/contract/precompiled/model/PrecompiledConstant.java index 7e0c8037d..0e47492b1 100644 --- a/src/main/java/org/fisco/bcos/sdk/contract/precompiled/model/PrecompiledConstant.java +++ b/src/main/java/org/fisco/bcos/sdk/contract/precompiled/model/PrecompiledConstant.java @@ -36,4 +36,5 @@ public class PrecompiledConstant { public static final String KEY_FIELD_NAME = "key_field"; public static final String VALUE_FIELD_NAME = "value_field"; + public static final String TABLE_NAME_FIELD = "table_name"; } diff --git a/src/main/java/org/fisco/bcos/sdk/contract/precompiled/model/PrecompiledRetCode.java b/src/main/java/org/fisco/bcos/sdk/contract/precompiled/model/PrecompiledRetCode.java index a043f9f62..921cfc43f 100644 --- a/src/main/java/org/fisco/bcos/sdk/contract/precompiled/model/PrecompiledRetCode.java +++ b/src/main/java/org/fisco/bcos/sdk/contract/precompiled/model/PrecompiledRetCode.java @@ -102,7 +102,8 @@ public class PrecompiledRetCode { "The committee permission control by ChainGovernancePrecompiled are recommended"); public static final RetCode CODE_CONTRACT_NOT_EXIST = new RetCode(-51003, "The contract is not exist"); - public static final RetCode CODE_TABLE_NAME_OVERFLOW = new RetCode(-51002, ""); + public static final RetCode CODE_TABLE_NAME_OVERFLOW = + new RetCode(-51002, "The table name string length exceeds the maximum limit"); public static final RetCode CODE_TABLE_AND_ADDRESS_NOT_EXIST = new RetCode(-51001, "The table name and address not exist"); public static final RetCode CODE_TABLE_AND_ADDRESS_EXIST = diff --git a/src/main/java/org/fisco/bcos/sdk/transaction/codec/decode/ReceiptParser.java b/src/main/java/org/fisco/bcos/sdk/transaction/codec/decode/ReceiptParser.java index 782eabc53..43ec02b15 100644 --- a/src/main/java/org/fisco/bcos/sdk/transaction/codec/decode/ReceiptParser.java +++ b/src/main/java/org/fisco/bcos/sdk/transaction/codec/decode/ReceiptParser.java @@ -23,6 +23,7 @@ import org.fisco.bcos.sdk.model.RevertMessageParser; import org.fisco.bcos.sdk.model.TransactionReceipt; import org.fisco.bcos.sdk.model.TransactionReceiptStatus; +import org.fisco.bcos.sdk.utils.Numeric; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -96,8 +97,9 @@ public static RetCode parseCallOutput(Call.CallOutput callResult, String message RevertMessageParser.tryResolveRevertMessage( callResult.getStatus(), callResult.getOutput()); if (errorOutput.getValue1()) { - return TransactionReceiptStatus.getStatusMessage( - callResult.getStatus(), errorOutput.getValue2()); + return new RetCode( + Numeric.decodeQuantity(callResult.getStatus()).intValue(), + errorOutput.getValue2()); } return TransactionReceiptStatus.getStatusMessage(callResult.getStatus(), message); }