Skip to content

Commit c6d1170

Browse files
committed
fix
1 parent 0c556ea commit c6d1170

File tree

3 files changed

+22
-6
lines changed

3 files changed

+22
-6
lines changed

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

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@
6868
import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_IOTDB_USER_KEY;
6969
import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_OPC_UA_ENABLE_ANONYMOUS_ACCESS_DEFAULT_VALUE;
7070
import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_OPC_UA_ENABLE_ANONYMOUS_ACCESS_KEY;
71+
import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_OPC_UA_HISTORIZING_DEFAULT_VALUE;
72+
import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_OPC_UA_HISTORIZING_KEY;
7173
import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_OPC_UA_HTTPS_BIND_PORT_DEFAULT_VALUE;
7274
import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_OPC_UA_HTTPS_BIND_PORT_KEY;
7375
import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_OPC_UA_MODEL_CLIENT_SERVER_VALUE;
@@ -98,6 +100,7 @@
98100
import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.SINK_IOTDB_USERNAME_KEY;
99101
import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.SINK_IOTDB_USER_KEY;
100102
import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.SINK_OPC_UA_ENABLE_ANONYMOUS_ACCESS_KEY;
103+
import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.SINK_OPC_UA_HISTORIZING_KEY;
101104
import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.SINK_OPC_UA_HTTPS_BIND_PORT_KEY;
102105
import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.SINK_OPC_UA_MODEL_KEY;
103106
import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.SINK_OPC_UA_NODE_URL_KEY;
@@ -358,7 +361,14 @@ private void customizeClient(final String nodeUrl, final PipeParameters paramete
358361
+ File.separatorChar
359362
+ UUID.nameUUIDFromBytes(nodeUrl.getBytes(TSFileConfig.STRING_CHARSET))));
360363

361-
client = new IoTDBOpcUaClient(nodeUrl, policy, provider);
364+
client =
365+
new IoTDBOpcUaClient(
366+
nodeUrl,
367+
policy,
368+
provider,
369+
parameters.getBooleanOrDefault(
370+
Arrays.asList(CONNECTOR_OPC_UA_HISTORIZING_KEY, SINK_OPC_UA_HISTORIZING_KEY),
371+
CONNECTOR_OPC_UA_HISTORIZING_DEFAULT_VALUE));
362372
new ClientRunner(client, securityDir, password).run();
363373
}
364374

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,14 +67,17 @@ public class IoTDBOpcUaClient {
6767
private final SecurityPolicy securityPolicy;
6868
private final IdentityProvider identityProvider;
6969
private OpcUaClient client;
70+
private boolean historizing;
7071

7172
public IoTDBOpcUaClient(
7273
final String nodeUrl,
7374
final SecurityPolicy securityPolicy,
74-
final IdentityProvider identityProvider) {
75+
final IdentityProvider identityProvider,
76+
final boolean historizing) {
7577
this.nodeUrl = nodeUrl;
7678
this.securityPolicy = securityPolicy;
7779
this.identityProvider = identityProvider;
80+
this.historizing = historizing;
7881
}
7982

8083
public void run(final OpcUaClient client) throws Exception {
@@ -251,7 +254,7 @@ IdentityProvider getIdentityProvider() {
251254

252255
/////////////////////////////// Attribute creator ///////////////////////////////
253256

254-
public static VariableAttributes createMeasurementAttributes(
257+
private VariableAttributes createMeasurementAttributes(
255258
final String name, final NodeId objectType, final Variant initialValue) {
256259
return new VariableAttributes(
257260
Unsigned.uint(0xFFFF), // specifiedAttributes
@@ -266,11 +269,10 @@ public static VariableAttributes createMeasurementAttributes(
266269
AccessLevel.toValue(AccessLevel.READ_WRITE),
267270
AccessLevel.toValue(AccessLevel.READ_WRITE),
268271
500.0, // samplingInterval
269-
false // historizing
270-
);
272+
historizing);
271273
}
272274

273-
public static ObjectAttributes createFolderAttributes(final String name) {
275+
private static ObjectAttributes createFolderAttributes(final String name) {
274276
return new ObjectAttributes(
275277
Unsigned.uint(0xFFFF), // specifiedAttributes
276278
LocalizedText.english(name),

iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/config/constant/PipeSinkConstant.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,10 @@ public class PipeSinkConstant {
211211
public static final String CONNECTOR_OPC_UA_QUALITY_SECURITY_POLICY_AES256_SHA256_RSAPSS_VALUE =
212212
"AES256_SHA256_RSAPSS";
213213

214+
public static final String CONNECTOR_OPC_UA_HISTORIZING_KEY = "connector.opcua.historizing";
215+
public static final String SINK_OPC_UA_HISTORIZING_KEY = "sink.opcua.historizing";
216+
public static final boolean CONNECTOR_OPC_UA_HISTORIZING_DEFAULT_VALUE = false;
217+
214218
public static final String CONNECTOR_LEADER_CACHE_ENABLE_KEY = "connector.leader-cache.enable";
215219
public static final String SINK_LEADER_CACHE_ENABLE_KEY = "sink.leader-cache.enable";
216220
public static final boolean CONNECTOR_LEADER_CACHE_ENABLE_DEFAULT_VALUE = true;

0 commit comments

Comments
 (0)