Skip to content

Commit aa5713e

Browse files
committed
Support Client TLS
1 parent 74cc483 commit aa5713e

File tree

2 files changed

+21
-7
lines changed

2 files changed

+21
-7
lines changed

src/Apache.IoTDB/SessionPool.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ public SessionPool(List<string> nodeUrls, string username, string password, int
129129
{
130130
}
131131
public SessionPool(List<string> nodeUrls, string username, string password, int fetchSize, string zoneId, int poolSize, bool enableRpcCompression, int timeout)
132-
: this(nodeUrls, username, password, fetchSize, zoneId, poolSize, enableRpcCompression, timeout,false, null, IoTDBConstant.TREE_SQL_DIALECT, "")
132+
: this(nodeUrls, username, password, fetchSize, zoneId, poolSize, enableRpcCompression, timeout, false, null, IoTDBConstant.TREE_SQL_DIALECT, "")
133133
{
134134

135135
}
@@ -246,7 +246,7 @@ public async Task Open(CancellationToken cancellationToken = default)
246246
{
247247
try
248248
{
249-
_clients.Add(await CreateAndOpen(_host, _port, _enableRpcCompression, _timeout, _useSsl,_certificatePath, _sqlDialect, _database, cancellationToken));
249+
_clients.Add(await CreateAndOpen(_host, _port, _enableRpcCompression, _timeout, _useSsl, _certificatePath, _sqlDialect, _database, cancellationToken));
250250
}
251251
catch (Exception e)
252252
{
@@ -269,7 +269,7 @@ public async Task Open(CancellationToken cancellationToken = default)
269269
var endPoint = _endPoints[endPointIndex];
270270
try
271271
{
272-
var client = await CreateAndOpen(endPoint.Ip, endPoint.Port, _enableRpcCompression, _timeout, _useSsl,_certificatePath, _sqlDialect, _database, cancellationToken);
272+
var client = await CreateAndOpen(endPoint.Ip, endPoint.Port, _enableRpcCompression, _timeout, _useSsl, _certificatePath, _sqlDialect, _database, cancellationToken);
273273
_clients.Add(client);
274274
isConnected = true;
275275
startIndex = (endPointIndex + 1) % _endPoints.Count;
@@ -308,7 +308,7 @@ public async Task<Client> Reconnect(Client originalClient = null, CancellationTo
308308
{
309309
try
310310
{
311-
var client = await CreateAndOpen(_host, _port, _enableRpcCompression, _timeout, _useSsl,_certificatePath, _sqlDialect, _database, cancellationToken);
311+
var client = await CreateAndOpen(_host, _port, _enableRpcCompression, _timeout, _useSsl, _certificatePath, _sqlDialect, _database, cancellationToken);
312312
return client;
313313
}
314314
catch (Exception e)
@@ -335,7 +335,7 @@ public async Task<Client> Reconnect(Client originalClient = null, CancellationTo
335335
int j = (startIndex + i) % _endPoints.Count;
336336
try
337337
{
338-
var client = await CreateAndOpen(_endPoints[j].Ip, _endPoints[j].Port, _enableRpcCompression, _timeout, _useSsl,_certificatePath, _sqlDialect, _database, cancellationToken);
338+
var client = await CreateAndOpen(_endPoints[j].Ip, _endPoints[j].Port, _enableRpcCompression, _timeout, _useSsl, _certificatePath, _sqlDialect, _database, cancellationToken);
339339
return client;
340340
}
341341
catch (Exception e)

src/Apache.IoTDB/TableSessionPool.Builder.cs

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ public class Builder
3737
private int _poolSize = 8;
3838
private bool _enableRpcCompression = false;
3939
private int _connectionTimeoutInMs = 500;
40+
private bool _useSsl = false;
41+
private string _certificatePath = null;
4042
private string _sqlDialect = IoTDBConstant.TREE_SQL_DIALECT;
4143
private string _database = "";
4244
private List<string> _nodeUrls = new List<string>();
@@ -95,6 +97,18 @@ public Builder SetConnectionTimeoutInMs(int timeout)
9597
return this;
9698
}
9799

100+
public Builder SetUseSsl(bool useSsl)
101+
{
102+
_useSsl = useSsl;
103+
return this;
104+
}
105+
106+
public Builder SetCertificatePath(string certificatePath)
107+
{
108+
_certificatePath = certificatePath;
109+
return this;
110+
}
111+
98112
public Builder SetNodeUrls(List<string> nodeUrls)
99113
{
100114
_nodeUrls = nodeUrls;
@@ -134,11 +148,11 @@ public TableSessionPool Build()
134148
// if nodeUrls is not empty, use nodeUrls to create session pool
135149
if (_nodeUrls.Count > 0)
136150
{
137-
sessionPool = new SessionPool(_nodeUrls, _username, _password, _fetchSize, _zoneId, _poolSize, _enableRpcCompression, _connectionTimeoutInMs, _sqlDialect, _database);
151+
sessionPool = new SessionPool(_nodeUrls, _username, _password, _fetchSize, _zoneId, _poolSize, _enableRpcCompression, _connectionTimeoutInMs, _useSsl, _certificatePath, _sqlDialect, _database);
138152
}
139153
else
140154
{
141-
sessionPool = new SessionPool(_host, _port, _username, _password, _fetchSize, _zoneId, _poolSize, _enableRpcCompression, _connectionTimeoutInMs, _sqlDialect, _database);
155+
sessionPool = new SessionPool(_host, _port, _username, _password, _fetchSize, _zoneId, _poolSize, _enableRpcCompression, _connectionTimeoutInMs, _useSsl, _certificatePath, _sqlDialect, _database);
142156
}
143157
return new TableSessionPool(sessionPool);
144158
}

0 commit comments

Comments
 (0)