Skip to content

Pipe: Supported non quality + value for remote server in OPC #17531

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Caideyipi wants to merge 1 commit into
base: master
Choose a base branch
from
+56 −21
Open

Pipe: Supported non quality + value for remote server in OPC #17531

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 50 additions & 15 deletions ...e/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/opcua/client/IoTDBOpcUaClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import org.apache.iotdb.db.pipe.sink.protocol.opcua.server.OpcUaNameSpace;
import org.apache.iotdb.pipe.api.exception.PipeException;

import org.apache.tsfile.common.constant.TsFileConstant;
import org.apache.tsfile.enums.TSDataType;
import org.apache.tsfile.write.record.Tablet;
import org.apache.tsfile.write.schema.IMeasurementSchema;
Expand Down Expand Up @@ -56,9 +57,10 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import javax.annotation.Nullable;

import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Objects;
import java.util.concurrent.ExecutionException;
Expand Down Expand Up @@ -130,7 +132,6 @@ private void transferTabletRowForClientServerModel(
StatusCode currentQuality = sink.getDefaultQuality();
Object value = null;
long timestamp = 0;
NodeId nodeId = null;
NodeId opcDataType = null;

for (int i = 0; i < measurementSchemas.size(); ++i) {
Expand All @@ -153,54 +154,85 @@ private void transferTabletRowForClientServerModel(
"When the 'with-quality' mode is enabled, the measurement must be either \"value-name\" or \"quality-name\"");
continue;
}
nodeId = new NodeId(NAME_SPACE_INDEX, String.join("/", segments));

final long utcTimestamp = timestampToUtc(timestamps.get(timestamps.size() > 1 ? i : 0));
value = values.get(i);
timestamp = utcTimestamp;
opcDataType = convertToOpcDataType(type);
if (Objects.isNull(sink.getValueName())) {
writeValue(
values.get(i),
utcTimestamp,
convertToOpcDataType(type),
currentQuality,
segments,
name);
} else {
value = values.get(i);
timestamp = utcTimestamp;
opcDataType = convertToOpcDataType(type);
}
}
if (Objects.isNull(value)) {
return;
}

writeValue(value, timestamp, opcDataType, currentQuality, segments, null);
}

private void writeValue(
final Object value,
final long timestamp,
final NodeId opcDataType,
final StatusCode currentQuality,
final String[] segments,
final @Nullable String name)
throws Exception {
final NodeId nodeId =
new NodeId(
NAME_SPACE_INDEX,
Objects.nonNull(name)
? String.join("/", segments) + "/" + name
: String.join("/", segments));
final Variant variant = new Variant(value);
final DataValue dataValue =
new DataValue(variant, currentQuality, new DateTime(timestamp), new DateTime());
StatusCode writeStatus = client.writeValue(nodeId, dataValue).get();

if (writeStatus.getValue() == StatusCodes.Bad_NodeIdUnknown) {
final AddNodesResponse addStatus =
client.addNodes(getNodesToAdd(segments, opcDataType, variant)).get();
client.addNodes(getNodesToAdd(segments, name, opcDataType, variant)).get();
for (final AddNodesResult result : addStatus.getResults()) {
if (!result.getStatusCode().equals(StatusCode.GOOD)
&& !(result.getStatusCode().getValue() == StatusCodes.Bad_NodeIdExists)) {
throw new PipeException(
"Failed to create nodes after transfer data value, creation status: "
+ addStatus
+ getErrorString(segments, opcDataType, value, writeStatus));
+ getErrorString(segments, name, opcDataType, value, writeStatus));
}
}
writeStatus = client.writeValue(nodeId, dataValue).get();
if (writeStatus.getValue() != StatusCode.GOOD.getValue()) {
throw new PipeException(
"Failed to transfer dataValue after successfully created nodes"
+ getErrorString(segments, opcDataType, value, writeStatus));
+ getErrorString(segments, name, opcDataType, value, writeStatus));
}
} else if (writeStatus.getValue() != StatusCode.GOOD.getValue()) {
throw new PipeException(
"Failed to transfer dataValue"
+ getErrorString(segments, opcDataType, value, writeStatus));
+ getErrorString(segments, name, opcDataType, value, writeStatus));
}
}

private static String getErrorString(
final String[] segments,
final @Nullable String name,
final NodeId dataType,
final Object value,
final StatusCode writeStatus) {
return ", segments: "
+ Arrays.toString(segments)
return ", measurement: "
+ (Objects.nonNull(name)
? String.join(TsFileConstant.PATH_SEPARATOR, segments)
+ TsFileConstant.PATH_SEPARATOR
+ name
: String.join(TsFileConstant.PATH_SEPARATOR, segments))
+ ", dataType: "
+ dataType
+ ", value: "
Expand All @@ -210,7 +242,10 @@ private static String getErrorString(
}

public List<AddNodesItem> getNodesToAdd(
final String[] segments, final NodeId opcDataType, final Variant initialValue) {
final String[] segments,
final @Nullable String name,
final NodeId opcDataType,
final Variant initialValue) {
final List<AddNodesItem> addNodesItems = new ArrayList<>();
final StringBuilder sb = new StringBuilder(segments[0]);
ExpandedNodeId curNodeId = new NodeId(NAME_SPACE_INDEX, segments[0]).expanded();
Expand All @@ -226,7 +261,7 @@ public List<AddNodesItem> getNodesToAdd(
Identifiers.FolderType.expanded()));

// segments.length >= 3
for (int i = 1; i < segments.length - 1; ++i) {
for (int i = 1; i < (Objects.nonNull(name) ? segments.length : segments.length - 1); ++i) {
sb.append("/").append(segments[i]);
final ExpandedNodeId nextId = new NodeId(NAME_SPACE_INDEX, sb.toString()).expanded();
addNodesItems.add(
Expand All @@ -242,7 +277,7 @@ public List<AddNodesItem> getNodesToAdd(
curNodeId = nextId;
}

final String measurementName = segments[segments.length - 1];
final String measurementName = Objects.nonNull(name) ? name : segments[segments.length - 1];
sb.append("/").append(measurementName);
addNodesItems.add(
new AddNodesItem(
Expand Down
12 changes: 6 additions & 6 deletions ...ode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/opcua/server/OpcUaNameSpace.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@
throws Exception;
}

private void transferTabletRowForClientServerModel(

Check warning on line 209 in iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/opcua/server/OpcUaNameSpace.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

A "Brain Method" was detected. Refactor it to reduce at least one of the following metrics: LOC from 117 to 64, Complexity from 23 to 14, Nesting Level from 3 to 2, Number of Variables from 23 to 6. 


See more on https://sonarcloud.io/project/issues?id=apache_iotdb&issues=AZ2vfmLZ2c69TGD5HhV8&open=AZ2vfmLZ2c69TGD5HhV8&pullRequest=17531
final String[] segments,
final List<IMeasurementSchema> measurementSchemas,
final List<Long> timestamps,
Expand Down Expand Up @@ -294,14 +294,14 @@
}
final UaVariableNode measurementNode;
final long utcTimestamp = timestampToUtc(timestamps.get(timestamps.size() > 1 ? i : 0));
final DataValue dataValue =
new DataValue(
new Variant(values.get(i)),
currentQuality,
new DateTime(utcTimestamp),
new DateTime());

if (Objects.isNull(sink.getValueName())) {
final DataValue dataValue =
new DataValue(
new Variant(values.get(i)),
currentQuality,
new DateTime(utcTimestamp),
new DateTime());
measurementNode = addNode(name, currentFolder, folderNode, dataValue, type);
if (Objects.isNull(measurementNode.getValue())
|| Objects.isNull(measurementNode.getValue().getSourceTime())
Expand Down Expand Up @@ -416,7 +416,7 @@
* @param tablet the tablet to send
* @throws UaException if failed to create {@link Event}
*/
private void transferTabletForPubSubModel(

Check warning on line 419 in iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/opcua/server/OpcUaNameSpace.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

A "Brain Method" was detected. Refactor it to reduce at least one of the following metrics: LOC from 102 to 64, Complexity from 25 to 14, Nesting Level from 4 to 2, Number of Variables from 12 to 6. 


See more on https://sonarcloud.io/project/issues?id=apache_iotdb&issues=AZ2vfmLZ2c69TGD5HhV9&open=AZ2vfmLZ2c69TGD5HhV9&pullRequest=17531
final Tablet tablet, final boolean isTableModel, final OpcUaSink sink) throws UaException {
final BaseEventTypeNode eventNode =
getServer()
Expand Down
Loading