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

Merge pull request #6477 from taosdata/hotfix/td-4681 

[TD-4681]<fix>: return invalid operator for not equal on primary ts column
This commit is contained in:
haojun Liao 2021-06-16 10:16:29 +08:00 committed by GitHub
parent 068a09dbeb a56a1cbf17
commit bda6a93f28
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/client/src/tscSQLParser.c
View File

@ -4694,7 +4694,10 @@ int32_t getTimeRange(STimeWindow* win, tSqlExpr* pRight, int32_t optr, int16_t t
win->skey = val; win->skey = val;
} else if (optr == TK_EQ) { } else if (optr == TK_EQ) {
win->ekey = win->skey = val; win->ekey = win->skey = val;
} else if (optr == TK_NE) {
return TSDB_CODE_TSC_INVALID_SQL;
} }
return TSDB_CODE_SUCCESS; return TSDB_CODE_SUCCESS;
} }

4
tests/pytest/query/filter.py
View File

@ -91,8 +91,8 @@ class TDTestCase:
tdSql.query("select * from db.st where name = 1231231") tdSql.query("select * from db.st where name = 1231231")
tdSql.checkRows(0) tdSql.checkRows(0)
# <> for timestamp type # <> for timestamp type not supported for primary timestamp
tdSql.query("select * from db.st where ts <> '2020-05-13 10:00:00.002'") tdSql.error("select * from db.st where ts <> '2020-05-13 10:00:00.002'")
# tdSql.checkRows(4) # tdSql.checkRows(4)
# <> for numeric type # <> for numeric type

4
tests/pytest/query/querySecondtscolumnTowherenow.py
View File

@ -58,8 +58,8 @@ class TDTestCase:
ts_len4 = len(tdSql.cursor.fetchall()) ts_len4 = len(tdSql.cursor.fetchall())
tdSql.execute("select * from t2ts1 where ts = now") tdSql.execute("select * from t2ts1 where ts = now")
ts_len5 = len(tdSql.cursor.fetchall()) ts_len5 = len(tdSql.cursor.fetchall())
tdSql.execute("select * from t2ts1 where ts <> now") # tdSql.execute("select * from t2ts1 where ts <> now")
ts_len6 = len(tdSql.cursor.fetchall()) ts_len6 = 3
tdSql.execute("select * from t2ts1 where ts between 0 and now") tdSql.execute("select * from t2ts1 where ts between 0 and now")
ts_len7 = len(tdSql.cursor.fetchall()) ts_len7 = len(tdSql.cursor.fetchall())
tdSql.execute("select * from t2ts1 where ts between now and now+100d") tdSql.execute("select * from t2ts1 where ts between now and now+100d")

4
tests/script/general/parser/timestamp_query.sim
View File

@ -24,6 +24,8 @@ $tsu = $tsu + $ts0
print ==================>issue #3481, normal column not allowed, print ==================>issue #3481, normal column not allowed,
sql_error select ts,c1,min(c2) from ts_stb0 sql_error select ts,c1,min(c2) from ts_stb0
print ==================>issue #4681, not equal operator on primary timestamp not allowed
sql_error select * from ts_stb0 where ts <> $ts0
##### select from supertable ##### select from supertable
$tb = $tbPrefix . 0 $tb = $tbPrefix . 0
@ -51,4 +53,4 @@ sql select first(c1), last(c1), (1537325400 - 1537146000)/(5*60) v from $tb wher
if $data13 != 598.000000000 then if $data13 != 598.000000000 then
print expect 598.000000000, actual $data03 print expect 598.000000000, actual $data03
return -1 return -1
endi endi