Skip to content

Commit 316410e

Browse files
JackieTien97JackieTien97
committed
resolve conflicts
2 parents 35419d6 + 993ec2f commit 316410e

File tree

118 files changed

+2681
-2021
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

118 files changed

+2681
-2021
lines changed

‎example/client-cpp-example/src/TableModelSessionExample.cpp‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
using namespace std;
2424

25-
TableSession *session;
25+
shared_ptr<TableSession> session;
2626

2727
void insertRelationalTablet() {
2828

@@ -203,8 +203,6 @@ int main() {
203203
cout << "session close\n" << endl;
204204
session->close();
205205

206-
delete session;
207-
208206
cout << "finished!\n" << endl;
209207
} catch (IoTDBConnectionException &e) {
210208
cout << e.what() << endl;

‎integration-test/src/test/java/org/apache/iotdb/confignode/it/load/IoTDBRegionGroupLeaderDistributionIT.java‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,9 @@ public void testBasicLeaderDistribution() throws Exception {
120120
showRegionResp
121121
.getRegionInfoList()
122122
.removeIf(r -> r.database.startsWith(SystemConstant.SYSTEM_DATABASE));
123+
showRegionResp
124+
.getRegionInfoList()
125+
.removeIf(r -> r.database.startsWith(SystemConstant.AUDIT_DATABASE));
123126
showRegionResp
124127
.getRegionInfoList()
125128
.forEach(
@@ -171,6 +174,9 @@ public void testCFDWithUnknownStatus() throws Exception {
171174
showRegionResp
172175
.getRegionInfoList()
173176
.removeIf(r -> r.database.startsWith(SystemConstant.SYSTEM_DATABASE));
177+
showRegionResp
178+
.getRegionInfoList()
179+
.removeIf(r -> r.database.startsWith(SystemConstant.AUDIT_DATABASE));
174180
showRegionResp
175181
.getRegionInfoList()
176182
.forEach(
@@ -213,6 +219,9 @@ public void testCFDWithUnknownStatus() throws Exception {
213219
showRegionResp
214220
.getRegionInfoList()
215221
.removeIf(r -> r.database.startsWith(SystemConstant.SYSTEM_DATABASE));
222+
showRegionResp
223+
.getRegionInfoList()
224+
.removeIf(r -> r.database.startsWith(SystemConstant.AUDIT_DATABASE));
216225
showRegionResp
217226
.getRegionInfoList()
218227
.forEach(
@@ -281,6 +290,9 @@ public void testCFDWithReadOnlyStatus() throws Exception {
281290
showRegionResp
282291
.getRegionInfoList()
283292
.removeIf(r -> r.database.startsWith(SystemConstant.SYSTEM_DATABASE));
293+
showRegionResp
294+
.getRegionInfoList()
295+
.removeIf(r -> r.database.startsWith(SystemConstant.AUDIT_DATABASE));
284296
showRegionResp
285297
.getRegionInfoList()
286298
.forEach(
@@ -334,6 +346,9 @@ public void testCFDWithReadOnlyStatus() throws Exception {
334346
showRegionResp
335347
.getRegionInfoList()
336348
.removeIf(r -> r.database.startsWith(SystemConstant.SYSTEM_DATABASE));
349+
showRegionResp
350+
.getRegionInfoList()
351+
.removeIf(r -> r.database.startsWith(SystemConstant.AUDIT_DATABASE));
337352
showRegionResp
338353
.getRegionInfoList()
339354
.forEach(

‎integration-test/src/test/java/org/apache/iotdb/confignode/it/partition/IoTDBAutoRegionGroupExtension2IT.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,8 @@ public void testAutoRegionGroupExtensionPolicy2()
150150
TShowRegionResp resp = client.showRegion(new TShowRegionReq());
151151
resp.getRegionInfoList()
152152
.removeIf(r -> r.getDatabase().startsWith(SystemConstant.SYSTEM_DATABASE));
153+
resp.getRegionInfoList()
154+
.removeIf(r -> r.getDatabase().startsWith(SystemConstant.AUDIT_DATABASE));
153155
Map<Integer, AtomicInteger> counter = new HashMap<>();
154156
resp.getRegionInfoList()
155157
.forEach(

‎integration-test/src/test/java/org/apache/iotdb/confignode/it/partition/IoTDBAutoRegionGroupExtensionIT.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,9 @@ public void testAutoRegionGroupExtensionPolicy() throws Exception {
113113
showRegionResp
114114
.getRegionInfoList()
115115
.removeIf(r -> r.database.equals(SystemConstant.SYSTEM_DATABASE));
116+
showRegionResp
117+
.getRegionInfoList()
118+
.removeIf(r -> r.database.equals(SystemConstant.AUDIT_DATABASE));
116119
if (showRegionResp.getRegionInfoListSize() == 0) {
117120
isAllRegionGroupDeleted = true;
118121
break;

‎integration-test/src/test/java/org/apache/iotdb/confignode/it/partition/IoTDBPartitionCreationIT.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -405,6 +405,9 @@ public void testPartitionAllocation() throws Exception {
405405
showRegionResp
406406
.getRegionInfoList()
407407
.removeIf(r -> r.database.equals(SystemConstant.SYSTEM_DATABASE));
408+
showRegionResp
409+
.getRegionInfoList()
410+
.removeIf(r -> r.database.equals(SystemConstant.AUDIT_DATABASE));
408411
Assert.assertEquals(
409412
TSStatusCode.SUCCESS_STATUS.getStatusCode(), showRegionResp.getStatus().getCode());
410413
for (TRegionInfo regionInfo : showRegionResp.getRegionInfoList()) {
@@ -470,6 +473,9 @@ public void testPartitionAllocation() throws Exception {
470473
showRegionResp
471474
.getRegionInfoList()
472475
.removeIf(r -> r.database.equals(SystemConstant.SYSTEM_DATABASE));
476+
showRegionResp
477+
.getRegionInfoList()
478+
.removeIf(r -> r.database.equals(SystemConstant.AUDIT_DATABASE));
473479
Assert.assertEquals(
474480
TSStatusCode.SUCCESS_STATUS.getStatusCode(), showRegionResp.getStatus().getCode());
475481
for (TRegionInfo regionInfo : showRegionResp.getRegionInfoList()) {

‎integration-test/src/test/java/org/apache/iotdb/confignode/it/partition/IoTDBPartitionDurableIT.java‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,9 @@ public void testReadOnlyDataNode() throws Exception {
155155
showRegionResp
156156
.getRegionInfoList()
157157
.removeIf(r -> r.database.equals(SystemConstant.SYSTEM_DATABASE));
158+
showRegionResp
159+
.getRegionInfoList()
160+
.removeIf(r -> r.database.equals(SystemConstant.AUDIT_DATABASE));
158161
Assert.assertEquals(
159162
TSStatusCode.SUCCESS_STATUS.getStatusCode(), showRegionResp.getStatus().getCode());
160163
// Create exactly one RegionGroup
@@ -242,6 +245,9 @@ public void testReadOnlyDataNode() throws Exception {
242245
showRegionResp
243246
.getRegionInfoList()
244247
.removeIf(r -> r.database.equals(SystemConstant.SYSTEM_DATABASE));
248+
showRegionResp
249+
.getRegionInfoList()
250+
.removeIf(r -> r.database.equals(SystemConstant.AUDIT_DATABASE));
245251
Assert.assertEquals(
246252
TSStatusCode.SUCCESS_STATUS.getStatusCode(), showRegionResp.getStatus().getCode());
247253
// There should be 2 RegionGroups
@@ -368,6 +374,9 @@ public void testUnknownDataNode() throws Exception {
368374
showRegionResp
369375
.getRegionInfoList()
370376
.removeIf(r -> r.database.equals(SystemConstant.SYSTEM_DATABASE));
377+
showRegionResp
378+
.getRegionInfoList()
379+
.removeIf(r -> r.database.equals(SystemConstant.AUDIT_DATABASE));
371380
Assert.assertEquals(
372381
TSStatusCode.SUCCESS_STATUS.getStatusCode(), showRegionResp.getStatus().getCode());
373382
for (TRegionInfo regionInfo : showRegionResp.getRegionInfoList()) {
@@ -426,6 +435,9 @@ public void testUnknownDataNode() throws Exception {
426435
showRegionResp
427436
.getRegionInfoList()
428437
.removeIf(r -> r.database.equals(SystemConstant.SYSTEM_DATABASE));
438+
showRegionResp
439+
.getRegionInfoList()
440+
.removeIf(r -> r.database.equals(SystemConstant.AUDIT_DATABASE));
429441
Assert.assertEquals(
430442
TSStatusCode.SUCCESS_STATUS.getStatusCode(), showRegionResp.getStatus().getCode());
431443
for (TRegionInfo regionInfo : showRegionResp.getRegionInfoList()) {

‎integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/IoTDBRegionOperationReliabilityITFramework.java‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,10 @@ public static Map<Integer, Set<Integer>> getDataRegionMap(Statement statement) t
442442
.equals(showRegionsResult.getString(ColumnHeaderConstant.TYPE))
443443
&& !showRegionsResult
444444
.getString(ColumnHeaderConstant.DATABASE)
445-
.equals(SystemConstant.SYSTEM_DATABASE)) {
445+
.equals(SystemConstant.SYSTEM_DATABASE)
446+
&& !showRegionsResult
447+
.getString(ColumnHeaderConstant.DATABASE)
448+
.equals(SystemConstant.AUDIT_DATABASE)) {
446449
int regionId = showRegionsResult.getInt(ColumnHeaderConstant.REGION_ID);
447450
int dataNodeId = showRegionsResult.getInt(ColumnHeaderConstant.DATA_NODE_ID);
448451
regionMap.computeIfAbsent(regionId, id -> new HashSet<>()).add(dataNodeId);
@@ -460,7 +463,10 @@ public static Map<Integer, Pair<Integer, Set<Integer>>> getDataRegionMapWithLead
460463
.equals(showRegionsResult.getString(ColumnHeaderConstant.TYPE))
461464
&& !showRegionsResult
462465
.getString(ColumnHeaderConstant.DATABASE)
463-
.equals(SystemConstant.SYSTEM_DATABASE)) {
466+
.equals(SystemConstant.SYSTEM_DATABASE)
467+
&& !showRegionsResult
468+
.getString(ColumnHeaderConstant.DATABASE)
469+
.equals(SystemConstant.AUDIT_DATABASE)) {
464470
int regionId = showRegionsResult.getInt(ColumnHeaderConstant.REGION_ID);
465471
int dataNodeId = showRegionsResult.getInt(ColumnHeaderConstant.DATA_NODE_ID);
466472
Pair<Integer, Set<Integer>> leaderNodesPair =

‎integration-test/src/test/java/org/apache/iotdb/db/it/utils/TestUtils.java‎

Lines changed: 77 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -976,19 +976,18 @@ public static void executeNonQueriesWithRetry(
976976
}
977977
}
978978

979-
public static boolean tryExecuteNonQueryWithRetry(
980-
BaseEnv env, String sql, Connection defaultConnection) {
981-
return tryExecuteNonQueryWithRetry(
979+
public static void executeNonQuery(BaseEnv env, String sql, Connection defaultConnection) {
980+
executeNonQuery(
982981
env, sql, SessionConfig.DEFAULT_USER, SessionConfig.DEFAULT_PASSWORD, defaultConnection);
983982
}
984983

985-
public static boolean tryExecuteNonQueryWithRetry(
984+
public static void executeNonQuery(
986985
String dataBaseName,
987986
String sqlDialect,
988987
BaseEnv env,
989988
String sql,
990989
Connection defaultConnection) {
991-
return tryExecuteNonQueryWithRetry(
990+
executeNonQuery(
992991
env,
993992
sql,
994993
SessionConfig.DEFAULT_USER,
@@ -998,21 +997,20 @@ public static boolean tryExecuteNonQueryWithRetry(
998997
defaultConnection);
999998
}
1000999

1001-
public static boolean tryExecuteNonQueryWithRetry(
1000+
public static void executeNonQuery(
10021001
BaseEnv env, String sql, String userName, String password, Connection defaultConnection) {
1003-
return tryExecuteNonQueriesWithRetry(
1004-
env, Collections.singletonList(sql), userName, password, defaultConnection);
1002+
executeNonQueries(env, Collections.singletonList(sql), userName, password, defaultConnection);
10051003
}
10061004

1007-
public static boolean tryExecuteNonQueryWithRetry(
1005+
public static void executeNonQuery(
10081006
BaseEnv env,
10091007
String sql,
10101008
String userName,
10111009
String password,
10121010
String dataBaseName,
10131011
String sqlDialect,
10141012
Connection defaultConnection) {
1015-
return tryExecuteNonQueriesWithRetry(
1013+
executeNonQueries(
10161014
env,
10171015
Collections.singletonList(sql),
10181016
userName,
@@ -1022,9 +1020,9 @@ public static boolean tryExecuteNonQueryWithRetry(
10221020
defaultConnection);
10231021
}
10241022

1025-
public static boolean tryExecuteNonQueriesWithRetry(
1023+
public static void executeNonQueries(
10261024
BaseEnv env, List<String> sqlList, Connection defaultConnection) {
1027-
return tryExecuteNonQueriesWithRetry(
1025+
executeNonQueries(
10281026
env,
10291027
sqlList,
10301028
SessionConfig.DEFAULT_USER,
@@ -1034,13 +1032,13 @@ public static boolean tryExecuteNonQueriesWithRetry(
10341032
defaultConnection);
10351033
}
10361034

1037-
public static boolean tryExecuteNonQueriesWithRetry(
1035+
public static void executeNonQueries(
10381036
String dataBase,
10391037
String sqlDialect,
10401038
BaseEnv env,
10411039
List<String> sqlList,
10421040
Connection defaultConnection) {
1043-
return tryExecuteNonQueriesWithRetry(
1041+
executeNonQueries(
10441042
env,
10451043
sqlList,
10461044
SessionConfig.DEFAULT_USER,
@@ -1052,6 +1050,71 @@ public static boolean tryExecuteNonQueriesWithRetry(
10521050

10531051
// This method will not throw failure given that a failure is encountered.
10541052
// Instead, it returns a flag to indicate the result of the execution.
1053+
public static void executeNonQueries(
1054+
BaseEnv env,
1055+
List<String> sqlList,
1056+
String userName,
1057+
String password,
1058+
Connection defaultConnection) {
1059+
executeNonQueries(env, sqlList, userName, password, null, TREE_SQL_DIALECT, defaultConnection);
1060+
}
1061+
1062+
public static void executeNonQueries(
1063+
BaseEnv env,
1064+
List<String> sqlList,
1065+
String userName,
1066+
String password,
1067+
String dataBase,
1068+
String sqlDialect,
1069+
Connection defaultConnection) {
1070+
int lastIndex = 0;
1071+
Connection localConnection = null;
1072+
Connection connectionToUse = defaultConnection;
1073+
Statement statement;
1074+
try {
1075+
// create a new connection if default is not provided or the previous is broken
1076+
if (connectionToUse == null) {
1077+
localConnection =
1078+
env.getConnection(
1079+
userName,
1080+
password,
1081+
BaseEnv.TABLE_SQL_DIALECT.equals(sqlDialect)
1082+
? BaseEnv.TABLE_SQL_DIALECT
1083+
: TREE_SQL_DIALECT);
1084+
connectionToUse = localConnection;
1085+
}
1086+
statement = connectionToUse.createStatement();
1087+
if (BaseEnv.TABLE_SQL_DIALECT.equals(sqlDialect) && dataBase != null) {
1088+
statement.execute("use " + dataBase);
1089+
}
1090+
for (int i = lastIndex; i < sqlList.size(); ++i) {
1091+
statement.execute(sqlList.get(i));
1092+
}
1093+
} catch (SQLException e) {
1094+
// the default connection should be closed by the upper level
1095+
// while the local connection should be closed here
1096+
if (connectionToUse == localConnection && localConnection != null) {
1097+
try {
1098+
localConnection.close();
1099+
} catch (SQLException ex) {
1100+
// ignore
1101+
}
1102+
}
1103+
throw new RuntimeException(e);
1104+
}
1105+
}
1106+
1107+
public static boolean tryExecuteNonQuery(BaseEnv env, String sql, Connection defaultConnection) {
1108+
return tryExecuteNonQuery(
1109+
env, sql, SessionConfig.DEFAULT_USER, SessionConfig.DEFAULT_PASSWORD, defaultConnection);
1110+
}
1111+
1112+
public static boolean tryExecuteNonQuery(
1113+
BaseEnv env, String sql, String userName, String password, Connection defaultConnection) {
1114+
return tryExecuteNonQueriesWithRetry(
1115+
env, Collections.singletonList(sql), userName, password, defaultConnection);
1116+
}
1117+
10551118
public static boolean tryExecuteNonQueriesWithRetry(
10561119
BaseEnv env,
10571120
List<String> sqlList,

‎integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/TableModelUtils.java‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public static void createDataBaseAndTable(
7575
statement.execute("use " + database);
7676
statement.execute(
7777
String.format(
78-
"CREATE TABLE %s(s0 string tag, s1 string tag, s2 string tag, s3 string tag,s4 int64 field, s5 float field, s6 string field, s7 timestamp field, s8 int32 field, s9 double field, s10 date field, s11 text field )",
78+
"CREATE TABLE IF NOT EXISTS %s(s0 string tag, s1 string tag, s2 string tag, s3 string tag,s4 int64 field, s5 float field, s6 string field, s7 timestamp field, s8 int32 field, s9 double field, s10 date field, s11 text field )",
7979
table));
8080
} catch (Exception e) {
8181
fail(e.getMessage());
@@ -98,7 +98,7 @@ public static void createDatabase(final BaseEnv baseEnv, final String database,
9898
}
9999
}
100100

101-
public static boolean insertData(
101+
public static void insertData(
102102
final String dataBaseName,
103103
final String tableName,
104104
final int startInclusive,
@@ -112,11 +112,10 @@ public static boolean insertData(
112112
tableName, i, i, i, i, i, i, i, i, i, i, getDateStr(i), i, i));
113113
}
114114
list.add("flush");
115-
return TestUtils.tryExecuteNonQueriesWithRetry(
116-
dataBaseName, BaseEnv.TABLE_SQL_DIALECT, baseEnv, list, null);
115+
TestUtils.executeNonQueries(dataBaseName, BaseEnv.TABLE_SQL_DIALECT, baseEnv, list, null);
117116
}
118117

119-
public static boolean insertData(
118+
public static void insertData(
120119
final String dataBaseName,
121120
final String tableName,
122121
final int start,
@@ -163,8 +162,7 @@ public static boolean insertData(
163162
values[11],
164163
i));
165164
}
166-
return TestUtils.tryExecuteNonQueriesWithRetry(
167-
dataBaseName, BaseEnv.TABLE_SQL_DIALECT, baseEnv, list, null);
165+
TestUtils.executeNonQueries(dataBaseName, BaseEnv.TABLE_SQL_DIALECT, baseEnv, list, null);
168166
}
169167

170168
public static boolean insertDataNotThrowError(
@@ -180,8 +178,12 @@ public static boolean insertDataNotThrowError(
180178
"insert into %s (s0, s3, s2, s1, s4, s5, s6, s7, s8, s9, s10, s11, time) values ('t%s','t%s','t%s','t%s','%s', %s.0, %s, %s, %d, %d.0, '%s', '%s', %s)",
181179
tableName, i, i, i, i, i, i, i, i, i, i, getDateStr(i), i, i));
182180
}
183-
return TestUtils.tryExecuteNonQueriesWithRetry(
184-
dataBaseName, BaseEnv.TABLE_SQL_DIALECT, baseEnv, list, null);
181+
try {
182+
TestUtils.executeNonQueries(dataBaseName, BaseEnv.TABLE_SQL_DIALECT, baseEnv, list, null);
183+
return true;
184+
} catch (final Throwable e) {
185+
return false;
186+
}
185187
}
186188

187189
public static boolean insertData(
@@ -246,10 +248,7 @@ public static void deleteData(
246248
List<String> list = new ArrayList<>(end - start + 1);
247249
list.add(
248250
String.format("delete from %s where time >= %s and time <= %s", tableName, start, end));
249-
if (!TestUtils.tryExecuteNonQueriesWithRetry(
250-
dataBaseName, BaseEnv.TABLE_SQL_DIALECT, baseEnv, list, null)) {
251-
fail();
252-
}
251+
TestUtils.executeNonQueries(dataBaseName, BaseEnv.TABLE_SQL_DIALECT, baseEnv, list, null);
253252
}
254253

255254
// s0 string, s1 string, s2 string, s3 string, s4 int64, s5 float, s6 string s7 timestamp, s8

0 commit comments

Comments
 (0)