[TD-4426]<fix> add test case

src/client/src/tscSQLParser.c

@@ -153,6 +153,9 @@ bool serializeExprListToVariant(SArray* pList, tVariant **dst, int8_t colType) {
   if (!pList || pList->size <= 0) {
     return ret;
   }  
+  if (colType == TSDB_DATA_TYPE_DOUBLE || colType == TSDB_DATA_TYPE_FLOAT) {
+    return ret;
+  }
   
   tSqlExprItem* item = (tSqlExprItem *)taosArrayGet(pList, 0); 
   int32_t firstTokenType = item->pNode->token.type; 
@@ -160,12 +163,11 @@ bool serializeExprListToVariant(SArray* pList, tVariant **dst, int8_t colType) {
 
   //nchar to binary and  
   toTSDBType(type);  
-  if (colType >= 0) {
   if (type != colType && (type != TSDB_DATA_TYPE_BINARY || colType != TSDB_DATA_TYPE_NCHAR)) {
     return false;  
   }    
   type = colType; 
-  }
+ 
 
   SBufferWriter bw = tbufInitWriter( NULL, false );
   tbufEnsureCapacity(&bw, 512);
@@ -8025,8 +8027,18 @@ int32_t exprTreeFromSqlExpr(SSqlCmd* pCmd, tExprNode **pExpr, const tSqlExpr* pS
       
       return TSDB_CODE_SUCCESS;
     } else if (pSqlExpr->tokenId == TK_SET) {
+      int32_t type = -1;
+      STableMeta* pTableMeta = tscGetMetaInfo(pQueryInfo, 0)->pTableMeta;
+      if (pCols != NULL) {
+        SColIndex* idx = taosArrayGet(pCols, 0);
+        SSchema* pSchema = tscGetTableColumnSchema(pTableMeta, idx->colIndex);
+        if (pSchema != NULL) {
+          type = pSchema->type; 
+        }
+      }
+
       tVariant *pVal;
-      if (serializeExprListToVariant(pSqlExpr->pParam, &pVal, -1) == false) {
+      if (serializeExprListToVariant(pSqlExpr->pParam, &pVal, type) == false) {
         return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), "not support filter expression");
       }
       *pExpr = calloc(1, sizeof(tExprNode));

src/common/src/texpr.c

@@ -482,7 +482,6 @@ void buildFilterSetFromBinary(void **q, const char *buf, int32_t len) {
     } else if (type == TSDB_DATA_TYPE_BINARY) {
       size_t  t = 0;
       const char *val = tbufReadBinary(&br, &t);
-      
       taosHashPut(pObj, (char *)val, t, &dummy, sizeof(dummy));
     } else if (type == TSDB_DATA_TYPE_NCHAR) {
       size_t  t = 0;

tests/pytest/query/in.py

+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import tdLog
+from util.cases import tdCases
+from util.sql import tdSql
+from util.dnodes import tdDnodes
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+        self.ts = 1538548685000
+
+    def run(self):
+        tdSql.prepare()
+
+        print("==============step1")
+        tdSql.execute(
+            "create table if not exists st (ts timestamp, tagtype int) tags(dev nchar(50))")
+        tdSql.execute(
+            'CREATE TABLE if not exists dev_001 using st tags("dev_01")')
+        tdSql.execute(
+            'CREATE TABLE if not exists dev_002 using st tags("dev_02")')
+
+        print("==============step2")
+        tdSql.error("select * from db.st where ts in ('2020-05-13 10:00:00.000')")
+
+        tdSql.execute(
+            """INSERT INTO dev_001(ts, tagtype) VALUES('2020-05-13 10:00:00.000', 1),
+            ('2020-05-13 10:00:00.001', 1)
+             dev_002 VALUES('2020-05-13 10:00:00.001', 1)""")
+
+        # TAG nchar
+        tdSql.query('select count(ts) from db.st where dev in ("dev_01")')
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 2)
+
+        tdSql.query('select count(ts) from db.st where dev in ("dev_01", "dev_01")')
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 2)
+
+        tdSql.query('select count(ts) from db.st where dev in ("dev_01", "dev_01", "dev_02")')
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 3)
+
+        
+        # colume int 
+        tdSql.query("select count(ts) from db.st where tagtype in (1)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 3)
+
+        tdSql.query("select count(ts) from db.st where tagtype in (1, 2)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 3)
+        tdSql.execute(
+            """INSERT INTO dev_001(ts, tagtype) VALUES('2020-05-13 10:00:01.000', 2),
+            ('2020-05-13 10:00:02.001', 2)
+             dev_002 VALUES('2020-05-13 10:00:03.001', 2)""")
+
+        tdSql.query("select count(ts) from db.st where tagtype in (1, 2)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 6)
+
+        tdSql.execute("create table tb(ts timestamp, c1 int, c2 binary(10), c3 nchar(10), c4 float, c5 bool)")
+        for i in range(10):
+            tdSql.execute("insert into tb values(%d, %d, 'binary%d', 'nchar%d', %f, %d)" % (self.ts + i, i, i, i, i + 0.1, i % 2))
+
+        #binary 
+        tdSql.query('select count(ts) from db.tb where c2 in ("binary1")')
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 1)
+        
+        tdSql.query('select count(ts) from db.tb where c2 in ("binary1", "binary2", "binary1")')
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 2)
+
+        #bool 
+        #tdSql.query('select count(ts) from db.tb where c5 in (true)')
+        #tdSql.checkRows(1)
+        #tdSql.checkData(0, 0, 5)
+
+        #float
+        #tdSql.query('select count(ts) from db.tb where c4 in (0.1)')
+        #tdSql.checkRows(1)
+        #tdSql.checkData(0, 0, 1)
+
+        #nchar 
+        tdSql.query('select count(ts) from db.tb where c3 in ("nchar0")')
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 1)
+        
+        
+        #tdSql.query("select tbname, dev from dev_001") 
+        #tdSql.checkRows(1)
+        #tdSql.checkData(0, 0, 'dev_001')
+        #tdSql.checkData(0, 1, 'dev_01')
+
+        #tdSql.query("select tbname, dev, tagtype from dev_001") 
+        #tdSql.checkRows(2)
+
+        ### test case for https://jira.taosdata.com:18080/browse/TD-1930
+        #tdSql.execute("create table tb(ts timestamp, c1 int, c2 binary(10), c3 nchar(10), c4 float, c5 bool)")
+        #for i in range(10):
+        #    tdSql.execute("insert into tb values(%d, %d, 'binary%d', 'nchar%d', %f, %d)" % (self.ts + i, i, i, i, i + 0.1, i % 2))
+        #
+        #tdSql.error("select * from tb where c2 = binary2")
+        #tdSql.error("select * from tb where c3 = nchar2")
+
+        #tdSql.query("select * from tb where c2 = 'binary2' ")
+        #tdSql.checkRows(1)
+
+        #tdSql.query("select * from tb where c3 = 'nchar2' ")
+        #tdSql.checkRows(1)
+
+        #tdSql.query("select * from tb where c1 = '2' ")
+        #tdSql.checkRows(1)
+
+        #tdSql.query("select * from tb where c1 = 2 ")
+        #tdSql.checkRows(1)
+
+        #tdSql.query("select * from tb where c4 = '0.1' ")
+        #tdSql.checkRows(1)
+
+        #tdSql.query("select * from tb where c4 = 0.1 ")
+        #tdSql.checkRows(1)
+
+        #tdSql.query("select * from tb where c5 = true ")
+        #tdSql.checkRows(5)
+
+        #tdSql.query("select * from tb where c5 = 'true' ")
+        #tdSql.checkRows(5)
+
+        ## For jira: https://jira.taosdata.com:18080/browse/TD-2850
+        #tdSql.execute("create database 'Test' ")
+        #tdSql.execute("use 'Test' ")
+        #tdSql.execute("create table 'TB'(ts timestamp, 'Col1' int) tags('Tag1' int)")
+        #tdSql.execute("insert into 'Tb0' using tb tags(1) values(now, 1)")
+        #tdSql.query("select * from tb")
+        #tdSql.checkRows(1)
+
+        
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())