diff --git a/.gitmodules b/.gitmodules index 00d5032..d55741c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -39,3 +39,11 @@ path = agent-frontend url = https://gitea.internetapi.cn/bdware/bdcontract-web-ide.git branch = master +[submodule "consistency-sdk"] + path = consistency-sdk + url = git@gitee.com:BDWare/consistency-sdk.git + branch = master +[submodule "custom-plugin"] + path = custom-plugin + url = git@gitee.com:BDWare/custom-plugin.git + branch = master diff --git a/agent-backend b/agent-backend index f3f146b..b1bf67c 160000 --- a/agent-backend +++ b/agent-backend @@ -1 +1 @@ -Subproject commit f3f146b30a222fcf099150614729a96fa6def236 +Subproject commit b1bf67c802c8ff45bde76fe30735a106449381b2 diff --git a/consistency-sdk/build/classes/java/main/org/bdware/sdk/consistency/ConsistencyPluginManager$1.class b/consistency-sdk/build/classes/java/main/org/bdware/sdk/consistency/ConsistencyPluginManager$1.class new file mode 100644 index 0000000..051aebd Binary files /dev/null and b/consistency-sdk/build/classes/java/main/org/bdware/sdk/consistency/ConsistencyPluginManager$1.class differ diff --git a/consistency-sdk/build/classes/java/main/org/bdware/sdk/consistency/ConsistencyPluginManager$Inner.class b/consistency-sdk/build/classes/java/main/org/bdware/sdk/consistency/ConsistencyPluginManager$Inner.class new file mode 100644 index 0000000..3988cde Binary files /dev/null and b/consistency-sdk/build/classes/java/main/org/bdware/sdk/consistency/ConsistencyPluginManager$Inner.class differ diff --git a/consistency-sdk/build/classes/java/main/org/bdware/sdk/consistency/ConsistencyPluginManager.class b/consistency-sdk/build/classes/java/main/org/bdware/sdk/consistency/ConsistencyPluginManager.class new file mode 100644 index 0000000..44f035a Binary files /dev/null and b/consistency-sdk/build/classes/java/main/org/bdware/sdk/consistency/ConsistencyPluginManager.class differ diff --git a/consistency-sdk/build/classes/java/main/org/bdware/sdk/consistency/api/ContractExecutorFactory.class b/consistency-sdk/build/classes/java/main/org/bdware/sdk/consistency/api/ContractExecutorFactory.class new file mode 100644 index 0000000..d5b9794 Binary files /dev/null and b/consistency-sdk/build/classes/java/main/org/bdware/sdk/consistency/api/ContractExecutorFactory.class differ diff --git a/consistency-sdk/build/classes/java/main/org/bdware/sdk/consistency/api/NotifiableResultMerger.class b/consistency-sdk/build/classes/java/main/org/bdware/sdk/consistency/api/NotifiableResultMerger.class new file mode 100644 index 0000000..13b7aeb Binary files /dev/null and b/consistency-sdk/build/classes/java/main/org/bdware/sdk/consistency/api/NotifiableResultMerger.class differ diff --git a/consistency-sdk/build/classes/java/main/org/bdware/sdk/consistency/api/context/ICMActions.class b/consistency-sdk/build/classes/java/main/org/bdware/sdk/consistency/api/context/ICMActions.class new file mode 100644 index 0000000..4142f72 Binary files /dev/null and b/consistency-sdk/build/classes/java/main/org/bdware/sdk/consistency/api/context/ICMActions.class differ diff --git a/consistency-sdk/build/classes/java/main/org/bdware/sdk/consistency/api/context/IGlobalConf.class b/consistency-sdk/build/classes/java/main/org/bdware/sdk/consistency/api/context/IGlobalConf.class new file mode 100644 index 0000000..ef0c832 Binary files /dev/null and b/consistency-sdk/build/classes/java/main/org/bdware/sdk/consistency/api/context/IGlobalConf.class differ diff --git a/consistency-sdk/build/classes/java/main/org/bdware/sdk/consistency/api/context/IMasterServerRecoverMechAction.class b/consistency-sdk/build/classes/java/main/org/bdware/sdk/consistency/api/context/IMasterServerRecoverMechAction.class new file mode 100644 index 0000000..9c071d2 Binary files /dev/null and b/consistency-sdk/build/classes/java/main/org/bdware/sdk/consistency/api/context/IMasterServerRecoverMechAction.class differ diff --git a/consistency-sdk/build/classes/java/main/org/bdware/sdk/consistency/api/context/IMasterServerTCPAction.class b/consistency-sdk/build/classes/java/main/org/bdware/sdk/consistency/api/context/IMasterServerTCPAction.class new file mode 100644 index 0000000..f478673 Binary files /dev/null and b/consistency-sdk/build/classes/java/main/org/bdware/sdk/consistency/api/context/IMasterServerTCPAction.class differ diff --git a/consistency-sdk/build/classes/java/main/org/bdware/sdk/consistency/api/context/INetworkManager.class b/consistency-sdk/build/classes/java/main/org/bdware/sdk/consistency/api/context/INetworkManager.class new file mode 100644 index 0000000..5ba4dd5 Binary files /dev/null and b/consistency-sdk/build/classes/java/main/org/bdware/sdk/consistency/api/context/INetworkManager.class differ diff --git a/consistency-sdk/build/classes/java/main/org/bdware/sdk/consistency/api/context/ISDKContext.class b/consistency-sdk/build/classes/java/main/org/bdware/sdk/consistency/api/context/ISDKContext.class new file mode 100644 index 0000000..38c7f5d Binary files /dev/null and b/consistency-sdk/build/classes/java/main/org/bdware/sdk/consistency/api/context/ISDKContext.class differ diff --git a/consistency-sdk/build/libs/consistency-sdk-1.0-SNAPSHOT.jar b/consistency-sdk/build/libs/consistency-sdk-1.0-SNAPSHOT.jar new file mode 100644 index 0000000..dd81065 Binary files /dev/null and b/consistency-sdk/build/libs/consistency-sdk-1.0-SNAPSHOT.jar differ diff --git a/consistency-sdk/build/tmp/compileJava/source-classes-mapping.txt b/consistency-sdk/build/tmp/compileJava/source-classes-mapping.txt new file mode 100644 index 0000000..caf624f --- /dev/null +++ b/consistency-sdk/build/tmp/compileJava/source-classes-mapping.txt @@ -0,0 +1,20 @@ +org/bdware/sdk/consistency/api/context/IMasterServerRecoverMechAction.java + org.bdware.sdk.consistency.api.context.IMasterServerRecoverMechAction +org/bdware/sdk/consistency/api/context/INetworkManager.java + org.bdware.sdk.consistency.api.context.INetworkManager +org/bdware/sdk/consistency/api/context/IMasterServerTCPAction.java + org.bdware.sdk.consistency.api.context.IMasterServerTCPAction +org/bdware/sdk/consistency/api/context/IGlobalConf.java + org.bdware.sdk.consistency.api.context.IGlobalConf +org/bdware/sdk/consistency/api/NotifiableResultMerger.java + org.bdware.sdk.consistency.api.NotifiableResultMerger +org/bdware/sdk/consistency/api/ContractExecutorFactory.java + org.bdware.sdk.consistency.api.ContractExecutorFactory +org/bdware/sdk/consistency/api/context/ISDKContext.java + org.bdware.sdk.consistency.api.context.ISDKContext +org/bdware/sdk/consistency/ConsistencyPluginManager.java + org.bdware.sdk.consistency.ConsistencyPluginManager + org.bdware.sdk.consistency.ConsistencyPluginManager$1 + org.bdware.sdk.consistency.ConsistencyPluginManager$Inner +org/bdware/sdk/consistency/api/context/ICMActions.java + org.bdware.sdk.consistency.api.context.ICMActions diff --git a/consistency-sdk/build/tmp/jar/MANIFEST.MF b/consistency-sdk/build/tmp/jar/MANIFEST.MF new file mode 100644 index 0000000..59499bc --- /dev/null +++ b/consistency-sdk/build/tmp/jar/MANIFEST.MF @@ -0,0 +1,2 @@ +Manifest-Version: 1.0 + diff --git a/custom-plugin/build/classes/java/main/org/bdware/consistency/plugin/common/AbstractContextContractExecutor.class b/custom-plugin/build/classes/java/main/org/bdware/consistency/plugin/common/AbstractContextContractExecutor.class new file mode 100644 index 0000000..ed4f89c Binary files /dev/null and b/custom-plugin/build/classes/java/main/org/bdware/consistency/plugin/common/AbstractContextContractExecutor.class differ diff --git a/custom-plugin/build/classes/java/main/org/bdware/consistency/plugin/pbft/ContractCluster.class b/custom-plugin/build/classes/java/main/org/bdware/consistency/plugin/pbft/ContractCluster.class new file mode 100644 index 0000000..5ee2bad Binary files /dev/null and b/custom-plugin/build/classes/java/main/org/bdware/consistency/plugin/pbft/ContractCluster.class differ diff --git a/custom-plugin/build/classes/java/main/org/bdware/consistency/plugin/pbft/PBFTExecutor$1$1.class b/custom-plugin/build/classes/java/main/org/bdware/consistency/plugin/pbft/PBFTExecutor$1$1.class new file mode 100644 index 0000000..c09972f Binary files /dev/null and b/custom-plugin/build/classes/java/main/org/bdware/consistency/plugin/pbft/PBFTExecutor$1$1.class differ diff --git a/custom-plugin/build/classes/java/main/org/bdware/consistency/plugin/pbft/PBFTExecutor$1.class b/custom-plugin/build/classes/java/main/org/bdware/consistency/plugin/pbft/PBFTExecutor$1.class new file mode 100644 index 0000000..2c0fd70 Binary files /dev/null and b/custom-plugin/build/classes/java/main/org/bdware/consistency/plugin/pbft/PBFTExecutor$1.class differ diff --git a/custom-plugin/build/classes/java/main/org/bdware/consistency/plugin/pbft/PBFTExecutor$ResultMerger.class b/custom-plugin/build/classes/java/main/org/bdware/consistency/plugin/pbft/PBFTExecutor$ResultMerger.class new file mode 100644 index 0000000..1e2f3d5 Binary files /dev/null and b/custom-plugin/build/classes/java/main/org/bdware/consistency/plugin/pbft/PBFTExecutor$ResultMerger.class differ diff --git a/custom-plugin/build/classes/java/main/org/bdware/consistency/plugin/pbft/PBFTExecutor.class b/custom-plugin/build/classes/java/main/org/bdware/consistency/plugin/pbft/PBFTExecutor.class new file mode 100644 index 0000000..217f7dd Binary files /dev/null and b/custom-plugin/build/classes/java/main/org/bdware/consistency/plugin/pbft/PBFTExecutor.class differ diff --git a/custom-plugin/build/classes/java/main/org/bdware/consistency/plugin/pbft/PBFTExecutorFactory.class b/custom-plugin/build/classes/java/main/org/bdware/consistency/plugin/pbft/PBFTExecutorFactory.class new file mode 100644 index 0000000..1e5f40d Binary files /dev/null and b/custom-plugin/build/classes/java/main/org/bdware/consistency/plugin/pbft/PBFTExecutorFactory.class differ diff --git a/custom-plugin/build/classes/java/main/org/bdware/consistency/plugin/ra/RequestAllExecutor$ResultMerger.class b/custom-plugin/build/classes/java/main/org/bdware/consistency/plugin/ra/RequestAllExecutor$ResultMerger.class new file mode 100644 index 0000000..e9015f5 Binary files /dev/null and b/custom-plugin/build/classes/java/main/org/bdware/consistency/plugin/ra/RequestAllExecutor$ResultMerger.class differ diff --git a/custom-plugin/build/classes/java/main/org/bdware/consistency/plugin/ra/RequestAllExecutor.class b/custom-plugin/build/classes/java/main/org/bdware/consistency/plugin/ra/RequestAllExecutor.class new file mode 100644 index 0000000..2d926d1 Binary files /dev/null and b/custom-plugin/build/classes/java/main/org/bdware/consistency/plugin/ra/RequestAllExecutor.class differ diff --git a/custom-plugin/build/classes/java/main/org/bdware/consistency/plugin/ra/RequestAllResponseAllFactory.class b/custom-plugin/build/classes/java/main/org/bdware/consistency/plugin/ra/RequestAllResponseAllFactory.class new file mode 100644 index 0000000..02eaaa4 Binary files /dev/null and b/custom-plugin/build/classes/java/main/org/bdware/consistency/plugin/ra/RequestAllResponseAllFactory.class differ diff --git a/custom-plugin/build/classes/java/main/org/bdware/consistency/plugin/ra/RequestAllResponseFirstFactory.class b/custom-plugin/build/classes/java/main/org/bdware/consistency/plugin/ra/RequestAllResponseFirstFactory.class new file mode 100644 index 0000000..ac32f65 Binary files /dev/null and b/custom-plugin/build/classes/java/main/org/bdware/consistency/plugin/ra/RequestAllResponseFirstFactory.class differ diff --git a/custom-plugin/build/classes/java/main/org/bdware/consistency/plugin/ra/RequestAllResponseHalfFactory.class b/custom-plugin/build/classes/java/main/org/bdware/consistency/plugin/ra/RequestAllResponseHalfFactory.class new file mode 100644 index 0000000..f44f8c4 Binary files /dev/null and b/custom-plugin/build/classes/java/main/org/bdware/consistency/plugin/ra/RequestAllResponseHalfFactory.class differ diff --git a/custom-plugin/build/classes/java/main/org/bdware/consistency/plugin/ro/RequestOnceExecutor$1.class b/custom-plugin/build/classes/java/main/org/bdware/consistency/plugin/ro/RequestOnceExecutor$1.class new file mode 100644 index 0000000..bfae06e Binary files /dev/null and b/custom-plugin/build/classes/java/main/org/bdware/consistency/plugin/ro/RequestOnceExecutor$1.class differ diff --git a/custom-plugin/build/classes/java/main/org/bdware/consistency/plugin/ro/RequestOnceExecutor.class b/custom-plugin/build/classes/java/main/org/bdware/consistency/plugin/ro/RequestOnceExecutor.class new file mode 100644 index 0000000..58a66c9 Binary files /dev/null and b/custom-plugin/build/classes/java/main/org/bdware/consistency/plugin/ro/RequestOnceExecutor.class differ diff --git a/custom-plugin/build/classes/java/main/org/bdware/consistency/plugin/ro/RequestOnceExecutorFactory.class b/custom-plugin/build/classes/java/main/org/bdware/consistency/plugin/ro/RequestOnceExecutorFactory.class new file mode 100644 index 0000000..838932d Binary files /dev/null and b/custom-plugin/build/classes/java/main/org/bdware/consistency/plugin/ro/RequestOnceExecutorFactory.class differ diff --git a/custom-plugin/build/classes/java/main/org/bdware/consistency/plugin/ro/ResponseOnceExecutor$1.class b/custom-plugin/build/classes/java/main/org/bdware/consistency/plugin/ro/ResponseOnceExecutor$1.class new file mode 100644 index 0000000..a30bd7e Binary files /dev/null and b/custom-plugin/build/classes/java/main/org/bdware/consistency/plugin/ro/ResponseOnceExecutor$1.class differ diff --git a/custom-plugin/build/classes/java/main/org/bdware/consistency/plugin/ro/ResponseOnceExecutor.class b/custom-plugin/build/classes/java/main/org/bdware/consistency/plugin/ro/ResponseOnceExecutor.class new file mode 100644 index 0000000..b017a08 Binary files /dev/null and b/custom-plugin/build/classes/java/main/org/bdware/consistency/plugin/ro/ResponseOnceExecutor.class differ diff --git a/custom-plugin/build/classes/java/main/org/bdware/consistency/plugin/ro/ResponseOnceExecutorFactory.class b/custom-plugin/build/classes/java/main/org/bdware/consistency/plugin/ro/ResponseOnceExecutorFactory.class new file mode 100644 index 0000000..8634e0d Binary files /dev/null and b/custom-plugin/build/classes/java/main/org/bdware/consistency/plugin/ro/ResponseOnceExecutorFactory.class differ diff --git a/custom-plugin/build/classes/java/main/org/bdware/consistency/plugin/sharding/MultiPointCooperationExecutor$1.class b/custom-plugin/build/classes/java/main/org/bdware/consistency/plugin/sharding/MultiPointCooperationExecutor$1.class new file mode 100644 index 0000000..a1a3bac Binary files /dev/null and b/custom-plugin/build/classes/java/main/org/bdware/consistency/plugin/sharding/MultiPointCooperationExecutor$1.class differ diff --git a/custom-plugin/build/classes/java/main/org/bdware/consistency/plugin/sharding/MultiPointCooperationExecutor$ResultMerger.class b/custom-plugin/build/classes/java/main/org/bdware/consistency/plugin/sharding/MultiPointCooperationExecutor$ResultMerger.class new file mode 100644 index 0000000..336b8a3 Binary files /dev/null and b/custom-plugin/build/classes/java/main/org/bdware/consistency/plugin/sharding/MultiPointCooperationExecutor$ResultMerger.class differ diff --git a/custom-plugin/build/classes/java/main/org/bdware/consistency/plugin/sharding/MultiPointCooperationExecutor.class b/custom-plugin/build/classes/java/main/org/bdware/consistency/plugin/sharding/MultiPointCooperationExecutor.class new file mode 100644 index 0000000..0339226 Binary files /dev/null and b/custom-plugin/build/classes/java/main/org/bdware/consistency/plugin/sharding/MultiPointCooperationExecutor.class differ diff --git a/custom-plugin/build/classes/java/main/org/bdware/consistency/plugin/sharding/MultiPointCooperationExecutorFactory.class b/custom-plugin/build/classes/java/main/org/bdware/consistency/plugin/sharding/MultiPointCooperationExecutorFactory.class new file mode 100644 index 0000000..577352d Binary files /dev/null and b/custom-plugin/build/classes/java/main/org/bdware/consistency/plugin/sharding/MultiPointCooperationExecutorFactory.class differ diff --git a/custom-plugin/build/classes/java/main/org/bdware/consistency/plugin/sharding/SelfAdaptiveShardingExecutor$Block.class b/custom-plugin/build/classes/java/main/org/bdware/consistency/plugin/sharding/SelfAdaptiveShardingExecutor$Block.class new file mode 100644 index 0000000..a48261f Binary files /dev/null and b/custom-plugin/build/classes/java/main/org/bdware/consistency/plugin/sharding/SelfAdaptiveShardingExecutor$Block.class differ diff --git a/custom-plugin/build/classes/java/main/org/bdware/consistency/plugin/sharding/SelfAdaptiveShardingExecutor.class b/custom-plugin/build/classes/java/main/org/bdware/consistency/plugin/sharding/SelfAdaptiveShardingExecutor.class new file mode 100644 index 0000000..5bfd50d Binary files /dev/null and b/custom-plugin/build/classes/java/main/org/bdware/consistency/plugin/sharding/SelfAdaptiveShardingExecutor.class differ diff --git a/custom-plugin/build/classes/java/main/org/bdware/consistency/plugin/sharding/SelfAdaptiveShardingExecutorFactory.class b/custom-plugin/build/classes/java/main/org/bdware/consistency/plugin/sharding/SelfAdaptiveShardingExecutorFactory.class new file mode 100644 index 0000000..9846c2d Binary files /dev/null and b/custom-plugin/build/classes/java/main/org/bdware/consistency/plugin/sharding/SelfAdaptiveShardingExecutorFactory.class differ diff --git a/custom-plugin/build/classes/java/main/org/bdware/consistency/plugin/single/SingleNodeExecutorFactory.class b/custom-plugin/build/classes/java/main/org/bdware/consistency/plugin/single/SingleNodeExecutorFactory.class new file mode 100644 index 0000000..32d864f Binary files /dev/null and b/custom-plugin/build/classes/java/main/org/bdware/consistency/plugin/single/SingleNodeExecutorFactory.class differ diff --git a/custom-plugin/build/libs/custom-plugin.jar b/custom-plugin/build/libs/custom-plugin.jar new file mode 100644 index 0000000..b26c63e Binary files /dev/null and b/custom-plugin/build/libs/custom-plugin.jar differ diff --git a/custom-plugin/build/tmp/compileJava/source-classes-mapping.txt b/custom-plugin/build/tmp/compileJava/source-classes-mapping.txt new file mode 100644 index 0000000..b370711 --- /dev/null +++ b/custom-plugin/build/tmp/compileJava/source-classes-mapping.txt @@ -0,0 +1,43 @@ +org/bdware/consistency/plugin/ra/RequestAllResponseHalfFactory.java + org.bdware.consistency.plugin.ra.RequestAllResponseHalfFactory +org/bdware/consistency/plugin/ro/ResponseOnceExecutorFactory.java + org.bdware.consistency.plugin.ro.ResponseOnceExecutorFactory +org/bdware/consistency/plugin/ro/RequestOnceExecutorFactory.java + org.bdware.consistency.plugin.ro.RequestOnceExecutorFactory +org/bdware/consistency/plugin/pbft/PBFTExecutorFactory.java + org.bdware.consistency.plugin.pbft.PBFTExecutorFactory +org/bdware/consistency/plugin/sharding/SelfAdaptiveShardingExecutorFactory.java + org.bdware.consistency.plugin.sharding.SelfAdaptiveShardingExecutorFactory +org/bdware/consistency/plugin/ra/RequestAllResponseAllFactory.java + org.bdware.consistency.plugin.ra.RequestAllResponseAllFactory +org/bdware/consistency/plugin/ra/RequestAllResponseFirstFactory.java + org.bdware.consistency.plugin.ra.RequestAllResponseFirstFactory +org/bdware/consistency/plugin/sharding/MultiPointCooperationExecutorFactory.java + org.bdware.consistency.plugin.sharding.MultiPointCooperationExecutorFactory +org/bdware/consistency/plugin/pbft/ContractCluster.java + org.bdware.consistency.plugin.pbft.ContractCluster +org/bdware/consistency/plugin/sharding/MultiPointCooperationExecutor.java + org.bdware.consistency.plugin.sharding.MultiPointCooperationExecutor + org.bdware.consistency.plugin.sharding.MultiPointCooperationExecutor$1 + org.bdware.consistency.plugin.sharding.MultiPointCooperationExecutor$ResultMerger +org/bdware/consistency/plugin/pbft/PBFTExecutor.java + org.bdware.consistency.plugin.pbft.PBFTExecutor + org.bdware.consistency.plugin.pbft.PBFTExecutor$1 + org.bdware.consistency.plugin.pbft.PBFTExecutor$1$1 + org.bdware.consistency.plugin.pbft.PBFTExecutor$ResultMerger +org/bdware/consistency/plugin/common/AbstractContextContractExecutor.java + org.bdware.consistency.plugin.common.AbstractContextContractExecutor +org/bdware/consistency/plugin/single/SingleNodeExecutorFactory.java + org.bdware.consistency.plugin.single.SingleNodeExecutorFactory +org/bdware/consistency/plugin/ra/RequestAllExecutor.java + org.bdware.consistency.plugin.ra.RequestAllExecutor + org.bdware.consistency.plugin.ra.RequestAllExecutor$ResultMerger +org/bdware/consistency/plugin/sharding/SelfAdaptiveShardingExecutor.java + org.bdware.consistency.plugin.sharding.SelfAdaptiveShardingExecutor + org.bdware.consistency.plugin.sharding.SelfAdaptiveShardingExecutor$Block +org/bdware/consistency/plugin/ro/RequestOnceExecutor.java + org.bdware.consistency.plugin.ro.RequestOnceExecutor + org.bdware.consistency.plugin.ro.RequestOnceExecutor$1 +org/bdware/consistency/plugin/ro/ResponseOnceExecutor.java + org.bdware.consistency.plugin.ro.ResponseOnceExecutor + org.bdware.consistency.plugin.ro.ResponseOnceExecutor$1 diff --git a/custom-plugin/build/tmp/jar/MANIFEST.MF b/custom-plugin/build/tmp/jar/MANIFEST.MF new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/custom-plugin/build/tmp/jar/MANIFEST.MF @@ -0,0 +1 @@ + diff --git a/custom-plugin/src/main/java/org/bdware/consistency/plugin/sharding/MultiPointCooperationExecutor.java b/custom-plugin/src/main/java/org/bdware/consistency/plugin/sharding/MultiPointCooperationExecutor.java index 81abd61..65689ca 100644 --- a/custom-plugin/src/main/java/org/bdware/consistency/plugin/sharding/MultiPointCooperationExecutor.java +++ b/custom-plugin/src/main/java/org/bdware/consistency/plugin/sharding/MultiPointCooperationExecutor.java @@ -87,7 +87,7 @@ public class MultiPointCooperationExecutor extends AbstractContextContractExecut "[sendRequests] get cmNode " + node.substring(0, 5) + " not null " - + "org.bdware.consistency.plugin.ra.RequestAllExecutor 发送请求给 " + + "RequestAllExecutor 发送请求给 " + node.substring(0, 5)); networkManager.sendToAgent(node, sendStr); } @@ -137,9 +137,9 @@ public class MultiPointCooperationExecutor extends AbstractContextContractExecut // List nodes = info.members; int validNode = 0; for (String node : nodes) { - if (networkManager.hasAgentConnection(node) - && masterServerRecoverMechAction.getRecoverStatusMap().get(node).get(contractID) - == RecoverFlag.Fine) { + if (networkManager.hasAgentConnection(node)) { + //&& masterServerRecoverMechAction.getRecoverStatusMap().get(node).get(contractID) + // == RecoverFlag.Fine validNode++; } } @@ -151,7 +151,7 @@ public class MultiPointCooperationExecutor extends AbstractContextContractExecut @Override public void execute(String requestID, ContractRequest req, ResultCallback rc, OnHashCallback hcb) { - LOGGER.info("[org.bdware.consistency.plugin.sharding.MultiPointCooperationExecutor] execute " + JsonUtil.toJson(req)); + LOGGER.info("[MultiPointCooperationExecutor] execute " + JsonUtil.toJson(req)); // 获得action 函数名 LOGGER.info("action is : " + req.getAction()); req.setContractID(cmActions.getManager().getContractIDByName(req.getContractID())); @@ -208,13 +208,12 @@ public class MultiPointCooperationExecutor extends AbstractContextContractExecut private int getJoinCount(JoinInfo joinInfo, String contractID) { if (joinInfo == null) return resultCount; - if (joinInfo.joinCount.isJsonPrimitive() && joinInfo.joinCount.getAsJsonPrimitive().isNumber()) { - return joinInfo.joinCount.getAsJsonPrimitive().getAsInt(); - } + if (joinInfo != null) return joinInfo.joinCount; + try { ContractRequest cr = new ContractRequest(); cr.setContractID(contractID); - cr.setAction(joinInfo.joinCount.getAsString()); + cr.setAction("TODO"); //TODO Arg需要好好设计一下。 //TODO 又好用又简单的那种设计 //TODO