Skip to content

Commit 4b65b8d

Browse files
shuwenweishuwenwei
authored
Added some common interfaces for compatibility
1 parent 078301b commit 4b65b8d

File tree

31 files changed

+351
-80
lines changed

31 files changed

+351
-80
lines changed

‎integration-test/src/test/java/org/apache/iotdb/db/it/auth/IoTDBClusterAuthorityIT.java‎

Lines changed: 46 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,8 @@ private void cleanUserAndRole(IConfigNodeRPCService.Iface client) throws TExcept
8484
"",
8585
new HashSet<>(),
8686
false,
87-
AuthUtils.serializePartialPathList(new ArrayList<>()));
87+
AuthUtils.serializePartialPathList(new ArrayList<>()),
88+
0);
8889
TAuthorizerResp authorizerResp = client.queryPermission(authorizerReq);
8990
status = authorizerResp.getStatus();
9091
assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(), status.getCode());
@@ -101,7 +102,8 @@ private void cleanUserAndRole(IConfigNodeRPCService.Iface client) throws TExcept
101102
"",
102103
new HashSet<>(),
103104
false,
104-
AuthUtils.serializePartialPathList(new ArrayList<>()));
105+
AuthUtils.serializePartialPathList(new ArrayList<>()),
106+
0);
105107
status = client.operatePermission(authorizerReq);
106108
assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(), status.getCode());
107109
}
@@ -150,7 +152,8 @@ public void permissionTest() throws IllegalPathException {
150152
"",
151153
new HashSet<>(),
152154
false,
153-
AuthUtils.serializePartialPathList(new ArrayList<>()));
155+
AuthUtils.serializePartialPathList(new ArrayList<>()),
156+
0);
154157
status = client.operatePermission(authorizerReq);
155158
assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(), status.getCode());
156159
authorizerReq.setUserName("tempuser1");
@@ -179,7 +182,8 @@ public void permissionTest() throws IllegalPathException {
179182
"",
180183
new HashSet<>(),
181184
false,
182-
AuthUtils.serializePartialPathList(new ArrayList<>()));
185+
AuthUtils.serializePartialPathList(new ArrayList<>()),
186+
0);
183187
status = client.operatePermission(authorizerReq);
184188
assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(), status.getCode());
185189
// in confignode: tempuser0
@@ -194,7 +198,8 @@ public void permissionTest() throws IllegalPathException {
194198
"",
195199
new HashSet<>(),
196200
false,
197-
AuthUtils.serializePartialPathList(new ArrayList<>()));
201+
AuthUtils.serializePartialPathList(new ArrayList<>()),
202+
0);
198203
authorizerResp = client.queryPermission(authorizerReq);
199204
status = authorizerResp.getStatus();
200205
assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(), status.getCode());
@@ -211,7 +216,8 @@ public void permissionTest() throws IllegalPathException {
211216
"",
212217
new HashSet<>(),
213218
false,
214-
AuthUtils.serializePartialPathList(new ArrayList<>()));
219+
AuthUtils.serializePartialPathList(new ArrayList<>()),
220+
0);
215221
status = client.operatePermission(authorizerReq);
216222
assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(), status.getCode());
217223
authorizerReq.setRoleName("temprole1");
@@ -229,7 +235,8 @@ public void permissionTest() throws IllegalPathException {
229235
"",
230236
new HashSet<>(),
231237
false,
232-
AuthUtils.serializePartialPathList(new ArrayList<>()));
238+
AuthUtils.serializePartialPathList(new ArrayList<>()),
239+
0);
233240
status = client.operatePermission(authorizerReq);
234241
assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(), status.getCode());
235242
// in confignode: tempuser0,temprole0
@@ -244,7 +251,8 @@ public void permissionTest() throws IllegalPathException {
244251
"",
245252
new HashSet<>(),
246253
false,
247-
AuthUtils.serializePartialPathList(new ArrayList<>()));
254+
AuthUtils.serializePartialPathList(new ArrayList<>()),
255+
0);
248256
authorizerResp = client.queryPermission(authorizerReq);
249257
status = authorizerResp.getStatus();
250258
assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(), status.getCode());
@@ -261,7 +269,8 @@ public void permissionTest() throws IllegalPathException {
261269
"newpwd123456",
262270
new HashSet<>(),
263271
false,
264-
AuthUtils.serializePartialPathList(new ArrayList<>()));
272+
AuthUtils.serializePartialPathList(new ArrayList<>()),
273+
0);
265274
status = client.operatePermission(authorizerReq);
266275
assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(), status.getCode());
267276

@@ -277,7 +286,8 @@ public void permissionTest() throws IllegalPathException {
277286
"",
278287
pathPrivilegeList,
279288
false,
280-
AuthUtils.serializePartialPathList(nodeNameList));
289+
AuthUtils.serializePartialPathList(nodeNameList),
290+
0);
281291
status = client.operatePermission(authorizerReq);
282292
assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(), status.getCode());
283293
// in confignode: tempuser0: root.ln.** ,read_data
@@ -304,7 +314,8 @@ public void permissionTest() throws IllegalPathException {
304314
"",
305315
pathPrivilegeList,
306316
false,
307-
AuthUtils.serializePartialPathList(nodeNameList));
317+
AuthUtils.serializePartialPathList(nodeNameList),
318+
0);
308319
status = client.operatePermission(authorizerReq);
309320
assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(), status.getCode());
310321
// in confignode: tempuser0: root.ln.** ,read_data
@@ -320,7 +331,8 @@ public void permissionTest() throws IllegalPathException {
320331
"",
321332
new HashSet<>(),
322333
false,
323-
AuthUtils.serializePartialPathList(nodeNameList));
334+
AuthUtils.serializePartialPathList(nodeNameList),
335+
0);
324336
status = client.operatePermission(authorizerReq);
325337
assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(), status.getCode());
326338
// in confignode: tempuser0: root.ln.** ,read_data; [temprole0]
@@ -336,7 +348,8 @@ public void permissionTest() throws IllegalPathException {
336348
"",
337349
revokePathPrivilege,
338350
false,
339-
AuthUtils.serializePartialPathList(nodeNameList));
351+
AuthUtils.serializePartialPathList(nodeNameList),
352+
0);
340353
status = client.operatePermission(authorizerReq);
341354
assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(), status.getCode());
342355
// in confignode: tempuser0: ; [temprole0]
@@ -352,7 +365,8 @@ public void permissionTest() throws IllegalPathException {
352365
"",
353366
revokePathPrivilege,
354367
false,
355-
AuthUtils.serializePartialPathList(nodeNameList));
368+
AuthUtils.serializePartialPathList(nodeNameList),
369+
0);
356370
status = client.operatePermission(authorizerReq);
357371
assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(), status.getCode());
358372
// in confignode: tempuser0: ; [temprole0]
@@ -368,7 +382,8 @@ public void permissionTest() throws IllegalPathException {
368382
"",
369383
new HashSet<>(),
370384
false,
371-
AuthUtils.serializePartialPathList(new ArrayList<>()));
385+
AuthUtils.serializePartialPathList(new ArrayList<>()),
386+
0);
372387
authorizerResp = client.queryPermission(authorizerReq);
373388
status = authorizerResp.getStatus();
374389
assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(), status.getCode());
@@ -391,7 +406,8 @@ public void permissionTest() throws IllegalPathException {
391406
"",
392407
new HashSet<>(),
393408
false,
394-
AuthUtils.serializePartialPathList(new ArrayList<>()));
409+
AuthUtils.serializePartialPathList(new ArrayList<>()),
410+
0);
395411
authorizerResp = client.queryPermission(authorizerReq);
396412
status = authorizerResp.getStatus();
397413
assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(), status.getCode());
@@ -411,7 +427,8 @@ public void permissionTest() throws IllegalPathException {
411427
"",
412428
new HashSet<>(),
413429
false,
414-
AuthUtils.serializePartialPathList(new ArrayList<>()));
430+
AuthUtils.serializePartialPathList(new ArrayList<>()),
431+
0);
415432
authorizerResp = client.queryPermission(authorizerReq);
416433
status = authorizerResp.getStatus();
417434
assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(), status.getCode());
@@ -428,7 +445,8 @@ public void permissionTest() throws IllegalPathException {
428445
"",
429446
new HashSet<>(),
430447
false,
431-
AuthUtils.serializePartialPathList(new ArrayList<>()));
448+
AuthUtils.serializePartialPathList(new ArrayList<>()),
449+
0);
432450
authorizerResp = client.queryPermission(authorizerReq);
433451
status = authorizerResp.getStatus();
434452
assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(), status.getCode());
@@ -446,7 +464,8 @@ public void permissionTest() throws IllegalPathException {
446464
"",
447465
new HashSet<>(),
448466
false,
449-
AuthUtils.serializePartialPathList(new ArrayList<>()));
467+
AuthUtils.serializePartialPathList(new ArrayList<>()),
468+
0);
450469
authorizerResp = client.queryPermission(authorizerReq);
451470
status = authorizerResp.getStatus();
452471
assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(), status.getCode());
@@ -488,7 +507,8 @@ public void permissionTest() throws IllegalPathException {
488507
"",
489508
Collections.singleton(PrivilegeType.MANAGE_USER.ordinal()),
490509
false,
491-
AuthUtils.serializePartialPathList(new ArrayList<>()));
510+
AuthUtils.serializePartialPathList(new ArrayList<>()),
511+
0);
492512
status = client.operatePermission(authorizerReq);
493513
assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(), status.getCode());
494514
// in confignode: tempuser0: MANAGE_USER
@@ -512,7 +532,8 @@ public void permissionTest() throws IllegalPathException {
512532
"",
513533
Collections.singleton(PrivilegeType.MANAGE_DATABASE.ordinal()),
514534
false,
515-
AuthUtils.serializePartialPathList(new ArrayList<>()));
535+
AuthUtils.serializePartialPathList(new ArrayList<>()),
536+
0);
516537
status = client.operatePermission(authorizerReq);
517538
assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(), status.getCode());
518539
// in confignode: tempuser0: MANAGE_USER
@@ -537,7 +558,8 @@ public void permissionTest() throws IllegalPathException {
537558
"",
538559
new HashSet<>(),
539560
false,
540-
AuthUtils.serializePartialPathList(new ArrayList<>()));
561+
AuthUtils.serializePartialPathList(new ArrayList<>()),
562+
0);
541563
status = client.operatePermission(authorizerReq);
542564
assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(), status.getCode());
543565

@@ -551,7 +573,8 @@ public void permissionTest() throws IllegalPathException {
551573
"",
552574
new HashSet<>(),
553575
false,
554-
AuthUtils.serializePartialPathList(new ArrayList<>()));
576+
AuthUtils.serializePartialPathList(new ArrayList<>()),
577+
0);
555578
authorizerResp = client.queryPermission(authorizerReq);
556579
status = authorizerResp.getStatus();
557580
assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(), status.getCode());

‎integration-test/src/test/java/org/apache/iotdb/db/it/auth/IoTDBClusterAuthorityRelationalIT.java‎

Lines changed: 25 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ private void cleanUserAndRole(SyncConfigNodeIServiceClient client) throws TExcep
8383
// clean user
8484
TAuthorizerRelationalReq authorizerReq =
8585
new TAuthorizerRelationalReq(
86-
AuthorRType.LIST_USER.ordinal(), "", "", "", "", "", Collections.emptySet(), false);
86+
AuthorRType.LIST_USER.ordinal(), "", "", "", "", "", Collections.emptySet(), false, 0);
8787

8888
TAuthorizerResp authorizerResp = client.queryRPermission(authorizerReq);
8989
status = authorizerResp.getStatus();
@@ -101,7 +101,8 @@ private void cleanUserAndRole(SyncConfigNodeIServiceClient client) throws TExcep
101101
"",
102102
"",
103103
Collections.emptySet(),
104-
false);
104+
false,
105+
0);
105106
status = client.operateRPermission(authorizerReq);
106107
assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(), status.getCode());
107108
}
@@ -110,7 +111,7 @@ private void cleanUserAndRole(SyncConfigNodeIServiceClient client) throws TExcep
110111
// clean role
111112
authorizerReq =
112113
new TAuthorizerRelationalReq(
113-
AuthorRType.LIST_ROLE.ordinal(), "", "", "", "", "", Collections.emptySet(), false);
114+
AuthorRType.LIST_ROLE.ordinal(), "", "", "", "", "", Collections.emptySet(), false, 0);
114115

115116
authorizerResp = client.queryRPermission(authorizerReq);
116117
status = authorizerResp.getStatus();
@@ -120,7 +121,15 @@ private void cleanUserAndRole(SyncConfigNodeIServiceClient client) throws TExcep
120121
for (String role : allRoles) {
121122
authorizerReq =
122123
new TAuthorizerRelationalReq(
123-
AuthorRType.DROP_ROLE.ordinal(), role, "", "", "", "", Collections.emptySet(), false);
124+
AuthorRType.DROP_ROLE.ordinal(),
125+
role,
126+
"",
127+
"",
128+
"",
129+
"",
130+
Collections.emptySet(),
131+
false,
132+
0);
124133
status = client.operateRPermission(authorizerReq);
125134
assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(), status.getCode());
126135
}
@@ -139,7 +148,8 @@ private void createUserORRoleAndCheck(
139148
"",
140149
"",
141150
Collections.emptySet(),
142-
false);
151+
false,
152+
0);
143153
status = client.operateRPermission(authorizerReq);
144154
assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(), status.getCode());
145155
authorizerReq =
@@ -151,7 +161,8 @@ private void createUserORRoleAndCheck(
151161
"",
152162
"",
153163
Collections.emptySet(),
154-
false);
164+
false,
165+
0);
155166
TAuthorizerResp resp = client.queryRPermission(authorizerReq);
156167
assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(), resp.getStatus().getCode());
157168
assertTrue(resp.getMemberInfo().contains(name));
@@ -175,7 +186,8 @@ private void grantSysPrivilegeAndCheck(
175186
"",
176187
"",
177188
Collections.singleton(sysPriv.ordinal()),
178-
grantOpt);
189+
grantOpt,
190+
0);
179191

180192
status = client.operateRPermission(authorizerRelationalReq);
181193
assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(), status.getCode());
@@ -229,7 +241,8 @@ private void grantPrivilegeAndCheck(
229241
union.getDBName() == null ? "" : union.getDBName(),
230242
union.getTbName() == null ? "" : union.getTbName(),
231243
Collections.singleton(union.getPrivilegeType().ordinal()),
232-
union.isGrantOption());
244+
union.isGrantOption(),
245+
0);
233246
status = client.operateRPermission(authorizerRelationalReq);
234247
assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(), status.getCode());
235248
int reqtype = -1;
@@ -346,7 +359,8 @@ public void permissionTest()
346359
"",
347360
"",
348361
Collections.emptySet(),
349-
false));
362+
false,
363+
0));
350364
grantSysPrivilegeAndCheck(client, "user1", "role1", true, PrivilegeType.MANAGE_USER, false);
351365
grantSysPrivilegeAndCheck(client, "user1", "role1", true, PrivilegeType.MANAGE_ROLE, true);
352366
grantPrivilegeAndCheck(
@@ -392,7 +406,8 @@ public void permissionTest()
392406
"",
393407
Collections.emptySet(),
394408
false,
395-
AuthUtils.serializePartialPathList(Collections.emptyList()));
409+
AuthUtils.serializePartialPathList(Collections.emptyList()),
410+
0);
396411
expectSuccess(client.checkRoleOfUser(user_role_req));
397412

398413
// check db is visible

‎iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/ConfigPhysicalPlan.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -290,6 +290,7 @@ public static ConfigPhysicalPlan create(final ByteBuffer buffer) throws IOExcept
290290
case CreateUser:
291291
case CreateRole:
292292
case DropUser:
293+
case DropUserV2:
293294
case DropRole:
294295
case GrantRole:
295296
case GrantUser:
@@ -298,14 +299,17 @@ public static ConfigPhysicalPlan create(final ByteBuffer buffer) throws IOExcept
298299
case RevokeRole:
299300
case RevokeRoleFromUser:
300301
case UpdateUser:
302+
case UpdateUserV2:
301303
case CreateUserWithRawPassword:
302304
plan = new AuthorTreePlan(configPhysicalPlanType);
303305
break;
304306
case RCreateUser:
305307
case RCreateRole:
306308
case RUpdateUser:
309+
case RUpdateUserV2:
307310
case RDropRole:
308311
case RDropUser:
312+
case RDropUserV2:
309313
case RGrantUserRole:
310314
case RRevokeUserRole:
311315
case RGrantRoleAny:

0 commit comments

Comments
 (0)