Skip to content

Commit 1f07ae3

Browse files
committed
many-clean
1 parent 0abc6b2 commit 1f07ae3

File tree

2 files changed

+25
-11
lines changed

2 files changed

+25
-11
lines changed

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/opcua/client/ClientRunner.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
package org.apache.iotdb.db.pipe.sink.protocol.opcua.client;
2121

22-
import org.apache.iotdb.commons.pipe.config.PipeConfig;
2322
import org.apache.iotdb.pipe.api.exception.PipeException;
2423

2524
import org.bouncycastle.jce.provider.BouncyCastleProvider;
@@ -35,9 +34,6 @@
3534
import java.nio.file.Path;
3635
import java.nio.file.Paths;
3736
import java.security.Security;
38-
import java.util.concurrent.CompletableFuture;
39-
import java.util.concurrent.ExecutionException;
40-
import java.util.concurrent.TimeUnit;
4137

4238
import static org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.Unsigned.uint;
4339

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/opcua/client/IoTDBOpcUaClient.java

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
import org.eclipse.milo.opcua.stack.core.types.structured.VariableAttributes;
5353

5454
import java.util.ArrayList;
55+
import java.util.Arrays;
5556
import java.util.List;
5657
import java.util.Objects;
5758
import java.util.function.Predicate;
@@ -139,22 +140,39 @@ private void transferTabletRowForClientServerModel(
139140
if (!result.getStatusCode().equals(StatusCode.GOOD)
140141
&& !(result.getStatusCode().getValue() == StatusCodes.Bad_NodeIdExists)) {
141142
throw new PipeException(
142-
"Failed to create nodes after transfer data value, write status: "
143-
+ writeStatus
144-
+ ", creation status: "
145-
+ addStatus);
143+
"Failed to create nodes after transfer data value, creation status: "
144+
+ addStatus
145+
+ getErrorString(segments, opcDataType, value, writeStatus));
146146
}
147147
}
148148
writeStatus = client.writeValue(nodeId, dataValue).get();
149149
if (writeStatus.getValue() != StatusCode.GOOD.getValue()) {
150150
throw new PipeException(
151-
"Failed to transfer dataValue after successfully created nodes, error: " + writeStatus);
151+
"Failed to transfer dataValue after successfully created nodes"
152+
+ getErrorString(segments, opcDataType, value, writeStatus));
152153
}
153-
} else if (writeStatus.getValue() != StatusCode.GOOD.getValue()){
154-
throw new PipeException("Failed to transfer dataValue, error: " + writeStatus);
154+
} else if (writeStatus.getValue() != StatusCode.GOOD.getValue()) {
155+
throw new PipeException(
156+
"Failed to transfer dataValue"
157+
+ getErrorString(segments, opcDataType, value, writeStatus));
155158
}
156159
}
157160

161+
private static String getErrorString(
162+
final String[] segments,
163+
final NodeId dataType,
164+
final Object value,
165+
final StatusCode writeStatus) {
166+
return ", segments: "
167+
+ Arrays.toString(segments)
168+
+ ", dataType: "
169+
+ dataType
170+
+ ", value: "
171+
+ value
172+
+ ", error: "
173+
+ writeStatus;
174+
}
175+
158176
public List<AddNodesItem> getNodesToAdd(
159177
final String[] segments, final NodeId opcDataType, final Variant initialValue) {
160178
final List<AddNodesItem> addNodesItems = new ArrayList<>();

0 commit comments

Comments
 (0)