Skip to content

Commit d579c34

Browse files
[AINode] Revert to master branch
1 parent 6ba848f commit d579c34

File tree

4 files changed

+76
-8
lines changed

4 files changed

+76
-8
lines changed

iotdb-core/ainode/poetry.lock

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/ClusterConfigTaskExecutor.java

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,10 @@
8585
import org.apache.iotdb.commons.udf.service.UDFExecutableManager;
8686
import org.apache.iotdb.commons.utils.CommonDateTimeUtils;
8787
import org.apache.iotdb.commons.utils.PathUtils;
88+
import org.apache.iotdb.commons.utils.SerializeUtils;
8889
import org.apache.iotdb.commons.utils.TimePartitionUtils;
8990
import org.apache.iotdb.confignode.rpc.thrift.TAINodeRemoveReq;
91+
import org.apache.iotdb.confignode.rpc.thrift.TAlterEncodingCompressorReq;
9092
import org.apache.iotdb.confignode.rpc.thrift.TAlterLogicalViewReq;
9193
import org.apache.iotdb.confignode.rpc.thrift.TAlterOrDropTableReq;
9294
import org.apache.iotdb.confignode.rpc.thrift.TAlterPipeReq;
@@ -246,6 +248,7 @@
246248
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowCluster;
247249
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowDB;
248250
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Use;
251+
import org.apache.iotdb.db.queryengine.plan.statement.metadata.AlterEncodingCompressorStatement;
249252
import org.apache.iotdb.db.queryengine.plan.statement.metadata.CountDatabaseStatement;
250253
import org.apache.iotdb.db.queryengine.plan.statement.metadata.CountTimeSlotListStatement;
251254
import org.apache.iotdb.db.queryengine.plan.statement.metadata.CreateContinuousQueryStatement;
@@ -2779,6 +2782,65 @@ public SettableFuture<ConfigTaskResult> showTopics(
27792782
return future;
27802783
}
27812784

2785+
@Override
2786+
public SettableFuture<ConfigTaskResult> alterEncodingCompressor(
2787+
final String queryId,
2788+
final AlterEncodingCompressorStatement alterEncodingCompressorStatement) {
2789+
final SettableFuture<ConfigTaskResult> future = SettableFuture.create();
2790+
// Will only occur if no permission
2791+
if (alterEncodingCompressorStatement.getPatternTree().isEmpty()) {
2792+
future.set(new ConfigTaskResult(TSStatusCode.SUCCESS_STATUS));
2793+
return future;
2794+
}
2795+
final ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
2796+
final DataOutputStream dataOutputStream = new DataOutputStream(byteArrayOutputStream);
2797+
try {
2798+
alterEncodingCompressorStatement.getPatternTree().serialize(dataOutputStream);
2799+
} catch (final IOException ignored) {
2800+
// memory operation, won't happen
2801+
}
2802+
final TAlterEncodingCompressorReq req =
2803+
new TAlterEncodingCompressorReq(
2804+
queryId,
2805+
ByteBuffer.wrap(byteArrayOutputStream.toByteArray()),
2806+
SerializeUtils.serializeNullable(alterEncodingCompressorStatement.getEncoding()),
2807+
SerializeUtils.serializeNullable(alterEncodingCompressorStatement.getCompressor()),
2808+
alterEncodingCompressorStatement.ifExists(),
2809+
alterEncodingCompressorStatement.isWithAudit());
2810+
try (final ConfigNodeClient client =
2811+
CLUSTER_DELETION_CONFIG_NODE_CLIENT_MANAGER.borrowClient(ConfigNodeInfo.CONFIG_REGION_ID)) {
2812+
TSStatus tsStatus;
2813+
do {
2814+
try {
2815+
tsStatus = client.alterEncodingCompressor(req);
2816+
} catch (final TTransportException e) {
2817+
if (e.getType() == TTransportException.TIMED_OUT
2818+
|| e.getCause() instanceof SocketTimeoutException) {
2819+
// time out mainly caused by slow execution, wait until
2820+
tsStatus = RpcUtils.getStatus(TSStatusCode.OVERLAP_WITH_EXISTING_TASK);
2821+
} else {
2822+
throw e;
2823+
}
2824+
}
2825+
// keep waiting until task ends
2826+
} while (TSStatusCode.OVERLAP_WITH_EXISTING_TASK.getStatusCode() == tsStatus.getCode());
2827+
2828+
if (TSStatusCode.SUCCESS_STATUS.getStatusCode() != tsStatus.getCode()) {
2829+
if (tsStatus.getCode() == TSStatusCode.MULTIPLE_ERROR.getStatusCode()) {
2830+
future.setException(
2831+
new BatchProcessException(tsStatus.subStatus.toArray(new TSStatus[0])));
2832+
} else {
2833+
future.setException(new IoTDBException(tsStatus));
2834+
}
2835+
} else {
2836+
future.set(new ConfigTaskResult(TSStatusCode.SUCCESS_STATUS));
2837+
}
2838+
} catch (final ClientManagerException | TException e) {
2839+
future.setException(e);
2840+
}
2841+
return future;
2842+
}
2843+
27822844
@Override
27832845
public SettableFuture<ConfigTaskResult> deleteTimeSeries(
27842846
final String queryId, final DeleteTimeSeriesStatement deleteTimeSeriesStatement) {

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/udf/UDTFForecast.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
import org.apache.iotdb.ainode.rpc.thrift.TForecastResp;
2323
import org.apache.iotdb.common.rpc.thrift.TEndPoint;
2424
import org.apache.iotdb.commons.client.IClientManager;
25-
import org.apache.iotdb.commons.client.ainode.AINodeClient;
26-
import org.apache.iotdb.commons.client.ainode.AINodeClientManager;
2725
import org.apache.iotdb.commons.exception.IoTDBRuntimeException;
26+
import org.apache.iotdb.db.protocol.client.ainode.AINodeClient;
27+
import org.apache.iotdb.db.protocol.client.ainode.AINodeClientManager;
2828
import org.apache.iotdb.db.queryengine.plan.analyze.IModelFetcher;
2929
import org.apache.iotdb.db.queryengine.plan.analyze.ModelFetcher;
3030
import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.model.ModelInferenceDescriptor;

iotdb-core/node-commons/pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -179,12 +179,6 @@
179179
<groupId>com.timecho.ratis</groupId>
180180
<artifactId>ratis-common</artifactId>
181181
</dependency>
182-
<dependency>
183-
<groupId>org.apache.iotdb</groupId>
184-
<artifactId>iotdb-thrift-ainode</artifactId>
185-
<version>2.0.6-SNAPSHOT</version>
186-
<scope>compile</scope>
187-
</dependency>
188182
</dependencies>
189183
<build>
190184
<resources>

0 commit comments

Comments
 (0)