Merge branch 'develop' of github.com:taosdata/TDengine into dev/chr
This commit is contained in:
tomchon
commit
e76d2ca904
|
|
@ -4,7 +4,7 @@ PROJECT(TDengine)
|
|||
IF (DEFINED VERNUMBER)
|
||||
SET(TD_VER_NUMBER ${VERNUMBER})
|
||||
ELSE ()
|
||||
SET(TD_VER_NUMBER "2.1.1.0")
|
||||
SET(TD_VER_NUMBER "2.1.3.0")
|
||||
ENDIF ()
|
||||
|
||||
IF (DEFINED VERCOMPATIBLE)
|
||||
|
|
|
|||
|
|
@ -49,6 +49,7 @@ TDengine 的 JDBC 驱动实现尽可能与关系型数据库驱动保持一致
|
|||
</tr>
|
||||
</table>
|
||||
|
||||
注意：与 JNI 方式不同，RESTful 接口是无状态的，因此 `USE db_name` 指令没有效果，RESTful 下所有对表名、超级表名的引用都需要指定数据库名前缀。
|
||||
|
||||
## 如何获取 taos-jdbcdriver
|
||||
|
||||
|
|
@ -551,7 +552,7 @@ TDengine 目前支持时间戳、数字、字符、布尔类型，与 Java 对
|
|||
| BIGINT | java.lang.Long |
|
||||
| FLOAT | java.lang.Float |
|
||||
| DOUBLE | java.lang.Double |
|
||||
| SMALLINT | java.lang.Short |
|
||||
| SMALLINT | java.lang.Short |
|
||||
| TINYINT | java.lang.Byte |
|
||||
| BOOL | java.lang.Boolean |
|
||||
| BINARY | byte array |
|
||||
|
|
|
|||
|
|
@ -585,7 +585,9 @@ conn.close()
|
|||
|
||||
## <a class="anchor" id="restful"></a>RESTful Connector
|
||||
|
||||
为支持各种不同类型平台的开发，TDengine提供符合REST设计标准的API，即RESTful API。为最大程度降低学习成本，不同于其他数据库RESTful API的设计方法，TDengine直接通过HTTP POST 请求BODY中包含的SQL语句来操作数据库，仅需要一个URL。RESTful连接器的使用参见[视频教程](https://www.taosdata.com/blog/2020/11/11/1965.html)。
|
||||
为支持各种不同类型平台的开发，TDengine 提供符合 REST 设计标准的 API，即 RESTful API。为最大程度降低学习成本，不同于其他数据库 RESTful API 的设计方法，TDengine 直接通过 HTTP POST 请求 BODY 中包含的 SQL 语句来操作数据库，仅需要一个 URL。RESTful 连接器的使用参见[视频教程](https://www.taosdata.com/blog/2020/11/11/1965.html)。
|
||||
|
||||
注意：与标准连接器的一个区别是，RESTful 接口是无状态的，因此 `USE db_name` 指令没有效果，所有对表名、超级表名的引用都需要指定数据库名前缀。
|
||||
|
||||
### HTTP请求格式
|
||||
|
||||
|
|
|
|||
|
|
@ -77,48 +77,43 @@ sudo cp -rf /usr/local/taos/connector/grafanaplugin /var/lib/grafana/plugins/tde
|
|||
|
||||
## <a class="anchor" id="matlab"></a>MATLAB
|
||||
|
||||
MATLAB可以通过安装包内提供的JDBC Driver直接连接到TDengine获取数据到本地工作空间。
|
||||
MATLAB 可以通过安装包内提供的 JDBC Driver 直接连接到 TDengine 获取数据到本地工作空间。
|
||||
|
||||
### MATLAB的JDBC接口适配
|
||||
### MATLAB 的 JDBC 接口适配
|
||||
|
||||
MATLAB的适配有下面几个步骤，下面以Windows10上适配MATLAB2017a为例：
|
||||
MATLAB 的适配有下面几个步骤，下面以 Windows 10 上适配 MATLAB2021a 为例：
|
||||
|
||||
- 将TDengine安装包内的驱动程序JDBCDriver-1.0.0-dist.jar拷贝到${matlab_root}\MATLAB\R2017a\java\jar\toolbox
|
||||
- 将TDengine安装包内的taos.lib文件拷贝至${matlab_ root _dir}\MATLAB\R2017a\lib\win64
|
||||
- 将新添加的驱动jar包加入MATLAB的classpath。在${matlab_ root _dir}\MATLAB\R2017a\toolbox\local\classpath.txt文件中添加下面一行
|
||||
|
||||
- 将 TDengine 客户端安装路径下的 `\TDengine\connector\jdbc的驱动程序taos-jdbcdriver-2.0.25-dist.jar` 拷贝到 `${matlab_root}\MATLAB\R2021a\java\jar\toolbox`。
|
||||
- 将 TDengine 安装包内的 `taos.lib` 文件拷贝至 `${matlab_root_dir}\MATLAB\R2021\lib\win64`。
|
||||
- 将新添加的驱动 jar 包加入 MATLAB 的 classpath。在 `${matlab_root_dir}\MATLAB\R2021a\toolbox\local\classpath.txt` 文件中添加下面一行：
|
||||
```
|
||||
$matlabroot/java/jar/toolbox/JDBCDriver-1.0.0-dist.jar
|
||||
$matlabroot/java/jar/toolbox/taos-jdbcdriver-2.0.25-dist.jar
|
||||
```
|
||||
- 在${user_home}\AppData\Roaming\MathWorks\MATLAB\R2017a\下添加一个文件javalibrarypath.txt, 并在该文件中添加taos.dll的路径，比如您的taos.dll是在安装时拷贝到了C:\Windows\System32下，那么就应该在javalibrarypath.txt中添加如下一行：
|
||||
|
||||
- 在 `${user_home}\AppData\Roaming\MathWorks\MATLAB\R2021a\` 下添加一个文件 `javalibrarypath.txt`，并在该文件中添加 taos.dll 的路径，比如您的 taos.dll 是在安装时拷贝到了 `C:\Windows\System32` 下，那么就应该在 `javalibrarypath.txt` 中添加如下一行：
|
||||
```
|
||||
C:\Windows\System32
|
||||
```
|
||||
|
||||
### 在MATLAB中连接TDengine获取数据
|
||||
### 在 MATLAB 中连接 TDengine 获取数据
|
||||
|
||||
在成功进行了上述配置后，打开MATLAB。
|
||||
在成功进行了上述配置后，打开 MATLAB。
|
||||
|
||||
- 创建一个连接：
|
||||
|
||||
```matlab
|
||||
conn = database(‘db’, ‘root’, ‘taosdata’, ‘com.taosdata.jdbc.TSDBDriver’, ‘jdbc:TSDB://127.0.0.1:0/’)
|
||||
conn = database(‘test’, ‘root’, ‘taosdata’, ‘com.taosdata.jdbc.TSDBDriver’, ‘jdbc:TSDB://192.168.1.94:6030/’)
|
||||
```
|
||||
- 执行一次查询：
|
||||
|
||||
```matlab
|
||||
sql0 = [‘select * from tb’]
|
||||
data = select(conn, sql0);
|
||||
```
|
||||
- 插入一条记录:
|
||||
|
||||
```matlab
|
||||
sql1 = [‘insert into tb values (now, 1)’]
|
||||
exec(conn, sql1)
|
||||
```
|
||||
|
||||
更多例子细节请参考安装包内examples\Matlab\TDengineDemo.m文件。
|
||||
更多例子细节请参考安装包内 `examples\Matlab\TDengineDemo.m` 文件。
|
||||
|
||||
## <a class="anchor" id="r"></a>R
|
||||
|
||||
|
|
|
|||
|
|
@ -144,7 +144,7 @@ TDengine 缺省的时间戳是毫秒精度，但通过在 CREATE DATABASE 时传
|
|||
```
|
||||
UPDATE 参数控制是否允许更新数据。缺省值为 0，取值范围为 [0, 1]。0 表示会直接丢弃后写入的相同时间戳的数据；1 表示会使用后写入的数据覆盖已有的相同时间戳的数据。
|
||||
|
||||
**Tips**: 以上所有参数修改后都可以用show databases来确认是否修改成功。另外，从 2.1.1.0 版本开始，修改这些参数后无需重启服务器即可生效。
|
||||
**Tips**: 以上所有参数修改后都可以用show databases来确认是否修改成功。另外，从 2.1.3.0 版本开始，修改这些参数后无需重启服务器即可生效。
|
||||
|
||||
- **显示系统所有数据库**
|
||||
|
||||
|
|
@ -263,6 +263,14 @@ TDengine 缺省的时间戳是毫秒精度，但通过在 CREATE DATABASE 时传
|
|||
```
|
||||
如果表是通过超级表创建，更改表结构的操作只能对超级表进行。同时针对超级表的结构更改对所有通过该结构创建的表生效。对于不是通过超级表创建的表，可以直接修改表结构。
|
||||
|
||||
- **表修改列宽**
|
||||
|
||||
```mysql
|
||||
ALTER TABLE tb_name MODIFY COLUMN field_name data_type(length);
|
||||
```
|
||||
如果数据列的类型是可变长格式（BINARY 或 NCHAR），那么可以使用此指令修改其宽度（只能改大，不能改小）。（2.1.3.0 版本新增）
|
||||
如果表是通过超级表创建，更改表结构的操作只能对超级表进行。同时针对超级表的结构更改对所有通过该结构创建的表生效。对于不是通过超级表创建的表，可以直接修改表结构。
|
||||
|
||||
## <a class="anchor" id="super-table"></a>超级表STable管理
|
||||
|
||||
注意：在 2.0.15.0 及以后的版本中，开始支持 STABLE 保留字。也即，在本节后文的指令说明中，CREATE、DROP、ALTER 三个指令在老版本中保留字需写作 TABLE 而不是 STABLE。
|
||||
|
|
@ -323,6 +331,13 @@ TDengine 缺省的时间戳是毫秒精度，但通过在 CREATE DATABASE 时传
|
|||
ALTER STABLE stb_name DROP COLUMN field_name;
|
||||
```
|
||||
|
||||
- **超级表修改列宽**
|
||||
|
||||
```mysql
|
||||
ALTER STABLE stb_name MODIFY COLUMN field_name data_type(length);
|
||||
```
|
||||
如果数据列的类型是可变长格式（BINARY 或 NCHAR），那么可以使用此指令修改其宽度（只能改大，不能改小）。（2.1.3.0 版本新增）
|
||||
|
||||
## <a class="anchor" id="tags"></a>超级表 STable 中 TAG 管理
|
||||
|
||||
- **添加标签**
|
||||
|
|
@ -346,6 +361,13 @@ TDengine 缺省的时间戳是毫秒精度，但通过在 CREATE DATABASE 时传
|
|||
```
|
||||
修改超级表的标签名，从超级表修改某个标签名后，该超级表下的所有子表也会自动更新该标签名。
|
||||
|
||||
- **修改标签列宽度**
|
||||
|
||||
```mysql
|
||||
ALTER STABLE stb_name MODIFY TAG tag_name data_type(length);
|
||||
```
|
||||
如果标签的类型是可变长格式（BINARY 或 NCHAR），那么可以使用此指令修改其宽度（只能改大，不能改小）。（2.1.3.0 版本新增）
|
||||
|
||||
- **修改子表标签值**
|
||||
|
||||
```mysql
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
name: tdengine
|
||||
base: core18
|
||||
version: '2.1.1.0'
|
||||
version: '2.1.3.0'
|
||||
icon: snap/gui/t-dengine.svg
|
||||
summary: an open-source big data platform designed and optimized for IoT.
|
||||
description: |
|
||||
|
|
@ -72,7 +72,7 @@ parts:
|
|||
- usr/bin/taosd
|
||||
- usr/bin/taos
|
||||
- usr/bin/taosdemo
|
||||
- usr/lib/libtaos.so.2.1.1.0
|
||||
- usr/lib/libtaos.so.2.1.3.0
|
||||
- usr/lib/libtaos.so.1
|
||||
- usr/lib/libtaos.so
|
||||
|
||||
|
|
|
|||
|
|
@ -63,7 +63,8 @@ static SExprInfo* doAddProjectCol(SQueryInfo* pQueryInfo, int32_t colIndex, int3
|
|||
static int32_t setShowInfo(SSqlObj* pSql, SSqlInfo* pInfo);
|
||||
static char* getAccountId(SSqlObj* pSql);
|
||||
|
||||
static bool serializeExprListToVariant(SArray* pList, tVariant **dest, int16_t colType);
|
||||
static int convertTimestampStrToInt64(tVariant *pVar, int32_t precision);
|
||||
static bool serializeExprListToVariant(SArray* pList, tVariant **dest, int16_t colType, uint8_t precision);
|
||||
static int32_t validateParamOfRelationIn(tVariant *pVar, int32_t colType);
|
||||
|
||||
static bool has(SArray* pFieldList, int32_t startIdx, const char* name);
|
||||
|
|
@ -149,7 +150,7 @@ int16_t getNewResColId(SSqlCmd* pCmd) {
|
|||
|
||||
// serialize expr in exprlist to binary
|
||||
// formate "type | size | value"
|
||||
bool serializeExprListToVariant(SArray* pList, tVariant **dst, int16_t colType) {
|
||||
bool serializeExprListToVariant(SArray* pList, tVariant **dst, int16_t colType, uint8_t precision) {
|
||||
bool ret = false;
|
||||
if (!pList || pList->size <= 0 || colType < 0) {
|
||||
return ret;
|
||||
|
|
@ -159,14 +160,17 @@ bool serializeExprListToVariant(SArray* pList, tVariant **dst, int16_t colType)
|
|||
int32_t firstTokenType = item->pNode->token.type;
|
||||
int32_t type = firstTokenType;
|
||||
|
||||
//nchar to binary and
|
||||
toTSDBType(type);
|
||||
if (type != colType && (type != TSDB_DATA_TYPE_BINARY || colType != TSDB_DATA_TYPE_NCHAR)) {
|
||||
return false;
|
||||
}
|
||||
type = colType;
|
||||
//nchar to binary and other xxint to bigint
|
||||
toTSDBType(type);
|
||||
if (colType != TSDB_DATA_TYPE_TIMESTAMP && !IS_UNSIGNED_NUMERIC_TYPE(colType)) {
|
||||
if (type != colType && (type != TSDB_DATA_TYPE_BINARY || colType != TSDB_DATA_TYPE_NCHAR)) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
type = colType;
|
||||
|
||||
SBufferWriter bw = tbufInitWriter( NULL, false);
|
||||
|
||||
SBufferWriter bw = tbufInitWriter( NULL, false );
|
||||
tbufEnsureCapacity(&bw, 512);
|
||||
|
||||
int32_t size = (int32_t)(pList->size);
|
||||
|
|
@ -179,16 +183,23 @@ bool serializeExprListToVariant(SArray* pList, tVariant **dst, int16_t colType)
|
|||
// check all the token type in expr list same or not
|
||||
if (firstTokenType != pSub->token.type) {
|
||||
break;
|
||||
}
|
||||
toTSDBType(pSub->token.type);
|
||||
|
||||
tVariant var;
|
||||
tVariantCreate(&var, &pSub->token);
|
||||
if (type == TSDB_DATA_TYPE_BOOL || IS_SIGNED_NUMERIC_TYPE(type)) {
|
||||
tbufWriteInt64(&bw, var.i64);
|
||||
} else if (IS_UNSIGNED_NUMERIC_TYPE(type)) {
|
||||
// ugly code, refactor later
|
||||
if (IS_UNSIGNED_NUMERIC_TYPE(pSub->token.type) || IS_SIGNED_NUMERIC_TYPE(pSub->token.type)) {
|
||||
tbufWriteUint64(&bw, var.i64);
|
||||
} else {
|
||||
tVariantDestroy(&var);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
toTSDBType(pSub->token.type);
|
||||
|
||||
tVariant var;
|
||||
tVariantCreate(&var, &pSub->token);
|
||||
if (type == TSDB_DATA_TYPE_BOOL || type == TSDB_DATA_TYPE_TINYINT || type == TSDB_DATA_TYPE_SMALLINT
|
||||
|| type == TSDB_DATA_TYPE_BIGINT || type == TSDB_DATA_TYPE_INT) {
|
||||
tbufWriteInt64(&bw, var.i64);
|
||||
} else if (type == TSDB_DATA_TYPE_DOUBLE || type == TSDB_DATA_TYPE_FLOAT) {
|
||||
else if (type == TSDB_DATA_TYPE_DOUBLE || type == TSDB_DATA_TYPE_FLOAT) {
|
||||
tbufWriteDouble(&bw, var.dKey);
|
||||
} else if (type == TSDB_DATA_TYPE_BINARY){
|
||||
tbufWriteBinary(&bw, var.pz, var.nLen);
|
||||
|
|
@ -201,6 +212,16 @@ bool serializeExprListToVariant(SArray* pList, tVariant **dst, int16_t colType)
|
|||
}
|
||||
tbufWriteBinary(&bw, buf, twcslen((wchar_t *)buf) * TSDB_NCHAR_SIZE);
|
||||
free(buf);
|
||||
} else if (type == TSDB_DATA_TYPE_TIMESTAMP) {
|
||||
if (var.nType == TSDB_DATA_TYPE_BINARY) {
|
||||
if (convertTimestampStrToInt64(&var, precision) < 0) {
|
||||
tVariantDestroy(&var);
|
||||
break;
|
||||
}
|
||||
tbufWriteInt64(&bw, var.i64);
|
||||
} else if (var.nType == TSDB_DATA_TYPE_BIGINT) {
|
||||
tbufWriteInt64(&bw, var.i64);
|
||||
}
|
||||
}
|
||||
tVariantDestroy(&var);
|
||||
|
||||
|
|
@ -286,29 +307,33 @@ static int32_t invalidOperationMsg(char* dstBuffer, const char* errMsg) {
|
|||
return tscInvalidOperationMsg(dstBuffer, errMsg, NULL);
|
||||
}
|
||||
|
||||
static int setColumnFilterInfoForTimestamp(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, tVariant* pVar) {
|
||||
static int convertTimestampStrToInt64(tVariant *pVar, int32_t precision) {
|
||||
int64_t time = 0;
|
||||
const char* msg = "invalid timestamp";
|
||||
|
||||
strdequote(pVar->pz);
|
||||
char* seg = strnchr(pVar->pz, '-', pVar->nLen, false);
|
||||
STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
|
||||
|
||||
STableComInfo tinfo = tscGetTableInfo(pTableMetaInfo->pTableMeta);
|
||||
|
||||
char* seg = strnchr(pVar->pz, '-', pVar->nLen, false);
|
||||
if (seg != NULL) {
|
||||
if (taosParseTime(pVar->pz, &time, pVar->nLen, tinfo.precision, tsDaylight) != TSDB_CODE_SUCCESS) {
|
||||
return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg);
|
||||
if (taosParseTime(pVar->pz, &time, pVar->nLen, precision, tsDaylight) != TSDB_CODE_SUCCESS) {
|
||||
return -1;
|
||||
}
|
||||
} else {
|
||||
if (tVariantDump(pVar, (char*)&time, TSDB_DATA_TYPE_BIGINT, true)) {
|
||||
return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg);
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
tVariantDestroy(pVar);
|
||||
tVariantCreateFromBinary(pVar, (char*)&time, 0, TSDB_DATA_TYPE_BIGINT);
|
||||
return 0;
|
||||
}
|
||||
static int setColumnFilterInfoForTimestamp(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, tVariant* pVar) {
|
||||
const char* msg = "invalid timestamp";
|
||||
|
||||
STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
|
||||
|
||||
STableComInfo tinfo = tscGetTableInfo(pTableMetaInfo->pTableMeta);
|
||||
if (convertTimestampStrToInt64(pVar, tinfo.precision) < -1) {
|
||||
return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg);
|
||||
}
|
||||
return TSDB_CODE_SUCCESS;
|
||||
}
|
||||
|
||||
|
|
@ -1282,7 +1307,7 @@ static bool validateTagParams(SArray* pTagsList, SArray* pFieldList, SSqlCmd* pC
|
|||
const char* msg1 = "invalid number of tag columns";
|
||||
const char* msg2 = "tag length too long";
|
||||
const char* msg3 = "duplicated column names";
|
||||
const char* msg4 = "timestamp not allowed in tags";
|
||||
//const char* msg4 = "timestamp not allowed in tags";
|
||||
const char* msg5 = "invalid data type in tags";
|
||||
const char* msg6 = "invalid tag name";
|
||||
const char* msg7 = "invalid binary/nchar tag length";
|
||||
|
|
@ -1298,10 +1323,10 @@ static bool validateTagParams(SArray* pTagsList, SArray* pFieldList, SSqlCmd* pC
|
|||
for (int32_t i = 0; i < numOfTags; ++i) {
|
||||
TAOS_FIELD* p = taosArrayGet(pTagsList, i);
|
||||
|
||||
if (p->type == TSDB_DATA_TYPE_TIMESTAMP) {
|
||||
invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg4);
|
||||
return false;
|
||||
}
|
||||
//if (p->type == TSDB_DATA_TYPE_TIMESTAMP) {
|
||||
// invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg4);
|
||||
// return false;
|
||||
//}
|
||||
|
||||
if (!isValidDataType(p->type)) {
|
||||
invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg5);
|
||||
|
|
@ -1359,7 +1384,7 @@ static bool validateTagParams(SArray* pTagsList, SArray* pFieldList, SSqlCmd* pC
|
|||
* tags name /column name is truncated in sql.y
|
||||
*/
|
||||
bool validateOneTags(SSqlCmd* pCmd, TAOS_FIELD* pTagField) {
|
||||
const char* msg1 = "timestamp not allowed in tags";
|
||||
//const char* msg1 = "timestamp not allowed in tags";
|
||||
const char* msg2 = "duplicated column names";
|
||||
const char* msg3 = "tag length too long";
|
||||
const char* msg4 = "invalid tag name";
|
||||
|
|
@ -1382,10 +1407,10 @@ bool validateOneTags(SSqlCmd* pCmd, TAOS_FIELD* pTagField) {
|
|||
}
|
||||
|
||||
// no timestamp allowable
|
||||
if (pTagField->type == TSDB_DATA_TYPE_TIMESTAMP) {
|
||||
invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg1);
|
||||
return false;
|
||||
}
|
||||
//if (pTagField->type == TSDB_DATA_TYPE_TIMESTAMP) {
|
||||
// invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg1);
|
||||
// return false;
|
||||
//}
|
||||
|
||||
if ((pTagField->type < TSDB_DATA_TYPE_BOOL) || (pTagField->type > TSDB_DATA_TYPE_UBIGINT)) {
|
||||
invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg6);
|
||||
|
|
@ -2125,7 +2150,10 @@ void setResultColName(char* name, tSqlExprItem* pItem, int32_t functionId, SStrT
|
|||
}
|
||||
|
||||
static void updateLastScanOrderIfNeeded(SQueryInfo* pQueryInfo) {
|
||||
if (pQueryInfo->sessionWindow.gap > 0 || tscGroupbyColumn(pQueryInfo)) {
|
||||
if (pQueryInfo->sessionWindow.gap > 0 ||
|
||||
pQueryInfo->stateWindow ||
|
||||
taosArrayGetSize(pQueryInfo->pUpstream) > 0 ||
|
||||
tscGroupbyColumn(pQueryInfo)) {
|
||||
size_t numOfExpr = tscNumOfExprs(pQueryInfo);
|
||||
for (int32_t i = 0; i < numOfExpr; ++i) {
|
||||
SExprInfo* pExpr = tscExprGet(pQueryInfo, i);
|
||||
|
|
@ -2385,7 +2413,9 @@ int32_t addExprAndResultField(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, int32_t col
|
|||
|
||||
// NOTE: has time range condition or normal column filter condition, the last_row query will be transferred to last query
|
||||
SConvertFunc cvtFunc = {.originFuncId = functionId, .execFuncId = functionId};
|
||||
if (functionId == TSDB_FUNC_LAST_ROW && ((!TSWINDOW_IS_EQUAL(pQueryInfo->window, TSWINDOW_INITIALIZER)) || (hasNormalColumnFilter(pQueryInfo)))) {
|
||||
if (functionId == TSDB_FUNC_LAST_ROW && ((!TSWINDOW_IS_EQUAL(pQueryInfo->window, TSWINDOW_INITIALIZER)) ||
|
||||
(hasNormalColumnFilter(pQueryInfo)) ||
|
||||
taosArrayGetSize(pQueryInfo->pUpstream)>0)) {
|
||||
cvtFunc.execFuncId = TSDB_FUNC_LAST;
|
||||
}
|
||||
|
||||
|
|
@ -3337,8 +3367,8 @@ static int32_t doExtractColumnFilterInfo(SSqlCmd* pCmd, SQueryInfo* pQueryInfo,
|
|||
|
||||
// TK_GT,TK_GE,TK_EQ,TK_NE are based on the pColumn->lowerBndd
|
||||
} else if (pExpr->tokenId == TK_IN) {
|
||||
tVariant *pVal;
|
||||
if (pRight->tokenId != TK_SET || !serializeExprListToVariant(pRight->pParam, &pVal, colType) || colType == TSDB_DATA_TYPE_TIMESTAMP) {
|
||||
tVariant *pVal;
|
||||
if (pRight->tokenId != TK_SET || !serializeExprListToVariant(pRight->pParam, &pVal, colType, timePrecision)) {
|
||||
return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg);
|
||||
}
|
||||
if (validateParamOfRelationIn(pVal, colType) != TSDB_CODE_SUCCESS) {
|
||||
|
|
@ -3349,8 +3379,7 @@ static int32_t doExtractColumnFilterInfo(SSqlCmd* pCmd, SQueryInfo* pQueryInfo,
|
|||
pColumnFilter->pz = (int64_t)calloc(1, pVal->nLen + 1);
|
||||
pColumnFilter->len = pVal->nLen;
|
||||
pColumnFilter->filterstr = 1;
|
||||
memcpy((char *)(pColumnFilter->pz), (char *)(pVal->pz), pVal->nLen);
|
||||
//retVal = tVariantDump(pVal, (char *)(pColumnFilter->pz), TSDB_DATA_TYPE_BINARY, false);
|
||||
memcpy((char *)(pColumnFilter->pz), (char *)(pVal->pz), pVal->nLen);
|
||||
|
||||
tVariantDestroy(pVal);
|
||||
free(pVal);
|
||||
|
|
@ -3483,6 +3512,7 @@ static int32_t extractColumnFilterInfo(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SC
|
|||
const char* msg1 = "non binary column not support like operator";
|
||||
const char* msg2 = "binary column not support this operator";
|
||||
const char* msg3 = "bool column not support this operator";
|
||||
const char* msg4 = "primary key not support this operator";
|
||||
|
||||
SColumn* pColumn = tscColumnListInsert(pQueryInfo->colList, pIndex->columnIndex, pTableMeta->id.uid, pSchema);
|
||||
SColumnFilterInfo* pColFilter = NULL;
|
||||
|
|
@ -3539,6 +3569,9 @@ static int32_t extractColumnFilterInfo(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SC
|
|||
|
||||
pColumn->columnIndex = pIndex->columnIndex;
|
||||
pColumn->tableUid = pTableMeta->id.uid;
|
||||
if (pColumn->columnIndex == PRIMARYKEY_TIMESTAMP_COL_INDEX && pExpr->tokenId == TK_IN) {
|
||||
return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg4);
|
||||
}
|
||||
|
||||
STableComInfo tinfo = tscGetTableInfo(pTableMeta);
|
||||
return doExtractColumnFilterInfo(pCmd, pQueryInfo, tinfo.precision, pColFilter, pSchema->type, pExpr);
|
||||
|
|
@ -6808,7 +6841,7 @@ int32_t doCheckForCreateFromStable(SSqlObj* pSql, SSqlInfo* pInfo) {
|
|||
const int32_t STABLE_INDEX = 1;
|
||||
|
||||
STableMetaInfo* pStableMetaInfo = tscGetMetaInfo(pQueryInfo, STABLE_INDEX);
|
||||
|
||||
|
||||
// super table name, create table by using dst
|
||||
int32_t numOfTables = (int32_t) taosArrayGetSize(pCreateTable->childTableInfo);
|
||||
for(int32_t j = 0; j < numOfTables; ++j) {
|
||||
|
|
@ -6837,6 +6870,7 @@ int32_t doCheckForCreateFromStable(SSqlObj* pSql, SSqlInfo* pInfo) {
|
|||
|
||||
// too long tag values will return invalid sql, not be truncated automatically
|
||||
SSchema *pTagSchema = tscGetTableTagSchema(pStableMetaInfo->pTableMeta);
|
||||
STableComInfo tinfo = tscGetTableInfo(pStableMetaInfo->pTableMeta);
|
||||
STagData *pTag = &pCreateTableInfo->tagdata;
|
||||
|
||||
SKVRowBuilder kvRowBuilder = {0};
|
||||
|
|
@ -6886,6 +6920,15 @@ int32_t doCheckForCreateFromStable(SSqlObj* pSql, SSqlInfo* pInfo) {
|
|||
tdDestroyKVRowBuilder(&kvRowBuilder);
|
||||
return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg3);
|
||||
}
|
||||
} else if (pSchema->type == TSDB_DATA_TYPE_TIMESTAMP) {
|
||||
if (pItem->pVar.nType == TSDB_DATA_TYPE_BINARY) {
|
||||
ret = convertTimestampStrToInt64(&(pItem->pVar), tinfo.precision);
|
||||
if (ret != TSDB_CODE_SUCCESS) {
|
||||
return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg4);
|
||||
}
|
||||
} else if (pItem->pVar.nType == TSDB_DATA_TYPE_TIMESTAMP) {
|
||||
pItem->pVar.i64 = convertTimePrecision(pItem->pVar.i64, TSDB_TIME_PRECISION_NANO, tinfo.precision);
|
||||
}
|
||||
}
|
||||
|
||||
ret = tVariantDump(&(pItem->pVar), tagVal, pSchema->type, true);
|
||||
|
|
@ -6932,7 +6975,17 @@ int32_t doCheckForCreateFromStable(SSqlObj* pSql, SSqlInfo* pInfo) {
|
|||
tdDestroyKVRowBuilder(&kvRowBuilder);
|
||||
return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg3);
|
||||
}
|
||||
} else if (pSchema->type == TSDB_DATA_TYPE_TIMESTAMP) {
|
||||
if (pItem->pVar.nType == TSDB_DATA_TYPE_BINARY) {
|
||||
ret = convertTimestampStrToInt64(&(pItem->pVar), tinfo.precision);
|
||||
if (ret != TSDB_CODE_SUCCESS) {
|
||||
return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg4);
|
||||
}
|
||||
} else if (pItem->pVar.nType == TSDB_DATA_TYPE_TIMESTAMP) {
|
||||
pItem->pVar.i64 = convertTimePrecision(pItem->pVar.i64, TSDB_TIME_PRECISION_NANO, tinfo.precision);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
ret = tVariantDump(&(pItem->pVar), tagVal, pSchema->type, true);
|
||||
|
||||
|
|
@ -7774,17 +7827,29 @@ int32_t validateSqlNode(SSqlObj* pSql, SSqlNode* pSqlNode, SQueryInfo* pQueryInf
|
|||
return code;
|
||||
}
|
||||
}
|
||||
|
||||
int32_t timeWindowQuery =
|
||||
(TPARSER_HAS_TOKEN(pSqlNode->interval.interval) || TPARSER_HAS_TOKEN(pSqlNode->sessionVal.gap));
|
||||
|
||||
if (validateSelectNodeList(pCmd, pQueryInfo, pSqlNode->pSelNodeList, false, false, false) != TSDB_CODE_SUCCESS) {
|
||||
if (validateSelectNodeList(pCmd, pQueryInfo, pSqlNode->pSelNodeList, false, false, timeWindowQuery) != TSDB_CODE_SUCCESS) {
|
||||
return TSDB_CODE_TSC_INVALID_OPERATION;
|
||||
}
|
||||
// parse the window_state
|
||||
if (validateStateWindowNode(pCmd, pQueryInfo, pSqlNode, false) != TSDB_CODE_SUCCESS) {
|
||||
return TSDB_CODE_TSC_INVALID_OPERATION;
|
||||
}
|
||||
|
||||
// todo NOT support yet
|
||||
for(int32_t i = 0; i < tscNumOfExprs(pQueryInfo); ++i) {
|
||||
SExprInfo* pExpr = tscExprGet(pQueryInfo, i);
|
||||
int32_t f = pExpr->base.functionId;
|
||||
if (f == TSDB_FUNC_STDDEV || f == TSDB_FUNC_PERCT) {
|
||||
return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg6);
|
||||
}
|
||||
|
||||
if ((timeWindowQuery || pQueryInfo->stateWindow) && f == TSDB_FUNC_LAST) {
|
||||
pExpr->base.numOfParams = 1;
|
||||
pExpr->base.param[0].i64 = TSDB_ORDER_ASC;
|
||||
pExpr->base.param[0].nType = TSDB_DATA_TYPE_INT;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -7815,7 +7880,10 @@ int32_t validateSqlNode(SSqlObj* pSql, SSqlNode* pSqlNode, SQueryInfo* pQueryInf
|
|||
if (validateIntervalNode(pSql, pQueryInfo, pSqlNode) != TSDB_CODE_SUCCESS) {
|
||||
return TSDB_CODE_TSC_INVALID_OPERATION;
|
||||
} else {
|
||||
if (isTimeWindowQuery(pQueryInfo) || pQueryInfo->sessionWindow.gap > 0) {
|
||||
if (validateSessionNode(pCmd, pQueryInfo, pSqlNode) != TSDB_CODE_SUCCESS) {
|
||||
return TSDB_CODE_TSC_INVALID_OPERATION;
|
||||
}
|
||||
if (isTimeWindowQuery(pQueryInfo)) {
|
||||
// check if the first column of the nest query result is timestamp column
|
||||
SColumn* pCol = taosArrayGetP(pQueryInfo->colList, 0);
|
||||
if (pCol->info.type != TSDB_DATA_TYPE_TIMESTAMP) {
|
||||
|
|
@ -7836,6 +7904,8 @@ int32_t validateSqlNode(SSqlObj* pSql, SSqlNode* pSqlNode, SQueryInfo* pQueryInf
|
|||
if ((code = doFunctionsCompatibleCheck(pCmd, pQueryInfo, tscGetErrorMsgPayload(pCmd))) != TSDB_CODE_SUCCESS) {
|
||||
return code;
|
||||
}
|
||||
|
||||
updateLastScanOrderIfNeeded(pQueryInfo);
|
||||
} else {
|
||||
pQueryInfo->command = TSDB_SQL_SELECT;
|
||||
|
||||
|
|
@ -7924,8 +7994,7 @@ int32_t validateSqlNode(SSqlObj* pSql, SSqlNode* pSqlNode, SQueryInfo* pQueryInf
|
|||
return TSDB_CODE_TSC_INVALID_OPERATION;
|
||||
}
|
||||
|
||||
if ((isTimeWindowQuery(pQueryInfo) || pQueryInfo->sessionWindow.gap > 0) &&
|
||||
(validateFunctionsInIntervalOrGroupbyQuery(pCmd, pQueryInfo) != TSDB_CODE_SUCCESS)) {
|
||||
if (isTimeWindowQuery(pQueryInfo) && (validateFunctionsInIntervalOrGroupbyQuery(pCmd, pQueryInfo) != TSDB_CODE_SUCCESS)) {
|
||||
return TSDB_CODE_TSC_INVALID_OPERATION;
|
||||
}
|
||||
|
||||
|
|
@ -8030,12 +8099,22 @@ int32_t exprTreeFromSqlExpr(SSqlCmd* pCmd, tExprNode **pExpr, const tSqlExpr* pS
|
|||
assert(pSqlExpr->pRight == NULL);
|
||||
|
||||
if (pSqlExpr->type == SQL_NODE_VALUE) {
|
||||
int32_t ret = TSDB_CODE_SUCCESS;
|
||||
*pExpr = calloc(1, sizeof(tExprNode));
|
||||
(*pExpr)->nodeType = TSQL_NODE_VALUE;
|
||||
(*pExpr)->pVal = calloc(1, sizeof(tVariant));
|
||||
|
||||
tVariantAssign((*pExpr)->pVal, &pSqlExpr->value);
|
||||
return TSDB_CODE_SUCCESS;
|
||||
|
||||
STableMeta* pTableMeta = tscGetMetaInfo(pQueryInfo, 0)->pTableMeta;
|
||||
if (pCols != NULL && taosArrayGetSize(pCols) > 0) {
|
||||
SColIndex* idx = taosArrayGet(pCols, 0);
|
||||
SSchema* pSchema = tscGetTableColumnSchema(pTableMeta, idx->colIndex);
|
||||
// convert time by precision
|
||||
if (pSchema != NULL && TSDB_DATA_TYPE_TIMESTAMP == pSchema->type && TSDB_DATA_TYPE_BINARY == (*pExpr)->pVal->nType) {
|
||||
ret = setColumnFilterInfoForTimestamp(pCmd, pQueryInfo, (*pExpr)->pVal);
|
||||
}
|
||||
}
|
||||
return ret;
|
||||
} else if (pSqlExpr->type == SQL_NODE_SQLFUNCTION) {
|
||||
// arithmetic expression on the results of aggregation functions
|
||||
*pExpr = calloc(1, sizeof(tExprNode));
|
||||
|
|
@ -8092,21 +8171,22 @@ int32_t exprTreeFromSqlExpr(SSqlCmd* pCmd, tExprNode **pExpr, const tSqlExpr* pS
|
|||
} else if (pSqlExpr->tokenId == TK_SET) {
|
||||
int32_t colType = -1;
|
||||
STableMeta* pTableMeta = tscGetMetaInfo(pQueryInfo, 0)->pTableMeta;
|
||||
if (pCols != NULL) {
|
||||
if (pCols != NULL && taosArrayGetSize(pCols) > 0) {
|
||||
SColIndex* idx = taosArrayGet(pCols, 0);
|
||||
SSchema* pSchema = tscGetTableColumnSchema(pTableMeta, idx->colIndex);
|
||||
if (pSchema != NULL) {
|
||||
colType = pSchema->type;
|
||||
}
|
||||
}
|
||||
|
||||
tVariant *pVal;
|
||||
if (colType >= TSDB_DATA_TYPE_TINYINT && colType <= TSDB_DATA_TYPE_BIGINT) {
|
||||
colType = TSDB_DATA_TYPE_BIGINT;
|
||||
} else if (colType == TSDB_DATA_TYPE_FLOAT || colType == TSDB_DATA_TYPE_DOUBLE) {
|
||||
colType = TSDB_DATA_TYPE_DOUBLE;
|
||||
}
|
||||
if (serializeExprListToVariant(pSqlExpr->pParam, &pVal, colType) == false) {
|
||||
STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
|
||||
STableComInfo tinfo = tscGetTableInfo(pTableMetaInfo->pTableMeta);
|
||||
if (serializeExprListToVariant(pSqlExpr->pParam, &pVal, colType, tinfo.precision) == false) {
|
||||
return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), "not support filter expression");
|
||||
}
|
||||
*pExpr = calloc(1, sizeof(tExprNode));
|
||||
|
|
|
|||
|
|
@ -476,7 +476,14 @@ void buildFilterSetFromBinary(void **q, const char *buf, int32_t len) {
|
|||
int dummy = -1;
|
||||
int32_t sz = tbufReadInt32(&br);
|
||||
for (int32_t i = 0; i < sz; i++) {
|
||||
if (type == TSDB_DATA_TYPE_BOOL || type == TSDB_DATA_TYPE_TINYINT || type == TSDB_DATA_TYPE_SMALLINT || type == TSDB_DATA_TYPE_BIGINT || type == TSDB_DATA_TYPE_INT) {
|
||||
if (type == TSDB_DATA_TYPE_BOOL || IS_SIGNED_NUMERIC_TYPE(type)) {
|
||||
int64_t val = tbufReadInt64(&br);
|
||||
taosHashPut(pObj, (char *)&val, sizeof(val), &dummy, sizeof(dummy));
|
||||
} else if (IS_UNSIGNED_NUMERIC_TYPE(type)) {
|
||||
uint64_t val = tbufReadUint64(&br);
|
||||
taosHashPut(pObj, (char *)&val, sizeof(val), &dummy, sizeof(dummy));
|
||||
}
|
||||
else if (type == TSDB_DATA_TYPE_TIMESTAMP) {
|
||||
int64_t val = tbufReadInt64(&br);
|
||||
taosHashPut(pObj, (char *)&val, sizeof(val), &dummy, sizeof(dummy));
|
||||
} else if (type == TSDB_DATA_TYPE_DOUBLE || type == TSDB_DATA_TYPE_FLOAT) {
|
||||
|
|
|
|||
|
|
@ -632,7 +632,15 @@ int32_t tStrToInteger(const char* z, int16_t type, int32_t n, int64_t* value, bo
|
|||
}
|
||||
|
||||
// the string may be overflow according to errno
|
||||
*value = issigned? strtoll(z, &endPtr, radix):strtoull(z, &endPtr, radix);
|
||||
if (!issigned) {
|
||||
const char *p = z;
|
||||
while(*p != 0 && *p == ' ') p++;
|
||||
if (*p != 0 && *p == '-') { return -1;}
|
||||
|
||||
*value = strtoull(z, &endPtr, radix);
|
||||
} else {
|
||||
*value = strtoll(z, &endPtr, radix);
|
||||
}
|
||||
|
||||
// not a valid integer number, return error
|
||||
if (endPtr - z != n || errno == ERANGE) {
|
||||
|
|
|
|||
|
|
@ -77,6 +77,10 @@ void tVariantCreate(tVariant *pVar, SStrToken *token) {
|
|||
pVar->nLen = strRmquote(pVar->pz, token->n);
|
||||
break;
|
||||
}
|
||||
case TSDB_DATA_TYPE_TIMESTAMP: {
|
||||
pVar->i64 = taosGetTimestamp(TSDB_TIME_PRECISION_NANO);
|
||||
break;
|
||||
}
|
||||
|
||||
default: { // nType == 0 means the null value
|
||||
type = TSDB_DATA_TYPE_NULL;
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Subproject commit 7a26c432f8b4203e42344ff3290b9b9b01b983d5
|
||||
Subproject commit b8f76da4a708d158ec3cc4b844571dc4414e36b4
|
||||
|
|
@ -1 +1 @@
|
|||
Subproject commit b62a26ecc164a310104df57691691b237e091c89
|
||||
Subproject commit ce5201014136503d34fecbd56494b67b4961056c
|
||||
|
|
@ -5,12 +5,13 @@
|
|||
## Install
|
||||
|
||||
```sh
|
||||
pip install git+https://github.com/taosdata/TDengine-connector-python
|
||||
git clone --depth 1 https://github.com/taosdata/TDengine.git
|
||||
pip install ./TDengine/src/connector/python
|
||||
```
|
||||
|
||||
## Source Code
|
||||
|
||||
[TDengine] connector for Python source code is hosted on [GitHub](https://github.com/taosdata/TDengine-connector-python).
|
||||
[TDengine] connector for Python source code is hosted on [GitHub](https://github.com/taosdata/TDengine/tree/develop/src/connector/python).
|
||||
|
||||
## License - AGPL
|
||||
|
||||
|
|
|
|||
|
|
@ -128,29 +128,29 @@
|
|||
#define TK_USING 110
|
||||
#define TK_AS 111
|
||||
#define TK_NULL 112
|
||||
#define TK_SELECT 113
|
||||
#define TK_UNION 114
|
||||
#define TK_ALL 115
|
||||
#define TK_DISTINCT 116
|
||||
#define TK_FROM 117
|
||||
#define TK_VARIABLE 118
|
||||
#define TK_INTERVAL 119
|
||||
#define TK_SESSION 120
|
||||
#define TK_STATE_WINDOW 121
|
||||
#define TK_FILL 122
|
||||
#define TK_SLIDING 123
|
||||
#define TK_ORDER 124
|
||||
#define TK_BY 125
|
||||
#define TK_ASC 126
|
||||
#define TK_DESC 127
|
||||
#define TK_GROUP 128
|
||||
#define TK_HAVING 129
|
||||
#define TK_LIMIT 130
|
||||
#define TK_OFFSET 131
|
||||
#define TK_SLIMIT 132
|
||||
#define TK_SOFFSET 133
|
||||
#define TK_WHERE 134
|
||||
#define TK_NOW 135
|
||||
#define TK_NOW 113
|
||||
#define TK_SELECT 114
|
||||
#define TK_UNION 115
|
||||
#define TK_ALL 116
|
||||
#define TK_DISTINCT 117
|
||||
#define TK_FROM 118
|
||||
#define TK_VARIABLE 119
|
||||
#define TK_INTERVAL 120
|
||||
#define TK_SESSION 121
|
||||
#define TK_STATE_WINDOW 122
|
||||
#define TK_FILL 123
|
||||
#define TK_SLIDING 124
|
||||
#define TK_ORDER 125
|
||||
#define TK_BY 126
|
||||
#define TK_ASC 127
|
||||
#define TK_DESC 128
|
||||
#define TK_GROUP 129
|
||||
#define TK_HAVING 130
|
||||
#define TK_LIMIT 131
|
||||
#define TK_OFFSET 132
|
||||
#define TK_SLIMIT 133
|
||||
#define TK_SOFFSET 134
|
||||
#define TK_WHERE 135
|
||||
#define TK_RESET 136
|
||||
#define TK_QUERY 137
|
||||
#define TK_SYNCDB 138
|
||||
|
|
|
|||
|
|
@ -437,6 +437,7 @@ tagitem(A) ::= FLOAT(X). { toTSDBType(X.type); tVariantCreate(&A, &X); }
|
|||
tagitem(A) ::= STRING(X). { toTSDBType(X.type); tVariantCreate(&A, &X); }
|
||||
tagitem(A) ::= BOOL(X). { toTSDBType(X.type); tVariantCreate(&A, &X); }
|
||||
tagitem(A) ::= NULL(X). { X.type = 0; tVariantCreate(&A, &X); }
|
||||
tagitem(A) ::= NOW(X). { X.type = TSDB_DATA_TYPE_TIMESTAMP; tVariantCreate(&A, &X);}
|
||||
|
||||
tagitem(A) ::= MINUS(X) INTEGER(Y).{
|
||||
X.n += Y.n;
|
||||
|
|
|
|||
|
|
@ -1751,7 +1751,10 @@ static int32_t setupQueryRuntimeEnv(SQueryRuntimeEnv *pRuntimeEnv, int32_t numOf
|
|||
case OP_SessionWindow: {
|
||||
pRuntimeEnv->proot =
|
||||
createSWindowOperatorInfo(pRuntimeEnv, pRuntimeEnv->proot, pQueryAttr->pExpr1, pQueryAttr->numOfOutput);
|
||||
setTableScanFilterOperatorInfo(pRuntimeEnv->proot->upstream[0]->info, pRuntimeEnv->proot);
|
||||
int32_t opType = pRuntimeEnv->proot->upstream[0]->operatorType;
|
||||
if (opType != OP_DummyInput) {
|
||||
setTableScanFilterOperatorInfo(pRuntimeEnv->proot->upstream[0]->info, pRuntimeEnv->proot);
|
||||
}
|
||||
break;
|
||||
}
|
||||
case OP_MultiTableAggregate: {
|
||||
|
|
@ -1787,7 +1790,10 @@ static int32_t setupQueryRuntimeEnv(SQueryRuntimeEnv *pRuntimeEnv, int32_t numOf
|
|||
}
|
||||
case OP_StateWindow: {
|
||||
pRuntimeEnv->proot = createStatewindowOperatorInfo(pRuntimeEnv, pRuntimeEnv->proot, pQueryAttr->pExpr1, pQueryAttr->numOfOutput);
|
||||
setTableScanFilterOperatorInfo(pRuntimeEnv->proot->upstream[0]->info, pRuntimeEnv->proot);
|
||||
int32_t opType = pRuntimeEnv->proot->upstream[0]->operatorType;
|
||||
if (opType != OP_DummyInput) {
|
||||
setTableScanFilterOperatorInfo(pRuntimeEnv->proot->upstream[0]->info, pRuntimeEnv->proot);
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
@ -2891,7 +2897,9 @@ void setTagValue(SOperatorInfo* pOperatorInfo, void *pTable, SQLFunctionCtx* pCt
|
|||
doSetTagValueInParam(pTable, pLocalExprInfo->base.colInfo.colId, &pCtx[idx].tag, pLocalExprInfo->base.resType,
|
||||
pLocalExprInfo->base.resBytes);
|
||||
|
||||
if (IS_NUMERIC_TYPE(pLocalExprInfo->base.resType) || pLocalExprInfo->base.resType == TSDB_DATA_TYPE_BOOL) {
|
||||
if (IS_NUMERIC_TYPE(pLocalExprInfo->base.resType)
|
||||
|| pLocalExprInfo->base.resType == TSDB_DATA_TYPE_BOOL
|
||||
|| pLocalExprInfo->base.resType == TSDB_DATA_TYPE_TIMESTAMP) {
|
||||
memcpy(pRuntimeEnv->tagVal + offset, &pCtx[idx].tag.i64, pLocalExprInfo->base.resBytes);
|
||||
} else {
|
||||
memcpy(pRuntimeEnv->tagVal + offset, pCtx[idx].tag.pz, pCtx[idx].tag.nLen);
|
||||
|
|
|
|||
|
|
@ -254,15 +254,23 @@ bool notNullOperator(SColumnFilterElem *pFilter, const char* minval, const char*
|
|||
return true;
|
||||
}
|
||||
bool inOperator(SColumnFilterElem *pFilter, const char* minval, const char* maxval, int16_t type) {
|
||||
if (type == TSDB_DATA_TYPE_BOOL || type == TSDB_DATA_TYPE_TINYINT || type == TSDB_DATA_TYPE_SMALLINT || type == TSDB_DATA_TYPE_BIGINT || type == TSDB_DATA_TYPE_INT) {
|
||||
if (type == TSDB_DATA_TYPE_BOOL || IS_SIGNED_NUMERIC_TYPE(type) || type == TSDB_DATA_TYPE_TIMESTAMP) {
|
||||
int64_t minv = -1, maxv = -1;
|
||||
GET_TYPED_DATA(minv, int64_t, type, minval);
|
||||
GET_TYPED_DATA(maxv, int64_t, type, maxval);
|
||||
if (minv == maxv) {
|
||||
return NULL != taosHashGet((SHashObj *)pFilter->q, (char *)&minv, sizeof(minv));
|
||||
}
|
||||
return true;
|
||||
} else if (type == TSDB_DATA_TYPE_DOUBLE || type == TSDB_DATA_TYPE_FLOAT) {
|
||||
return false;
|
||||
} else if (IS_UNSIGNED_NUMERIC_TYPE(type)) {
|
||||
uint64_t minv = 0, maxv = 0;
|
||||
GET_TYPED_DATA(minv, uint64_t, type, minval);
|
||||
GET_TYPED_DATA(maxv, uint64_t, type, maxval);
|
||||
if (minv == maxv) {
|
||||
return NULL != taosHashGet((SHashObj *)pFilter->q, (char *)&minv, sizeof(minv));
|
||||
}
|
||||
return false;
|
||||
}else if (type == TSDB_DATA_TYPE_DOUBLE || type == TSDB_DATA_TYPE_FLOAT) {
|
||||
double v;
|
||||
GET_TYPED_DATA(v, double, type, minval);
|
||||
return NULL != taosHashGet((SHashObj *)pFilter->q, (char *)&v, sizeof(v));
|
||||
|
|
|
|||
1274
src/query/src/sql.c
1274
src/query/src/sql.c
File diff suppressed because it is too large
Load Diff
|
|
@ -3355,11 +3355,16 @@ static bool tableFilterFp(const void* pNode, void* param) {
|
|||
}
|
||||
} else if (pInfo->optr == TSDB_RELATION_IN) {
|
||||
int type = pInfo->sch.type;
|
||||
if (type == TSDB_DATA_TYPE_BOOL || type == TSDB_DATA_TYPE_TINYINT || type == TSDB_DATA_TYPE_SMALLINT || type == TSDB_DATA_TYPE_BIGINT || type == TSDB_DATA_TYPE_INT) {
|
||||
if (type == TSDB_DATA_TYPE_BOOL || IS_SIGNED_NUMERIC_TYPE(type) || type == TSDB_DATA_TYPE_TIMESTAMP) {
|
||||
int64_t v;
|
||||
GET_TYPED_DATA(v, int64_t, pInfo->sch.type, val);
|
||||
return NULL != taosHashGet((SHashObj *)pInfo->q, (char *)&v, sizeof(v));
|
||||
} else if (type == TSDB_DATA_TYPE_DOUBLE || type == TSDB_DATA_TYPE_DOUBLE) {
|
||||
} else if (IS_UNSIGNED_NUMERIC_TYPE(type)) {
|
||||
uint64_t v;
|
||||
GET_TYPED_DATA(v, uint64_t, pInfo->sch.type, val);
|
||||
return NULL != taosHashGet((SHashObj *)pInfo->q, (char *)&v, sizeof(v));
|
||||
}
|
||||
else if (type == TSDB_DATA_TYPE_DOUBLE || type == TSDB_DATA_TYPE_DOUBLE) {
|
||||
double v;
|
||||
GET_TYPED_DATA(v, double, pInfo->sch.type, val);
|
||||
return NULL != taosHashGet((SHashObj *)pInfo->q, (char *)&v, sizeof(v));
|
||||
|
|
|
|||
|
|
@ -9,11 +9,15 @@
|
|||
<version>SNAPSHOT</version>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<properties>
|
||||
<project.assembly.dir>src/main/resources/assembly</project.assembly.dir>
|
||||
</properties>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>com.taosdata.jdbc</groupId>
|
||||
<artifactId>taos-jdbcdriver</artifactId>
|
||||
<version>2.0.22</version>
|
||||
<version>2.0.30</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
|
|
@ -22,20 +26,60 @@
|
|||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-assembly-plugin</artifactId>
|
||||
<version>3.1.0</version>
|
||||
<configuration>
|
||||
<archive>
|
||||
<manifest>
|
||||
<mainClass>com.taosdata.example.JDBCDemo</mainClass>
|
||||
</manifest>
|
||||
</archive>
|
||||
<descriptorRefs>
|
||||
<descriptorRef>jar-with-dependencies</descriptorRef>
|
||||
</descriptorRefs>
|
||||
</configuration>
|
||||
<version>3.3.0</version>
|
||||
<executions>
|
||||
<!-- jdbcDemo -->
|
||||
<execution>
|
||||
<id>make-assembly</id>
|
||||
<id>JdbcDemo</id>
|
||||
<configuration>
|
||||
<finalName>JdbcDemo</finalName>
|
||||
<archive>
|
||||
<manifest>
|
||||
<mainClass>com.taosdata.example.JdbcDemo</mainClass>
|
||||
</manifest>
|
||||
</archive>
|
||||
<descriptorRefs>
|
||||
<descriptorRef>jar-with-dependencies</descriptorRef>
|
||||
</descriptorRefs>
|
||||
</configuration>
|
||||
<phase>package</phase>
|
||||
<goals>
|
||||
<goal>single</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
|
||||
<execution>
|
||||
<id>JdbcRestfulDemo</id>
|
||||
<configuration>
|
||||
<finalName>JdbcRestfulDemo</finalName>
|
||||
<archive>
|
||||
<manifest>
|
||||
<mainClass>com.taosdata.example.JdbcRestfulDemo</mainClass>
|
||||
</manifest>
|
||||
</archive>
|
||||
<descriptorRefs>
|
||||
<descriptorRef>jar-with-dependencies</descriptorRef>
|
||||
</descriptorRefs>
|
||||
</configuration>
|
||||
<phase>package</phase>
|
||||
<goals>
|
||||
<goal>single</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
|
||||
<execution>
|
||||
<id>SubscribeDemo</id>
|
||||
<configuration>
|
||||
<finalName>SubscribeDemo</finalName>
|
||||
<archive>
|
||||
<manifest>
|
||||
<mainClass>com.taosdata.example.SubscribeDemo</mainClass>
|
||||
</manifest>
|
||||
</archive>
|
||||
<descriptorRefs>
|
||||
<descriptorRef>jar-with-dependencies</descriptorRef>
|
||||
</descriptorRefs>
|
||||
</configuration>
|
||||
<phase>package</phase>
|
||||
<goals>
|
||||
<goal>single</goal>
|
||||
|
|
|
|||
|
|
@ -11,12 +11,12 @@ Download the tdengine package on our website: ``https://www.taosdata.com/cn/all-
|
|||
## Run jdbcDemo using mvn plugin
|
||||
run command:
|
||||
```
|
||||
mvn clean compile exec:java -Dexec.mainClass="com.taosdata.example.JDBCDemo"
|
||||
mvn clean compile exec:java -Dexec.mainClass="com.taosdata.example.JdbcDemo"
|
||||
```
|
||||
|
||||
and run with your customed args
|
||||
```
|
||||
mvn clean compile exec:java -Dexec.mainClass="com.taosdata.example.JDBCDemo" -Dexec.args="-host [HOSTNAME]"
|
||||
mvn clean compile exec:java -Dexec.mainClass="com.taosdata.example.JdbcDemo" -Dexec.args="-host [HOSTNAME]"
|
||||
```
|
||||
|
||||
## Compile the Demo Code and Run It
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ package com.taosdata.example;
|
|||
import java.sql.*;
|
||||
import java.util.Properties;
|
||||
|
||||
public class JDBCDemo {
|
||||
public class JdbcDemo {
|
||||
private static String host;
|
||||
private static final String dbName = "test";
|
||||
private static final String tbName = "weather";
|
||||
|
|
@ -17,7 +17,7 @@ public class JDBCDemo {
|
|||
if (host == null) {
|
||||
printHelp();
|
||||
}
|
||||
JDBCDemo demo = new JDBCDemo();
|
||||
JdbcDemo demo = new JdbcDemo();
|
||||
demo.init();
|
||||
demo.createDatabase();
|
||||
demo.useDatabase();
|
||||
|
|
@ -4,7 +4,7 @@ import java.sql.*;
|
|||
import java.util.Properties;
|
||||
|
||||
public class JdbcRestfulDemo {
|
||||
private static final String host = "master";
|
||||
private static final String host = "127.0.0.1";
|
||||
|
||||
public static void main(String[] args) {
|
||||
try {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,210 @@
|
|||
# #################################################################
|
||||
# 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 -*-
|
||||
|
||||
# TODO: after TD-4518 and TD-4510 is resolved, add the exception test case for these situations
|
||||
|
||||
import sys
|
||||
from util.log import *
|
||||
from util.cases import *
|
||||
from util.sql import *
|
||||
import time
|
||||
from datetime import datetime
|
||||
import os
|
||||
|
||||
|
||||
class TDTestCase:
|
||||
def init(self, conn, logSql):
|
||||
tdLog.debug("start to execute %s" % __file__)
|
||||
tdSql.init(conn.cursor(), logSql)
|
||||
|
||||
def run(self):
|
||||
tdSql.prepare()
|
||||
tdSql.execute('reset query cache')
|
||||
tdSql.execute('drop database if exists db')
|
||||
tdSql.execute('create database db precision "ns";')
|
||||
tdSql.query('show databases;')
|
||||
tdSql.checkData(0,16,'ns')
|
||||
tdSql.execute('use db')
|
||||
|
||||
tdLog.debug('testing nanosecond support in 1st timestamp')
|
||||
tdSql.execute('create table tb (ts timestamp, speed int)')
|
||||
tdSql.execute('insert into tb values(\'2021-06-10 0:00:00.100000001\', 1);')
|
||||
tdSql.execute('insert into tb values(1623254400150000000, 2);')
|
||||
tdSql.execute('import into tb values(1623254400300000000, 3);')
|
||||
tdSql.execute('import into tb values(1623254400299999999, 4);')
|
||||
tdSql.execute('insert into tb values(1623254400300000001, 5);')
|
||||
tdSql.execute('insert into tb values(1623254400999999999, 7);')
|
||||
|
||||
|
||||
tdSql.query('select * from tb;')
|
||||
tdSql.checkData(0,0,'2021-06-10 0:00:00.100000001')
|
||||
tdSql.checkData(1,0,'2021-06-10 0:00:00.150000000')
|
||||
tdSql.checkData(2,0,'2021-06-10 0:00:00.299999999')
|
||||
tdSql.checkData(3,1,3)
|
||||
tdSql.checkData(4,1,5)
|
||||
tdSql.checkData(5,1,7)
|
||||
tdSql.checkRows(6)
|
||||
tdSql.query('select count(*) from tb where ts > 1623254400100000000 and ts < 1623254400100000002;')
|
||||
tdSql.checkData(0,0,1)
|
||||
tdSql.query('select count(*) from tb where ts > \'2021-06-10 0:00:00.100000001\' and ts < \'2021-06-10 0:00:00.160000000\';')
|
||||
tdSql.checkData(0,0,1)
|
||||
|
||||
tdSql.query('select count(*) from tb where ts > 1623254400100000000 and ts < 1623254400150000000;')
|
||||
tdSql.checkData(0,0,1)
|
||||
tdSql.query('select count(*) from tb where ts > \'2021-06-10 0:00:00.100000000\' and ts < \'2021-06-10 0:00:00.150000000\';')
|
||||
tdSql.checkData(0,0,1)
|
||||
|
||||
tdSql.query('select count(*) from tb where ts > 1623254400400000000;')
|
||||
tdSql.checkData(0,0,1)
|
||||
tdSql.query('select count(*) from tb where ts < \'2021-06-10 00:00:00.400000000\';')
|
||||
tdSql.checkData(0,0,5)
|
||||
|
||||
tdSql.query('select count(*) from tb where ts > now + 400000000b;')
|
||||
tdSql.checkRows(0)
|
||||
|
||||
tdSql.query('select count(*) from tb where ts >= \'2021-06-10 0:00:00.100000001\';')
|
||||
tdSql.checkData(0,0,6)
|
||||
|
||||
tdSql.query('select count(*) from tb where ts <= 1623254400300000000;')
|
||||
tdSql.checkData(0,0,4)
|
||||
|
||||
tdSql.query('select count(*) from tb where ts = \'2021-06-10 0:00:00.000000000\';')
|
||||
tdSql.checkRows(0)
|
||||
|
||||
tdSql.query('select count(*) from tb where ts = 1623254400150000000;')
|
||||
tdSql.checkData(0,0,1)
|
||||
|
||||
tdSql.query('select count(*) from tb where ts = \'2021-06-10 0:00:00.100000001\';')
|
||||
tdSql.checkData(0,0,1)
|
||||
|
||||
tdSql.query('select count(*) from tb where ts between 1623254400000000000 and 1623254400400000000;')
|
||||
tdSql.checkData(0,0,5)
|
||||
|
||||
tdSql.query('select count(*) from tb where ts between \'2021-06-10 0:00:00.299999999\' and \'2021-06-10 0:00:00.300000001\';')
|
||||
tdSql.checkData(0,0,3)
|
||||
|
||||
tdSql.query('select avg(speed) from tb interval(5000000000b);')
|
||||
tdSql.checkRows(1)
|
||||
|
||||
tdSql.query('select avg(speed) from tb interval(100000000b)')
|
||||
tdSql.checkRows(4)
|
||||
|
||||
tdSql.query('select avg(speed) from tb interval(100000000b) sliding (100000000b);')
|
||||
tdSql.checkRows(4)
|
||||
|
||||
tdSql.query('select last(*) from tb')
|
||||
tdSql.checkData(0,0, '2021-06-10 0:00:00.999999999')
|
||||
tdSql.checkData(0,0, 1623254400999999999)
|
||||
|
||||
tdSql.query('select first(*) from tb')
|
||||
tdSql.checkData(0,0, 1623254400100000001)
|
||||
tdSql.checkData(0,0, '2021-06-10 0:00:00.100000001')
|
||||
|
||||
tdSql.execute('insert into tb values(now + 500000000b, 6);')
|
||||
tdSql.query('select * from tb;')
|
||||
tdSql.checkRows(7)
|
||||
|
||||
tdLog.debug('testing nanosecond support in other timestamps')
|
||||
tdSql.execute('create table tb2 (ts timestamp, speed int, ts2 timestamp);')
|
||||
tdSql.execute('insert into tb2 values(\'2021-06-10 0:00:00.100000001\', 1, \'2021-06-11 0:00:00.100000001\');')
|
||||
tdSql.execute('insert into tb2 values(1623254400150000000, 2, 1623340800150000000);')
|
||||
tdSql.execute('import into tb2 values(1623254400300000000, 3, 1623340800300000000);')
|
||||
tdSql.execute('import into tb2 values(1623254400299999999, 4, 1623340800299999999);')
|
||||
tdSql.execute('insert into tb2 values(1623254400300000001, 5, 1623340800300000001);')
|
||||
tdSql.execute('insert into tb2 values(1623254400999999999, 7, 1623513600999999999);')
|
||||
|
||||
tdSql.query('select * from tb2;')
|
||||
tdSql.checkData(0,0,'2021-06-10 0:00:00.100000001')
|
||||
tdSql.checkData(1,0,'2021-06-10 0:00:00.150000000')
|
||||
tdSql.checkData(2,1,4)
|
||||
tdSql.checkData(3,1,3)
|
||||
tdSql.checkData(4,2,'2021-06-11 00:00:00.300000001')
|
||||
tdSql.checkData(5,2,'2021-06-13 00:00:00.999999999')
|
||||
tdSql.checkRows(6)
|
||||
tdSql.query('select count(*) from tb2 where ts2 > 1623340800000000000 and ts2 < 1623340800150000000;')
|
||||
tdSql.checkData(0,0,1)
|
||||
tdSql.query('select count(*) from tb2 where ts2 > \'2021-06-11 0:00:00.100000000\' and ts2 < \'2021-06-11 0:00:00.100000002\';')
|
||||
tdSql.checkData(0,0,1)
|
||||
|
||||
tdSql.query('select count(*) from tb2 where ts2 > 1623340800500000000;')
|
||||
tdSql.checkData(0,0,1)
|
||||
tdSql.query('select count(*) from tb2 where ts2 < \'2021-06-11 0:00:00.400000000\';')
|
||||
tdSql.checkData(0,0,5)
|
||||
|
||||
tdSql.query('select count(*) from tb2 where ts2 > now + 400000000b;')
|
||||
tdSql.checkRows(0)
|
||||
|
||||
tdSql.query('select count(*) from tb2 where ts2 >= \'2021-06-11 0:00:00.100000001\';')
|
||||
tdSql.checkData(0,0,6)
|
||||
|
||||
tdSql.query('select count(*) from tb2 where ts2 <= 1623340800400000000;')
|
||||
tdSql.checkData(0,0,5)
|
||||
|
||||
tdSql.query('select count(*) from tb2 where ts2 = \'2021-06-11 0:00:00.000000000\';')
|
||||
tdSql.checkRows(0)
|
||||
|
||||
tdSql.query('select count(*) from tb2 where ts2 = \'2021-06-11 0:00:00.300000001\';')
|
||||
tdSql.checkData(0,0,1)
|
||||
|
||||
tdSql.query('select count(*) from tb2 where ts2 = 1623340800300000001;')
|
||||
tdSql.checkData(0,0,1)
|
||||
|
||||
tdSql.query('select count(*) from tb2 where ts2 between 1623340800000000000 and 1623340800450000000;')
|
||||
tdSql.checkData(0,0,5)
|
||||
|
||||
tdSql.query('select count(*) from tb2 where ts2 between \'2021-06-11 0:00:00.299999999\' and \'2021-06-11 0:00:00.300000001\';')
|
||||
tdSql.checkData(0,0,3)
|
||||
|
||||
tdSql.query('select count(*) from tb2 where ts2 <> 1623513600999999999;')
|
||||
tdSql.checkData(0,0,5)
|
||||
|
||||
tdSql.query('select count(*) from tb2 where ts2 <> \'2021-06-11 0:00:00.100000001\';')
|
||||
tdSql.checkData(0,0,5)
|
||||
|
||||
tdSql.query('select count(*) from tb2 where ts2 <> \'2021-06-11 0:00:00.100000000\';')
|
||||
tdSql.checkData(0,0,6)
|
||||
|
||||
tdSql.query('select count(*) from tb2 where ts2 != 1623513600999999999;')
|
||||
tdSql.checkData(0,0,5)
|
||||
|
||||
tdSql.query('select count(*) from tb2 where ts2 != \'2021-06-11 0:00:00.100000001\';')
|
||||
tdSql.checkData(0,0,5)
|
||||
|
||||
tdSql.query('select count(*) from tb2 where ts2 != \'2021-06-11 0:00:00.100000000\';')
|
||||
tdSql.checkData(0,0,6)
|
||||
|
||||
tdSql.execute('insert into tb2 values(now + 500000000b, 6, now +2d);')
|
||||
tdSql.query('select * from tb2;')
|
||||
tdSql.checkRows(7)
|
||||
|
||||
tdLog.debug('testing ill nanosecond format handling')
|
||||
tdSql.execute('create table tb3 (ts timestamp, speed int);')
|
||||
|
||||
tdSql.error('insert into tb3 values(16232544001500000, 2);')
|
||||
tdSql.execute('insert into tb3 values(\'2021-06-10 0:00:00.123456\', 2);')
|
||||
tdSql.query('select * from tb3 where ts = \'2021-06-10 0:00:00.123456000\';')
|
||||
tdSql.checkRows(1)
|
||||
|
||||
tdSql.execute('insert into tb3 values(\'2021-06-10 0:00:00.123456789000\', 2);')
|
||||
tdSql.query('select * from tb3 where ts = \'2021-06-10 0:00:00.123456789\';')
|
||||
tdSql.checkRows(1)
|
||||
|
||||
os.system('sudo timedatectl set-ntp on')
|
||||
|
||||
def stop(self):
|
||||
tdSql.close()
|
||||
tdLog.success("%s successfully executed" % __file__)
|
||||
|
||||
|
||||
tdCases.addWindows(__file__, TDTestCase())
|
||||
tdCases.addLinux(__file__, TDTestCase())
|
||||
|
|
@ -73,8 +73,10 @@ python3 ./test.py -f tag_lite/int.py
|
|||
python3 ./test.py -f tag_lite/set.py
|
||||
python3 ./test.py -f tag_lite/smallint.py
|
||||
python3 ./test.py -f tag_lite/tinyint.py
|
||||
python3 ./test.py -f tag_lite/timestamp.py
|
||||
|
||||
#python3 ./test.py -f dbmgmt/database-name-boundary.py
|
||||
python3 test.py -f dbmgmt/nanoSecondCheck.py
|
||||
|
||||
python3 ./test.py -f import_merge/importBlock1HO.py
|
||||
python3 ./test.py -f import_merge/importBlock1HPO.py
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ import taos
|
|||
from util.log import *
|
||||
from util.cases import *
|
||||
from util.sql import *
|
||||
import numpy as np
|
||||
#import numpy as np
|
||||
|
||||
|
||||
class TDTestCase:
|
||||
|
|
|
|||
|
|
@ -51,38 +51,73 @@ class TDTestCase:
|
|||
tdSql.checkRows(15)
|
||||
tdSql.checkData(0, 1, 2)
|
||||
|
||||
# session(ts,5a) main query
|
||||
tdSql.query("select count(*) from (select * from dev_001) session(ts,5a)")
|
||||
tdSql.checkRows(15)
|
||||
tdSql.checkData(0, 1, 2)
|
||||
|
||||
|
||||
# session(ts,1s)
|
||||
tdSql.query("select count(*) from dev_001 session(ts,1s)")
|
||||
tdSql.checkRows(12)
|
||||
tdSql.checkData(0, 1, 5)
|
||||
|
||||
# session(ts,1s) main query
|
||||
tdSql.query("select count(*) from (select * from dev_001) session(ts,1s)")
|
||||
tdSql.checkRows(12)
|
||||
tdSql.checkData(0, 1, 5)
|
||||
|
||||
tdSql.query("select count(*) from dev_001 session(ts,1000a)")
|
||||
tdSql.checkRows(12)
|
||||
tdSql.checkData(0, 1, 5)
|
||||
|
||||
tdSql.query("select count(*) from (select * from dev_001) session(ts,1000a)")
|
||||
tdSql.checkRows(12)
|
||||
tdSql.checkData(0, 1, 5)
|
||||
|
||||
# session(ts,1m)
|
||||
tdSql.query("select count(*) from dev_001 session(ts,1m)")
|
||||
tdSql.checkRows(9)
|
||||
tdSql.checkData(0, 1, 8)
|
||||
|
||||
# session(ts,1m)
|
||||
tdSql.query("select count(*) from (select * from dev_001) session(ts,1m)")
|
||||
tdSql.checkRows(9)
|
||||
tdSql.checkData(0, 1, 8)
|
||||
|
||||
# session(ts,1h)
|
||||
tdSql.query("select count(*) from dev_001 session(ts,1h)")
|
||||
tdSql.checkRows(6)
|
||||
tdSql.checkData(0, 1, 11)
|
||||
|
||||
# session(ts,1h)
|
||||
tdSql.query("select count(*) from (select * from dev_001) session(ts,1h)")
|
||||
tdSql.checkRows(6)
|
||||
tdSql.checkData(0, 1, 11)
|
||||
|
||||
# session(ts,1d)
|
||||
tdSql.query("select count(*) from dev_001 session(ts,1d)")
|
||||
tdSql.checkRows(4)
|
||||
tdSql.checkData(0, 1, 13)
|
||||
|
||||
# session(ts,1d)
|
||||
tdSql.query("select count(*) from (select * from dev_001) session(ts,1d)")
|
||||
tdSql.checkRows(4)
|
||||
tdSql.checkData(0, 1, 13)
|
||||
|
||||
# session(ts,1w)
|
||||
tdSql.query("select count(*) from dev_001 session(ts,1w)")
|
||||
tdSql.checkRows(2)
|
||||
tdSql.checkData(0, 1, 15)
|
||||
|
||||
# session(ts,1w)
|
||||
tdSql.query("select count(*) from (select * from dev_001) session(ts,1w)")
|
||||
tdSql.checkRows(2)
|
||||
tdSql.checkData(0, 1, 15)
|
||||
|
||||
# session with where
|
||||
tdSql.query("select count(*),first(tagtype),last(tagtype),avg(tagtype),sum(tagtype),min(tagtype),max(tagtype),leastsquares(tagtype, 1, 1),spread(tagtype),stddev(tagtype),percentile(tagtype,0) from dev_001 where ts <'2020-05-20 0:0:0' session(ts,1d)")
|
||||
|
||||
tdSql.checkRows(2)
|
||||
tdSql.checkData(0, 1, 13)
|
||||
tdSql.checkData(0, 2, 1)
|
||||
|
|
@ -97,6 +132,20 @@ class TDTestCase:
|
|||
tdSql.checkData(0, 11, 1)
|
||||
tdSql.checkData(1, 11, 14)
|
||||
|
||||
# session with where main
|
||||
|
||||
tdSql.query("select count(*),first(tagtype),last(tagtype),avg(tagtype),sum(tagtype),min(tagtype),max(tagtype),leastsquares(tagtype, 1, 1) from (select * from dev_001 where ts <'2020-05-20 0:0:0') session(ts,1d)")
|
||||
|
||||
tdSql.checkRows(2)
|
||||
tdSql.checkData(0, 1, 13)
|
||||
tdSql.checkData(0, 2, 1)
|
||||
tdSql.checkData(0, 3, 13)
|
||||
tdSql.checkData(0, 4, 7)
|
||||
tdSql.checkData(0, 5, 91)
|
||||
tdSql.checkData(0, 6, 1)
|
||||
tdSql.checkData(0, 7, 13)
|
||||
tdSql.checkData(0, 8, '{slop:1.000000, intercept:0.000000}')
|
||||
|
||||
# tdsql err
|
||||
tdSql.error("select * from dev_001 session(ts,1w)")
|
||||
tdSql.error("select count(*) from st session(ts,1w)")
|
||||
|
|
|
|||
|
|
@ -0,0 +1,102 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
|
||||
import sys
|
||||
from util.log import *
|
||||
from util.cases import *
|
||||
from util.sql import *
|
||||
|
||||
|
||||
class TDTestCase:
|
||||
def init(self, conn, logSql):
|
||||
tdLog.debug("start to execute %s" % __file__)
|
||||
tdSql.init(conn.cursor(), logSql)
|
||||
|
||||
def run(self):
|
||||
tdSql.prepare()
|
||||
|
||||
tdLog.info('======================== dnode1 start')
|
||||
tbPrefix = "ta_fl_tb"
|
||||
mtPrefix = "ta_fl_mt"
|
||||
tbNum = 10
|
||||
rowNum = 20
|
||||
totalNum = 200
|
||||
tdLog.info('=============== step1')
|
||||
i = 0
|
||||
mt = "%s%d" % (mtPrefix, i)
|
||||
tdSql.execute(
|
||||
'create table %s (ts timestamp, tbcol int) TAGS(tgcol float, tgTs timestamp, tgcol2 int)' %(mt))
|
||||
i = 0
|
||||
ts = 1605045600000
|
||||
tsStr = "2020-11-11 06:00:00"
|
||||
while (i < 5):
|
||||
tb = "%s%d" % (tbPrefix, i)
|
||||
tdLog.info('create table %s using %s tags(%d, %d, %d)' % (tb, mt, i, ts + i, i))
|
||||
tdSql.execute('create table %s using %s tags(%d, %d, %d)' % (tb, mt, i, ts + i, i))
|
||||
x = 0
|
||||
while (x < rowNum):
|
||||
ms = x * 60000
|
||||
#tdLog.info(
|
||||
# "insert into %s values (%d, %d)" %
|
||||
# (tb, 1605045600000 + ms, x))
|
||||
tdSql.execute(
|
||||
"insert into %s values (%d, %d)" %
|
||||
(tb, 1605045600000 + ms, x))
|
||||
x = x + 1
|
||||
i = i + 1
|
||||
tdLog.info('=============== step2')
|
||||
tdSql.query('select * from %s' % (mt))
|
||||
tdSql.checkRows(5 * rowNum)
|
||||
|
||||
tdSql.query('select * from %s where tgTs = %ld and tgcol2 = 0' % (mt, ts))
|
||||
tdSql.checkRows(rowNum)
|
||||
|
||||
tdSql.query('select * from %s where tgTs = \"%s\" and tgcol2 = 0' % (mt, tsStr))
|
||||
tdSql.checkRows(rowNum)
|
||||
|
||||
tdLog.info('=============== step3')
|
||||
i = 0
|
||||
while (i < 5):
|
||||
tb = "%s%d" % (tbPrefix, i + 100)
|
||||
tdLog.info('create table %s using %s tags(%d, \"%s\", %d)' % (tb, mt, i + 100, tsStr, i + 100))
|
||||
tdSql.execute('create table %s using %s tags(%d, \"%s\", %d)' % (tb, mt, i + 100, tsStr, i + 100))
|
||||
x = 0
|
||||
while (x < rowNum):
|
||||
ms = x * 60000
|
||||
#tdLog.info(
|
||||
# "insert into %s values (%d, %d)" %
|
||||
# (tb, 1605045600000 + ms, x))
|
||||
tdSql.execute(
|
||||
"insert into %s values (%d, %d)" %
|
||||
(tb, 1605045600000 + ms, x))
|
||||
x = x + 1
|
||||
i = i + 1
|
||||
|
||||
tdSql.query('select * from %s where tgTs = %ld and tgcol2 = 100' % (mt, ts))
|
||||
tdSql.checkRows(rowNum)
|
||||
|
||||
tdSql.query('select * from %s where tgTs = \"%s\" and tgcol2 = 100' % (mt, tsStr))
|
||||
tdSql.checkRows(rowNum)
|
||||
|
||||
tdLog.info('=============== step4')
|
||||
|
||||
i = 0
|
||||
tb = "%s%d"%(tbPrefix, i + 1000)
|
||||
tdSql.execute('insert into %s using %s tags(%d, \"%s\", %d) values(now, 10)' % (tb, mt, i + 100, tsStr, i + 1000))
|
||||
tdSql.execute('insert into %s using %s tags(%d, \"%s\", %d) values(now+2s, 10)' % (tb, mt, i + 100, tsStr, i + 1000))
|
||||
tdSql.execute('insert into %s using %s tags(%d, \"%s\", %d) values(now+3s, 10)' % (tb, mt, i + 100, tsStr, i + 1000))
|
||||
tdSql.query('select * from %s where tgTs = \"%s\" and tgcol2 = 1000' % (mt, tsStr))
|
||||
tdSql.checkRows(3)
|
||||
|
||||
i = 0
|
||||
tb = "%s%d"%(tbPrefix, i + 10000)
|
||||
tdSql.execute('create table %s using %s tags(%d, now, %d)' % (tb, mt, i + 10000,i + 10000))
|
||||
tdSql.checkRows(3)
|
||||
|
||||
|
||||
def stop(self):
|
||||
tdSql.close()
|
||||
tdLog.success("%s successfully executed" % __file__)
|
||||
|
||||
|
||||
tdCases.addWindows(__file__, TDTestCase())
|
||||
tdCases.addLinux(__file__, TDTestCase())
|
||||
|
|
@ -159,4 +159,4 @@ if $rows != 0 then
|
|||
return -1
|
||||
endi
|
||||
|
||||
system sh/exec.sh -n dnode1 -s stop -x SIGINT
|
||||
system sh/exec.sh -n dnode1 -s stop -x SIGINT
|
||||
|
|
|
|||
|
|
@ -0,0 +1,166 @@
|
|||
system sh/stop_dnodes.sh
|
||||
system sh/deploy.sh -n dnode1 -i 1
|
||||
system sh/cfg.sh -n dnode1 -c walLevel -v 1
|
||||
system sh/exec.sh -n dnode1 -s start
|
||||
|
||||
sleep 2000
|
||||
sql connect
|
||||
print ======================== dnode1 start
|
||||
|
||||
$dbPrefix = db
|
||||
$tbPrefix = tb
|
||||
$mtPrefix = st
|
||||
$tbNum = 10
|
||||
$rowNum = 20
|
||||
$totalNum = 200
|
||||
|
||||
print =============== step1
|
||||
$i = 0
|
||||
$db = $dbPrefix . $i
|
||||
$mt = $mtPrefix . $i
|
||||
|
||||
sql create database $db
|
||||
sql use $db
|
||||
sql create table $mt (ts timestamp, tbcol bigint unsigned) TAGS(tgcol bigint unsigned)
|
||||
|
||||
$i = 0
|
||||
while $i < 5
|
||||
$tb = $tbPrefix . $i
|
||||
sql create table $tb using $mt tags( 0 )
|
||||
sql create table $tb using $mt tags( -111 )
|
||||
$x = 0
|
||||
while $x < $rowNum
|
||||
$ms = $x . m
|
||||
sql insert into $tb values (now + $ms , 0 )
|
||||
$x = $x + 1
|
||||
sql_error insert into $tb values (now + $ms , -10)
|
||||
sql_error insert into $tb values (now + $ms , -1000)
|
||||
sql_error insert into $tb values (now + $ms , -10000000)
|
||||
endw
|
||||
$i = $i + 1
|
||||
endw
|
||||
while $i < 10
|
||||
$tb = $tbPrefix . $i
|
||||
sql create table $tb using $mt tags( 1 )
|
||||
$x = 0
|
||||
while $x < $rowNum
|
||||
$ms = $x . m
|
||||
sql insert into $tb values (now + $ms , 1 )
|
||||
$x = $x + 1
|
||||
endw
|
||||
$i = $i + 1
|
||||
endw
|
||||
|
||||
print =============== step2
|
||||
sql select * from $mt where tbcol = 0
|
||||
if $rows != 100 then
|
||||
return -1
|
||||
endi
|
||||
sql select * from $mt where tbcol <> 0
|
||||
if $rows != 100 then
|
||||
return -1
|
||||
endi
|
||||
sql select * from $mt where tbcol = 1
|
||||
if $rows != 100 then
|
||||
return -1
|
||||
endi
|
||||
sql select * from $mt where tbcol <> 1
|
||||
if $rows != 100 then
|
||||
return -1
|
||||
endi
|
||||
sql select * from $mt where tbcol = 1
|
||||
if $rows != 100 then
|
||||
return -1
|
||||
endi
|
||||
sql select * from $mt where tbcol <> 1
|
||||
if $rows != 100 then
|
||||
return -1
|
||||
endi
|
||||
sql select * from $mt where tbcol = 0
|
||||
if $rows != 100 then
|
||||
return -1
|
||||
endi
|
||||
sql select * from $mt where tbcol <> 0
|
||||
if $rows != 100 then
|
||||
return -1
|
||||
endi
|
||||
|
||||
print =============== step3
|
||||
sql select * from $mt where ts > now + 4m and tbcol = 1
|
||||
if $rows != 75 then
|
||||
return -1
|
||||
endi
|
||||
sql select * from $mt where ts > now + 4m and tbcol <> 1
|
||||
if $rows != 75 then
|
||||
return -1
|
||||
endi
|
||||
sql select * from $mt where ts < now + 4m and tbcol = 0
|
||||
if $rows != 25 then
|
||||
return -1
|
||||
endi
|
||||
sql select * from $mt where ts < now + 4m and tbcol <> 0
|
||||
if $rows != 25 then
|
||||
return -1
|
||||
endi
|
||||
sql select * from $mt where ts <= now + 4m and tbcol = 0
|
||||
if $rows != 25 then
|
||||
return -1
|
||||
endi
|
||||
sql select * from $mt where ts <= now + 4m and tbcol <> 0
|
||||
if $rows != 25 then
|
||||
return -1
|
||||
endi
|
||||
sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol <> 0
|
||||
if $rows != 5 then
|
||||
return -1
|
||||
endi
|
||||
sql select * from $mt where ts > now + 4m and tbcol <> 0 and ts < now + 5m
|
||||
if $rows != 5 then
|
||||
return -1
|
||||
endi
|
||||
|
||||
print =============== step4
|
||||
sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
|
||||
print $data00 $data01 $data02 $data03 $data04 $data05 $data06
|
||||
if $data00 != 200 then
|
||||
return -1
|
||||
endi
|
||||
|
||||
print =============== step5
|
||||
sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = 1
|
||||
print $data00 $data01 $data02 $data03 $data04 $data05 $data06
|
||||
if $data00 != 100 then
|
||||
return -1
|
||||
endi
|
||||
|
||||
print =============== step6
|
||||
sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = 1 group by tgcol
|
||||
print $data00 $data01 $data02 $data03 $data04 $data05 $data06
|
||||
print $data10 $data11 $data12 $data13 $data14 $data15 $data16
|
||||
if $data00 != 100 then
|
||||
print expect 100, actual $data00
|
||||
return -1
|
||||
endi
|
||||
|
||||
print =============== step7
|
||||
sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tbcol = 1 group by tgcol
|
||||
print $data00 $data01 $data02 $data03 $data04 $data05 $data06
|
||||
if $data00 != 25 then
|
||||
return -1
|
||||
endi
|
||||
|
||||
print =============== step8
|
||||
sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = 1 interval(1d) group by tgcol order by tgcol desc
|
||||
print $data00 $data01 $data02 $data03 $data04 $data05 $data06
|
||||
if $data01 != 100 then
|
||||
return -1
|
||||
endi
|
||||
|
||||
print =============== clear
|
||||
sql drop database $db
|
||||
sql show databases
|
||||
if $rows != 0 then
|
||||
return -1
|
||||
endi
|
||||
|
||||
system sh/exec.sh -n dnode1 -s stop -x SIGINT
|
||||
|
|
@ -99,7 +99,7 @@ $i_binary2 = varchar(20) # illegal string
|
|||
$i_bool = boolean
|
||||
$nchar = nchar # nchar with unspecified length
|
||||
print ========== create_mt.sim case4: illegal data types in tags test
|
||||
sql_error create table $mt (ts timestamp, col int) tags (tag1 timestamp )
|
||||
##sql_error create table $mt (ts timestamp, col int) tags (tag1 timestamp )
|
||||
sql_error create table $mt (ts timestamp, col int) tags (tag1 $i_ts )
|
||||
sql_error create table $mt (ts timestamp, col int) tags (tag1 $i_binary )
|
||||
sql_error create table $mt (ts timestamp, col int) tags (tag1 $i_bigint )
|
||||
|
|
@ -253,4 +253,4 @@ if $rows != 0 then
|
|||
return -1
|
||||
endi
|
||||
|
||||
system sh/exec.sh -n dnode1 -s stop -x SIGINT
|
||||
system sh/exec.sh -n dnode1 -s stop -x SIGINT
|
||||
|
|
|
|||
|
|
@ -70,4 +70,17 @@ sleep 100
|
|||
|
||||
run general/parser/lastrow_query.sim
|
||||
|
||||
system sh/exec.sh -n dnode1 -s stop -x SIGINT
|
||||
print =================== last_row + nested query
|
||||
sql use $db
|
||||
sql create table lr_nested(ts timestamp, f int)
|
||||
sql insert into lr_nested values(now, 1)
|
||||
sql insert into lr_nested values(now+1s, null)
|
||||
sql select last_row(*) from (select * from lr_nested)
|
||||
if $rows != 1 then
|
||||
return -1
|
||||
endi
|
||||
if $data01 != NULL then
|
||||
return -1
|
||||
endi
|
||||
|
||||
system sh/exec.sh -n dnode1 -s stop -x SIGINT
|
||||
|
|
|
|||
|
|
@ -155,8 +155,8 @@ sql_error select last(*) from wh_mt1_tb1 where c6 in ('1')
|
|||
#sql_error select last(*) from wh_mt1_tb1 where c7 in ('binary')
|
||||
#sql_error select last(*) from wh_mt1 where c8 in ('nchar')
|
||||
#sql_error select last(*) from wh_mt1_tb1 where c9 in (true, false)
|
||||
sql_error select last(*) from wh_mt1 where c10 in ('2019-01-01 00:00:00.000')
|
||||
sql_error select last(*) from wh_mt1_tb1 where c10 in ('2019-01-01 00:00:00.000')
|
||||
#sql_error select last(*) from wh_mt1 where c10 in ('2019-01-01 00:00:00.000')
|
||||
#sql_error select last(*) from wh_mt1_tb1 where c10 in ('2019-01-01 00:00:00.000')
|
||||
sql select last(*) from wh_mt1 where c1 = 1
|
||||
if $rows != 1 then
|
||||
return -1
|
||||
|
|
|
|||
Loading…
Reference in New Issue