Skip to content

Commit e7d92ce

Browse files
authored
[server] Rename RPC AlterTablePropertiesRequest to AlterTableRequest for future extensibility (#1766)
1 parent 9013f5a commit e7d92ce

File tree

7 files changed

+22
-25
lines changed

7 files changed

+22
-25
lines changed

fluss-client/src/main/java/org/apache/fluss/client/admin/FlussAdmin.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
import org.apache.fluss.rpc.gateway.AdminGateway;
4343
import org.apache.fluss.rpc.gateway.AdminReadOnlyGateway;
4444
import org.apache.fluss.rpc.gateway.TabletServerGateway;
45-
import org.apache.fluss.rpc.messages.AlterTablePropertiesRequest;
45+
import org.apache.fluss.rpc.messages.AlterTableRequest;
4646
import org.apache.fluss.rpc.messages.CreateAclsRequest;
4747
import org.apache.fluss.rpc.messages.CreateDatabaseRequest;
4848
import org.apache.fluss.rpc.messages.CreateTableRequest;
@@ -243,7 +243,7 @@ public CompletableFuture<Void> createTable(
243243
public CompletableFuture<Void> alterTable(
244244
TablePath tablePath, List<TableChange> tableChanges, boolean ignoreIfNotExists) {
245245
tablePath.validate();
246-
AlterTablePropertiesRequest request = new AlterTablePropertiesRequest();
246+
AlterTableRequest request = new AlterTableRequest();
247247

248248
List<PbAlterConfig> pbFlussTableChanges =
249249
tableChanges.stream()
@@ -255,7 +255,7 @@ public CompletableFuture<Void> alterTable(
255255
.setTablePath()
256256
.setDatabaseName(tablePath.getDatabaseName())
257257
.setTableName(tablePath.getTableName());
258-
return gateway.alterTableProperties(request).thenApply(r -> null);
258+
return gateway.alterTable(request).thenApply(r -> null);
259259
}
260260

261261
@Override

fluss-rpc/src/main/java/org/apache/fluss/rpc/gateway/AdminGateway.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
package org.apache.fluss.rpc.gateway;
1919

20-
import org.apache.fluss.rpc.messages.AlterTablePropertiesRequest;
21-
import org.apache.fluss.rpc.messages.AlterTablePropertiesResponse;
20+
import org.apache.fluss.rpc.messages.AlterTableRequest;
21+
import org.apache.fluss.rpc.messages.AlterTableResponse;
2222
import org.apache.fluss.rpc.messages.CreateAclsRequest;
2323
import org.apache.fluss.rpc.messages.CreateAclsResponse;
2424
import org.apache.fluss.rpc.messages.CreateDatabaseRequest;
@@ -69,11 +69,10 @@ public interface AdminGateway extends AdminReadOnlyGateway {
6969
/**
7070
* Alter a table.
7171
*
72-
* @param request the request to alter the configs of a table.
72+
* @param request the request to alter a table.
7373
*/
7474
@RPC(api = ApiKeys.ALTER_TABLE_PROPERTIES)
75-
CompletableFuture<AlterTablePropertiesResponse> alterTableProperties(
76-
AlterTablePropertiesRequest request);
75+
CompletableFuture<AlterTableResponse> alterTable(AlterTableRequest request);
7776

7877
/**
7978
* Drop a table.

fluss-rpc/src/main/proto/FlussApi.proto

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ message CreateTableResponse {
109109
}
110110

111111
// alter table request and response
112-
message AlterTablePropertiesRequest {
112+
message AlterTableRequest {
113113
required PbTablePath table_path = 1;
114114
required bool ignore_if_not_exists = 2;
115115
repeated PbAlterConfig config_changes = 3;
@@ -122,7 +122,7 @@ message PbAlterConfig {
122122
required int32 op_type = 3; // SET=0, DELETE=1, APPEND=2, SUBTRACT=3
123123
}
124124

125-
message AlterTablePropertiesResponse {
125+
message AlterTableResponse {
126126
}
127127

128128

fluss-server/src/main/java/org/apache/fluss/server/coordinator/CoordinatorService.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141
import org.apache.fluss.rpc.gateway.CoordinatorGateway;
4242
import org.apache.fluss.rpc.messages.AdjustIsrRequest;
4343
import org.apache.fluss.rpc.messages.AdjustIsrResponse;
44-
import org.apache.fluss.rpc.messages.AlterTablePropertiesRequest;
45-
import org.apache.fluss.rpc.messages.AlterTablePropertiesResponse;
44+
import org.apache.fluss.rpc.messages.AlterTableRequest;
45+
import org.apache.fluss.rpc.messages.AlterTableResponse;
4646
import org.apache.fluss.rpc.messages.CommitKvSnapshotRequest;
4747
import org.apache.fluss.rpc.messages.CommitKvSnapshotResponse;
4848
import org.apache.fluss.rpc.messages.CommitLakeTableSnapshotRequest;
@@ -293,8 +293,7 @@ public CompletableFuture<CreateTableResponse> createTable(CreateTableRequest req
293293
}
294294

295295
@Override
296-
public CompletableFuture<AlterTablePropertiesResponse> alterTableProperties(
297-
AlterTablePropertiesRequest request) {
296+
public CompletableFuture<AlterTableResponse> alterTable(AlterTableRequest request) {
298297
TablePath tablePath = toTablePath(request.getTablePath());
299298
tablePath.validate();
300299
if (authorizer != null) {
@@ -313,7 +312,7 @@ public CompletableFuture<AlterTablePropertiesResponse> alterTableProperties(
313312
dataLakeFormat,
314313
lakeTableTieringManager);
315314

316-
return CompletableFuture.completedFuture(new AlterTablePropertiesResponse());
315+
return CompletableFuture.completedFuture(new AlterTableResponse());
317316
}
318317

319318
public static TablePropertyChanges toTablePropertyChanges(List<TableChange> tableChanges) {

fluss-server/src/test/java/org/apache/fluss/server/coordinator/TableManagerITCase.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
import java.util.stream.Collectors;
8989

9090
import static org.apache.fluss.config.ConfigOptions.DEFAULT_LISTENER_NAME;
91-
import static org.apache.fluss.server.testutils.RpcMessageTestUtils.newAlterTablePropertiesRequest;
91+
import static org.apache.fluss.server.testutils.RpcMessageTestUtils.newAlterTableRequest;
9292
import static org.apache.fluss.server.testutils.RpcMessageTestUtils.newCreateDatabaseRequest;
9393
import static org.apache.fluss.server.testutils.RpcMessageTestUtils.newCreateTableRequest;
9494
import static org.apache.fluss.server.testutils.RpcMessageTestUtils.newDatabaseExistsRequest;
@@ -294,8 +294,8 @@ void testTableManagement(boolean isCoordinatorServer) throws Exception {
294294
List<String> resetProperties = new ArrayList<>();
295295

296296
adminGateway
297-
.alterTableProperties(
298-
newAlterTablePropertiesRequest(
297+
.alterTable(
298+
newAlterTableRequest(
299299
tablePath,
300300
alterTableProperties(setProperties, resetProperties),
301301
false))

fluss-server/src/test/java/org/apache/fluss/server/coordinator/TestCoordinatorGateway.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
import org.apache.fluss.rpc.gateway.CoordinatorGateway;
2424
import org.apache.fluss.rpc.messages.AdjustIsrRequest;
2525
import org.apache.fluss.rpc.messages.AdjustIsrResponse;
26-
import org.apache.fluss.rpc.messages.AlterTablePropertiesRequest;
27-
import org.apache.fluss.rpc.messages.AlterTablePropertiesResponse;
26+
import org.apache.fluss.rpc.messages.AlterTableRequest;
27+
import org.apache.fluss.rpc.messages.AlterTableResponse;
2828
import org.apache.fluss.rpc.messages.ApiVersionsRequest;
2929
import org.apache.fluss.rpc.messages.ApiVersionsResponse;
3030
import org.apache.fluss.rpc.messages.CommitKvSnapshotRequest;
@@ -142,8 +142,7 @@ public CompletableFuture<CreateTableResponse> createTable(CreateTableRequest req
142142
}
143143

144144
@Override
145-
public CompletableFuture<AlterTablePropertiesResponse> alterTableProperties(
146-
AlterTablePropertiesRequest request) {
145+
public CompletableFuture<AlterTableResponse> alterTable(AlterTableRequest request) {
147146
throw new UnsupportedOperationException();
148147
}
149148

fluss-server/src/test/java/org/apache/fluss/server/testutils/RpcMessageTestUtils.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import org.apache.fluss.record.MemoryLogRecords;
2828
import org.apache.fluss.record.bytesview.MemorySegmentBytesView;
2929
import org.apache.fluss.rpc.gateway.CoordinatorGateway;
30-
import org.apache.fluss.rpc.messages.AlterTablePropertiesRequest;
30+
import org.apache.fluss.rpc.messages.AlterTableRequest;
3131
import org.apache.fluss.rpc.messages.CreateDatabaseRequest;
3232
import org.apache.fluss.rpc.messages.CreatePartitionRequest;
3333
import org.apache.fluss.rpc.messages.CreateTableRequest;
@@ -141,9 +141,9 @@ public static CreateTableRequest newCreateTableRequest(
141141
return createTableRequest;
142142
}
143143

144-
public static AlterTablePropertiesRequest newAlterTablePropertiesRequest(
144+
public static AlterTableRequest newAlterTableRequest(
145145
TablePath tablePath, List<PbAlterConfig> alterConfigs, boolean ignoreIfExists) {
146-
AlterTablePropertiesRequest request = new AlterTablePropertiesRequest();
146+
AlterTableRequest request = new AlterTableRequest();
147147
request.addAllConfigChanges(alterConfigs)
148148
.setIgnoreIfNotExists(ignoreIfExists)
149149
.setTablePath()

0 commit comments

Comments
 (0)