Skip to content

Commit 8867ab6

Browse files
CaideyipiCaideyipi
authored
Revert "Refactored IoTDB codes (#16644)" (#16645)
This reverts commit e15fb6a.
1 parent e15fb6a commit 8867ab6

141 files changed

Lines changed: 7171 additions & 7267 deletions

File tree

Some content is hidden

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

‎integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBInsertAlignedValuesIT.java‎

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -292,62 +292,62 @@ public void testInsertWithWrongType() throws SQLException {
292292
}
293293

294294
@Test
295-
// public void testInsertAlignedTimeseriesWithoutAligned() throws SQLException {
295+
public void testInsertAlignedTimeseriesWithoutAligned() throws SQLException {
296296
try (Connection connection = EnvFactory.getEnv().getConnection();
297297
Statement statement = connection.createStatement()) {
298298
statement.execute(
299299
"CREATE ALIGNED TIMESERIES root.lz.dev.GPS2(latitude INT32 encoding=PLAIN compressor=SNAPPY, longitude INT32 encoding=PLAIN compressor=SNAPPY) ");
300-
// statement.execute("insert into root.lz.dev.GPS2(time,latitude,longitude) values(1,123,456)");
301-
// // it's supported.
302-
// }
303-
// }
304-
//
305-
// @Test
306-
// public void testInsertTimeseriesWithUnMatchedAlignedType() throws SQLException {
307-
// try (Connection connection = EnvFactory.getEnv().getConnection();
308-
// Statement statement = connection.createStatement()) {
309-
// statement.execute("create ALIGNED timeseries root.db.d_aligned(s01 INT64 encoding=RLE)");
310-
// statement.execute("insert into root.db.d_aligned(time, s01) aligned values (4000, 123)");
311-
// statement.execute("insert into root.db.d_aligned(time, s01) values (5000, 456)");
312-
// statement.execute("create timeseries root.db.d_not_aligned.s01 INT64 encoding=RLE");
313-
// statement.execute("insert into root.db.d_not_aligned(time, s01) values (4000, 987)");
314-
// statement.execute("insert into root.db.d_not_aligned(time, s01) aligned values (5000, 654)");
315-
//
316-
// try (ResultSet resultSet = statement.executeQuery("select s01 from root.db.d_aligned")) {
317-
// assertTrue(resultSet.next());
318-
// assertEquals(4000, resultSet.getLong(1));
319-
// assertEquals(123, resultSet.getLong(2));
320-
//
321-
// assertTrue(resultSet.next());
322-
// assertEquals(5000, resultSet.getLong(1));
323-
// assertEquals(456, resultSet.getLong(2));
324-
//
325-
// assertFalse(resultSet.next());
326-
// }
327-
//
328-
// try (ResultSet resultSet = statement.executeQuery("select s01 from root.db.d_not_aligned")) {
329-
// assertTrue(resultSet.next());
330-
// assertEquals(4000, resultSet.getLong(1));
331-
// assertEquals(987, resultSet.getLong(2));
332-
//
333-
// assertTrue(resultSet.next());
334-
// assertEquals(5000, resultSet.getLong(1));
335-
// assertEquals(654, resultSet.getLong(2));
336-
//
337-
// assertFalse(resultSet.next());
338-
// }
300+
statement.execute("insert into root.lz.dev.GPS2(time,latitude,longitude) values(1,123,456)");
301+
// it's supported.
339302
}
340303
}
341304

342305
@Test
343-
// public void testInsertNonAlignedTimeseriesWithAligned() throws SQLException {
306+
public void testInsertTimeseriesWithUnMatchedAlignedType() throws SQLException {
307+
try (Connection connection = EnvFactory.getEnv().getConnection();
308+
Statement statement = connection.createStatement()) {
309+
statement.execute("create ALIGNED timeseries root.db.d_aligned(s01 INT64 encoding=RLE)");
310+
statement.execute("insert into root.db.d_aligned(time, s01) aligned values (4000, 123)");
311+
statement.execute("insert into root.db.d_aligned(time, s01) values (5000, 456)");
312+
statement.execute("create timeseries root.db.d_not_aligned.s01 INT64 encoding=RLE");
313+
statement.execute("insert into root.db.d_not_aligned(time, s01) values (4000, 987)");
314+
statement.execute("insert into root.db.d_not_aligned(time, s01) aligned values (5000, 654)");
315+
316+
try (ResultSet resultSet = statement.executeQuery("select s01 from root.db.d_aligned")) {
317+
assertTrue(resultSet.next());
318+
assertEquals(4000, resultSet.getLong(1));
319+
assertEquals(123, resultSet.getLong(2));
320+
321+
assertTrue(resultSet.next());
322+
assertEquals(5000, resultSet.getLong(1));
323+
assertEquals(456, resultSet.getLong(2));
324+
325+
assertFalse(resultSet.next());
326+
}
327+
328+
try (ResultSet resultSet = statement.executeQuery("select s01 from root.db.d_not_aligned")) {
329+
assertTrue(resultSet.next());
330+
assertEquals(4000, resultSet.getLong(1));
331+
assertEquals(987, resultSet.getLong(2));
332+
333+
assertTrue(resultSet.next());
334+
assertEquals(5000, resultSet.getLong(1));
335+
assertEquals(654, resultSet.getLong(2));
336+
337+
assertFalse(resultSet.next());
338+
}
339+
}
340+
}
341+
342+
@Test
343+
public void testInsertNonAlignedTimeseriesWithAligned() throws SQLException {
344344
try (Connection connection = EnvFactory.getEnv().getConnection();
345345
Statement statement = connection.createStatement()) {
346346
statement.execute("CREATE TIMESERIES root.lz.dev.GPS3.latitude with datatype=INT32");
347347
statement.execute("CREATE TIMESERIES root.lz.dev.GPS3.longitude with datatype=INT32");
348348
statement.execute(
349-
// "insert into root.lz.dev.GPS3(time,latitude,longitude) aligned values(1,123,456)");
350-
// // it's supported.
349+
"insert into root.lz.dev.GPS3(time,latitude,longitude) aligned values(1,123,456)");
350+
// it's supported.
351351
}
352352
}
353353

‎integration-test/src/test/java/org/apache/iotdb/db/it/query/IoTDBResultSetIT.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,8 +177,8 @@ public void emptyShowTimeseriesTest() {
177177
+ ColumnHeaderConstant.DEADBAND
178178
+ ","
179179
+ ColumnHeaderConstant.DEADBAND_PARAMETERS
180-
// + ","
181-
// + ColumnHeaderConstant.VIEW_TYPE
180+
+ ","
181+
+ ColumnHeaderConstant.VIEW_TYPE
182182
+ ",";
183183
resultSetEqualTest("show timeseries root.sg1.**", expectedHeader, emptyResultSet);
184184
}

‎integration-test/src/test/java/org/apache/iotdb/db/it/selectinto/IoTDBSelectIntoIT.java‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -336,36 +336,36 @@ public void testExpression() {
336336
"select k1, k2, k3 from root.sg_expr.d;", expectedQueryHeader, queryRetArray);
337337
}
338338

339-
// @Test
340-
// public void testUsingUnMatchedAlignment() {
341-
// String[] intoRetArray =
342-
// new String[] {
343-
// "root.sg.d1.s1,root.sg_bk1.new_aligned_d.t1,10,",
344-
// "root.sg.d2.s1,root.sg_bk1.new_aligned_d.t2,7,",
345-
// "root.sg.d1.s2,root.sg_bk1.new_aligned_d.t3,9,",
346-
// "root.sg.d2.s2,root.sg_bk1.new_aligned_d.t4,8,",
347-
// };
348-
// executeNonQuery(
349-
// "CREATE ALIGNED TIMESERIES root.sg_bk1.new_aligned_d(t1 INT32, t2 INT32, t3 FLOAT, t4 FLOAT);");
350-
// // use matched interface (aligned == aligned)
351-
// resultSetEqualTest(
352-
// "select s1, s2 into aligned root.sg_bk1.new_aligned_d(t1, t2, t3, t4) from root.sg.*;",
353-
// selectIntoHeader,
354-
// intoRetArray);
355-
// String expectedQueryHeader =
356-
// "Time,root.sg_bk1.new_aligned_d.t1,root.sg_bk1.new_aligned_d.t3,root.sg_bk1.new_aligned_d.t2,root.sg_bk1.new_aligned_d.t4,";
357-
// resultSetEqualTest(
358-
// "select t1, t3, t2, t4 from root.sg_bk1.new_aligned_d;", expectedQueryHeader, rawDataSet);
359-
//
360-
// // use unmatched interface (non-aligned != aligned)
361-
// resultSetEqualTest(
362-
// "select s1, s2 into root.sg_bk1.new_aligned_d(t1, t2, t3, t4) from root.sg.*;",
363-
// selectIntoHeader,
364-
// intoRetArray);
365-
// resultSetEqualTest(
366-
// "select t1, t3, t2, t4 from root.sg_bk1.new_aligned_d;", expectedQueryHeader, rawDataSet);
367-
// }
368-
//
339+
@Test
340+
public void testUsingUnMatchedAlignment() {
341+
String[] intoRetArray =
342+
new String[] {
343+
"root.sg.d1.s1,root.sg_bk1.new_aligned_d.t1,10,",
344+
"root.sg.d2.s1,root.sg_bk1.new_aligned_d.t2,7,",
345+
"root.sg.d1.s2,root.sg_bk1.new_aligned_d.t3,9,",
346+
"root.sg.d2.s2,root.sg_bk1.new_aligned_d.t4,8,",
347+
};
348+
executeNonQuery(
349+
"CREATE ALIGNED TIMESERIES root.sg_bk1.new_aligned_d(t1 INT32, t2 INT32, t3 FLOAT, t4 FLOAT);");
350+
// use matched interface (aligned == aligned)
351+
resultSetEqualTest(
352+
"select s1, s2 into aligned root.sg_bk1.new_aligned_d(t1, t2, t3, t4) from root.sg.*;",
353+
selectIntoHeader,
354+
intoRetArray);
355+
String expectedQueryHeader =
356+
"Time,root.sg_bk1.new_aligned_d.t1,root.sg_bk1.new_aligned_d.t3,root.sg_bk1.new_aligned_d.t2,root.sg_bk1.new_aligned_d.t4,";
357+
resultSetEqualTest(
358+
"select t1, t3, t2, t4 from root.sg_bk1.new_aligned_d;", expectedQueryHeader, rawDataSet);
359+
360+
// use unmatched interface (non-aligned != aligned)
361+
resultSetEqualTest(
362+
"select s1, s2 into root.sg_bk1.new_aligned_d(t1, t2, t3, t4) from root.sg.*;",
363+
selectIntoHeader,
364+
intoRetArray);
365+
resultSetEqualTest(
366+
"select t1, t3, t2, t4 from root.sg_bk1.new_aligned_d;", expectedQueryHeader, rawDataSet);
367+
}
368+
369369
// -------------------------------------- ALIGN BY DEVICE -------------------------------------
370370

371371
@Test

‎iotdb-client/client-py/tests/integration/test_dataframe.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ def test_non_time_query():
7171
"Attributes",
7272
"Deadband",
7373
"DeadbandParameters",
74-
// "ViewType",
74+
"ViewType",
7575
]
7676
assert_array_equal(
7777
df.values,

‎iotdb-core/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ ddlStatement
7070
| callInference | loadModel | unloadModel
7171
// Quota
7272
| setSpaceQuota | showSpaceQuota | setThrottleQuota | showThrottleQuota
73-
// // View
73+
// View
7474
| createLogicalView | dropLogicalView | showLogicalView | renameLogicalView | alterLogicalView
7575
// Table View
7676
| createTableView
@@ -767,11 +767,11 @@ showAIDevices
767767
: SHOW AI_DEVICES
768768
;
769769

770-
// // Create Logical View
771-
// createLogicalView
772-
// : CREATE VIEW viewTargetPaths AS viewSourcePaths
773-
// ;
774-
//
770+
// Create Logical View
771+
createLogicalView
772+
: CREATE VIEW viewTargetPaths AS viewSourcePaths
773+
;
774+
775775
showLogicalView
776776
: SHOW VIEW prefixPath? timeseriesWhereClause? rowPaginationClause?
777777
;
@@ -789,21 +789,21 @@ alterLogicalView
789789
| ALTER VIEW fullPath alterClause
790790
;
791791

792-
// viewSuffixPaths
793-
// : nodeNameWithoutWildcard (DOT nodeNameWithoutWildcard)*
794-
// ;
795-
//
796-
// viewTargetPaths
797-
// : fullPath (COMMA fullPath)*
798-
// | prefixPath LR_BRACKET viewSuffixPaths (COMMA viewSuffixPaths)* RR_BRACKET
799-
// ;
800-
//
801-
// viewSourcePaths
802-
// : fullPath (COMMA fullPath)*
803-
// | prefixPath LR_BRACKET viewSuffixPaths (COMMA viewSuffixPaths)* RR_BRACKET
804-
// | selectClause fromClause
805-
// ;
806-
//
792+
viewSuffixPaths
793+
: nodeNameWithoutWildcard (DOT nodeNameWithoutWildcard)*
794+
;
795+
796+
viewTargetPaths
797+
: fullPath (COMMA fullPath)*
798+
| prefixPath LR_BRACKET viewSuffixPaths (COMMA viewSuffixPaths)* RR_BRACKET
799+
;
800+
801+
viewSourcePaths
802+
: fullPath (COMMA fullPath)*
803+
| prefixPath LR_BRACKET viewSuffixPaths (COMMA viewSuffixPaths)* RR_BRACKET
804+
| selectClause fromClause
805+
;
806+
807807
// Table view
808808
createTableView
809809
: CREATE (OR REPLACE)? VIEW qualifiedName

‎iotdb-core/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/SqlLexer.g4‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1022,10 +1022,10 @@ VERSION
10221022
: V E R S I O N
10231023
;
10241024

1025-
// VIEW
1026-
// : V I E W
1027-
// ;
1028-
//
1025+
VIEW
1026+
: V I E W
1027+
;
1028+
10291029
WATERMARK_EMBEDDING
10301030
: W A T E R M A R K '_' E M B E D D I N G
10311031
;

‎iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/schema/mnode/factory/ConfigMNodeFactory.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,10 @@ public IConfigMNode createAboveDatabaseMNode(IConfigMNode parent, String name) {
7373
public IConfigMNode createInternalMNode(IConfigMNode parent, String name) {
7474
return new ConfigBasicInternalMNode(parent, name);
7575
}
76-
//
77-
// @Override
78-
// public IMeasurementMNode<IConfigMNode> createLogicalViewMNode(
76+
77+
@Override
78+
public IMeasurementMNode<IConfigMNode> createLogicalViewMNode(
7979
IDeviceMNode<IConfigMNode> parent, String name, IMeasurementSchema measurementSchema) {
8080
throw new UnsupportedOperationException("View is not supported.");
81-
// }
81+
}
8282
}

‎iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/DeleteLogicalViewProcedure.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
import org.apache.iotdb.confignode.procedure.state.schema.DeleteLogicalViewState;
3838
import org.apache.iotdb.confignode.procedure.store.ProcedureType;
3939
import org.apache.iotdb.consensus.exception.ConsensusException;
40-
// import org.apache.iotdb.db.exception.metadata.view.ViewNotExistException;
40+
import org.apache.iotdb.db.exception.metadata.view.ViewNotExistException;
4141
import org.apache.iotdb.mpp.rpc.thrift.TConstructViewSchemaBlackListReq;
4242
import org.apache.iotdb.mpp.rpc.thrift.TDeleteViewSchemaReq;
4343
import org.apache.iotdb.mpp.rpc.thrift.TInvalidateMatchedSchemaCacheReq;
@@ -102,7 +102,7 @@ protected Flow executeFromState(
102102
} else {
103103
setFailure(
104104
new ProcedureException(
105-
// new ViewNotExistException(
105+
new ViewNotExistException(
106106
patternTree.getAllPathPatterns().stream()
107107
.map(PartialPath::getFullPath)
108108
.collect(Collectors.toList()))));

‎iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/schemaregion/SchemaExecutionVisitor.java‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import org.apache.iotdb.commons.exception.MetadataException;
2626
import org.apache.iotdb.commons.path.MeasurementPath;
2727
import org.apache.iotdb.commons.path.PartialPath;
28-
// import org.apache.iotdb.commons.schema.view.viewExpression.ViewExpression;
28+
import org.apache.iotdb.commons.schema.view.viewExpression.ViewExpression;
2929
import org.apache.iotdb.db.exception.metadata.MeasurementAlreadyExistException;
3030
import org.apache.iotdb.db.exception.metadata.template.TemplateIsInUseException;
3131
import org.apache.iotdb.db.pipe.agent.PipeDataNodeAgent;
@@ -591,28 +591,28 @@ public TSStatus visitDeactivateTemplate(
591591
}
592592
}
593593

594-
// @Override
594+
@Override
595595
public TSStatus visitCreateLogicalView(
596596
final CreateLogicalViewNode node, final ISchemaRegion schemaRegion) {
597597
final Map<PartialPath, ViewExpression> viewPathToSourceMap =
598598
node.getViewPathToSourceExpressionMap();
599599
final List<TSStatus> failingStatus = new ArrayList<>();
600600
for (final Map.Entry<PartialPath, ViewExpression> entry : viewPathToSourceMap.entrySet()) {
601-
// try {
602-
// schemaRegion.createLogicalView(
601+
try {
602+
schemaRegion.createLogicalView(
603603
SchemaRegionWritePlanFactory.getCreateLogicalViewPlan(
604604
entry.getKey(), entry.getValue()));
605605
} catch (final MetadataException e) {
606-
// logger.error("{}: MetaData error: ", IoTDBConstant.GLOBAL_DB_NAME, e);
607-
// failingStatus.add(RpcUtils.getStatus(e.getErrorCode(), e.getMessage()));
608-
// }
609-
// }
610-
// if (!failingStatus.isEmpty()) {
611-
// return RpcUtils.getStatus(failingStatus);
612-
// }
613-
// return RpcUtils.getStatus(TSStatusCode.SUCCESS_STATUS, "Execute successfully");
614-
// }
615-
//
606+
logger.error("{}: MetaData error: ", IoTDBConstant.GLOBAL_DB_NAME, e);
607+
failingStatus.add(RpcUtils.getStatus(e.getErrorCode(), e.getMessage()));
608+
}
609+
}
610+
if (!failingStatus.isEmpty()) {
611+
return RpcUtils.getStatus(failingStatus);
612+
}
613+
return RpcUtils.getStatus(TSStatusCode.SUCCESS_STATUS, "Execute successfully");
614+
}
615+
616616
@Override
617617
public TSStatus visitAlterLogicalView(
618618
final AlterLogicalViewNode node, final ISchemaRegion schemaRegion) {

0 commit comments

Comments
 (0)