Skip to content
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

Jump to bottom

[Refactor] Reduce redundancy by introducing consistent functional interface in SessionConnection #14212

Merged
merged 4 commits into from
Dec 2, 2024
+132 −274
Merged

[Refactor] Reduce redundancy by introducing consistent functional interface in SessionConnection #14212

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
54ba85a
refactor session connect to reduce redundency
SzyWilliam Nov 26, 2024
90cce52
refactor session connect to reduce redundency
SzyWilliam Nov 28, 2024
99627e0
mvn spotless
SzyWilliam Nov 28, 2024
ea78d9f
fix small error
SzyWilliam Nov 28, 2024
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
169 changes: 47 additions & 122 deletions iotdb-client/session/src/main/java/org/apache/iotdb/session/SessionConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
import org.apache.iotdb.service.rpc.thrift.TSSetSchemaTemplateReq;
import org.apache.iotdb.service.rpc.thrift.TSSetTimeZoneReq;
import org.apache.iotdb.service.rpc.thrift.TSUnsetSchemaTemplateReq;
import org.apache.iotdb.session.util.CheckedSupplier;
import org.apache.iotdb.session.util.SessionUtils;

import org.apache.thrift.TException;
Expand Down Expand Up @@ -1477,180 +1478,104 @@ private boolean reconnect() {

protected void createSchemaTemplate(TSCreateSchemaTemplateReq request)
throws IoTDBConnectionException, StatementExecutionException {
request.setSessionId(sessionId);
try {
doOperation(() -> {
request.setSessionId(sessionId);
RpcUtils.verifySuccess(client.createSchemaTemplate(request));
} catch (TException e) {
if (reconnect()) {
try {
request.setSessionId(sessionId);
RpcUtils.verifySuccess(client.createSchemaTemplate(request));
} catch (TException tException) {
throw new IoTDBConnectionException(tException);
}
} else {
throw new IoTDBConnectionException(logForReconnectionFailure());
}
}
return null;
});
}

protected void appendSchemaTemplate(TSAppendSchemaTemplateReq request)
throws IoTDBConnectionException, StatementExecutionException {
request.setSessionId(sessionId);
try {
doOperation(() -> {
request.setSessionId(sessionId);
RpcUtils.verifySuccess(client.appendSchemaTemplate(request));
} catch (TException e) {
if (reconnect()) {
try {
request.setSessionId(sessionId);
RpcUtils.verifySuccess(client.appendSchemaTemplate(request));
} catch (TException tException) {
throw new IoTDBConnectionException(tException);
}
} else {
throw new IoTDBConnectionException(logForReconnectionFailure());
}
}
return null;
});
}

protected void pruneSchemaTemplate(TSPruneSchemaTemplateReq request)
throws IoTDBConnectionException, StatementExecutionException {
request.setSessionId(sessionId);
try {
doOperation(() -> {
request.setSessionId(sessionId);
RpcUtils.verifySuccess(client.pruneSchemaTemplate(request));
} catch (TException e) {
if (reconnect()) {
try {
request.setSessionId(sessionId);
RpcUtils.verifySuccess(client.pruneSchemaTemplate(request));
} catch (TException tException) {
throw new IoTDBConnectionException(tException);
}
} else {
throw new IoTDBConnectionException(logForReconnectionFailure());
}
}
return null;
});
}

protected TSQueryTemplateResp querySchemaTemplate(TSQueryTemplateReq req)
throws StatementExecutionException, IoTDBConnectionException {
TSQueryTemplateResp execResp;
req.setSessionId(sessionId);
try {
execResp = client.querySchemaTemplate(req);
return doOperation(() -> {
req.setSessionId(sessionId);
TSQueryTemplateResp execResp = client.querySchemaTemplate(req);
RpcUtils.verifySuccess(execResp.getStatus());
} catch (TException e) {
if (reconnect()) {
try {
execResp = client.querySchemaTemplate(req);
} catch (TException tException) {
throw new IoTDBConnectionException(tException);
}
} else {
throw new IoTDBConnectionException(logForReconnectionFailure());
}
}

RpcUtils.verifySuccess(execResp.getStatus());
return execResp;
return execResp;
});
}

protected void setSchemaTemplate(TSSetSchemaTemplateReq request)
throws IoTDBConnectionException, StatementExecutionException {
request.setSessionId(sessionId);
try {
doOperation(() -> {
request.setSessionId(sessionId);
RpcUtils.verifySuccess(client.setSchemaTemplate(request));
} catch (TException e) {
if (reconnect()) {
try {
request.setSessionId(sessionId);
RpcUtils.verifySuccess(client.setSchemaTemplate(request));
} catch (TException tException) {
throw new IoTDBConnectionException(tException);
}
} else {
throw new IoTDBConnectionException(logForReconnectionFailure());
}
}
return null;
});
}

protected void unsetSchemaTemplate(TSUnsetSchemaTemplateReq request)
throws IoTDBConnectionException, StatementExecutionException {
request.setSessionId(sessionId);
try {
doOperation(() -> {
request.setSessionId(sessionId);
RpcUtils.verifySuccess(client.unsetSchemaTemplate(request));
} catch (TException e) {
if (reconnect()) {
try {
request.setSessionId(sessionId);
RpcUtils.verifySuccess(client.unsetSchemaTemplate(request));
} catch (TException tException) {
throw new IoTDBConnectionException(tException);
}
} else {
throw new IoTDBConnectionException(logForReconnectionFailure());
}
}
return null;
});
}

protected void dropSchemaTemplate(TSDropSchemaTemplateReq request)
throws IoTDBConnectionException, StatementExecutionException {
request.setSessionId(sessionId);
try {
doOperation(() -> {
request.setSessionId(sessionId);
RpcUtils.verifySuccess(client.dropSchemaTemplate(request));
} catch (TException e) {
if (reconnect()) {
try {
request.setSessionId(sessionId);
RpcUtils.verifySuccess(client.dropSchemaTemplate(request));
} catch (TException tException) {
throw new IoTDBConnectionException(tException);
}
} else {
throw new IoTDBConnectionException(logForReconnectionFailure());
}
}
return null;
});
}

protected void createTimeseriesUsingSchemaTemplate(
TCreateTimeseriesUsingSchemaTemplateReq request)
throws IoTDBConnectionException, StatementExecutionException {
request.setSessionId(sessionId);
try {
doOperation(() -> {
request.setSessionId(sessionId);
RpcUtils.verifySuccess(client.createTimeseriesUsingSchemaTemplate(request));
} catch (TException e) {
if (reconnect()) {
try {
request.setSessionId(sessionId);
RpcUtils.verifySuccess(client.createTimeseriesUsingSchemaTemplate(request));
} catch (TException tException) {
throw new IoTDBConnectionException(tException);
}
} else {
throw new IoTDBConnectionException(MSG_RECONNECTION_FAIL);
}
}
return null;
});
}

protected TSBackupConfigurationResp getBackupConfiguration()
throws IoTDBConnectionException, StatementExecutionException {
TSBackupConfigurationResp execResp;
try {
execResp = client.getBackupConfiguration();
return doOperation(() -> {
TSBackupConfigurationResp execResp = client.getBackupConfiguration();
RpcUtils.verifySuccess(execResp.getStatus());
return execResp;
});
}

private <RETURN> RETURN doOperation(CheckedSupplier<RETURN, TException> supplier)
throws IoTDBConnectionException, StatementExecutionException {
RETURN ret;
try {
ret = supplier.get();
} catch (TException e) {
if (reconnect()) {
try {
execResp = client.getBackupConfiguration();
RpcUtils.verifySuccess(execResp.getStatus());
ret = supplier.get();
} catch (TException tException) {
throw new IoTDBConnectionException(tException);
}
} else {
throw new IoTDBConnectionException(logForReconnectionFailure());
}
}
return execResp;
return ret;
}

public TSConnectionInfoResp fetchAllConnections() throws IoTDBConnectionException {
Expand Down
32 changes: 32 additions & 0 deletions iotdb-client/session/src/main/java/org/apache/iotdb/session/util/CheckedSupplier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/

package org.apache.iotdb.session.util;

import org.apache.iotdb.rpc.StatementExecutionException;

/** Supplier with a throws-clause. */
@FunctionalInterface
public interface CheckedSupplier<OUTPUT, THROWABLE extends Throwable> {
/**
* The same as {@link java.util.function.Supplier#get()}
* except that this method is declared with a throws-clause.
*/
OUTPUT get() throws THROWABLE, StatementExecutionException;
}
Loading