xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

TD-13747 New SQL model integration

This commit is contained in:
Xiaoyu Wang 2022-02-28 05:06:07 -05:00
parent cd7a0e559b
commit 79e4cc0ea9
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/libs/parser/test/parserTest.cpp
View File

@ -23,7 +23,7 @@
using namespace std; using namespace std;
using namespace testing; using namespace testing;
class NewParserTest : public Test { class ParserTest : public Test {
protected: protected:
void setDatabase(const string& acctId, const string& db) { void setDatabase(const string& acctId, const string& db) {
acctId_ = acctId; acctId_ = acctId;
@ -510,7 +510,7 @@ private:
SQuery* query_; SQuery* query_;
}; };
TEST_F(NewParserTest, selectSimple) { TEST_F(ParserTest, selectSimple) {
setDatabase("root", "test"); setDatabase("root", "test");
bind("SELECT * FROM t1"); bind("SELECT * FROM t1");
@ -529,7 +529,7 @@ TEST_F(NewParserTest, selectSimple) {
ASSERT_TRUE(run()); ASSERT_TRUE(run());
} }
TEST_F(NewParserTest, selectConstant) { TEST_F(ParserTest, selectConstant) {
setDatabase("root", "test"); setDatabase("root", "test");
bind("SELECT 123, 20.4, 'abc', \"wxy\", TIMESTAMP '2022-02-09 17:30:20', true, false, 10s FROM t1"); bind("SELECT 123, 20.4, 'abc', \"wxy\", TIMESTAMP '2022-02-09 17:30:20', true, false, 10s FROM t1");
@ -539,7 +539,7 @@ TEST_F(NewParserTest, selectConstant) {
ASSERT_TRUE(run()); ASSERT_TRUE(run());
} }
TEST_F(NewParserTest, selectExpression) { TEST_F(ParserTest, selectExpression) {
setDatabase("root", "test"); setDatabase("root", "test");
bind("SELECT ts + 10s, c1 + 10, concat(c2, 'abc') FROM t1"); bind("SELECT ts + 10s, c1 + 10, concat(c2, 'abc') FROM t1");
@ -552,7 +552,7 @@ TEST_F(NewParserTest, selectExpression) {
ASSERT_TRUE(run()); ASSERT_TRUE(run());
} }
TEST_F(NewParserTest, selectClause) { TEST_F(ParserTest, selectClause) {
setDatabase("root", "test"); setDatabase("root", "test");
// GROUP BY clause // GROUP BY clause
@ -592,7 +592,7 @@ TEST_F(NewParserTest, selectClause) {
ASSERT_TRUE(run()); ASSERT_TRUE(run());
} }
TEST_F(NewParserTest, selectSyntaxError) { TEST_F(ParserTest, selectSyntaxError) {
setDatabase("root", "test"); setDatabase("root", "test");
bind("SELECTT * FROM t1"); bind("SELECTT * FROM t1");
@ -608,7 +608,7 @@ TEST_F(NewParserTest, selectSyntaxError) {
ASSERT_TRUE(run(TSDB_CODE_FAILED)); ASSERT_TRUE(run(TSDB_CODE_FAILED));
} }
TEST_F(NewParserTest, selectSemanticError) { TEST_F(ParserTest, selectSemanticError) {
setDatabase("root", "test"); setDatabase("root", "test");
// TSDB_CODE_PAR_INVALID_COLUMN // TSDB_CODE_PAR_INVALID_COLUMN

8
source/libs/planner/test/plannerTest.cpp
View File

@ -23,7 +23,7 @@
using namespace std; using namespace std;
using namespace testing; using namespace testing;
class NewPlannerTest : public Test { class PlannerTest : public Test {
protected: protected:
enum TestTarget { enum TestTarget {
TEST_LOGIC_PLAN, TEST_LOGIC_PLAN,
@ -114,14 +114,14 @@ private:
SQuery* query_; SQuery* query_;
}; };
TEST_F(NewPlannerTest, simple) { TEST_F(PlannerTest, simple) {
setDatabase("root", "test"); setDatabase("root", "test");
bind("SELECT * FROM t1"); bind("SELECT * FROM t1");
ASSERT_TRUE(run()); ASSERT_TRUE(run());
} }
TEST_F(NewPlannerTest, groupBy) { TEST_F(PlannerTest, groupBy) {
setDatabase("root", "test"); setDatabase("root", "test");
bind("SELECT count(*) FROM t1"); bind("SELECT count(*) FROM t1");
@ -137,7 +137,7 @@ TEST_F(NewPlannerTest, groupBy) {
ASSERT_TRUE(run()); ASSERT_TRUE(run());
} }
TEST_F(NewPlannerTest, subquery) { TEST_F(PlannerTest, subquery) {
setDatabase("root", "test"); setDatabase("root", "test");
bind("SELECT count(*) FROM (SELECT c1 + c3 a, c1 + count(*) b FROM t1 where c2 = 'abc' GROUP BY c1, c3) where a > 100 group by b"); bind("SELECT count(*) FROM (SELECT c1 + c3 a, c1 + count(*) b FROM t1 where c2 = 'abc' GROUP BY c1, c3) where a > 100 group by b");