Skip to content

T
TDengine

taosdata / TDengine
大约 2 年 前同步成功

通知 1193
Star 22018
Fork 4786
T
TDengine
提交 44acd0ee 编写于 作者: H hjxilinx
浏览文件
操作

merge develop branch

上级 4bf606a5 de19fbfc
显示空白变更内容
内联 并排
Showing with 876 addition and 836 deletion
documentation/webdocs/markdowndocs/TAOS SQL-ch.md
浏览文件 @ 44acd0ee
...@@ -423,7 +423,7 @@ count(tbname) | ...@@ -423,7 +423,7 @@ count(tbname) |
###聚合函数 ###聚合函数
TDengine支持针对数据的聚合查询。提供支持的聚合和提取函数如下表： TDengine支持针对数据的聚合查询。提供支持的聚合和选择函数如下：
- **COUNT** - **COUNT**
```mysql ```mysql
...@@ -446,13 +446,14 @@ TDengine支持针对数据的聚合查询。提供支持的聚合和提取函数 ...@@ -446,13 +446,14 @@ TDengine支持针对数据的聚合查询。提供支持的聚合和提取函数
适用于：表、超级表。 适用于：表、超级表。
- **WAVG** - **TWA**
```mysql ```mysql
SELECT WAVG(field_name) FROM tb_name WHERE clause SELECT TWA(field_name) FROM tb_name WHERE clause
``` ```
功能说明：统计表/超级表中某列在一段时间内的时间加权平均。 功能说明：时间加权平均函数。统计表/超级表中某列在一段时间内的时间加权平均。
返回结果数据类型：双精度浮点数Double。 返回结果数据类型：双精度浮点数Double。
应用字段：不能应用在timestamp、binary、nchar、bool类型字段。 应用字段：不能应用在timestamp、binary、nchar、bool类型字段。
说明：时间加权平均(time weighted average, TWA）查询需要指定查询时间段的 _开始时间_ 和 _结束时间_ 。
适用于：表、超级表。 适用于：表、超级表。
...@@ -556,6 +557,14 @@ TDengine支持针对数据的聚合查询。提供支持的聚合和提取函数 ...@@ -556,6 +557,14 @@ TDengine支持针对数据的聚合查询。提供支持的聚合和提取函数
应用字段：不能应用在timestamp、binary、nchar、bool类型字段。 应用字段：不能应用在timestamp、binary、nchar、bool类型字段。
说明：*k*值取值范围0≤*k*≤100，为0的时候等同于MIN，为100的时候等同于MAX。 说明：*k*值取值范围0≤*k*≤100，为0的时候等同于MIN，为100的时候等同于MAX。
- **APERCENTILE**
```mysql
SELECT APERCENTILE(field_name, P) FROM { tb_name | stb_name } [WHERE clause]
```
功能说明：统计表中某列的值百分比分位数，与PERCENTILE函数相似，但是返回近似结果。
返回结果数据类型： 双精度浮点数Double。
应用字段：不能应用在timestamp、binary、nchar、bool类型字段。
说明：*k*值取值范围0≤*k*≤100，为0的时候等同于MIN，为100的时候等同于MAX。推荐使用```APERCENTILE```函数，该函数性能远胜于```PERCENTILE```函数
- **LAST_ROW** - **LAST_ROW**
```mysql ```mysql
......
src/client/src/sql.c
浏览文件 @ 44acd0ee
...@@ -93,26 +93,26 @@ ...@@ -93,26 +93,26 @@
#endif #endif
/************* Begin control #defines *****************************************/ /************* Begin control #defines *****************************************/
#define YYCODETYPE unsigned short int #define YYCODETYPE unsigned short int
#define YYNOCODE 262 #define YYNOCODE 268
#define YYACTIONTYPE unsigned short int #define YYACTIONTYPE unsigned short int
#define ParseTOKENTYPE SSQLToken #define ParseTOKENTYPE SSQLToken
typedef union { typedef union {
int yyinit; int yyinit;
ParseTOKENTYPE yy0; ParseTOKENTYPE yy0;
SSubclauseInfo* yy117; tVariantList* yy30;
SQuerySQL* yy138; SLimitVal yy150;
SCreateAcctSQL yy155; SCreateTableSQL* yy212;
SLimitVal yy162; SCreateAcctSQL yy239;
int yy220; int yy250;
tVariant yy236; SSubclauseInfo* yy309;
tSQLExpr* yy244; tFieldList* yy325;
SCreateDBInfo yy262; tVariant yy380;
tSQLExprList* yy284; tSQLExpr* yy388;
SCreateTableSQL* yy344; SQuerySQL* yy444;
int64_t yy369; int64_t yy489;
TAOS_FIELD yy397; TAOS_FIELD yy505;
tFieldList* yy421; tSQLExprList* yy506;
tVariantList* yy480; SCreateDBInfo yy532;
} YYMINORTYPE; } YYMINORTYPE;
#ifndef YYSTACKDEPTH #ifndef YYSTACKDEPTH
#define YYSTACKDEPTH 100 #define YYSTACKDEPTH 100
...@@ -124,7 +124,7 @@ typedef union { ...@@ -124,7 +124,7 @@ typedef union {
#define YYFALLBACK 1 #define YYFALLBACK 1
#define YYNSTATE 247 #define YYNSTATE 247
#define YYNRULE 216 #define YYNRULE 216
#define YYNTOKEN 197 #define YYNTOKEN 203
#define YY_MAX_SHIFT 246 #define YY_MAX_SHIFT 246
#define YY_MIN_SHIFTREDUCE 399 #define YY_MIN_SHIFTREDUCE 399
#define YY_MAX_SHIFTREDUCE 614 #define YY_MAX_SHIFTREDUCE 614
...@@ -208,10 +208,10 @@ static const YYACTIONTYPE yy_action[] = { ...@@ -208,10 +208,10 @@ static const YYACTIONTYPE yy_action[] = {
/* 50 */ 749, 200, 39, 37, 40, 38, 185, 100, 225, 224, /* 50 */ 749, 200, 39, 37, 40, 38, 185, 100, 225, 224,
/* 60 */ 34, 33, 162, 730, 32, 31, 30, 400, 401, 402, /* 60 */ 34, 33, 162, 730, 32, 31, 30, 400, 401, 402,
/* 70 */ 403, 404, 405, 406, 407, 408, 409, 410, 411, 245, /* 70 */ 403, 404, 405, 406, 407, 408, 409, 410, 411, 245,
/* 80 */ 730, 41, 43, 188, 35, 36, 215, 817, 197, 29, /* 80 */ 730, 41, 43, 188, 35, 36, 215, 236, 197, 29,
/* 90 */ 58, 20, 200, 39, 37, 40, 38, 32, 31, 30, /* 90 */ 58, 20, 200, 39, 37, 40, 38, 32, 31, 30,
/* 100 */ 56, 34, 33, 75, 730, 32, 31, 30, 43, 236, /* 100 */ 56, 34, 33, 75, 730, 32, 31, 30, 43, 236,
/* 110 */ 35, 36, 776, 236, 195, 29, 20, 20, 200, 39, /* 110 */ 35, 36, 776, 817, 195, 29, 20, 20, 200, 39,
/* 120 */ 37, 40, 38, 164, 570, 727, 227, 34, 33, 440, /* 120 */ 37, 40, 38, 164, 570, 727, 227, 34, 33, 440,
/* 130 */ 167, 32, 31, 30, 238, 35, 36, 441, 7, 816, /* 130 */ 167, 32, 31, 30, 238, 35, 36, 441, 7, 816,
/* 140 */ 29, 61, 110, 200, 39, 37, 40, 38, 223, 228, /* 140 */ 29, 61, 110, 200, 39, 37, 40, 38, 223, 228,
...@@ -228,106 +228,107 @@ static const YYACTIONTYPE yy_action[] = { ...@@ -228,106 +228,107 @@ static const YYACTIONTYPE yy_action[] = {
/* 250 */ 32, 31, 30, 137, 113, 114, 219, 64, 67, 156, /* 250 */ 32, 31, 30, 137, 113, 114, 219, 64, 67, 156,
/* 260 */ 157, 95, 515, 666, 184, 512, 123, 513, 26, 514, /* 260 */ 157, 95, 515, 666, 184, 512, 123, 513, 26, 514,
/* 270 */ 523, 147, 127, 125, 240, 88, 87, 187, 42, 158, /* 270 */ 523, 147, 127, 125, 240, 88, 87, 187, 42, 158,
/* 280 */ 73, 77, 239, 84, 76, 572, 528, 138, 42, 582, /* 280 */ 73, 77, 239, 84, 76, 572, 528, 729, 42, 582,
/* 290 */ 79, 17, 658, 165, 166, 123, 243, 242, 92, 582, /* 290 */ 79, 17, 658, 165, 166, 123, 243, 242, 92, 582,
/* 300 */ 47, 542, 543, 600, 581, 45, 13, 12, 584, 576, /* 300 */ 47, 542, 543, 600, 581, 45, 13, 12, 584, 576,
/* 310 */ 786, 579, 12, 575, 581, 578, 2, 72, 71, 48, /* 310 */ 138, 579, 12, 575, 581, 578, 2, 72, 71, 48,
/* 320 */ 505, 573, 42, 140, 45, 504, 204, 9, 8, 21, /* 320 */ 505, 573, 42, 743, 45, 504, 204, 9, 8, 21,
/* 330 */ 21, 141, 519, 582, 520, 517, 142, 518, 83, 82, /* 330 */ 21, 140, 519, 582, 520, 517, 141, 518, 83, 82,
/* 340 */ 143, 134, 130, 135, 729, 133, 830, 785, 581, 160, /* 340 */ 142, 143, 134, 130, 135, 830, 133, 786, 581, 785,
/* 350 */ 109, 782, 781, 161, 751, 721, 226, 97, 743, 111, /* 350 */ 160, 782, 781, 161, 751, 721, 768, 226, 97, 767,
/* 360 */ 768, 767, 516, 112, 668, 205, 26, 128, 24, 218, /* 360 */ 111, 112, 516, 668, 205, 109, 128, 24, 218, 220,
/* 370 */ 186, 220, 829, 69, 90, 828, 826, 115, 686, 25, /* 370 */ 829, 69, 26, 828, 826, 115, 186, 686, 25, 22,
/* 380 */ 22, 129, 655, 538, 78, 653, 189, 80, 651, 650, /* 380 */ 90, 129, 655, 78, 653, 80, 651, 650, 169, 538,
/* 390 */ 169, 193, 52, 740, 124, 648, 647, 646, 644, 636, /* 390 */ 124, 648, 189, 647, 646, 644, 636, 193, 52, 740,
/* 400 */ 49, 126, 44, 642, 640, 101, 102, 198, 638, 196, /* 400 */ 126, 642, 640, 638, 49, 755, 756, 101, 769, 44,
/* 410 */ 194, 755, 756, 190, 769, 192, 28, 217, 74, 229, /* 410 */ 198, 196, 194, 28, 192, 190, 217, 74, 229, 230,
/* 420 */ 230, 231, 232, 233, 202, 234, 235, 53, 241, 614, /* 420 */ 202, 232, 231, 614, 233, 234, 53, 235, 241, 170,
/* 430 */ 170, 171, 173, 62, 146, 172, 65, 613, 176, 175, /* 430 */ 146, 62, 171, 65, 173, 172, 613, 176, 175, 178,
/* 440 */ 649, 177, 89, 643, 118, 178, 612, 687, 116, 117, /* 440 */ 649, 177, 612, 89, 91, 117, 687, 118, 116, 119,
/* 450 */ 119, 120, 122, 725, 121, 91, 1, 105, 103, 106, /* 450 */ 120, 643, 104, 102, 122, 725, 106, 103, 105, 121,
/* 460 */ 104, 107, 23, 108, 180, 181, 605, 183, 187, 525, /* 460 */ 107, 1, 108, 23, 180, 181, 605, 183, 187, 525,
/* 470 */ 55, 153, 539, 98, 57, 191, 201, 18, 544, 99, /* 470 */ 55, 539, 153, 98, 57, 191, 18, 63, 4, 544,
/* 480 */ 4, 5, 585, 19, 3, 14, 6, 63, 480, 203, /* 480 */ 99, 5, 585, 3, 19, 14, 201, 6, 203, 480,
/* 490 */ 479, 478, 477, 476, 475, 474, 473, 471, 45, 444, /* 490 */ 479, 478, 477, 476, 475, 474, 473, 471, 45, 444,
/* 500 */ 66, 446, 21, 501, 216, 500, 498, 54, 465, 463, /* 500 */ 66, 446, 21, 501, 216, 68, 500, 498, 54, 465,
/* 510 */ 46, 68, 455, 70, 461, 457, 459, 453, 451, 472, /* 510 */ 46, 463, 455, 70, 461, 457, 459, 453, 451, 472,
/* 520 */ 470, 81, 426, 442, 415, 413, 93, 94, 618, /* 520 */ 470, 81, 426, 442, 93, 415, 94, 413, 618,
}; };
static const YYCODETYPE yy_lookahead[] = { static const YYCODETYPE yy_lookahead[] = {
/* 0 */ 201, 1, 250, 200, 201, 250, 198, 199, 250, 9, /* 0 */ 207, 1, 256, 206, 207, 256, 204, 205, 256, 9,
/* 10 */ 250, 259, 260, 13, 14, 201, 16, 17, 260, 259, /* 10 */ 256, 265, 266, 13, 14, 207, 16, 17, 266, 265,
/* 20 */ 260, 21, 234, 1, 24, 25, 26, 27, 28, 250, /* 20 */ 266, 21, 240, 1, 24, 25, 26, 27, 28, 256,
/* 30 */ 5, 9, 201, 33, 34, 201, 248, 37, 38, 39, /* 30 */ 5, 9, 207, 33, 34, 207, 254, 37, 38, 39,
/* 40 */ 13, 14, 234, 16, 17, 218, 250, 233, 21, 235, /* 40 */ 13, 14, 240, 16, 17, 224, 256, 239, 21, 241,
/* 50 */ 251, 24, 25, 26, 27, 28, 248, 201, 33, 34, /* 50 */ 257, 24, 25, 26, 27, 28, 254, 207, 33, 34,
/* 60 */ 33, 34, 218, 236, 37, 38, 39, 45, 46, 47, /* 60 */ 33, 34, 224, 242, 37, 38, 39, 45, 46, 47,
/* 70 */ 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, /* 70 */ 48, 49, 50, 51, 52, 53, 54, 55, 56, 57,
/* 80 */ 236, 13, 14, 252, 16, 17, 218, 250, 254, 21, /* 80 */ 242, 13, 14, 258, 16, 17, 224, 78, 260, 21,
/* 90 */ 256, 201, 24, 25, 26, 27, 28, 37, 38, 39, /* 90 */ 262, 207, 24, 25, 26, 27, 28, 37, 38, 39,
/* 100 */ 100, 33, 34, 72, 236, 37, 38, 39, 14, 78, /* 100 */ 100, 33, 34, 72, 242, 37, 38, 39, 14, 78,
/* 110 */ 16, 17, 256, 78, 258, 21, 201, 201, 24, 25, /* 110 */ 16, 17, 262, 256, 264, 21, 207, 207, 24, 25,
/* 120 */ 26, 27, 28, 233, 97, 235, 201, 33, 34, 1, /* 120 */ 26, 27, 28, 239, 97, 241, 207, 33, 34, 1,
/* 130 */ 63, 37, 38, 39, 60, 16, 17, 9, 96, 250, /* 130 */ 63, 37, 38, 39, 60, 16, 17, 9, 96, 256,
/* 140 */ 21, 99, 100, 24, 25, 26, 27, 28, 233, 233, /* 140 */ 21, 99, 100, 24, 25, 26, 27, 28, 239, 239,
/* 150 */ 235, 235, 33, 34, 101, 230, 37, 38, 39, 85, /* 150 */ 241, 241, 33, 34, 101, 236, 37, 38, 39, 85,
/* 160 */ 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, /* 160 */ 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
/* 170 */ 217, 118, 219, 220, 221, 222, 223, 224, 225, 226, /* 170 */ 223, 118, 225, 226, 227, 228, 229, 230, 231, 232,
/* 180 */ 227, 228, 229, 1, 2, 44, 250, 5, 201, 7, /* 180 */ 233, 234, 235, 1, 2, 44, 256, 5, 207, 7,
/* 190 */ 201, 9, 125, 1, 2, 128, 129, 5, 96, 7, /* 190 */ 207, 9, 125, 1, 2, 128, 129, 5, 96, 7,
/* 200 */ 201, 9, 33, 34, 63, 103, 37, 38, 39, 60, /* 200 */ 207, 9, 33, 34, 63, 103, 37, 38, 39, 60,
/* 210 */ 69, 70, 71, 124, 205, 33, 34, 208, 77, 37, /* 210 */ 69, 70, 71, 124, 211, 33, 34, 214, 77, 37,
/* 220 */ 131, 219, 133, 221, 250, 33, 34, 1, 2, 37, /* 220 */ 131, 225, 133, 227, 256, 33, 34, 1, 2, 37,
/* 230 */ 237, 5, 250, 7, 235, 9, 87, 96, 25, 26, /* 230 */ 243, 5, 256, 7, 241, 9, 87, 96, 25, 26,
/* 240 */ 27, 28, 249, 256, 103, 256, 33, 34, 113, 114, /* 240 */ 27, 28, 255, 262, 103, 262, 33, 34, 113, 114,
/* 250 */ 37, 38, 39, 250, 64, 65, 66, 67, 68, 33, /* 250 */ 37, 38, 39, 256, 64, 65, 66, 67, 68, 33,
/* 260 */ 34, 96, 2, 205, 123, 5, 208, 7, 103, 9, /* 260 */ 34, 96, 2, 211, 123, 5, 214, 7, 103, 9,
/* 270 */ 97, 130, 64, 65, 66, 67, 68, 104, 96, 59, /* 270 */ 97, 130, 64, 65, 66, 67, 68, 104, 96, 59,
/* 280 */ 64, 65, 66, 67, 68, 1, 101, 250, 96, 107, /* 280 */ 64, 65, 66, 67, 68, 1, 101, 242, 96, 107,
/* 290 */ 74, 106, 205, 33, 34, 208, 60, 61, 62, 107, /* 290 */ 74, 106, 211, 33, 34, 214, 60, 61, 62, 107,
/* 300 */ 101, 97, 97, 97, 122, 101, 101, 101, 97, 5, /* 300 */ 101, 97, 97, 97, 122, 101, 101, 101, 97, 5,
/* 310 */ 231, 7, 101, 5, 122, 7, 96, 126, 127, 120, /* 310 */ 256, 7, 101, 5, 122, 7, 96, 126, 127, 120,
/* 320 */ 97, 37, 96, 250, 101, 97, 97, 126, 127, 101, /* 320 */ 97, 37, 96, 240, 101, 97, 97, 126, 127, 101,
/* 330 */ 101, 250, 5, 107, 7, 5, 250, 7, 72, 73, /* 330 */ 101, 256, 5, 107, 7, 5, 256, 7, 72, 73,
/* 340 */ 250, 250, 250, 250, 236, 250, 236, 231, 122, 231, /* 340 */ 256, 256, 256, 256, 256, 242, 256, 237, 122, 237,
/* 350 */ 238, 231, 231, 231, 201, 232, 231, 201, 234, 201, /* 350 */ 237, 237, 237, 237, 207, 238, 263, 237, 207, 263,
/* 360 */ 257, 257, 102, 201, 201, 201, 103, 201, 201, 201, /* 360 */ 207, 207, 102, 207, 207, 244, 207, 207, 207, 207,
/* 370 */ 234, 201, 201, 201, 59, 201, 201, 201, 201, 201, /* 370 */ 207, 207, 103, 207, 207, 207, 240, 207, 207, 207,
/* 380 */ 201, 201, 201, 107, 201, 201, 253, 201, 201, 201, /* 380 */ 59, 207, 207, 207, 207, 207, 207, 207, 207, 107,
/* 390 */ 201, 253, 117, 247, 201, 201, 201, 201, 201, 201, /* 390 */ 207, 207, 259, 207, 207, 207, 207, 259, 117, 253,
/* 400 */ 119, 201, 116, 201, 201, 246, 245, 111, 201, 115, /* 400 */ 207, 207, 207, 207, 119, 208, 208, 252, 208, 116,
/* 410 */ 110, 202, 202, 108, 202, 109, 121, 75, 84, 83, /* 410 */ 111, 115, 110, 121, 109, 108, 75, 84, 83, 49,
/* 420 */ 49, 80, 82, 53, 202, 81, 79, 202, 75, 5, /* 420 */ 208, 82, 80, 5, 53, 81, 208, 79, 75, 132,
/* 430 */ 132, 5, 58, 206, 202, 132, 206, 5, 5, 132, /* 430 */ 208, 212, 5, 212, 58, 132, 5, 5, 132, 58,
/* 440 */ 202, 132, 203, 202, 210, 58, 5, 216, 215, 214, /* 440 */ 208, 132, 5, 209, 209, 220, 222, 216, 221, 219,
/* 450 */ 213, 211, 209, 234, 212, 203, 207, 242, 244, 241, /* 450 */ 217, 208, 249, 251, 215, 240, 247, 250, 248, 218,
/* 460 */ 243, 240, 204, 239, 132, 58, 86, 124, 104, 97, /* 460 */ 246, 213, 245, 210, 132, 58, 86, 124, 104, 97,
/* 470 */ 105, 1, 97, 96, 101, 96, 98, 101, 97, 96, /* 470 */ 105, 97, 1, 96, 101, 96, 101, 72, 112, 97,
/* 480 */ 112, 112, 97, 101, 96, 96, 96, 72, 9, 98, /* 480 */ 96, 112, 97, 96, 101, 96, 98, 96, 98, 9,
/* 490 */ 5, 5, 5, 5, 1, 5, 5, 5, 101, 76, /* 490 */ 5, 5, 5, 5, 1, 5, 5, 5, 101, 76,
/* 500 */ 72, 58, 101, 5, 15, 5, 97, 96, 5, 5, /* 500 */ 72, 58, 101, 5, 15, 127, 5, 97, 96, 5,
/* 510 */ 16, 127, 5, 127, 5, 5, 5, 5, 5, 5, /* 510 */ 16, 5, 5, 127, 5, 5, 5, 5, 5, 5,
/* 520 */ 5, 58, 58, 76, 59, 58, 21, 21, 0, 261, /* 520 */ 5, 58, 58, 76, 21, 59, 21, 58, 0, 267,
/* 530 */ 261, 261, 261, 261, 261, 261, 261, 261, 261, 261, /* 530 */ 267, 267, 267, 267, 267, 267, 267, 267, 267, 267,
/* 540 */ 261, 261, 261, 261, 261, 261, 261, 261, 261, 261, /* 540 */ 267, 267, 267, 267, 267, 267, 267, 267, 267, 267,
/* 550 */ 261, 261, 261, 261, 261, 261, 261, 261, 261, 261, /* 550 */ 267, 267, 267, 267, 267, 267, 267, 267, 267, 267,
/* 560 */ 261, 261, 261, 261, 261, 261, 261, 261, 261, 261, /* 560 */ 267, 267, 267, 267, 267, 267, 267, 267, 267, 267,
/* 570 */ 261, 261, 261, 261, 261, 261, 261, 261, 261, 261, /* 570 */ 267, 267, 267, 267, 267, 267, 267, 267, 267, 267,
/* 580 */ 261, 261, 261, 261, 261, 261, 261, 261, 261, 261, /* 580 */ 267, 267, 267, 267, 267, 267, 267, 267, 267, 267,
/* 590 */ 261, 261, 261, 261, 261, 261, 261, 261, 261, 261, /* 590 */ 267, 267, 267, 267, 267, 267, 267, 267, 267, 267,
/* 600 */ 261, 261, 261, 261, 261, 261, 261, 261, 261, 261, /* 600 */ 267, 267, 267, 267, 267, 267, 267, 267, 267, 267,
/* 610 */ 261, 261, 261, 261, 261, 261, 261, 261, 261, 261, /* 610 */ 267, 267, 267, 267, 267, 267, 267, 267, 267, 267,
/* 620 */ 261, 261, 261, 261, 261, 261, 261, 261, 261, 261, /* 620 */ 267, 267, 267, 267, 267, 267, 267, 267, 267, 267,
/* 630 */ 261, 261, 261, 261, 261, 261, 261, 261, 261, 261, /* 630 */ 267, 267, 267, 267, 267, 267, 267, 267, 267, 267,
/* 640 */ 261, 261, 261, 261, 261, 261, 261, 261, 261, 261, /* 640 */ 267, 267, 267, 267, 267, 267, 267, 267, 267, 267,
/* 650 */ 261, 261, 261, 261, 261, 261, 261, 261, 261, 261, /* 650 */ 267, 267, 267, 267, 267, 267, 267, 267, 267, 267,
/* 660 */ 261, 261, 261, 261, 261, 261, 261, 261, 261, 261, /* 660 */ 267, 267, 267, 267, 267, 267, 267, 267, 267, 267,
/* 670 */ 261, 261, 261, 261, 261, 261, 261, 261, 261, 261, /* 670 */ 267, 267, 267, 267, 267, 267, 267, 267, 267, 267,
/* 680 */ 261, 261, 261, 261, 261, 261, 261, 261, 261, 261, /* 680 */ 267, 267, 267, 267, 267, 267, 267, 267, 267, 267,
/* 690 */ 261, 261, 261, 261, 261, 261, 261, 261, 261, 261, /* 690 */ 267, 267, 267, 267, 267, 267, 267, 267, 267, 267,
/* 700 */ 261, 261, 261, 261, 261, 261, 261, 261, 261, 261, /* 700 */ 267, 267, 267, 267, 267, 267, 267, 267, 267, 267,
/* 710 */ 261, 261, 261, 261, 261, 261, 261, 261, 261, 261, /* 710 */ 267, 267, 267, 267, 267, 267, 267, 267, 267, 267,
/* 720 */ 261, 261, 261, 261, 261, 261, /* 720 */ 267, 267, 267, 267, 267, 267, 267, 267, 267, 267,
/* 730 */ 267, 267,
}; };
#define YY_SHIFT_COUNT (246) #define YY_SHIFT_COUNT (246)
#define YY_SHIFT_MIN (0) #define YY_SHIFT_MIN (0)
...@@ -335,47 +336,47 @@ static const YYCODETYPE yy_lookahead[] = { ...@@ -335,47 +336,47 @@ static const YYCODETYPE yy_lookahead[] = {
static const unsigned short int yy_shift_ofst[] = { static const unsigned short int yy_shift_ofst[] = {
/* 0 */ 141, 74, 182, 226, 128, 128, 128, 128, 128, 128, /* 0 */ 141, 74, 182, 226, 128, 128, 128, 128, 128, 128,
/* 10 */ 0, 22, 226, 260, 260, 260, 102, 128, 128, 128, /* 10 */ 0, 22, 226, 260, 260, 260, 102, 128, 128, 128,
/* 20 */ 128, 128, 31, 149, 35, 35, 529, 192, 226, 226, /* 20 */ 128, 128, 31, 149, 9, 9, 529, 192, 226, 226,
/* 30 */ 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, /* 30 */ 226, 226, 226, 226, 226, 226, 226, 226, 226, 226,
/* 40 */ 226, 226, 226, 226, 226, 260, 260, 25, 25, 25, /* 40 */ 226, 226, 226, 226, 226, 260, 260, 25, 25, 25,
/* 50 */ 25, 25, 25, 42, 25, 165, 128, 128, 135, 135, /* 50 */ 25, 25, 25, 42, 25, 165, 128, 128, 135, 135,
/* 60 */ 185, 128, 128, 128, 128, 128, 128, 128, 128, 128, /* 60 */ 185, 128, 128, 128, 128, 128, 128, 128, 128, 128,
/* 70 */ 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, /* 70 */ 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
/* 80 */ 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, /* 80 */ 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
/* 90 */ 128, 128, 128, 128, 128, 263, 315, 315, 276, 276, /* 90 */ 128, 128, 128, 128, 128, 269, 321, 321, 282, 282,
/* 100 */ 315, 275, 281, 286, 296, 294, 300, 306, 305, 295, /* 100 */ 321, 281, 285, 293, 299, 296, 302, 305, 307, 292,
/* 110 */ 263, 315, 315, 342, 342, 315, 334, 336, 371, 341, /* 110 */ 269, 321, 321, 341, 341, 321, 333, 335, 370, 342,
/* 120 */ 340, 370, 344, 347, 315, 353, 315, 353, 529, 529, /* 120 */ 339, 371, 344, 348, 321, 353, 321, 353, 529, 529,
/* 130 */ 27, 68, 68, 68, 94, 119, 213, 213, 213, 216, /* 130 */ 27, 68, 68, 68, 94, 119, 213, 213, 213, 216,
/* 140 */ 169, 169, 169, 169, 190, 208, 67, 89, 60, 60, /* 140 */ 169, 169, 169, 169, 190, 208, 67, 89, 60, 60,
/* 150 */ 236, 173, 204, 205, 206, 211, 304, 308, 284, 220, /* 150 */ 236, 173, 204, 205, 206, 211, 304, 308, 284, 220,
/* 160 */ 199, 53, 223, 228, 229, 327, 330, 191, 201, 266, /* 160 */ 199, 53, 223, 228, 229, 327, 330, 191, 201, 266,
/* 170 */ 424, 298, 426, 303, 374, 432, 307, 433, 309, 387, /* 170 */ 418, 297, 427, 303, 376, 431, 306, 432, 309, 381,
/* 180 */ 441, 332, 407, 380, 343, 364, 372, 365, 373, 375, /* 180 */ 437, 332, 407, 380, 343, 364, 372, 365, 373, 374,
/* 190 */ 377, 470, 379, 381, 383, 376, 368, 382, 369, 385, /* 190 */ 377, 471, 379, 382, 384, 375, 366, 383, 369, 385,
/* 200 */ 388, 389, 378, 390, 391, 415, 479, 485, 486, 487, /* 200 */ 387, 389, 388, 391, 390, 405, 480, 485, 486, 487,
/* 210 */ 488, 493, 490, 491, 492, 397, 423, 489, 428, 443, /* 210 */ 488, 493, 490, 491, 492, 397, 423, 489, 428, 443,
/* 220 */ 494, 384, 386, 401, 498, 500, 409, 411, 401, 503, /* 220 */ 494, 378, 386, 401, 498, 501, 410, 412, 401, 504,
/* 230 */ 504, 507, 509, 510, 511, 512, 513, 514, 515, 463, /* 230 */ 506, 507, 509, 510, 511, 512, 513, 514, 515, 463,
/* 240 */ 464, 447, 505, 506, 465, 467, 528, /* 240 */ 464, 447, 503, 505, 466, 469, 528,
}; };
#define YY_REDUCE_COUNT (129) #define YY_REDUCE_COUNT (129)
#define YY_REDUCE_MIN (-248) #define YY_REDUCE_MIN (-254)
#define YY_REDUCE_MAX (258) #define YY_REDUCE_MAX (253)
static const short yy_reduce_ofst[] = { static const short yy_reduce_ofst[] = {
/* 0 */ -192, -47, -248, -240, -144, -166, -186, -110, -85, -84, /* 0 */ -198, -53, -254, -246, -150, -172, -192, -116, -91, -90,
/* 10 */ -201, -197, -242, -173, -156, -132, -212, -169, -13, -11, /* 10 */ -207, -203, -248, -179, -162, -138, -218, -175, -19, -17,
/* 20 */ -75, -1, 9, 2, 58, 87, -7, -245, -221, -204, /* 20 */ -81, -7, 3, -4, 52, 81, -13, -251, -227, -210,
/* 30 */ -163, -111, -64, -26, -18, 3, 37, 73, 81, 86, /* 30 */ -143, -117, -70, -32, -24, -3, 54, 75, 80, 84,
/* 40 */ 90, 91, 92, 93, 95, 108, 110, 79, 116, 118, /* 40 */ 85, 86, 87, 88, 90, 45, 103, 110, 112, 113,
/* 50 */ 120, 121, 122, 123, 125, 124, 153, 156, 103, 104, /* 50 */ 114, 115, 116, 117, 120, 83, 147, 151, 93, 96,
/* 60 */ 112, 158, 162, 163, 164, 166, 167, 168, 170, 171, /* 60 */ 121, 153, 154, 156, 157, 159, 160, 161, 162, 163,
/* 70 */ 172, 174, 175, 176, 177, 178, 179, 180, 181, 183, /* 70 */ 164, 166, 167, 168, 170, 171, 172, 174, 175, 176,
/* 80 */ 184, 186, 187, 188, 189, 193, 194, 195, 196, 197, /* 80 */ 177, 178, 179, 180, 181, 183, 184, 186, 187, 188,
/* 90 */ 198, 200, 202, 203, 207, 136, 209, 210, 133, 138, /* 90 */ 189, 193, 194, 195, 196, 136, 197, 198, 133, 138,
/* 100 */ 212, 146, 159, 161, 214, 217, 215, 218, 221, 224, /* 100 */ 200, 146, 155, 202, 207, 203, 210, 209, 214, 217,
/* 110 */ 219, 222, 225, 227, 230, 232, 231, 233, 235, 234, /* 110 */ 215, 212, 218, 219, 221, 222, 224, 227, 225, 231,
/* 120 */ 237, 240, 242, 243, 238, 239, 241, 252, 249, 258, /* 120 */ 230, 233, 241, 239, 232, 234, 243, 235, 248, 253,
}; };
static const YYACTIONTYPE yy_default[] = { static const YYACTIONTYPE yy_default[] = {
/* 0 */ 615, 667, 823, 823, 615, 615, 615, 615, 615, 615, /* 0 */ 615, 667, 823, 823, 615, 615, 615, 615, 615, 615,
...@@ -606,6 +607,12 @@ static const YYCODETYPE yyFallback[] = { ...@@ -606,6 +607,12 @@ static const YYCODETYPE yyFallback[] = {
1, /* TWA => ID */ 1, /* TWA => ID */
1, /* INTERP => ID */ 1, /* INTERP => ID */
1, /* LAST_ROW => ID */ 1, /* LAST_ROW => ID */
1, /* RATE => ID */
1, /* IRATE => ID */
1, /* SUM_RATE => ID */
1, /* SUM_IRATE => ID */
1, /* AVG_RATE => ID */
1, /* AVG_IRATE => ID */
1, /* SEMI => ID */ 1, /* SEMI => ID */
1, /* NONE => ID */ 1, /* NONE => ID */
1, /* PREV => ID */ 1, /* PREV => ID */
...@@ -889,83 +896,89 @@ static const char *const yyTokenName[] = { ...@@ -889,83 +896,89 @@ static const char *const yyTokenName[] = {
/* 181 */ "TWA", /* 181 */ "TWA",
/* 182 */ "INTERP", /* 182 */ "INTERP",
/* 183 */ "LAST_ROW", /* 183 */ "LAST_ROW",
/* 184 */ "SEMI", /* 184 */ "RATE",
/* 185 */ "NONE", /* 185 */ "IRATE",
/* 186 */ "PREV", /* 186 */ "SUM_RATE",
/* 187 */ "LINEAR", /* 187 */ "SUM_IRATE",
/* 188 */ "IMPORT", /* 188 */ "AVG_RATE",
/* 189 */ "METRIC", /* 189 */ "AVG_IRATE",
/* 190 */ "TBNAME", /* 190 */ "SEMI",
/* 191 */ "JOIN", /* 191 */ "NONE",
/* 192 */ "METRICS", /* 192 */ "PREV",
/* 193 */ "STABLE", /* 193 */ "LINEAR",
/* 194 */ "INSERT", /* 194 */ "IMPORT",
/* 195 */ "INTO", /* 195 */ "METRIC",
/* 196 */ "VALUES", /* 196 */ "TBNAME",
/* 197 */ "error", /* 197 */ "JOIN",
/* 198 */ "program", /* 198 */ "METRICS",
/* 199 */ "cmd", /* 199 */ "STABLE",
/* 200 */ "dbPrefix", /* 200 */ "INSERT",
/* 201 */ "ids", /* 201 */ "INTO",
/* 202 */ "cpxName", /* 202 */ "VALUES",
/* 203 */ "ifexists", /* 203 */ "error",
/* 204 */ "alter_db_optr", /* 204 */ "program",
/* 205 */ "acct_optr", /* 205 */ "cmd",
/* 206 */ "ifnotexists", /* 206 */ "dbPrefix",
/* 207 */ "db_optr", /* 207 */ "ids",
/* 208 */ "pps", /* 208 */ "cpxName",
/* 209 */ "tseries", /* 209 */ "ifexists",
/* 210 */ "dbs", /* 210 */ "alter_db_optr",
/* 211 */ "streams", /* 211 */ "acct_optr",
/* 212 */ "storage", /* 212 */ "ifnotexists",
/* 213 */ "qtime", /* 213 */ "db_optr",
/* 214 */ "users", /* 214 */ "pps",
/* 215 */ "conns", /* 215 */ "tseries",
/* 216 */ "state", /* 216 */ "dbs",
/* 217 */ "keep", /* 217 */ "streams",
/* 218 */ "tagitemlist", /* 218 */ "storage",
/* 219 */ "tables", /* 219 */ "qtime",
/* 220 */ "cache", /* 220 */ "users",
/* 221 */ "replica", /* 221 */ "conns",
/* 222 */ "days", /* 222 */ "state",
/* 223 */ "rows", /* 223 */ "keep",
/* 224 */ "ablocks", /* 224 */ "tagitemlist",
/* 225 */ "tblocks", /* 225 */ "tables",
/* 226 */ "ctime", /* 226 */ "cache",
/* 227 */ "clog", /* 227 */ "replica",
/* 228 */ "comp", /* 228 */ "days",
/* 229 */ "prec", /* 229 */ "rows",
/* 230 */ "typename", /* 230 */ "ablocks",
/* 231 */ "signed", /* 231 */ "tblocks",
/* 232 */ "create_table_args", /* 232 */ "ctime",
/* 233 */ "columnlist", /* 233 */ "clog",
/* 234 */ "select", /* 234 */ "comp",
/* 235 */ "column", /* 235 */ "prec",
/* 236 */ "tagitem", /* 236 */ "typename",
/* 237 */ "selcollist", /* 237 */ "signed",
/* 238 */ "from", /* 238 */ "create_table_args",
/* 239 */ "where_opt", /* 239 */ "columnlist",
/* 240 */ "interval_opt", /* 240 */ "select",
/* 241 */ "fill_opt", /* 241 */ "column",
/* 242 */ "sliding_opt", /* 242 */ "tagitem",
/* 243 */ "groupby_opt", /* 243 */ "selcollist",
/* 244 */ "orderby_opt", /* 244 */ "from",
/* 245 */ "having_opt", /* 245 */ "where_opt",
/* 246 */ "slimit_opt", /* 246 */ "interval_opt",
/* 247 */ "limit_opt", /* 247 */ "fill_opt",
/* 248 */ "union", /* 248 */ "sliding_opt",
/* 249 */ "sclp", /* 249 */ "groupby_opt",
/* 250 */ "expr", /* 250 */ "orderby_opt",
/* 251 */ "as", /* 251 */ "having_opt",
/* 252 */ "tablelist", /* 252 */ "slimit_opt",
/* 253 */ "tmvar", /* 253 */ "limit_opt",
/* 254 */ "sortlist", /* 254 */ "union",
/* 255 */ "sortitem", /* 255 */ "sclp",
/* 256 */ "item", /* 256 */ "expr",
/* 257 */ "sortorder", /* 257 */ "as",
/* 258 */ "grouplist", /* 258 */ "tablelist",
/* 259 */ "exprlist", /* 259 */ "tmvar",
/* 260 */ "expritem", /* 260 */ "sortlist",
/* 261 */ "sortitem",
/* 262 */ "item",
/* 263 */ "sortorder",
/* 264 */ "grouplist",
/* 265 */ "exprlist",
/* 266 */ "expritem",
}; };
#endif /* defined(YYCOVERAGE) || !defined(NDEBUG) */ #endif /* defined(YYCOVERAGE) || !defined(NDEBUG) */
...@@ -1309,50 +1322,50 @@ static void yy_destructor( ...@@ -1309,50 +1322,50 @@ static void yy_destructor(
** inside the C code. ** inside the C code.
*/ */
/********* Begin destructor definitions ***************************************/ /********* Begin destructor definitions ***************************************/
case 217: /* keep */ case 223: /* keep */
case 218: /* tagitemlist */ case 224: /* tagitemlist */
case 241: /* fill_opt */ case 247: /* fill_opt */
case 243: /* groupby_opt */ case 249: /* groupby_opt */
case 244: /* orderby_opt */ case 250: /* orderby_opt */
case 254: /* sortlist */ case 260: /* sortlist */
case 258: /* grouplist */ case 264: /* grouplist */
{ {
tVariantListDestroy((yypminor->yy480)); tVariantListDestroy((yypminor->yy30));
} }
break; break;
case 233: /* columnlist */ case 239: /* columnlist */
{ {
tFieldListDestroy((yypminor->yy421)); tFieldListDestroy((yypminor->yy325));
} }
break; break;
case 234: /* select */ case 240: /* select */
{ {
doDestroyQuerySql((yypminor->yy138)); doDestroyQuerySql((yypminor->yy444));
} }
break; break;
case 237: /* selcollist */ case 243: /* selcollist */
case 249: /* sclp */ case 255: /* sclp */
case 259: /* exprlist */ case 265: /* exprlist */
{ {
tSQLExprListDestroy((yypminor->yy284)); tSQLExprListDestroy((yypminor->yy506));
} }
break; break;
case 239: /* where_opt */ case 245: /* where_opt */
case 245: /* having_opt */ case 251: /* having_opt */
case 250: /* expr */ case 256: /* expr */
case 260: /* expritem */ case 266: /* expritem */
{ {
tSQLExprDestroy((yypminor->yy244)); tSQLExprDestroy((yypminor->yy388));
} }
break; break;
case 248: /* union */ case 254: /* union */
{ {
destroyAllSelectClause((yypminor->yy117)); destroyAllSelectClause((yypminor->yy309));
} }
break; break;
case 255: /* sortitem */ case 261: /* sortitem */
{ {
tVariantDestroy(&(yypminor->yy236)); tVariantDestroy(&(yypminor->yy380));
} }
break; break;
/********* End destructor definitions *****************************************/ /********* End destructor definitions *****************************************/
...@@ -1646,222 +1659,222 @@ static const struct { ...@@ -1646,222 +1659,222 @@ static const struct {
YYCODETYPE lhs; /* Symbol on the left-hand side of the rule */ YYCODETYPE lhs; /* Symbol on the left-hand side of the rule */
signed char nrhs; /* Negative of the number of RHS symbols in the rule */ signed char nrhs; /* Negative of the number of RHS symbols in the rule */
} yyRuleInfo[] = { } yyRuleInfo[] = {
{ 198, -1 }, /* (0) program ::= cmd */ { 204, -1 }, /* (0) program ::= cmd */
{ 199, -2 }, /* (1) cmd ::= SHOW DATABASES */ { 205, -2 }, /* (1) cmd ::= SHOW DATABASES */
{ 199, -2 }, /* (2) cmd ::= SHOW MNODES */ { 205, -2 }, /* (2) cmd ::= SHOW MNODES */
{ 199, -2 }, /* (3) cmd ::= SHOW DNODES */ { 205, -2 }, /* (3) cmd ::= SHOW DNODES */
{ 199, -2 }, /* (4) cmd ::= SHOW ACCOUNTS */ { 205, -2 }, /* (4) cmd ::= SHOW ACCOUNTS */
{ 199, -2 }, /* (5) cmd ::= SHOW USERS */ { 205, -2 }, /* (5) cmd ::= SHOW USERS */
{ 199, -2 }, /* (6) cmd ::= SHOW MODULES */ { 205, -2 }, /* (6) cmd ::= SHOW MODULES */
{ 199, -2 }, /* (7) cmd ::= SHOW QUERIES */ { 205, -2 }, /* (7) cmd ::= SHOW QUERIES */
{ 199, -2 }, /* (8) cmd ::= SHOW CONNECTIONS */ { 205, -2 }, /* (8) cmd ::= SHOW CONNECTIONS */
{ 199, -2 }, /* (9) cmd ::= SHOW STREAMS */ { 205, -2 }, /* (9) cmd ::= SHOW STREAMS */
{ 199, -2 }, /* (10) cmd ::= SHOW CONFIGS */ { 205, -2 }, /* (10) cmd ::= SHOW CONFIGS */
{ 199, -2 }, /* (11) cmd ::= SHOW SCORES */ { 205, -2 }, /* (11) cmd ::= SHOW SCORES */
{ 199, -2 }, /* (12) cmd ::= SHOW GRANTS */ { 205, -2 }, /* (12) cmd ::= SHOW GRANTS */
{ 199, -2 }, /* (13) cmd ::= SHOW VNODES */ { 205, -2 }, /* (13) cmd ::= SHOW VNODES */
{ 199, -3 }, /* (14) cmd ::= SHOW VNODES IPTOKEN */ { 205, -3 }, /* (14) cmd ::= SHOW VNODES IPTOKEN */
{ 200, 0 }, /* (15) dbPrefix ::= */ { 206, 0 }, /* (15) dbPrefix ::= */
{ 200, -2 }, /* (16) dbPrefix ::= ids DOT */ { 206, -2 }, /* (16) dbPrefix ::= ids DOT */
{ 202, 0 }, /* (17) cpxName ::= */ { 208, 0 }, /* (17) cpxName ::= */
{ 202, -2 }, /* (18) cpxName ::= DOT ids */ { 208, -2 }, /* (18) cpxName ::= DOT ids */
{ 199, -3 }, /* (19) cmd ::= SHOW dbPrefix TABLES */ { 205, -3 }, /* (19) cmd ::= SHOW dbPrefix TABLES */
{ 199, -5 }, /* (20) cmd ::= SHOW dbPrefix TABLES LIKE ids */ { 205, -5 }, /* (20) cmd ::= SHOW dbPrefix TABLES LIKE ids */
{ 199, -3 }, /* (21) cmd ::= SHOW dbPrefix STABLES */ { 205, -3 }, /* (21) cmd ::= SHOW dbPrefix STABLES */
{ 199, -5 }, /* (22) cmd ::= SHOW dbPrefix STABLES LIKE ids */ { 205, -5 }, /* (22) cmd ::= SHOW dbPrefix STABLES LIKE ids */
{ 199, -3 }, /* (23) cmd ::= SHOW dbPrefix VGROUPS */ { 205, -3 }, /* (23) cmd ::= SHOW dbPrefix VGROUPS */
{ 199, -4 }, /* (24) cmd ::= SHOW dbPrefix VGROUPS ids */ { 205, -4 }, /* (24) cmd ::= SHOW dbPrefix VGROUPS ids */
{ 199, -5 }, /* (25) cmd ::= DROP TABLE ifexists ids cpxName */ { 205, -5 }, /* (25) cmd ::= DROP TABLE ifexists ids cpxName */
{ 199, -4 }, /* (26) cmd ::= DROP DATABASE ifexists ids */ { 205, -4 }, /* (26) cmd ::= DROP DATABASE ifexists ids */
{ 199, -3 }, /* (27) cmd ::= DROP DNODE IPTOKEN */ { 205, -3 }, /* (27) cmd ::= DROP DNODE IPTOKEN */
{ 199, -3 }, /* (28) cmd ::= DROP USER ids */ { 205, -3 }, /* (28) cmd ::= DROP USER ids */
{ 199, -3 }, /* (29) cmd ::= DROP ACCOUNT ids */ { 205, -3 }, /* (29) cmd ::= DROP ACCOUNT ids */
{ 199, -2 }, /* (30) cmd ::= USE ids */ { 205, -2 }, /* (30) cmd ::= USE ids */
{ 199, -3 }, /* (31) cmd ::= DESCRIBE ids cpxName */ { 205, -3 }, /* (31) cmd ::= DESCRIBE ids cpxName */
{ 199, -5 }, /* (32) cmd ::= ALTER USER ids PASS ids */ { 205, -5 }, /* (32) cmd ::= ALTER USER ids PASS ids */
{ 199, -5 }, /* (33) cmd ::= ALTER USER ids PRIVILEGE ids */ { 205, -5 }, /* (33) cmd ::= ALTER USER ids PRIVILEGE ids */
{ 199, -4 }, /* (34) cmd ::= ALTER DNODE IPTOKEN ids */ { 205, -4 }, /* (34) cmd ::= ALTER DNODE IPTOKEN ids */
{ 199, -5 }, /* (35) cmd ::= ALTER DNODE IPTOKEN ids ids */ { 205, -5 }, /* (35) cmd ::= ALTER DNODE IPTOKEN ids ids */
{ 199, -3 }, /* (36) cmd ::= ALTER LOCAL ids */ { 205, -3 }, /* (36) cmd ::= ALTER LOCAL ids */
{ 199, -4 }, /* (37) cmd ::= ALTER LOCAL ids ids */ { 205, -4 }, /* (37) cmd ::= ALTER LOCAL ids ids */
{ 199, -4 }, /* (38) cmd ::= ALTER DATABASE ids alter_db_optr */ { 205, -4 }, /* (38) cmd ::= ALTER DATABASE ids alter_db_optr */
{ 199, -4 }, /* (39) cmd ::= ALTER ACCOUNT ids acct_optr */ { 205, -4 }, /* (39) cmd ::= ALTER ACCOUNT ids acct_optr */
{ 199, -6 }, /* (40) cmd ::= ALTER ACCOUNT ids PASS ids acct_optr */ { 205, -6 }, /* (40) cmd ::= ALTER ACCOUNT ids PASS ids acct_optr */
{ 201, -1 }, /* (41) ids ::= ID */ { 207, -1 }, /* (41) ids ::= ID */
{ 201, -1 }, /* (42) ids ::= STRING */ { 207, -1 }, /* (42) ids ::= STRING */
{ 203, -2 }, /* (43) ifexists ::= IF EXISTS */ { 209, -2 }, /* (43) ifexists ::= IF EXISTS */
{ 203, 0 }, /* (44) ifexists ::= */ { 209, 0 }, /* (44) ifexists ::= */
{ 206, -3 }, /* (45) ifnotexists ::= IF NOT EXISTS */ { 212, -3 }, /* (45) ifnotexists ::= IF NOT EXISTS */
{ 206, 0 }, /* (46) ifnotexists ::= */ { 212, 0 }, /* (46) ifnotexists ::= */
{ 199, -3 }, /* (47) cmd ::= CREATE DNODE IPTOKEN */ { 205, -3 }, /* (47) cmd ::= CREATE DNODE IPTOKEN */
{ 199, -6 }, /* (48) cmd ::= CREATE ACCOUNT ids PASS ids acct_optr */ { 205, -6 }, /* (48) cmd ::= CREATE ACCOUNT ids PASS ids acct_optr */
{ 199, -5 }, /* (49) cmd ::= CREATE DATABASE ifnotexists ids db_optr */ { 205, -5 }, /* (49) cmd ::= CREATE DATABASE ifnotexists ids db_optr */
{ 199, -5 }, /* (50) cmd ::= CREATE USER ids PASS ids */ { 205, -5 }, /* (50) cmd ::= CREATE USER ids PASS ids */
{ 208, 0 }, /* (51) pps ::= */ { 214, 0 }, /* (51) pps ::= */
{ 208, -2 }, /* (52) pps ::= PPS INTEGER */ { 214, -2 }, /* (52) pps ::= PPS INTEGER */
{ 209, 0 }, /* (53) tseries ::= */ { 215, 0 }, /* (53) tseries ::= */
{ 209, -2 }, /* (54) tseries ::= TSERIES INTEGER */ { 215, -2 }, /* (54) tseries ::= TSERIES INTEGER */
{ 210, 0 }, /* (55) dbs ::= */ { 216, 0 }, /* (55) dbs ::= */
{ 210, -2 }, /* (56) dbs ::= DBS INTEGER */ { 216, -2 }, /* (56) dbs ::= DBS INTEGER */
{ 211, 0 }, /* (57) streams ::= */ { 217, 0 }, /* (57) streams ::= */
{ 211, -2 }, /* (58) streams ::= STREAMS INTEGER */ { 217, -2 }, /* (58) streams ::= STREAMS INTEGER */
{ 212, 0 }, /* (59) storage ::= */ { 218, 0 }, /* (59) storage ::= */
{ 212, -2 }, /* (60) storage ::= STORAGE INTEGER */ { 218, -2 }, /* (60) storage ::= STORAGE INTEGER */
{ 213, 0 }, /* (61) qtime ::= */ { 219, 0 }, /* (61) qtime ::= */
{ 213, -2 }, /* (62) qtime ::= QTIME INTEGER */ { 219, -2 }, /* (62) qtime ::= QTIME INTEGER */
{ 214, 0 }, /* (63) users ::= */ { 220, 0 }, /* (63) users ::= */
{ 214, -2 }, /* (64) users ::= USERS INTEGER */ { 220, -2 }, /* (64) users ::= USERS INTEGER */
{ 215, 0 }, /* (65) conns ::= */ { 221, 0 }, /* (65) conns ::= */
{ 215, -2 }, /* (66) conns ::= CONNS INTEGER */ { 221, -2 }, /* (66) conns ::= CONNS INTEGER */
{ 216, 0 }, /* (67) state ::= */ { 222, 0 }, /* (67) state ::= */
{ 216, -2 }, /* (68) state ::= STATE ids */ { 222, -2 }, /* (68) state ::= STATE ids */
{ 205, -9 }, /* (69) acct_optr ::= pps tseries storage streams qtime dbs users conns state */ { 211, -9 }, /* (69) acct_optr ::= pps tseries storage streams qtime dbs users conns state */
{ 217, -2 }, /* (70) keep ::= KEEP tagitemlist */ { 223, -2 }, /* (70) keep ::= KEEP tagitemlist */
{ 219, -2 }, /* (71) tables ::= TABLES INTEGER */ { 225, -2 }, /* (71) tables ::= TABLES INTEGER */
{ 220, -2 }, /* (72) cache ::= CACHE INTEGER */ { 226, -2 }, /* (72) cache ::= CACHE INTEGER */
{ 221, -2 }, /* (73) replica ::= REPLICA INTEGER */ { 227, -2 }, /* (73) replica ::= REPLICA INTEGER */
{ 222, -2 }, /* (74) days ::= DAYS INTEGER */ { 228, -2 }, /* (74) days ::= DAYS INTEGER */
{ 223, -2 }, /* (75) rows ::= ROWS INTEGER */ { 229, -2 }, /* (75) rows ::= ROWS INTEGER */
{ 224, -2 }, /* (76) ablocks ::= ABLOCKS ID */ { 230, -2 }, /* (76) ablocks ::= ABLOCKS ID */
{ 225, -2 }, /* (77) tblocks ::= TBLOCKS INTEGER */ { 231, -2 }, /* (77) tblocks ::= TBLOCKS INTEGER */
{ 226, -2 }, /* (78) ctime ::= CTIME INTEGER */ { 232, -2 }, /* (78) ctime ::= CTIME INTEGER */
{ 227, -2 }, /* (79) clog ::= CLOG INTEGER */ { 233, -2 }, /* (79) clog ::= CLOG INTEGER */
{ 228, -2 }, /* (80) comp ::= COMP INTEGER */ { 234, -2 }, /* (80) comp ::= COMP INTEGER */
{ 229, -2 }, /* (81) prec ::= PRECISION STRING */ { 235, -2 }, /* (81) prec ::= PRECISION STRING */
{ 207, 0 }, /* (82) db_optr ::= */ { 213, 0 }, /* (82) db_optr ::= */
{ 207, -2 }, /* (83) db_optr ::= db_optr tables */ { 213, -2 }, /* (83) db_optr ::= db_optr tables */
{ 207, -2 }, /* (84) db_optr ::= db_optr cache */ { 213, -2 }, /* (84) db_optr ::= db_optr cache */
{ 207, -2 }, /* (85) db_optr ::= db_optr replica */ { 213, -2 }, /* (85) db_optr ::= db_optr replica */
{ 207, -2 }, /* (86) db_optr ::= db_optr days */ { 213, -2 }, /* (86) db_optr ::= db_optr days */
{ 207, -2 }, /* (87) db_optr ::= db_optr rows */ { 213, -2 }, /* (87) db_optr ::= db_optr rows */
{ 207, -2 }, /* (88) db_optr ::= db_optr ablocks */ { 213, -2 }, /* (88) db_optr ::= db_optr ablocks */
{ 207, -2 }, /* (89) db_optr ::= db_optr tblocks */ { 213, -2 }, /* (89) db_optr ::= db_optr tblocks */
{ 207, -2 }, /* (90) db_optr ::= db_optr ctime */ { 213, -2 }, /* (90) db_optr ::= db_optr ctime */
{ 207, -2 }, /* (91) db_optr ::= db_optr clog */ { 213, -2 }, /* (91) db_optr ::= db_optr clog */
{ 207, -2 }, /* (92) db_optr ::= db_optr comp */ { 213, -2 }, /* (92) db_optr ::= db_optr comp */
{ 207, -2 }, /* (93) db_optr ::= db_optr prec */ { 213, -2 }, /* (93) db_optr ::= db_optr prec */
{ 207, -2 }, /* (94) db_optr ::= db_optr keep */ { 213, -2 }, /* (94) db_optr ::= db_optr keep */
{ 204, 0 }, /* (95) alter_db_optr ::= */ { 210, 0 }, /* (95) alter_db_optr ::= */
{ 204, -2 }, /* (96) alter_db_optr ::= alter_db_optr replica */ { 210, -2 }, /* (96) alter_db_optr ::= alter_db_optr replica */
{ 204, -2 }, /* (97) alter_db_optr ::= alter_db_optr tables */ { 210, -2 }, /* (97) alter_db_optr ::= alter_db_optr tables */
{ 230, -1 }, /* (98) typename ::= ids */ { 236, -1 }, /* (98) typename ::= ids */
{ 230, -4 }, /* (99) typename ::= ids LP signed RP */ { 236, -4 }, /* (99) typename ::= ids LP signed RP */
{ 231, -1 }, /* (100) signed ::= INTEGER */ { 237, -1 }, /* (100) signed ::= INTEGER */
{ 231, -2 }, /* (101) signed ::= PLUS INTEGER */ { 237, -2 }, /* (101) signed ::= PLUS INTEGER */
{ 231, -2 }, /* (102) signed ::= MINUS INTEGER */ { 237, -2 }, /* (102) signed ::= MINUS INTEGER */
{ 199, -6 }, /* (103) cmd ::= CREATE TABLE ifnotexists ids cpxName create_table_args */ { 205, -6 }, /* (103) cmd ::= CREATE TABLE ifnotexists ids cpxName create_table_args */
{ 232, -3 }, /* (104) create_table_args ::= LP columnlist RP */ { 238, -3 }, /* (104) create_table_args ::= LP columnlist RP */
{ 232, -7 }, /* (105) create_table_args ::= LP columnlist RP TAGS LP columnlist RP */ { 238, -7 }, /* (105) create_table_args ::= LP columnlist RP TAGS LP columnlist RP */
{ 232, -7 }, /* (106) create_table_args ::= USING ids cpxName TAGS LP tagitemlist RP */ { 238, -7 }, /* (106) create_table_args ::= USING ids cpxName TAGS LP tagitemlist RP */
{ 232, -2 }, /* (107) create_table_args ::= AS select */ { 238, -2 }, /* (107) create_table_args ::= AS select */
{ 233, -3 }, /* (108) columnlist ::= columnlist COMMA column */ { 239, -3 }, /* (108) columnlist ::= columnlist COMMA column */
{ 233, -1 }, /* (109) columnlist ::= column */ { 239, -1 }, /* (109) columnlist ::= column */
{ 235, -2 }, /* (110) column ::= ids typename */ { 241, -2 }, /* (110) column ::= ids typename */
{ 218, -3 }, /* (111) tagitemlist ::= tagitemlist COMMA tagitem */ { 224, -3 }, /* (111) tagitemlist ::= tagitemlist COMMA tagitem */
{ 218, -1 }, /* (112) tagitemlist ::= tagitem */ { 224, -1 }, /* (112) tagitemlist ::= tagitem */
{ 236, -1 }, /* (113) tagitem ::= INTEGER */ { 242, -1 }, /* (113) tagitem ::= INTEGER */
{ 236, -1 }, /* (114) tagitem ::= FLOAT */ { 242, -1 }, /* (114) tagitem ::= FLOAT */
{ 236, -1 }, /* (115) tagitem ::= STRING */ { 242, -1 }, /* (115) tagitem ::= STRING */
{ 236, -1 }, /* (116) tagitem ::= BOOL */ { 242, -1 }, /* (116) tagitem ::= BOOL */
{ 236, -1 }, /* (117) tagitem ::= NULL */ { 242, -1 }, /* (117) tagitem ::= NULL */
{ 236, -2 }, /* (118) tagitem ::= MINUS INTEGER */ { 242, -2 }, /* (118) tagitem ::= MINUS INTEGER */
{ 236, -2 }, /* (119) tagitem ::= MINUS FLOAT */ { 242, -2 }, /* (119) tagitem ::= MINUS FLOAT */
{ 236, -2 }, /* (120) tagitem ::= PLUS INTEGER */ { 242, -2 }, /* (120) tagitem ::= PLUS INTEGER */
{ 236, -2 }, /* (121) tagitem ::= PLUS FLOAT */ { 242, -2 }, /* (121) tagitem ::= PLUS FLOAT */
{ 234, -12 }, /* (122) select ::= SELECT selcollist from where_opt interval_opt fill_opt sliding_opt groupby_opt orderby_opt having_opt slimit_opt limit_opt */ { 240, -12 }, /* (122) select ::= SELECT selcollist from where_opt interval_opt fill_opt sliding_opt groupby_opt orderby_opt having_opt slimit_opt limit_opt */
{ 248, -1 }, /* (123) union ::= select */ { 254, -1 }, /* (123) union ::= select */
{ 248, -3 }, /* (124) union ::= LP union RP */ { 254, -3 }, /* (124) union ::= LP union RP */
{ 248, -4 }, /* (125) union ::= union UNION ALL select */ { 254, -4 }, /* (125) union ::= union UNION ALL select */
{ 248, -6 }, /* (126) union ::= union UNION ALL LP select RP */ { 254, -6 }, /* (126) union ::= union UNION ALL LP select RP */
{ 199, -1 }, /* (127) cmd ::= union */ { 205, -1 }, /* (127) cmd ::= union */
{ 234, -2 }, /* (128) select ::= SELECT selcollist */ { 240, -2 }, /* (128) select ::= SELECT selcollist */
{ 249, -2 }, /* (129) sclp ::= selcollist COMMA */ { 255, -2 }, /* (129) sclp ::= selcollist COMMA */
{ 249, 0 }, /* (130) sclp ::= */ { 255, 0 }, /* (130) sclp ::= */
{ 237, -3 }, /* (131) selcollist ::= sclp expr as */ { 243, -3 }, /* (131) selcollist ::= sclp expr as */
{ 237, -2 }, /* (132) selcollist ::= sclp STAR */ { 243, -2 }, /* (132) selcollist ::= sclp STAR */
{ 251, -2 }, /* (133) as ::= AS ids */ { 257, -2 }, /* (133) as ::= AS ids */
{ 251, -1 }, /* (134) as ::= ids */ { 257, -1 }, /* (134) as ::= ids */
{ 251, 0 }, /* (135) as ::= */ { 257, 0 }, /* (135) as ::= */
{ 238, -2 }, /* (136) from ::= FROM tablelist */ { 244, -2 }, /* (136) from ::= FROM tablelist */
{ 252, -2 }, /* (137) tablelist ::= ids cpxName */ { 258, -2 }, /* (137) tablelist ::= ids cpxName */
{ 252, -4 }, /* (138) tablelist ::= tablelist COMMA ids cpxName */ { 258, -4 }, /* (138) tablelist ::= tablelist COMMA ids cpxName */
{ 253, -1 }, /* (139) tmvar ::= VARIABLE */ { 259, -1 }, /* (139) tmvar ::= VARIABLE */
{ 240, -4 }, /* (140) interval_opt ::= INTERVAL LP tmvar RP */ { 246, -4 }, /* (140) interval_opt ::= INTERVAL LP tmvar RP */
{ 240, 0 }, /* (141) interval_opt ::= */ { 246, 0 }, /* (141) interval_opt ::= */
{ 241, 0 }, /* (142) fill_opt ::= */ { 247, 0 }, /* (142) fill_opt ::= */
{ 241, -6 }, /* (143) fill_opt ::= FILL LP ID COMMA tagitemlist RP */ { 247, -6 }, /* (143) fill_opt ::= FILL LP ID COMMA tagitemlist RP */
{ 241, -4 }, /* (144) fill_opt ::= FILL LP ID RP */ { 247, -4 }, /* (144) fill_opt ::= FILL LP ID RP */
{ 242, -4 }, /* (145) sliding_opt ::= SLIDING LP tmvar RP */ { 248, -4 }, /* (145) sliding_opt ::= SLIDING LP tmvar RP */
{ 242, 0 }, /* (146) sliding_opt ::= */ { 248, 0 }, /* (146) sliding_opt ::= */
{ 244, 0 }, /* (147) orderby_opt ::= */ { 250, 0 }, /* (147) orderby_opt ::= */
{ 244, -3 }, /* (148) orderby_opt ::= ORDER BY sortlist */ { 250, -3 }, /* (148) orderby_opt ::= ORDER BY sortlist */
{ 254, -4 }, /* (149) sortlist ::= sortlist COMMA item sortorder */ { 260, -4 }, /* (149) sortlist ::= sortlist COMMA item sortorder */
{ 254, -2 }, /* (150) sortlist ::= item sortorder */ { 260, -2 }, /* (150) sortlist ::= item sortorder */
{ 256, -2 }, /* (151) item ::= ids cpxName */ { 262, -2 }, /* (151) item ::= ids cpxName */
{ 257, -1 }, /* (152) sortorder ::= ASC */ { 263, -1 }, /* (152) sortorder ::= ASC */
{ 257, -1 }, /* (153) sortorder ::= DESC */ { 263, -1 }, /* (153) sortorder ::= DESC */
{ 257, 0 }, /* (154) sortorder ::= */ { 263, 0 }, /* (154) sortorder ::= */
{ 243, 0 }, /* (155) groupby_opt ::= */ { 249, 0 }, /* (155) groupby_opt ::= */
{ 243, -3 }, /* (156) groupby_opt ::= GROUP BY grouplist */ { 249, -3 }, /* (156) groupby_opt ::= GROUP BY grouplist */
{ 258, -3 }, /* (157) grouplist ::= grouplist COMMA item */ { 264, -3 }, /* (157) grouplist ::= grouplist COMMA item */
{ 258, -1 }, /* (158) grouplist ::= item */ { 264, -1 }, /* (158) grouplist ::= item */
{ 245, 0 }, /* (159) having_opt ::= */ { 251, 0 }, /* (159) having_opt ::= */
{ 245, -2 }, /* (160) having_opt ::= HAVING expr */ { 251, -2 }, /* (160) having_opt ::= HAVING expr */
{ 247, 0 }, /* (161) limit_opt ::= */ { 253, 0 }, /* (161) limit_opt ::= */
{ 247, -2 }, /* (162) limit_opt ::= LIMIT signed */ { 253, -2 }, /* (162) limit_opt ::= LIMIT signed */
{ 247, -4 }, /* (163) limit_opt ::= LIMIT signed OFFSET signed */ { 253, -4 }, /* (163) limit_opt ::= LIMIT signed OFFSET signed */
{ 247, -4 }, /* (164) limit_opt ::= LIMIT signed COMMA signed */ { 253, -4 }, /* (164) limit_opt ::= LIMIT signed COMMA signed */
{ 246, 0 }, /* (165) slimit_opt ::= */ { 252, 0 }, /* (165) slimit_opt ::= */
{ 246, -2 }, /* (166) slimit_opt ::= SLIMIT signed */ { 252, -2 }, /* (166) slimit_opt ::= SLIMIT signed */
{ 246, -4 }, /* (167) slimit_opt ::= SLIMIT signed SOFFSET signed */ { 252, -4 }, /* (167) slimit_opt ::= SLIMIT signed SOFFSET signed */
{ 246, -4 }, /* (168) slimit_opt ::= SLIMIT signed COMMA signed */ { 252, -4 }, /* (168) slimit_opt ::= SLIMIT signed COMMA signed */
{ 239, 0 }, /* (169) where_opt ::= */ { 245, 0 }, /* (169) where_opt ::= */
{ 239, -2 }, /* (170) where_opt ::= WHERE expr */ { 245, -2 }, /* (170) where_opt ::= WHERE expr */
{ 250, -3 }, /* (171) expr ::= LP expr RP */ { 256, -3 }, /* (171) expr ::= LP expr RP */
{ 250, -1 }, /* (172) expr ::= ID */ { 256, -1 }, /* (172) expr ::= ID */
{ 250, -3 }, /* (173) expr ::= ID DOT ID */ { 256, -3 }, /* (173) expr ::= ID DOT ID */
{ 250, -3 }, /* (174) expr ::= ID DOT STAR */ { 256, -3 }, /* (174) expr ::= ID DOT STAR */
{ 250, -1 }, /* (175) expr ::= INTEGER */ { 256, -1 }, /* (175) expr ::= INTEGER */
{ 250, -2 }, /* (176) expr ::= MINUS INTEGER */ { 256, -2 }, /* (176) expr ::= MINUS INTEGER */
{ 250, -2 }, /* (177) expr ::= PLUS INTEGER */ { 256, -2 }, /* (177) expr ::= PLUS INTEGER */
{ 250, -1 }, /* (178) expr ::= FLOAT */ { 256, -1 }, /* (178) expr ::= FLOAT */
{ 250, -2 }, /* (179) expr ::= MINUS FLOAT */ { 256, -2 }, /* (179) expr ::= MINUS FLOAT */
{ 250, -2 }, /* (180) expr ::= PLUS FLOAT */ { 256, -2 }, /* (180) expr ::= PLUS FLOAT */
{ 250, -1 }, /* (181) expr ::= STRING */ { 256, -1 }, /* (181) expr ::= STRING */
{ 250, -1 }, /* (182) expr ::= NOW */ { 256, -1 }, /* (182) expr ::= NOW */
{ 250, -1 }, /* (183) expr ::= VARIABLE */ { 256, -1 }, /* (183) expr ::= VARIABLE */
{ 250, -1 }, /* (184) expr ::= BOOL */ { 256, -1 }, /* (184) expr ::= BOOL */
{ 250, -4 }, /* (185) expr ::= ID LP exprlist RP */ { 256, -4 }, /* (185) expr ::= ID LP exprlist RP */
{ 250, -4 }, /* (186) expr ::= ID LP STAR RP */ { 256, -4 }, /* (186) expr ::= ID LP STAR RP */
{ 250, -3 }, /* (187) expr ::= expr AND expr */ { 256, -3 }, /* (187) expr ::= expr AND expr */
{ 250, -3 }, /* (188) expr ::= expr OR expr */ { 256, -3 }, /* (188) expr ::= expr OR expr */
{ 250, -3 }, /* (189) expr ::= expr LT expr */ { 256, -3 }, /* (189) expr ::= expr LT expr */
{ 250, -3 }, /* (190) expr ::= expr GT expr */ { 256, -3 }, /* (190) expr ::= expr GT expr */
{ 250, -3 }, /* (191) expr ::= expr LE expr */ { 256, -3 }, /* (191) expr ::= expr LE expr */
{ 250, -3 }, /* (192) expr ::= expr GE expr */ { 256, -3 }, /* (192) expr ::= expr GE expr */
{ 250, -3 }, /* (193) expr ::= expr NE expr */ { 256, -3 }, /* (193) expr ::= expr NE expr */
{ 250, -3 }, /* (194) expr ::= expr EQ expr */ { 256, -3 }, /* (194) expr ::= expr EQ expr */
{ 250, -3 }, /* (195) expr ::= expr PLUS expr */ { 256, -3 }, /* (195) expr ::= expr PLUS expr */
{ 250, -3 }, /* (196) expr ::= expr MINUS expr */ { 256, -3 }, /* (196) expr ::= expr MINUS expr */
{ 250, -3 }, /* (197) expr ::= expr STAR expr */ { 256, -3 }, /* (197) expr ::= expr STAR expr */
{ 250, -3 }, /* (198) expr ::= expr SLASH expr */ { 256, -3 }, /* (198) expr ::= expr SLASH expr */
{ 250, -3 }, /* (199) expr ::= expr REM expr */ { 256, -3 }, /* (199) expr ::= expr REM expr */
{ 250, -3 }, /* (200) expr ::= expr LIKE expr */ { 256, -3 }, /* (200) expr ::= expr LIKE expr */
{ 250, -5 }, /* (201) expr ::= expr IN LP exprlist RP */ { 256, -5 }, /* (201) expr ::= expr IN LP exprlist RP */
{ 259, -3 }, /* (202) exprlist ::= exprlist COMMA expritem */ { 265, -3 }, /* (202) exprlist ::= exprlist COMMA expritem */
{ 259, -1 }, /* (203) exprlist ::= expritem */ { 265, -1 }, /* (203) exprlist ::= expritem */
{ 260, -1 }, /* (204) expritem ::= expr */ { 266, -1 }, /* (204) expritem ::= expr */
{ 260, 0 }, /* (205) expritem ::= */ { 266, 0 }, /* (205) expritem ::= */
{ 199, -3 }, /* (206) cmd ::= RESET QUERY CACHE */ { 205, -3 }, /* (206) cmd ::= RESET QUERY CACHE */
{ 199, -7 }, /* (207) cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist */ { 205, -7 }, /* (207) cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist */
{ 199, -7 }, /* (208) cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */ { 205, -7 }, /* (208) cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */
{ 199, -7 }, /* (209) cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */ { 205, -7 }, /* (209) cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */
{ 199, -7 }, /* (210) cmd ::= ALTER TABLE ids cpxName DROP TAG ids */ { 205, -7 }, /* (210) cmd ::= ALTER TABLE ids cpxName DROP TAG ids */
{ 199, -8 }, /* (211) cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */ { 205, -8 }, /* (211) cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */
{ 199, -9 }, /* (212) cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem */ { 205, -9 }, /* (212) cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem */
{ 199, -5 }, /* (213) cmd ::= KILL CONNECTION IPTOKEN COLON INTEGER */ { 205, -5 }, /* (213) cmd ::= KILL CONNECTION IPTOKEN COLON INTEGER */
{ 199, -7 }, /* (214) cmd ::= KILL STREAM IPTOKEN COLON INTEGER COLON INTEGER */ { 205, -7 }, /* (214) cmd ::= KILL STREAM IPTOKEN COLON INTEGER COLON INTEGER */
{ 199, -7 }, /* (215) cmd ::= KILL QUERY IPTOKEN COLON INTEGER COLON INTEGER */ { 205, -7 }, /* (215) cmd ::= KILL QUERY IPTOKEN COLON INTEGER COLON INTEGER */
}; };
static void yy_accept(yyParser*); /* Forward Declaration */ static void yy_accept(yyParser*); /* Forward Declaration */
...@@ -2081,13 +2094,13 @@ static void yy_reduce( ...@@ -2081,13 +2094,13 @@ static void yy_reduce(
{ setDCLSQLElems(pInfo, TSDB_SQL_CFG_LOCAL, 2, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy0); } { setDCLSQLElems(pInfo, TSDB_SQL_CFG_LOCAL, 2, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy0); }
break; break;
case 38: /* cmd ::= ALTER DATABASE ids alter_db_optr */ case 38: /* cmd ::= ALTER DATABASE ids alter_db_optr */
{ SSQLToken t = {0}; setCreateDBSQL(pInfo, TSDB_SQL_ALTER_DB, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy262, &t);} { SSQLToken t = {0}; setCreateDBSQL(pInfo, TSDB_SQL_ALTER_DB, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy532, &t);}
break; break;
case 39: /* cmd ::= ALTER ACCOUNT ids acct_optr */ case 39: /* cmd ::= ALTER ACCOUNT ids acct_optr */
{ setCreateAcctSQL(pInfo, TSDB_SQL_ALTER_ACCT, &yymsp[-1].minor.yy0, NULL, &yymsp[0].minor.yy155);} { setCreateAcctSQL(pInfo, TSDB_SQL_ALTER_ACCT, &yymsp[-1].minor.yy0, NULL, &yymsp[0].minor.yy239);}
break; break;
case 40: /* cmd ::= ALTER ACCOUNT ids PASS ids acct_optr */ case 40: /* cmd ::= ALTER ACCOUNT ids PASS ids acct_optr */
{ setCreateAcctSQL(pInfo, TSDB_SQL_ALTER_ACCT, &yymsp[-3].minor.yy0, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy155);} { setCreateAcctSQL(pInfo, TSDB_SQL_ALTER_ACCT, &yymsp[-3].minor.yy0, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy239);}
break; break;
case 41: /* ids ::= ID */ case 41: /* ids ::= ID */
case 42: /* ids ::= STRING */ yytestcase(yyruleno==42); case 42: /* ids ::= STRING */ yytestcase(yyruleno==42);
...@@ -2108,10 +2121,10 @@ static void yy_reduce( ...@@ -2108,10 +2121,10 @@ static void yy_reduce(
{ setDCLSQLElems(pInfo, TSDB_SQL_CREATE_DNODE, 1, &yymsp[0].minor.yy0);} { setDCLSQLElems(pInfo, TSDB_SQL_CREATE_DNODE, 1, &yymsp[0].minor.yy0);}
break; break;
case 48: /* cmd ::= CREATE ACCOUNT ids PASS ids acct_optr */ case 48: /* cmd ::= CREATE ACCOUNT ids PASS ids acct_optr */
{ setCreateAcctSQL(pInfo, TSDB_SQL_CREATE_ACCT, &yymsp[-3].minor.yy0, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy155);} { setCreateAcctSQL(pInfo, TSDB_SQL_CREATE_ACCT, &yymsp[-3].minor.yy0, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy239);}
break; break;
case 49: /* cmd ::= CREATE DATABASE ifnotexists ids db_optr */ case 49: /* cmd ::= CREATE DATABASE ifnotexists ids db_optr */
{ setCreateDBSQL(pInfo, TSDB_SQL_CREATE_DB, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy262, &yymsp[-2].minor.yy0);} { setCreateDBSQL(pInfo, TSDB_SQL_CREATE_DB, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy532, &yymsp[-2].minor.yy0);}
break; break;
case 50: /* cmd ::= CREATE USER ids PASS ids */ case 50: /* cmd ::= CREATE USER ids PASS ids */
{ setCreateUserSQL(pInfo, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0);} { setCreateUserSQL(pInfo, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0);}
...@@ -2140,20 +2153,20 @@ static void yy_reduce( ...@@ -2140,20 +2153,20 @@ static void yy_reduce(
break; break;
case 69: /* acct_optr ::= pps tseries storage streams qtime dbs users conns state */ case 69: /* acct_optr ::= pps tseries storage streams qtime dbs users conns state */
{ {
yylhsminor.yy155.maxUsers = (yymsp[-2].minor.yy0.n>0)?atoi(yymsp[-2].minor.yy0.z):-1; yylhsminor.yy239.maxUsers = (yymsp[-2].minor.yy0.n>0)?atoi(yymsp[-2].minor.yy0.z):-1;
yylhsminor.yy155.maxDbs = (yymsp[-3].minor.yy0.n>0)?atoi(yymsp[-3].minor.yy0.z):-1; yylhsminor.yy239.maxDbs = (yymsp[-3].minor.yy0.n>0)?atoi(yymsp[-3].minor.yy0.z):-1;
yylhsminor.yy155.maxTimeSeries = (yymsp[-7].minor.yy0.n>0)?atoi(yymsp[-7].minor.yy0.z):-1; yylhsminor.yy239.maxTimeSeries = (yymsp[-7].minor.yy0.n>0)?atoi(yymsp[-7].minor.yy0.z):-1;
yylhsminor.yy155.maxStreams = (yymsp[-5].minor.yy0.n>0)?atoi(yymsp[-5].minor.yy0.z):-1; yylhsminor.yy239.maxStreams = (yymsp[-5].minor.yy0.n>0)?atoi(yymsp[-5].minor.yy0.z):-1;
yylhsminor.yy155.maxPointsPerSecond = (yymsp[-8].minor.yy0.n>0)?atoi(yymsp[-8].minor.yy0.z):-1; yylhsminor.yy239.maxPointsPerSecond = (yymsp[-8].minor.yy0.n>0)?atoi(yymsp[-8].minor.yy0.z):-1;
yylhsminor.yy155.maxStorage = (yymsp[-6].minor.yy0.n>0)?strtoll(yymsp[-6].minor.yy0.z, NULL, 10):-1; yylhsminor.yy239.maxStorage = (yymsp[-6].minor.yy0.n>0)?strtoll(yymsp[-6].minor.yy0.z, NULL, 10):-1;
yylhsminor.yy155.maxQueryTime = (yymsp[-4].minor.yy0.n>0)?strtoll(yymsp[-4].minor.yy0.z, NULL, 10):-1; yylhsminor.yy239.maxQueryTime = (yymsp[-4].minor.yy0.n>0)?strtoll(yymsp[-4].minor.yy0.z, NULL, 10):-1;
yylhsminor.yy155.maxConnections = (yymsp[-1].minor.yy0.n>0)?atoi(yymsp[-1].minor.yy0.z):-1; yylhsminor.yy239.maxConnections = (yymsp[-1].minor.yy0.n>0)?atoi(yymsp[-1].minor.yy0.z):-1;
yylhsminor.yy155.stat = yymsp[0].minor.yy0; yylhsminor.yy239.stat = yymsp[0].minor.yy0;
} }
yymsp[-8].minor.yy155 = yylhsminor.yy155; yymsp[-8].minor.yy239 = yylhsminor.yy239;
break; break;
case 70: /* keep ::= KEEP tagitemlist */ case 70: /* keep ::= KEEP tagitemlist */
{ yymsp[-1].minor.yy480 = yymsp[0].minor.yy480; } { yymsp[-1].minor.yy30 = yymsp[0].minor.yy30; }
break; break;
case 71: /* tables ::= TABLES INTEGER */ case 71: /* tables ::= TABLES INTEGER */
case 72: /* cache ::= CACHE INTEGER */ yytestcase(yyruleno==72); case 72: /* cache ::= CACHE INTEGER */ yytestcase(yyruleno==72);
...@@ -2169,81 +2182,81 @@ static void yy_reduce( ...@@ -2169,81 +2182,81 @@ static void yy_reduce(
{ yymsp[-1].minor.yy0 = yymsp[0].minor.yy0; } { yymsp[-1].minor.yy0 = yymsp[0].minor.yy0; }
break; break;
case 82: /* db_optr ::= */ case 82: /* db_optr ::= */
{setDefaultCreateDbOption(&yymsp[1].minor.yy262);} {setDefaultCreateDbOption(&yymsp[1].minor.yy532);}
break; break;
case 83: /* db_optr ::= db_optr tables */ case 83: /* db_optr ::= db_optr tables */
case 97: /* alter_db_optr ::= alter_db_optr tables */ yytestcase(yyruleno==97); case 97: /* alter_db_optr ::= alter_db_optr tables */ yytestcase(yyruleno==97);
{ yylhsminor.yy262 = yymsp[-1].minor.yy262; yylhsminor.yy262.tablesPerVnode = strtol(yymsp[0].minor.yy0.z, NULL, 10); } { yylhsminor.yy532 = yymsp[-1].minor.yy532; yylhsminor.yy532.tablesPerVnode = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
yymsp[-1].minor.yy262 = yylhsminor.yy262; yymsp[-1].minor.yy532 = yylhsminor.yy532;
break; break;
case 84: /* db_optr ::= db_optr cache */ case 84: /* db_optr ::= db_optr cache */
{ yylhsminor.yy262 = yymsp[-1].minor.yy262; yylhsminor.yy262.cacheBlockSize = strtol(yymsp[0].minor.yy0.z, NULL, 10); } { yylhsminor.yy532 = yymsp[-1].minor.yy532; yylhsminor.yy532.cacheBlockSize = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
yymsp[-1].minor.yy262 = yylhsminor.yy262; yymsp[-1].minor.yy532 = yylhsminor.yy532;
break; break;
case 85: /* db_optr ::= db_optr replica */ case 85: /* db_optr ::= db_optr replica */
case 96: /* alter_db_optr ::= alter_db_optr replica */ yytestcase(yyruleno==96); case 96: /* alter_db_optr ::= alter_db_optr replica */ yytestcase(yyruleno==96);
{ yylhsminor.yy262 = yymsp[-1].minor.yy262; yylhsminor.yy262.replica = strtol(yymsp[0].minor.yy0.z, NULL, 10); } { yylhsminor.yy532 = yymsp[-1].minor.yy532; yylhsminor.yy532.replica = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
yymsp[-1].minor.yy262 = yylhsminor.yy262; yymsp[-1].minor.yy532 = yylhsminor.yy532;
break; break;
case 86: /* db_optr ::= db_optr days */ case 86: /* db_optr ::= db_optr days */
{ yylhsminor.yy262 = yymsp[-1].minor.yy262; yylhsminor.yy262.daysPerFile = strtol(yymsp[0].minor.yy0.z, NULL, 10); } { yylhsminor.yy532 = yymsp[-1].minor.yy532; yylhsminor.yy532.daysPerFile = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
yymsp[-1].minor.yy262 = yylhsminor.yy262; yymsp[-1].minor.yy532 = yylhsminor.yy532;
break; break;
case 87: /* db_optr ::= db_optr rows */ case 87: /* db_optr ::= db_optr rows */
{ yylhsminor.yy262 = yymsp[-1].minor.yy262; yylhsminor.yy262.rowPerFileBlock = strtol(yymsp[0].minor.yy0.z, NULL, 10); } { yylhsminor.yy532 = yymsp[-1].minor.yy532; yylhsminor.yy532.rowPerFileBlock = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
yymsp[-1].minor.yy262 = yylhsminor.yy262; yymsp[-1].minor.yy532 = yylhsminor.yy532;
break; break;
case 88: /* db_optr ::= db_optr ablocks */ case 88: /* db_optr ::= db_optr ablocks */
{ yylhsminor.yy262 = yymsp[-1].minor.yy262; yylhsminor.yy262.numOfAvgCacheBlocks = strtod(yymsp[0].minor.yy0.z, NULL); } { yylhsminor.yy532 = yymsp[-1].minor.yy532; yylhsminor.yy532.numOfAvgCacheBlocks = strtod(yymsp[0].minor.yy0.z, NULL); }
yymsp[-1].minor.yy262 = yylhsminor.yy262; yymsp[-1].minor.yy532 = yylhsminor.yy532;
break; break;
case 89: /* db_optr ::= db_optr tblocks */ case 89: /* db_optr ::= db_optr tblocks */
{ yylhsminor.yy262 = yymsp[-1].minor.yy262; yylhsminor.yy262.numOfBlocksPerTable = strtol(yymsp[0].minor.yy0.z, NULL, 10); } { yylhsminor.yy532 = yymsp[-1].minor.yy532; yylhsminor.yy532.numOfBlocksPerTable = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
yymsp[-1].minor.yy262 = yylhsminor.yy262; yymsp[-1].minor.yy532 = yylhsminor.yy532;
break; break;
case 90: /* db_optr ::= db_optr ctime */ case 90: /* db_optr ::= db_optr ctime */
{ yylhsminor.yy262 = yymsp[-1].minor.yy262; yylhsminor.yy262.commitTime = strtol(yymsp[0].minor.yy0.z, NULL, 10); } { yylhsminor.yy532 = yymsp[-1].minor.yy532; yylhsminor.yy532.commitTime = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
yymsp[-1].minor.yy262 = yylhsminor.yy262; yymsp[-1].minor.yy532 = yylhsminor.yy532;
break; break;
case 91: /* db_optr ::= db_optr clog */ case 91: /* db_optr ::= db_optr clog */
{ yylhsminor.yy262 = yymsp[-1].minor.yy262; yylhsminor.yy262.commitLog = strtol(yymsp[0].minor.yy0.z, NULL, 10); } { yylhsminor.yy532 = yymsp[-1].minor.yy532; yylhsminor.yy532.commitLog = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
yymsp[-1].minor.yy262 = yylhsminor.yy262; yymsp[-1].minor.yy532 = yylhsminor.yy532;
break; break;
case 92: /* db_optr ::= db_optr comp */ case 92: /* db_optr ::= db_optr comp */
{ yylhsminor.yy262 = yymsp[-1].minor.yy262; yylhsminor.yy262.compressionLevel = strtol(yymsp[0].minor.yy0.z, NULL, 10); } { yylhsminor.yy532 = yymsp[-1].minor.yy532; yylhsminor.yy532.compressionLevel = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
yymsp[-1].minor.yy262 = yylhsminor.yy262; yymsp[-1].minor.yy532 = yylhsminor.yy532;
break; break;
case 93: /* db_optr ::= db_optr prec */ case 93: /* db_optr ::= db_optr prec */
{ yylhsminor.yy262 = yymsp[-1].minor.yy262; yylhsminor.yy262.precision = yymsp[0].minor.yy0; } { yylhsminor.yy532 = yymsp[-1].minor.yy532; yylhsminor.yy532.precision = yymsp[0].minor.yy0; }
yymsp[-1].minor.yy262 = yylhsminor.yy262; yymsp[-1].minor.yy532 = yylhsminor.yy532;
break; break;
case 94: /* db_optr ::= db_optr keep */ case 94: /* db_optr ::= db_optr keep */
{ yylhsminor.yy262 = yymsp[-1].minor.yy262; yylhsminor.yy262.keep = yymsp[0].minor.yy480; } { yylhsminor.yy532 = yymsp[-1].minor.yy532; yylhsminor.yy532.keep = yymsp[0].minor.yy30; }
yymsp[-1].minor.yy262 = yylhsminor.yy262; yymsp[-1].minor.yy532 = yylhsminor.yy532;
break; break;
case 95: /* alter_db_optr ::= */ case 95: /* alter_db_optr ::= */
{ setDefaultCreateDbOption(&yymsp[1].minor.yy262);} { setDefaultCreateDbOption(&yymsp[1].minor.yy532);}
break; break;
case 98: /* typename ::= ids */ case 98: /* typename ::= ids */
{ tSQLSetColumnType (&yylhsminor.yy397, &yymsp[0].minor.yy0); } { tSQLSetColumnType (&yylhsminor.yy505, &yymsp[0].minor.yy0); }
yymsp[0].minor.yy397 = yylhsminor.yy397; yymsp[0].minor.yy505 = yylhsminor.yy505;
break; break;
case 99: /* typename ::= ids LP signed RP */ case 99: /* typename ::= ids LP signed RP */
{ {
yymsp[-3].minor.yy0.type = -yymsp[-1].minor.yy369; // negative value of name length yymsp[-3].minor.yy0.type = -yymsp[-1].minor.yy489; // negative value of name length
tSQLSetColumnType(&yylhsminor.yy397, &yymsp[-3].minor.yy0); tSQLSetColumnType(&yylhsminor.yy505, &yymsp[-3].minor.yy0);
} }
yymsp[-3].minor.yy397 = yylhsminor.yy397; yymsp[-3].minor.yy505 = yylhsminor.yy505;
break; break;
case 100: /* signed ::= INTEGER */ case 100: /* signed ::= INTEGER */
{ yylhsminor.yy369 = strtol(yymsp[0].minor.yy0.z, NULL, 10); } { yylhsminor.yy489 = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
yymsp[0].minor.yy369 = yylhsminor.yy369; yymsp[0].minor.yy489 = yylhsminor.yy489;
break; break;
case 101: /* signed ::= PLUS INTEGER */ case 101: /* signed ::= PLUS INTEGER */
{ yymsp[-1].minor.yy369 = strtol(yymsp[0].minor.yy0.z, NULL, 10); } { yymsp[-1].minor.yy489 = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
break; break;
case 102: /* signed ::= MINUS INTEGER */ case 102: /* signed ::= MINUS INTEGER */
{ yymsp[-1].minor.yy369 = -strtol(yymsp[0].minor.yy0.z, NULL, 10);} { yymsp[-1].minor.yy489 = -strtol(yymsp[0].minor.yy0.z, NULL, 10);}
break; break;
case 103: /* cmd ::= CREATE TABLE ifnotexists ids cpxName create_table_args */ case 103: /* cmd ::= CREATE TABLE ifnotexists ids cpxName create_table_args */
{ {
...@@ -2253,61 +2266,61 @@ static void yy_reduce( ...@@ -2253,61 +2266,61 @@ static void yy_reduce(
break; break;
case 104: /* create_table_args ::= LP columnlist RP */ case 104: /* create_table_args ::= LP columnlist RP */
{ {
yymsp[-2].minor.yy344 = tSetCreateSQLElems(yymsp[-1].minor.yy421, NULL, NULL, NULL, NULL, TSQL_CREATE_TABLE); yymsp[-2].minor.yy212 = tSetCreateSQLElems(yymsp[-1].minor.yy325, NULL, NULL, NULL, NULL, TSQL_CREATE_TABLE);
setSQLInfo(pInfo, yymsp[-2].minor.yy344, NULL, TSDB_SQL_CREATE_TABLE); setSQLInfo(pInfo, yymsp[-2].minor.yy212, NULL, TSDB_SQL_CREATE_TABLE);
} }
break; break;
case 105: /* create_table_args ::= LP columnlist RP TAGS LP columnlist RP */ case 105: /* create_table_args ::= LP columnlist RP TAGS LP columnlist RP */
{ {
yymsp[-6].minor.yy344 = tSetCreateSQLElems(yymsp[-5].minor.yy421, yymsp[-1].minor.yy421, NULL, NULL, NULL, TSQL_CREATE_STABLE); yymsp[-6].minor.yy212 = tSetCreateSQLElems(yymsp[-5].minor.yy325, yymsp[-1].minor.yy325, NULL, NULL, NULL, TSQL_CREATE_STABLE);
setSQLInfo(pInfo, yymsp[-6].minor.yy344, NULL, TSDB_SQL_CREATE_TABLE); setSQLInfo(pInfo, yymsp[-6].minor.yy212, NULL, TSDB_SQL_CREATE_TABLE);
} }
break; break;
case 106: /* create_table_args ::= USING ids cpxName TAGS LP tagitemlist RP */ case 106: /* create_table_args ::= USING ids cpxName TAGS LP tagitemlist RP */
{ {
yymsp[-5].minor.yy0.n += yymsp[-4].minor.yy0.n; yymsp[-5].minor.yy0.n += yymsp[-4].minor.yy0.n;
yymsp[-6].minor.yy344 = tSetCreateSQLElems(NULL, NULL, &yymsp[-5].minor.yy0, yymsp[-1].minor.yy480, NULL, TSQL_CREATE_TABLE_FROM_STABLE); yymsp[-6].minor.yy212 = tSetCreateSQLElems(NULL, NULL, &yymsp[-5].minor.yy0, yymsp[-1].minor.yy30, NULL, TSQL_CREATE_TABLE_FROM_STABLE);
setSQLInfo(pInfo, yymsp[-6].minor.yy344, NULL, TSDB_SQL_CREATE_TABLE); setSQLInfo(pInfo, yymsp[-6].minor.yy212, NULL, TSDB_SQL_CREATE_TABLE);
} }
break; break;
case 107: /* create_table_args ::= AS select */ case 107: /* create_table_args ::= AS select */
{ {
yymsp[-1].minor.yy344 = tSetCreateSQLElems(NULL, NULL, NULL, NULL, yymsp[0].minor.yy138, TSQL_CREATE_STREAM); yymsp[-1].minor.yy212 = tSetCreateSQLElems(NULL, NULL, NULL, NULL, yymsp[0].minor.yy444, TSQL_CREATE_STREAM);
setSQLInfo(pInfo, yymsp[-1].minor.yy344, NULL, TSDB_SQL_CREATE_TABLE); setSQLInfo(pInfo, yymsp[-1].minor.yy212, NULL, TSDB_SQL_CREATE_TABLE);
} }
break; break;
case 108: /* columnlist ::= columnlist COMMA column */ case 108: /* columnlist ::= columnlist COMMA column */
{yylhsminor.yy421 = tFieldListAppend(yymsp[-2].minor.yy421, &yymsp[0].minor.yy397); } {yylhsminor.yy325 = tFieldListAppend(yymsp[-2].minor.yy325, &yymsp[0].minor.yy505); }
yymsp[-2].minor.yy421 = yylhsminor.yy421; yymsp[-2].minor.yy325 = yylhsminor.yy325;
break; break;
case 109: /* columnlist ::= column */ case 109: /* columnlist ::= column */
{yylhsminor.yy421 = tFieldListAppend(NULL, &yymsp[0].minor.yy397);} {yylhsminor.yy325 = tFieldListAppend(NULL, &yymsp[0].minor.yy505);}
yymsp[0].minor.yy421 = yylhsminor.yy421; yymsp[0].minor.yy325 = yylhsminor.yy325;
break; break;
case 110: /* column ::= ids typename */ case 110: /* column ::= ids typename */
{ {
tSQLSetColumnInfo(&yylhsminor.yy397, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy397); tSQLSetColumnInfo(&yylhsminor.yy505, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy505);
} }
yymsp[-1].minor.yy397 = yylhsminor.yy397; yymsp[-1].minor.yy505 = yylhsminor.yy505;
break; break;
case 111: /* tagitemlist ::= tagitemlist COMMA tagitem */ case 111: /* tagitemlist ::= tagitemlist COMMA tagitem */
{ yylhsminor.yy480 = tVariantListAppend(yymsp[-2].minor.yy480, &yymsp[0].minor.yy236, -1); } { yylhsminor.yy30 = tVariantListAppend(yymsp[-2].minor.yy30, &yymsp[0].minor.yy380, -1); }
yymsp[-2].minor.yy480 = yylhsminor.yy480; yymsp[-2].minor.yy30 = yylhsminor.yy30;
break; break;
case 112: /* tagitemlist ::= tagitem */ case 112: /* tagitemlist ::= tagitem */
{ yylhsminor.yy480 = tVariantListAppend(NULL, &yymsp[0].minor.yy236, -1); } { yylhsminor.yy30 = tVariantListAppend(NULL, &yymsp[0].minor.yy380, -1); }
yymsp[0].minor.yy480 = yylhsminor.yy480; yymsp[0].minor.yy30 = yylhsminor.yy30;
break; break;
case 113: /* tagitem ::= INTEGER */ case 113: /* tagitem ::= INTEGER */
case 114: /* tagitem ::= FLOAT */ yytestcase(yyruleno==114); case 114: /* tagitem ::= FLOAT */ yytestcase(yyruleno==114);
case 115: /* tagitem ::= STRING */ yytestcase(yyruleno==115); case 115: /* tagitem ::= STRING */ yytestcase(yyruleno==115);
case 116: /* tagitem ::= BOOL */ yytestcase(yyruleno==116); case 116: /* tagitem ::= BOOL */ yytestcase(yyruleno==116);
{toTSDBType(yymsp[0].minor.yy0.type); tVariantCreate(&yylhsminor.yy236, &yymsp[0].minor.yy0); } {toTSDBType(yymsp[0].minor.yy0.type); tVariantCreate(&yylhsminor.yy380, &yymsp[0].minor.yy0); }
yymsp[0].minor.yy236 = yylhsminor.yy236; yymsp[0].minor.yy380 = yylhsminor.yy380;
break; break;
case 117: /* tagitem ::= NULL */ case 117: /* tagitem ::= NULL */
{ yymsp[0].minor.yy0.type = 0; tVariantCreate(&yylhsminor.yy236, &yymsp[0].minor.yy0); } { yymsp[0].minor.yy0.type = 0; tVariantCreate(&yylhsminor.yy380, &yymsp[0].minor.yy0); }
yymsp[0].minor.yy236 = yylhsminor.yy236; yymsp[0].minor.yy380 = yylhsminor.yy380;
break; break;
case 118: /* tagitem ::= MINUS INTEGER */ case 118: /* tagitem ::= MINUS INTEGER */
case 119: /* tagitem ::= MINUS FLOAT */ yytestcase(yyruleno==119); case 119: /* tagitem ::= MINUS FLOAT */ yytestcase(yyruleno==119);
...@@ -2317,59 +2330,59 @@ static void yy_reduce( ...@@ -2317,59 +2330,59 @@ static void yy_reduce(
yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n;
yymsp[-1].minor.yy0.type = yymsp[0].minor.yy0.type; yymsp[-1].minor.yy0.type = yymsp[0].minor.yy0.type;
toTSDBType(yymsp[-1].minor.yy0.type); toTSDBType(yymsp[-1].minor.yy0.type);
tVariantCreate(&yylhsminor.yy236, &yymsp[-1].minor.yy0); tVariantCreate(&yylhsminor.yy380, &yymsp[-1].minor.yy0);
} }
yymsp[-1].minor.yy236 = yylhsminor.yy236; yymsp[-1].minor.yy380 = yylhsminor.yy380;
break; break;
case 122: /* select ::= SELECT selcollist from where_opt interval_opt fill_opt sliding_opt groupby_opt orderby_opt having_opt slimit_opt limit_opt */ case 122: /* select ::= SELECT selcollist from where_opt interval_opt fill_opt sliding_opt groupby_opt orderby_opt having_opt slimit_opt limit_opt */
{ {
yylhsminor.yy138 = tSetQuerySQLElems(&yymsp[-11].minor.yy0, yymsp[-10].minor.yy284, yymsp[-9].minor.yy480, yymsp[-8].minor.yy244, yymsp[-4].minor.yy480, yymsp[-3].minor.yy480, &yymsp[-7].minor.yy0, &yymsp[-5].minor.yy0, yymsp[-6].minor.yy480, &yymsp[0].minor.yy162, &yymsp[-1].minor.yy162); yylhsminor.yy444 = tSetQuerySQLElems(&yymsp[-11].minor.yy0, yymsp[-10].minor.yy506, yymsp[-9].minor.yy30, yymsp[-8].minor.yy388, yymsp[-4].minor.yy30, yymsp[-3].minor.yy30, &yymsp[-7].minor.yy0, &yymsp[-5].minor.yy0, yymsp[-6].minor.yy30, &yymsp[0].minor.yy150, &yymsp[-1].minor.yy150);
} }
yymsp[-11].minor.yy138 = yylhsminor.yy138; yymsp[-11].minor.yy444 = yylhsminor.yy444;
break; break;
case 123: /* union ::= select */ case 123: /* union ::= select */
{ yylhsminor.yy117 = setSubclause(NULL, yymsp[0].minor.yy138); } { yylhsminor.yy309 = setSubclause(NULL, yymsp[0].minor.yy444); }
yymsp[0].minor.yy117 = yylhsminor.yy117; yymsp[0].minor.yy309 = yylhsminor.yy309;
break; break;
case 124: /* union ::= LP union RP */ case 124: /* union ::= LP union RP */
{ yymsp[-2].minor.yy117 = yymsp[-1].minor.yy117; } { yymsp[-2].minor.yy309 = yymsp[-1].minor.yy309; }
break; break;
case 125: /* union ::= union UNION ALL select */ case 125: /* union ::= union UNION ALL select */
{ yylhsminor.yy117 = appendSelectClause(yymsp[-3].minor.yy117, yymsp[0].minor.yy138); } { yylhsminor.yy309 = appendSelectClause(yymsp[-3].minor.yy309, yymsp[0].minor.yy444); }
yymsp[-3].minor.yy117 = yylhsminor.yy117; yymsp[-3].minor.yy309 = yylhsminor.yy309;
break; break;
case 126: /* union ::= union UNION ALL LP select RP */ case 126: /* union ::= union UNION ALL LP select RP */
{ yylhsminor.yy117 = appendSelectClause(yymsp[-5].minor.yy117, yymsp[-1].minor.yy138); } { yylhsminor.yy309 = appendSelectClause(yymsp[-5].minor.yy309, yymsp[-1].minor.yy444); }
yymsp[-5].minor.yy117 = yylhsminor.yy117; yymsp[-5].minor.yy309 = yylhsminor.yy309;
break; break;
case 127: /* cmd ::= union */ case 127: /* cmd ::= union */
{ setSQLInfo(pInfo, yymsp[0].minor.yy117, NULL, TSDB_SQL_SELECT); } { setSQLInfo(pInfo, yymsp[0].minor.yy309, NULL, TSDB_SQL_SELECT); }
break; break;
case 128: /* select ::= SELECT selcollist */ case 128: /* select ::= SELECT selcollist */
{ {
yylhsminor.yy138 = tSetQuerySQLElems(&yymsp[-1].minor.yy0, yymsp[0].minor.yy284, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); yylhsminor.yy444 = tSetQuerySQLElems(&yymsp[-1].minor.yy0, yymsp[0].minor.yy506, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
} }
yymsp[-1].minor.yy138 = yylhsminor.yy138; yymsp[-1].minor.yy444 = yylhsminor.yy444;
break; break;
case 129: /* sclp ::= selcollist COMMA */ case 129: /* sclp ::= selcollist COMMA */
{yylhsminor.yy284 = yymsp[-1].minor.yy284;} {yylhsminor.yy506 = yymsp[-1].minor.yy506;}
yymsp[-1].minor.yy284 = yylhsminor.yy284; yymsp[-1].minor.yy506 = yylhsminor.yy506;
break; break;
case 130: /* sclp ::= */ case 130: /* sclp ::= */
{yymsp[1].minor.yy284 = 0;} {yymsp[1].minor.yy506 = 0;}
break; break;
case 131: /* selcollist ::= sclp expr as */ case 131: /* selcollist ::= sclp expr as */
{ {
yylhsminor.yy284 = tSQLExprListAppend(yymsp[-2].minor.yy284, yymsp[-1].minor.yy244, yymsp[0].minor.yy0.n?&yymsp[0].minor.yy0:0); yylhsminor.yy506 = tSQLExprListAppend(yymsp[-2].minor.yy506, yymsp[-1].minor.yy388, yymsp[0].minor.yy0.n?&yymsp[0].minor.yy0:0);
} }
yymsp[-2].minor.yy284 = yylhsminor.yy284; yymsp[-2].minor.yy506 = yylhsminor.yy506;
break; break;
case 132: /* selcollist ::= sclp STAR */ case 132: /* selcollist ::= sclp STAR */
{ {
tSQLExpr *pNode = tSQLExprIdValueCreate(NULL, TK_ALL); tSQLExpr *pNode = tSQLExprIdValueCreate(NULL, TK_ALL);
yylhsminor.yy284 = tSQLExprListAppend(yymsp[-1].minor.yy284, pNode, 0); yylhsminor.yy506 = tSQLExprListAppend(yymsp[-1].minor.yy506, pNode, 0);
} }
yymsp[-1].minor.yy284 = yylhsminor.yy284; yymsp[-1].minor.yy506 = yylhsminor.yy506;
break; break;
case 133: /* as ::= AS ids */ case 133: /* as ::= AS ids */
{ yymsp[-1].minor.yy0 = yymsp[0].minor.yy0; } { yymsp[-1].minor.yy0 = yymsp[0].minor.yy0; }
...@@ -2382,15 +2395,15 @@ static void yy_reduce( ...@@ -2382,15 +2395,15 @@ static void yy_reduce(
{ yymsp[1].minor.yy0.n = 0; } { yymsp[1].minor.yy0.n = 0; }
break; break;
case 136: /* from ::= FROM tablelist */ case 136: /* from ::= FROM tablelist */
{yymsp[-1].minor.yy480 = yymsp[0].minor.yy480;} {yymsp[-1].minor.yy30 = yymsp[0].minor.yy30;}
break; break;
case 137: /* tablelist ::= ids cpxName */ case 137: /* tablelist ::= ids cpxName */
{ toTSDBType(yymsp[-1].minor.yy0.type); yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yylhsminor.yy480 = tVariantListAppendToken(NULL, &yymsp[-1].minor.yy0, -1);} { toTSDBType(yymsp[-1].minor.yy0.type); yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yylhsminor.yy30 = tVariantListAppendToken(NULL, &yymsp[-1].minor.yy0, -1);}
yymsp[-1].minor.yy480 = yylhsminor.yy480; yymsp[-1].minor.yy30 = yylhsminor.yy30;
break; break;
case 138: /* tablelist ::= tablelist COMMA ids cpxName */ case 138: /* tablelist ::= tablelist COMMA ids cpxName */
{ toTSDBType(yymsp[-1].minor.yy0.type); yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yylhsminor.yy480 = tVariantListAppendToken(yymsp[-3].minor.yy480, &yymsp[-1].minor.yy0, -1); } { toTSDBType(yymsp[-1].minor.yy0.type); yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yylhsminor.yy30 = tVariantListAppendToken(yymsp[-3].minor.yy30, &yymsp[-1].minor.yy0, -1); }
yymsp[-3].minor.yy480 = yylhsminor.yy480; yymsp[-3].minor.yy30 = yylhsminor.yy30;
break; break;
case 139: /* tmvar ::= VARIABLE */ case 139: /* tmvar ::= VARIABLE */
{yylhsminor.yy0 = yymsp[0].minor.yy0;} {yylhsminor.yy0 = yymsp[0].minor.yy0;}
...@@ -2405,7 +2418,7 @@ static void yy_reduce( ...@@ -2405,7 +2418,7 @@ static void yy_reduce(
{yymsp[1].minor.yy0.n = 0; yymsp[1].minor.yy0.z = NULL; yymsp[1].minor.yy0.type = 0; } {yymsp[1].minor.yy0.n = 0; yymsp[1].minor.yy0.z = NULL; yymsp[1].minor.yy0.type = 0; }
break; break;
case 142: /* fill_opt ::= */ case 142: /* fill_opt ::= */
{yymsp[1].minor.yy480 = 0; } {yymsp[1].minor.yy30 = 0; }
break; break;
case 143: /* fill_opt ::= FILL LP ID COMMA tagitemlist RP */ case 143: /* fill_opt ::= FILL LP ID COMMA tagitemlist RP */
{ {
...@@ -2413,223 +2426,223 @@ static void yy_reduce( ...@@ -2413,223 +2426,223 @@ static void yy_reduce(
toTSDBType(yymsp[-3].minor.yy0.type); toTSDBType(yymsp[-3].minor.yy0.type);
tVariantCreate(&A, &yymsp[-3].minor.yy0); tVariantCreate(&A, &yymsp[-3].minor.yy0);
tVariantListInsert(yymsp[-1].minor.yy480, &A, -1, 0); tVariantListInsert(yymsp[-1].minor.yy30, &A, -1, 0);
yymsp[-5].minor.yy480 = yymsp[-1].minor.yy480; yymsp[-5].minor.yy30 = yymsp[-1].minor.yy30;
} }
break; break;
case 144: /* fill_opt ::= FILL LP ID RP */ case 144: /* fill_opt ::= FILL LP ID RP */
{ {
toTSDBType(yymsp[-1].minor.yy0.type); toTSDBType(yymsp[-1].minor.yy0.type);
yymsp[-3].minor.yy480 = tVariantListAppendToken(NULL, &yymsp[-1].minor.yy0, -1); yymsp[-3].minor.yy30 = tVariantListAppendToken(NULL, &yymsp[-1].minor.yy0, -1);
} }
break; break;
case 147: /* orderby_opt ::= */ case 147: /* orderby_opt ::= */
case 155: /* groupby_opt ::= */ yytestcase(yyruleno==155); case 155: /* groupby_opt ::= */ yytestcase(yyruleno==155);
{yymsp[1].minor.yy480 = 0;} {yymsp[1].minor.yy30 = 0;}
break; break;
case 148: /* orderby_opt ::= ORDER BY sortlist */ case 148: /* orderby_opt ::= ORDER BY sortlist */
case 156: /* groupby_opt ::= GROUP BY grouplist */ yytestcase(yyruleno==156); case 156: /* groupby_opt ::= GROUP BY grouplist */ yytestcase(yyruleno==156);
{yymsp[-2].minor.yy480 = yymsp[0].minor.yy480;} {yymsp[-2].minor.yy30 = yymsp[0].minor.yy30;}
break; break;
case 149: /* sortlist ::= sortlist COMMA item sortorder */ case 149: /* sortlist ::= sortlist COMMA item sortorder */
{ {
yylhsminor.yy480 = tVariantListAppend(yymsp[-3].minor.yy480, &yymsp[-1].minor.yy236, yymsp[0].minor.yy220); yylhsminor.yy30 = tVariantListAppend(yymsp[-3].minor.yy30, &yymsp[-1].minor.yy380, yymsp[0].minor.yy250);
} }
yymsp[-3].minor.yy480 = yylhsminor.yy480; yymsp[-3].minor.yy30 = yylhsminor.yy30;
break; break;
case 150: /* sortlist ::= item sortorder */ case 150: /* sortlist ::= item sortorder */
{ {
yylhsminor.yy480 = tVariantListAppend(NULL, &yymsp[-1].minor.yy236, yymsp[0].minor.yy220); yylhsminor.yy30 = tVariantListAppend(NULL, &yymsp[-1].minor.yy380, yymsp[0].minor.yy250);
} }
yymsp[-1].minor.yy480 = yylhsminor.yy480; yymsp[-1].minor.yy30 = yylhsminor.yy30;
break; break;
case 151: /* item ::= ids cpxName */ case 151: /* item ::= ids cpxName */
{ {
toTSDBType(yymsp[-1].minor.yy0.type); toTSDBType(yymsp[-1].minor.yy0.type);
yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n;
tVariantCreate(&yylhsminor.yy236, &yymsp[-1].minor.yy0); tVariantCreate(&yylhsminor.yy380, &yymsp[-1].minor.yy0);
} }
yymsp[-1].minor.yy236 = yylhsminor.yy236; yymsp[-1].minor.yy380 = yylhsminor.yy380;
break; break;
case 152: /* sortorder ::= ASC */ case 152: /* sortorder ::= ASC */
{yymsp[0].minor.yy220 = TSQL_SO_ASC; } {yymsp[0].minor.yy250 = TSQL_SO_ASC; }
break; break;
case 153: /* sortorder ::= DESC */ case 153: /* sortorder ::= DESC */
{yymsp[0].minor.yy220 = TSQL_SO_DESC;} {yymsp[0].minor.yy250 = TSQL_SO_DESC;}
break; break;
case 154: /* sortorder ::= */ case 154: /* sortorder ::= */
{yymsp[1].minor.yy220 = TSQL_SO_ASC;} {yymsp[1].minor.yy250 = TSQL_SO_ASC;}
break; break;
case 157: /* grouplist ::= grouplist COMMA item */ case 157: /* grouplist ::= grouplist COMMA item */
{ {
yylhsminor.yy480 = tVariantListAppend(yymsp[-2].minor.yy480, &yymsp[0].minor.yy236, -1); yylhsminor.yy30 = tVariantListAppend(yymsp[-2].minor.yy30, &yymsp[0].minor.yy380, -1);
} }
yymsp[-2].minor.yy480 = yylhsminor.yy480; yymsp[-2].minor.yy30 = yylhsminor.yy30;
break; break;
case 158: /* grouplist ::= item */ case 158: /* grouplist ::= item */
{ {
yylhsminor.yy480 = tVariantListAppend(NULL, &yymsp[0].minor.yy236, -1); yylhsminor.yy30 = tVariantListAppend(NULL, &yymsp[0].minor.yy380, -1);
} }
yymsp[0].minor.yy480 = yylhsminor.yy480; yymsp[0].minor.yy30 = yylhsminor.yy30;
break; break;
case 159: /* having_opt ::= */ case 159: /* having_opt ::= */
case 169: /* where_opt ::= */ yytestcase(yyruleno==169); case 169: /* where_opt ::= */ yytestcase(yyruleno==169);
case 205: /* expritem ::= */ yytestcase(yyruleno==205); case 205: /* expritem ::= */ yytestcase(yyruleno==205);
{yymsp[1].minor.yy244 = 0;} {yymsp[1].minor.yy388 = 0;}
break; break;
case 160: /* having_opt ::= HAVING expr */ case 160: /* having_opt ::= HAVING expr */
case 170: /* where_opt ::= WHERE expr */ yytestcase(yyruleno==170); case 170: /* where_opt ::= WHERE expr */ yytestcase(yyruleno==170);
{yymsp[-1].minor.yy244 = yymsp[0].minor.yy244;} {yymsp[-1].minor.yy388 = yymsp[0].minor.yy388;}
break; break;
case 161: /* limit_opt ::= */ case 161: /* limit_opt ::= */
case 165: /* slimit_opt ::= */ yytestcase(yyruleno==165); case 165: /* slimit_opt ::= */ yytestcase(yyruleno==165);
{yymsp[1].minor.yy162.limit = -1; yymsp[1].minor.yy162.offset = 0;} {yymsp[1].minor.yy150.limit = -1; yymsp[1].minor.yy150.offset = 0;}
break; break;
case 162: /* limit_opt ::= LIMIT signed */ case 162: /* limit_opt ::= LIMIT signed */
case 166: /* slimit_opt ::= SLIMIT signed */ yytestcase(yyruleno==166); case 166: /* slimit_opt ::= SLIMIT signed */ yytestcase(yyruleno==166);
{yymsp[-1].minor.yy162.limit = yymsp[0].minor.yy369; yymsp[-1].minor.yy162.offset = 0;} {yymsp[-1].minor.yy150.limit = yymsp[0].minor.yy489; yymsp[-1].minor.yy150.offset = 0;}
break; break;
case 163: /* limit_opt ::= LIMIT signed OFFSET signed */ case 163: /* limit_opt ::= LIMIT signed OFFSET signed */
case 167: /* slimit_opt ::= SLIMIT signed SOFFSET signed */ yytestcase(yyruleno==167); case 167: /* slimit_opt ::= SLIMIT signed SOFFSET signed */ yytestcase(yyruleno==167);
{yymsp[-3].minor.yy162.limit = yymsp[-2].minor.yy369; yymsp[-3].minor.yy162.offset = yymsp[0].minor.yy369;} {yymsp[-3].minor.yy150.limit = yymsp[-2].minor.yy489; yymsp[-3].minor.yy150.offset = yymsp[0].minor.yy489;}
break; break;
case 164: /* limit_opt ::= LIMIT signed COMMA signed */ case 164: /* limit_opt ::= LIMIT signed COMMA signed */
case 168: /* slimit_opt ::= SLIMIT signed COMMA signed */ yytestcase(yyruleno==168); case 168: /* slimit_opt ::= SLIMIT signed COMMA signed */ yytestcase(yyruleno==168);
{yymsp[-3].minor.yy162.limit = yymsp[0].minor.yy369; yymsp[-3].minor.yy162.offset = yymsp[-2].minor.yy369;} {yymsp[-3].minor.yy150.limit = yymsp[0].minor.yy489; yymsp[-3].minor.yy150.offset = yymsp[-2].minor.yy489;}
break; break;
case 171: /* expr ::= LP expr RP */ case 171: /* expr ::= LP expr RP */
{yymsp[-2].minor.yy244 = yymsp[-1].minor.yy244; } {yymsp[-2].minor.yy388 = yymsp[-1].minor.yy388; }
break; break;
case 172: /* expr ::= ID */ case 172: /* expr ::= ID */
{yylhsminor.yy244 = tSQLExprIdValueCreate(&yymsp[0].minor.yy0, TK_ID);} {yylhsminor.yy388 = tSQLExprIdValueCreate(&yymsp[0].minor.yy0, TK_ID);}
yymsp[0].minor.yy244 = yylhsminor.yy244; yymsp[0].minor.yy388 = yylhsminor.yy388;
break; break;
case 173: /* expr ::= ID DOT ID */ case 173: /* expr ::= ID DOT ID */
{yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yylhsminor.yy244 = tSQLExprIdValueCreate(&yymsp[-2].minor.yy0, TK_ID);} {yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yylhsminor.yy388 = tSQLExprIdValueCreate(&yymsp[-2].minor.yy0, TK_ID);}
yymsp[-2].minor.yy244 = yylhsminor.yy244; yymsp[-2].minor.yy388 = yylhsminor.yy388;
break; break;
case 174: /* expr ::= ID DOT STAR */ case 174: /* expr ::= ID DOT STAR */
{yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yylhsminor.yy244 = tSQLExprIdValueCreate(&yymsp[-2].minor.yy0, TK_ALL);} {yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yylhsminor.yy388 = tSQLExprIdValueCreate(&yymsp[-2].minor.yy0, TK_ALL);}
yymsp[-2].minor.yy244 = yylhsminor.yy244; yymsp[-2].minor.yy388 = yylhsminor.yy388;
break; break;
case 175: /* expr ::= INTEGER */ case 175: /* expr ::= INTEGER */
{yylhsminor.yy244 = tSQLExprIdValueCreate(&yymsp[0].minor.yy0, TK_INTEGER);} {yylhsminor.yy388 = tSQLExprIdValueCreate(&yymsp[0].minor.yy0, TK_INTEGER);}
yymsp[0].minor.yy244 = yylhsminor.yy244; yymsp[0].minor.yy388 = yylhsminor.yy388;
break; break;
case 176: /* expr ::= MINUS INTEGER */ case 176: /* expr ::= MINUS INTEGER */
case 177: /* expr ::= PLUS INTEGER */ yytestcase(yyruleno==177); case 177: /* expr ::= PLUS INTEGER */ yytestcase(yyruleno==177);
{yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_INTEGER; yylhsminor.yy244 = tSQLExprIdValueCreate(&yymsp[-1].minor.yy0, TK_INTEGER);} {yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_INTEGER; yylhsminor.yy388 = tSQLExprIdValueCreate(&yymsp[-1].minor.yy0, TK_INTEGER);}
yymsp[-1].minor.yy244 = yylhsminor.yy244; yymsp[-1].minor.yy388 = yylhsminor.yy388;
break; break;
case 178: /* expr ::= FLOAT */ case 178: /* expr ::= FLOAT */
{yylhsminor.yy244 = tSQLExprIdValueCreate(&yymsp[0].minor.yy0, TK_FLOAT);} {yylhsminor.yy388 = tSQLExprIdValueCreate(&yymsp[0].minor.yy0, TK_FLOAT);}
yymsp[0].minor.yy244 = yylhsminor.yy244; yymsp[0].minor.yy388 = yylhsminor.yy388;
break; break;
case 179: /* expr ::= MINUS FLOAT */ case 179: /* expr ::= MINUS FLOAT */
case 180: /* expr ::= PLUS FLOAT */ yytestcase(yyruleno==180); case 180: /* expr ::= PLUS FLOAT */ yytestcase(yyruleno==180);
{yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_FLOAT; yylhsminor.yy244 = tSQLExprIdValueCreate(&yymsp[-1].minor.yy0, TK_FLOAT);} {yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_FLOAT; yylhsminor.yy388 = tSQLExprIdValueCreate(&yymsp[-1].minor.yy0, TK_FLOAT);}
yymsp[-1].minor.yy244 = yylhsminor.yy244; yymsp[-1].minor.yy388 = yylhsminor.yy388;
break; break;
case 181: /* expr ::= STRING */ case 181: /* expr ::= STRING */
{yylhsminor.yy244 = tSQLExprIdValueCreate(&yymsp[0].minor.yy0, TK_STRING);} {yylhsminor.yy388 = tSQLExprIdValueCreate(&yymsp[0].minor.yy0, TK_STRING);}
yymsp[0].minor.yy244 = yylhsminor.yy244; yymsp[0].minor.yy388 = yylhsminor.yy388;
break; break;
case 182: /* expr ::= NOW */ case 182: /* expr ::= NOW */
{yylhsminor.yy244 = tSQLExprIdValueCreate(&yymsp[0].minor.yy0, TK_NOW); } {yylhsminor.yy388 = tSQLExprIdValueCreate(&yymsp[0].minor.yy0, TK_NOW); }
yymsp[0].minor.yy244 = yylhsminor.yy244; yymsp[0].minor.yy388 = yylhsminor.yy388;
break; break;
case 183: /* expr ::= VARIABLE */ case 183: /* expr ::= VARIABLE */
{yylhsminor.yy244 = tSQLExprIdValueCreate(&yymsp[0].minor.yy0, TK_VARIABLE);} {yylhsminor.yy388 = tSQLExprIdValueCreate(&yymsp[0].minor.yy0, TK_VARIABLE);}
yymsp[0].minor.yy244 = yylhsminor.yy244; yymsp[0].minor.yy388 = yylhsminor.yy388;
break; break;
case 184: /* expr ::= BOOL */ case 184: /* expr ::= BOOL */
{yylhsminor.yy244 = tSQLExprIdValueCreate(&yymsp[0].minor.yy0, TK_BOOL);} {yylhsminor.yy388 = tSQLExprIdValueCreate(&yymsp[0].minor.yy0, TK_BOOL);}
yymsp[0].minor.yy244 = yylhsminor.yy244; yymsp[0].minor.yy388 = yylhsminor.yy388;
break; break;
case 185: /* expr ::= ID LP exprlist RP */ case 185: /* expr ::= ID LP exprlist RP */
{ {
yylhsminor.yy244 = tSQLExprCreateFunction(yymsp[-1].minor.yy284, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type); yylhsminor.yy388 = tSQLExprCreateFunction(yymsp[-1].minor.yy506, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type);
} }
yymsp[-3].minor.yy244 = yylhsminor.yy244; yymsp[-3].minor.yy388 = yylhsminor.yy388;
break; break;
case 186: /* expr ::= ID LP STAR RP */ case 186: /* expr ::= ID LP STAR RP */
{ {
yylhsminor.yy244 = tSQLExprCreateFunction(NULL, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type); yylhsminor.yy388 = tSQLExprCreateFunction(NULL, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type);
} }
yymsp[-3].minor.yy244 = yylhsminor.yy244; yymsp[-3].minor.yy388 = yylhsminor.yy388;
break; break;
case 187: /* expr ::= expr AND expr */ case 187: /* expr ::= expr AND expr */
{yylhsminor.yy244 = tSQLExprCreate(yymsp[-2].minor.yy244, yymsp[0].minor.yy244, TK_AND);} {yylhsminor.yy388 = tSQLExprCreate(yymsp[-2].minor.yy388, yymsp[0].minor.yy388, TK_AND);}
yymsp[-2].minor.yy244 = yylhsminor.yy244; yymsp[-2].minor.yy388 = yylhsminor.yy388;
break; break;
case 188: /* expr ::= expr OR expr */ case 188: /* expr ::= expr OR expr */
{yylhsminor.yy244 = tSQLExprCreate(yymsp[-2].minor.yy244, yymsp[0].minor.yy244, TK_OR); } {yylhsminor.yy388 = tSQLExprCreate(yymsp[-2].minor.yy388, yymsp[0].minor.yy388, TK_OR); }
yymsp[-2].minor.yy244 = yylhsminor.yy244; yymsp[-2].minor.yy388 = yylhsminor.yy388;
break; break;
case 189: /* expr ::= expr LT expr */ case 189: /* expr ::= expr LT expr */
{yylhsminor.yy244 = tSQLExprCreate(yymsp[-2].minor.yy244, yymsp[0].minor.yy244, TK_LT);} {yylhsminor.yy388 = tSQLExprCreate(yymsp[-2].minor.yy388, yymsp[0].minor.yy388, TK_LT);}
yymsp[-2].minor.yy244 = yylhsminor.yy244; yymsp[-2].minor.yy388 = yylhsminor.yy388;
break; break;
case 190: /* expr ::= expr GT expr */ case 190: /* expr ::= expr GT expr */
{yylhsminor.yy244 = tSQLExprCreate(yymsp[-2].minor.yy244, yymsp[0].minor.yy244, TK_GT);} {yylhsminor.yy388 = tSQLExprCreate(yymsp[-2].minor.yy388, yymsp[0].minor.yy388, TK_GT);}
yymsp[-2].minor.yy244 = yylhsminor.yy244; yymsp[-2].minor.yy388 = yylhsminor.yy388;
break; break;
case 191: /* expr ::= expr LE expr */ case 191: /* expr ::= expr LE expr */
{yylhsminor.yy244 = tSQLExprCreate(yymsp[-2].minor.yy244, yymsp[0].minor.yy244, TK_LE);} {yylhsminor.yy388 = tSQLExprCreate(yymsp[-2].minor.yy388, yymsp[0].minor.yy388, TK_LE);}
yymsp[-2].minor.yy244 = yylhsminor.yy244; yymsp[-2].minor.yy388 = yylhsminor.yy388;
break; break;
case 192: /* expr ::= expr GE expr */ case 192: /* expr ::= expr GE expr */
{yylhsminor.yy244 = tSQLExprCreate(yymsp[-2].minor.yy244, yymsp[0].minor.yy244, TK_GE);} {yylhsminor.yy388 = tSQLExprCreate(yymsp[-2].minor.yy388, yymsp[0].minor.yy388, TK_GE);}
yymsp[-2].minor.yy244 = yylhsminor.yy244; yymsp[-2].minor.yy388 = yylhsminor.yy388;
break; break;
case 193: /* expr ::= expr NE expr */ case 193: /* expr ::= expr NE expr */
{yylhsminor.yy244 = tSQLExprCreate(yymsp[-2].minor.yy244, yymsp[0].minor.yy244, TK_NE);} {yylhsminor.yy388 = tSQLExprCreate(yymsp[-2].minor.yy388, yymsp[0].minor.yy388, TK_NE);}
yymsp[-2].minor.yy244 = yylhsminor.yy244; yymsp[-2].minor.yy388 = yylhsminor.yy388;
break; break;
case 194: /* expr ::= expr EQ expr */ case 194: /* expr ::= expr EQ expr */
{yylhsminor.yy244 = tSQLExprCreate(yymsp[-2].minor.yy244, yymsp[0].minor.yy244, TK_EQ);} {yylhsminor.yy388 = tSQLExprCreate(yymsp[-2].minor.yy388, yymsp[0].minor.yy388, TK_EQ);}
yymsp[-2].minor.yy244 = yylhsminor.yy244; yymsp[-2].minor.yy388 = yylhsminor.yy388;
break; break;
case 195: /* expr ::= expr PLUS expr */ case 195: /* expr ::= expr PLUS expr */
{yylhsminor.yy244 = tSQLExprCreate(yymsp[-2].minor.yy244, yymsp[0].minor.yy244, TK_PLUS); } {yylhsminor.yy388 = tSQLExprCreate(yymsp[-2].minor.yy388, yymsp[0].minor.yy388, TK_PLUS); }
yymsp[-2].minor.yy244 = yylhsminor.yy244; yymsp[-2].minor.yy388 = yylhsminor.yy388;
break; break;
case 196: /* expr ::= expr MINUS expr */ case 196: /* expr ::= expr MINUS expr */
{yylhsminor.yy244 = tSQLExprCreate(yymsp[-2].minor.yy244, yymsp[0].minor.yy244, TK_MINUS); } {yylhsminor.yy388 = tSQLExprCreate(yymsp[-2].minor.yy388, yymsp[0].minor.yy388, TK_MINUS); }
yymsp[-2].minor.yy244 = yylhsminor.yy244; yymsp[-2].minor.yy388 = yylhsminor.yy388;
break; break;
case 197: /* expr ::= expr STAR expr */ case 197: /* expr ::= expr STAR expr */
{yylhsminor.yy244 = tSQLExprCreate(yymsp[-2].minor.yy244, yymsp[0].minor.yy244, TK_STAR); } {yylhsminor.yy388 = tSQLExprCreate(yymsp[-2].minor.yy388, yymsp[0].minor.yy388, TK_STAR); }
yymsp[-2].minor.yy244 = yylhsminor.yy244; yymsp[-2].minor.yy388 = yylhsminor.yy388;
break; break;
case 198: /* expr ::= expr SLASH expr */ case 198: /* expr ::= expr SLASH expr */
{yylhsminor.yy244 = tSQLExprCreate(yymsp[-2].minor.yy244, yymsp[0].minor.yy244, TK_DIVIDE);} {yylhsminor.yy388 = tSQLExprCreate(yymsp[-2].minor.yy388, yymsp[0].minor.yy388, TK_DIVIDE);}
yymsp[-2].minor.yy244 = yylhsminor.yy244; yymsp[-2].minor.yy388 = yylhsminor.yy388;
break; break;
case 199: /* expr ::= expr REM expr */ case 199: /* expr ::= expr REM expr */
{yylhsminor.yy244 = tSQLExprCreate(yymsp[-2].minor.yy244, yymsp[0].minor.yy244, TK_REM); } {yylhsminor.yy388 = tSQLExprCreate(yymsp[-2].minor.yy388, yymsp[0].minor.yy388, TK_REM); }
yymsp[-2].minor.yy244 = yylhsminor.yy244; yymsp[-2].minor.yy388 = yylhsminor.yy388;
break; break;
case 200: /* expr ::= expr LIKE expr */ case 200: /* expr ::= expr LIKE expr */
{yylhsminor.yy244 = tSQLExprCreate(yymsp[-2].minor.yy244, yymsp[0].minor.yy244, TK_LIKE); } {yylhsminor.yy388 = tSQLExprCreate(yymsp[-2].minor.yy388, yymsp[0].minor.yy388, TK_LIKE); }
yymsp[-2].minor.yy244 = yylhsminor.yy244; yymsp[-2].minor.yy388 = yylhsminor.yy388;
break; break;
case 201: /* expr ::= expr IN LP exprlist RP */ case 201: /* expr ::= expr IN LP exprlist RP */
{yylhsminor.yy244 = tSQLExprCreate(yymsp[-4].minor.yy244, (tSQLExpr*)yymsp[-1].minor.yy284, TK_IN); } {yylhsminor.yy388 = tSQLExprCreate(yymsp[-4].minor.yy388, (tSQLExpr*)yymsp[-1].minor.yy506, TK_IN); }
yymsp[-4].minor.yy244 = yylhsminor.yy244; yymsp[-4].minor.yy388 = yylhsminor.yy388;
break; break;
case 202: /* exprlist ::= exprlist COMMA expritem */ case 202: /* exprlist ::= exprlist COMMA expritem */
{yylhsminor.yy284 = tSQLExprListAppend(yymsp[-2].minor.yy284,yymsp[0].minor.yy244,0);} {yylhsminor.yy506 = tSQLExprListAppend(yymsp[-2].minor.yy506,yymsp[0].minor.yy388,0);}
yymsp[-2].minor.yy284 = yylhsminor.yy284; yymsp[-2].minor.yy506 = yylhsminor.yy506;
break; break;
case 203: /* exprlist ::= expritem */ case 203: /* exprlist ::= expritem */
{yylhsminor.yy284 = tSQLExprListAppend(0,yymsp[0].minor.yy244,0);} {yylhsminor.yy506 = tSQLExprListAppend(0,yymsp[0].minor.yy388,0);}
yymsp[0].minor.yy284 = yylhsminor.yy284; yymsp[0].minor.yy506 = yylhsminor.yy506;
break; break;
case 204: /* expritem ::= expr */ case 204: /* expritem ::= expr */
{yylhsminor.yy244 = yymsp[0].minor.yy244;} {yylhsminor.yy388 = yymsp[0].minor.yy388;}
yymsp[0].minor.yy244 = yylhsminor.yy244; yymsp[0].minor.yy388 = yylhsminor.yy388;
break; break;
case 206: /* cmd ::= RESET QUERY CACHE */ case 206: /* cmd ::= RESET QUERY CACHE */
{ setDCLSQLElems(pInfo, TSDB_SQL_RESET_CACHE, 0);} { setDCLSQLElems(pInfo, TSDB_SQL_RESET_CACHE, 0);}
...@@ -2637,7 +2650,7 @@ static void yy_reduce( ...@@ -2637,7 +2650,7 @@ static void yy_reduce(
case 207: /* cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist */ case 207: /* cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist */
{ {
yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
SAlterTableSQL* pAlterTable = tAlterTableSQLElems(&yymsp[-4].minor.yy0, yymsp[0].minor.yy421, NULL, TSDB_ALTER_TABLE_ADD_COLUMN); SAlterTableSQL* pAlterTable = tAlterTableSQLElems(&yymsp[-4].minor.yy0, yymsp[0].minor.yy325, NULL, TSDB_ALTER_TABLE_ADD_COLUMN);
setSQLInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); setSQLInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
} }
break; break;
...@@ -2655,7 +2668,7 @@ static void yy_reduce( ...@@ -2655,7 +2668,7 @@ static void yy_reduce(
case 209: /* cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */ case 209: /* cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */
{ {
yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
SAlterTableSQL* pAlterTable = tAlterTableSQLElems(&yymsp[-4].minor.yy0, yymsp[0].minor.yy421, NULL, TSDB_ALTER_TABLE_ADD_TAG_COLUMN); SAlterTableSQL* pAlterTable = tAlterTableSQLElems(&yymsp[-4].minor.yy0, yymsp[0].minor.yy325, NULL, TSDB_ALTER_TABLE_ADD_TAG_COLUMN);
setSQLInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); setSQLInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
} }
break; break;
...@@ -2690,7 +2703,7 @@ static void yy_reduce( ...@@ -2690,7 +2703,7 @@ static void yy_reduce(
toTSDBType(yymsp[-2].minor.yy0.type); toTSDBType(yymsp[-2].minor.yy0.type);
tVariantList* A = tVariantListAppendToken(NULL, &yymsp[-2].minor.yy0, -1); tVariantList* A = tVariantListAppendToken(NULL, &yymsp[-2].minor.yy0, -1);
A = tVariantListAppend(A, &yymsp[0].minor.yy236, -1); A = tVariantListAppend(A, &yymsp[0].minor.yy380, -1);
SAlterTableSQL* pAlterTable = tAlterTableSQLElems(&yymsp[-6].minor.yy0, NULL, A, TSDB_ALTER_TABLE_UPDATE_TAG_VAL); SAlterTableSQL* pAlterTable = tAlterTableSQLElems(&yymsp[-6].minor.yy0, NULL, A, TSDB_ALTER_TABLE_UPDATE_TAG_VAL);
setSQLInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); setSQLInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
......
src/client/src/tscSecondaryMerge.c
浏览文件 @ 44acd0ee
...@@ -213,7 +213,7 @@ void tscCreateLocalReducer(tExtMemBuffer **pMemBuffer, int32_t numOfBuffer, tOrd ...@@ -213,7 +213,7 @@ void tscCreateLocalReducer(tExtMemBuffer **pMemBuffer, int32_t numOfBuffer, tOrd
tscTrace("%p load data from disk into memory, orderOfVnode:%d, total:%d", pSqlObjAddr, i + 1, idx + 1); tscTrace("%p load data from disk into memory, orderOfVnode:%d, total:%d", pSqlObjAddr, i + 1, idx + 1);
tExtMemBufferLoadData(pMemBuffer[i], &(pDS->filePage), j, 0); tExtMemBufferLoadData(pMemBuffer[i], &(pDS->filePage), j, 0);
#ifdef _DEBUG_VIEW #ifdef _DEBUG_VIEW
printf("load data page into mem for build loser tree: %ld rows\n", pDS->filePage.numOfElems); printf("load data page into mem for build loser tree: %" PRIu64 " rows\n", pDS->filePage.numOfElems);
SSrcColumnInfo colInfo[256] = {0}; SSrcColumnInfo colInfo[256] = {0};
SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex); SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
...@@ -347,7 +347,7 @@ static int32_t tscFlushTmpBufferImpl(tExtMemBuffer *pMemoryBuf, tOrderDescriptor ...@@ -347,7 +347,7 @@ static int32_t tscFlushTmpBufferImpl(tExtMemBuffer *pMemoryBuf, tOrderDescriptor
} }
#ifdef _DEBUG_VIEW #ifdef _DEBUG_VIEW
printf("%ld rows data flushed to disk after been sorted:\n", pPage->numOfElems); printf("%" PRIu64 " rows data flushed to disk after been sorted:\n", pPage->numOfElems);
tColModelDisplay(pDesc->pSchema, pPage->data, pPage->numOfElems, pPage->numOfElems); tColModelDisplay(pDesc->pSchema, pPage->data, pPage->numOfElems, pPage->numOfElems);
#endif #endif
......
src/client/src/tscServer.c
浏览文件 @ 44acd0ee
...@@ -1212,7 +1212,7 @@ void tscRetrieveFromVnodeCallBack(void *param, TAOS_RES *tres, int numOfRows) { ...@@ -1212,7 +1212,7 @@ void tscRetrieveFromVnodeCallBack(void *param, TAOS_RES *tres, int numOfRows) {
tColModelCompact(pDesc->pSchema, trsupport->localBuffer, pDesc->pSchema->maxCapacity); tColModelCompact(pDesc->pSchema, trsupport->localBuffer, pDesc->pSchema->maxCapacity);
#ifdef _DEBUG_VIEW #ifdef _DEBUG_VIEW
printf("%ld rows data flushed to disk:\n", trsupport->localBuffer->numOfElems); printf("%" PRIu64 " rows data flushed to disk:\n", trsupport->localBuffer->numOfElems);
SSrcColumnInfo colInfo[256] = {0}; SSrcColumnInfo colInfo[256] = {0};
SQueryInfo * pQueryInfo = tscGetQueryInfoDetail(&pPObj->cmd, 0); SQueryInfo * pQueryInfo = tscGetQueryInfoDetail(&pPObj->cmd, 0);
...@@ -1560,7 +1560,7 @@ static char *doSerializeTableInfo(SSqlObj *pSql, int32_t numOfMeters, int32_t vn ...@@ -1560,7 +1560,7 @@ static char *doSerializeTableInfo(SSqlObj *pSql, int32_t numOfMeters, int32_t vn
tscTrace("%p vid:%d, query on %d meters", pSql, htons(vnodeId), numOfMeters); tscTrace("%p vid:%d, query on %d meters", pSql, htons(vnodeId), numOfMeters);
if (UTIL_METER_IS_NOMRAL_METER(pMeterMetaInfo)) { if (UTIL_METER_IS_NOMRAL_METER(pMeterMetaInfo)) {
#ifdef _DEBUG_VIEW #ifdef _DEBUG_VIEW
tscTrace("%p sid:%d, uid:%lld", pSql, pMeterMetaInfo->pMeterMeta->sid, pMeterMetaInfo->pMeterMeta->uid); tscTrace("%p sid:%d, uid:%" PRIu64, pSql, pMeterMetaInfo->pMeterMeta->sid, pMeterMetaInfo->pMeterMeta->uid);
#endif #endif
SMeterSidExtInfo *pMeterInfo = (SMeterSidExtInfo *)pMsg; SMeterSidExtInfo *pMeterInfo = (SMeterSidExtInfo *)pMsg;
pMeterInfo->sid = htonl(pMeterMeta->sid); pMeterInfo->sid = htonl(pMeterMeta->sid);
...@@ -1583,7 +1583,7 @@ static char *doSerializeTableInfo(SSqlObj *pSql, int32_t numOfMeters, int32_t vn ...@@ -1583,7 +1583,7 @@ static char *doSerializeTableInfo(SSqlObj *pSql, int32_t numOfMeters, int32_t vn
pMsg += pMetricMeta->tagLen; pMsg += pMetricMeta->tagLen;
#ifdef _DEBUG_VIEW #ifdef _DEBUG_VIEW
tscTrace("%p sid:%d, uid:%lld", pSql, pQueryMeterInfo->sid, pQueryMeterInfo->uid); tscTrace("%p sid:%d, uid:%" PRId64, pSql, pQueryMeterInfo->sid, pQueryMeterInfo->uid);
#endif #endif
} }
} }
......
src/client/src/tscStream.c
浏览文件 @ 44acd0ee
...@@ -349,7 +349,7 @@ static void tscSetNextLaunchTimer(SSqlStream *pStream, SSqlObj *pSql) { ...@@ -349,7 +349,7 @@ static void tscSetNextLaunchTimer(SSqlStream *pStream, SSqlObj *pSql) {
} else { } else {
pStream->stime += pStream->slidingTime; pStream->stime += pStream->slidingTime;
if ((pStream->stime - pStream->interval) >= pStream->etime) { if ((pStream->stime - pStream->interval) >= pStream->etime) {
tscTrace("%p stream:%p, stime:%ld is larger than end time: %ld, stop the stream", pStream->pSql, pStream, tscTrace("%p stream:%p, stime:%" PRId64 " is larger than end time: %" PRId64 ", stop the stream", pStream->pSql, pStream,
pStream->stime, pStream->etime); pStream->stime, pStream->etime);
// TODO : How to terminate stream here // TODO : How to terminate stream here
if (pStream->callback) { if (pStream->callback) {
......
src/inc/sql.y
浏览文件 @ 44acd0ee
...@@ -653,5 +653,5 @@ cmd ::= KILL QUERY IPTOKEN(X) COLON(Z) INTEGER(Y) COLON(K) INTEGER(F). {X ...@@ -653,5 +653,5 @@ cmd ::= KILL QUERY IPTOKEN(X) COLON(Z) INTEGER(Y) COLON(K) INTEGER(F). {X
DELIMITERS DESC DETACH EACH END EXPLAIN FAIL FOR GLOB IGNORE IMMEDIATE INITIALLY INSTEAD DELIMITERS DESC DETACH EACH END EXPLAIN FAIL FOR GLOB IGNORE IMMEDIATE INITIALLY INSTEAD
LIKE MATCH KEY OF OFFSET RAISE REPLACE RESTRICT ROW STATEMENT TRIGGER VIEW ALL LIKE MATCH KEY OF OFFSET RAISE REPLACE RESTRICT ROW STATEMENT TRIGGER VIEW ALL
COUNT SUM AVG MIN MAX FIRST LAST TOP BOTTOM STDDEV PERCENTILE APERCENTILE LEASTSQUARES HISTOGRAM DIFF COUNT SUM AVG MIN MAX FIRST LAST TOP BOTTOM STDDEV PERCENTILE APERCENTILE LEASTSQUARES HISTOGRAM DIFF
SPREAD TWA INTERP LAST_ROW NOW IPTOKEN SEMI NONE PREV LINEAR IMPORT METRIC TBNAME JOIN METRICS STABLE NULL INSERT INTO SPREAD TWA INTERP LAST_ROW RATE IRATE SUM_RATE SUM_IRATE AVG_RATE AVG_IRATE NOW IPTOKEN SEMI NONE PREV LINEAR IMPORT
VALUES. METRIC TBNAME JOIN METRICS STABLE NULL INSERT INTO VALUES.
src/inc/tsqldef.h
浏览文件 @ 44acd0ee
...@@ -199,19 +199,25 @@ ...@@ -199,19 +199,25 @@
#define TK_TWA 181 #define TK_TWA 181
#define TK_INTERP 182 #define TK_INTERP 182
#define TK_LAST_ROW 183 #define TK_LAST_ROW 183
#define TK_SEMI 184 #define TK_RATE 184
#define TK_NONE 185 #define TK_IRATE 185
#define TK_PREV 186 #define TK_SUM_RATE 186
#define TK_LINEAR 187 #define TK_SUM_IRATE 187
#define TK_IMPORT 188 #define TK_AVG_RATE 188
#define TK_METRIC 189 #define TK_AVG_IRATE 189
#define TK_TBNAME 190 #define TK_SEMI 190
#define TK_JOIN 191 #define TK_NONE 191
#define TK_METRICS 192 #define TK_PREV 192
#define TK_STABLE 193 #define TK_LINEAR 193
#define TK_INSERT 194 #define TK_IMPORT 194
#define TK_INTO 195 #define TK_METRIC 195
#define TK_VALUES 196 #define TK_TBNAME 196
#define TK_JOIN 197
#define TK_METRICS 198
#define TK_STABLE 199
#define TK_INSERT 200
#define TK_INTO 201
#define TK_VALUES 202
#endif #endif
......
src/kit/taosdemo/taosdemo.c
浏览文件 @ 44acd0ee
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
#include <argp.h> #include <argp.h>
#include <assert.h> #include <assert.h>
#include <inttypes.h>
#ifndef _ALPINE #ifndef _ALPINE
#include <error.h> #include <error.h>
...@@ -575,7 +576,7 @@ void *readTable(void *sarg) { ...@@ -575,7 +576,7 @@ void *readTable(void *sarg) {
double totalT = 0; double totalT = 0;
int count = 0; int count = 0;
for (int i = 0; i < num_of_tables; i++) { for (int i = 0; i < num_of_tables; i++) {
sprintf(command, "select %s from %s%d where ts>= %ld", aggreFunc[j], tb_prefix, i, sTime); sprintf(command, "select %s from %s%d where ts>= %" PRId64, aggreFunc[j], tb_prefix, i, sTime);
double t = getCurrentTime(); double t = getCurrentTime();
if (taos_query(taos, command) != 0) { if (taos_query(taos, command) != 0) {
...@@ -818,7 +819,7 @@ double getCurrentTime() { ...@@ -818,7 +819,7 @@ double getCurrentTime() {
void generateData(char *res, char **data_type, int num_of_cols, int64_t timestamp, int len_of_binary) { void generateData(char *res, char **data_type, int num_of_cols, int64_t timestamp, int len_of_binary) {
memset(res, 0, MAX_DATA_SIZE); memset(res, 0, MAX_DATA_SIZE);
char *pstr = res; char *pstr = res;
pstr += sprintf(pstr, "(%ld", timestamp); pstr += sprintf(pstr, "(%" PRId64, timestamp);
int c = 0; int c = 0;
for (; c < MAX_NUM_DATATYPE; c++) { for (; c < MAX_NUM_DATATYPE; c++) {
...@@ -835,7 +836,7 @@ void generateData(char *res, char **data_type, int num_of_cols, int64_t timestam ...@@ -835,7 +836,7 @@ void generateData(char *res, char **data_type, int num_of_cols, int64_t timestam
} else if (strcasecmp(data_type[i % c], "int") == 0) { } else if (strcasecmp(data_type[i % c], "int") == 0) {
pstr += sprintf(pstr, ", %d", (int)(rand() % 10)); pstr += sprintf(pstr, ", %d", (int)(rand() % 10));
} else if (strcasecmp(data_type[i % c], "bigint") == 0) { } else if (strcasecmp(data_type[i % c], "bigint") == 0) {
pstr += sprintf(pstr, ", %ld", rand() % 2147483648); pstr += sprintf(pstr, ", %" PRId64, rand() % 2147483648);
} else if (strcasecmp(data_type[i % c], "float") == 0) { } else if (strcasecmp(data_type[i % c], "float") == 0) {
pstr += sprintf(pstr, ", %10.4f", (float)(rand() / 1000)); pstr += sprintf(pstr, ", %10.4f", (float)(rand() / 1000));
} else if (strcasecmp(data_type[i % c], "double") == 0) { } else if (strcasecmp(data_type[i % c], "double") == 0) {
......
src/kit/taosdump/taosdump.c
浏览文件 @ 44acd0ee
...@@ -890,7 +890,7 @@ int taosDumpTableData(FILE *fp, char *tbname, struct arguments *arguments) { ...@@ -890,7 +890,7 @@ int taosDumpTableData(FILE *fp, char *tbname, struct arguments *arguments) {
if (arguments->schemaonly) return 0; if (arguments->schemaonly) return 0;
sprintf(command, "select * from %s where _c0 >= %ld and _c0 <= %ld order by _c0 asc", tbname, arguments->start_time, sprintf(command, "select * from %s where _c0 >= %" PRId64 " and _c0 <= %" PRId64 " order by _c0 asc", tbname, arguments->start_time,
arguments->end_time); arguments->end_time);
if (taos_query(taos, command) != 0) { if (taos_query(taos, command) != 0) {
fprintf(stderr, "failed to run command %s, reason: %s\n", command, taos_errstr(taos)); fprintf(stderr, "failed to run command %s, reason: %s\n", command, taos_errstr(taos));
...@@ -944,13 +944,13 @@ int taosDumpTableData(FILE *fp, char *tbname, struct arguments *arguments) { ...@@ -944,13 +944,13 @@ int taosDumpTableData(FILE *fp, char *tbname, struct arguments *arguments) {
pstr += sprintf(pstr, "%d", *((int *)row[col])); pstr += sprintf(pstr, "%d", *((int *)row[col]));
break; break;
case TSDB_DATA_TYPE_BIGINT: case TSDB_DATA_TYPE_BIGINT:
pstr += sprintf(pstr, "%ld", *((int64_t *)row[col])); pstr += sprintf(pstr, "%" PRId64 "", *((int64_t *)row[col]));
break; break;
case TSDB_DATA_TYPE_FLOAT: case TSDB_DATA_TYPE_FLOAT:
pstr += sprintf(pstr, "%f", *((float *)row[col])); pstr += sprintf(pstr, "%f", GET_FLOAT_VAL(row[col]));
break; break;
case TSDB_DATA_TYPE_DOUBLE: case TSDB_DATA_TYPE_DOUBLE:
pstr += sprintf(pstr, "%f", *((double *)row[col])); pstr += sprintf(pstr, "%f", GET_DOUBLE_VAL(row[col]));
break; break;
case TSDB_DATA_TYPE_BINARY: case TSDB_DATA_TYPE_BINARY:
*(pstr++) = '\''; *(pstr++) = '\'';
...@@ -963,7 +963,7 @@ int taosDumpTableData(FILE *fp, char *tbname, struct arguments *arguments) { ...@@ -963,7 +963,7 @@ int taosDumpTableData(FILE *fp, char *tbname, struct arguments *arguments) {
pstr += sprintf(pstr, "\'%s\'", tbuf); pstr += sprintf(pstr, "\'%s\'", tbuf);
break; break;
case TSDB_DATA_TYPE_TIMESTAMP: case TSDB_DATA_TYPE_TIMESTAMP:
pstr += sprintf(pstr, "%ld", *(int64_t *)row[col]); pstr += sprintf(pstr, "%" PRId64 "", *(int64_t *)row[col]);
break; break;
default: default:
break; break;
...@@ -1145,7 +1145,7 @@ int taosDumpIn(struct arguments *arguments) { ...@@ -1145,7 +1145,7 @@ int taosDumpIn(struct arguments *arguments) {
} }
taosReplaceCtrlChar(tcommand); taosReplaceCtrlChar(tcommand);
if (taos_query(taos, tcommand) != 0) if (taos_query(taos, tcommand) != 0)
fprintf(stderr, "linenu: %ld failed to run command %s reason:%s \ncontinue...\n", linenu, command, fprintf(stderr, "linenu: %" PRId64 " failed to run command %s reason:%s \ncontinue...\n", linenu, command,
taos_errstr(taos)); taos_errstr(taos));
pstr = command; pstr = command;
...@@ -1193,7 +1193,7 @@ int taosDumpIn(struct arguments *arguments) { ...@@ -1193,7 +1193,7 @@ int taosDumpIn(struct arguments *arguments) {
} }
taosReplaceCtrlChar(tcommand); taosReplaceCtrlChar(tcommand);
if (taos_query(taos, tcommand) != 0) if (taos_query(taos, tcommand) != 0)
fprintf(stderr, "linenu:%ld failed to run command %s reason: %s \ncontinue...\n", linenu, command, fprintf(stderr, "linenu:%" PRId64 " failed to run command %s reason: %s \ncontinue...\n", linenu, command,
taos_errstr(taos)); taos_errstr(taos));
} }
...@@ -1216,7 +1216,7 @@ int taosDumpIn(struct arguments *arguments) { ...@@ -1216,7 +1216,7 @@ int taosDumpIn(struct arguments *arguments) {
} }
taosReplaceCtrlChar(lcommand); taosReplaceCtrlChar(lcommand);
if (taos_query(taos, tcommand) != 0) if (taos_query(taos, tcommand) != 0)
fprintf(stderr, "linenu:%ld failed to run command %s reason:%s \ncontinue...\n", linenu, command, fprintf(stderr, "linenu:%" PRId64 " failed to run command %s reason:%s \ncontinue...\n", linenu, command,
taos_errstr(taos)); taos_errstr(taos));
} }
......
src/modules/http/src/httpJson.c
浏览文件 @ 44acd0ee
...@@ -119,7 +119,7 @@ int httpWriteJsonBufBody(JsonBuf* buf, bool isTheLast) { ...@@ -119,7 +119,7 @@ int httpWriteJsonBufBody(JsonBuf* buf, bool isTheLast) {
return 0; // there is no data to dump. return 0; // there is no data to dump.
} else { } else {
int len = sprintf(sLen, "%lx\r\n", srcLen); int len = sprintf(sLen, "%lx\r\n", srcLen);
httpTrace("context:%p, fd:%d, ip:%s, write body, chunkSize:%ld, response:\n%s", httpTrace("context:%p, fd:%d, ip:%s, write body, chunkSize:%" PRIu64 ", response:\n%s",
buf->pContext, buf->pContext->fd, buf->pContext->ipstr, srcLen, buf->buf); buf->pContext, buf->pContext->fd, buf->pContext->ipstr, srcLen, buf->buf);
httpWriteBufNoTrace(buf->pContext, sLen, len); httpWriteBufNoTrace(buf->pContext, sLen, len);
remain = httpWriteBufNoTrace(buf->pContext, buf->buf, (int) srcLen); remain = httpWriteBufNoTrace(buf->pContext, buf->buf, (int) srcLen);
...@@ -131,7 +131,7 @@ int httpWriteJsonBufBody(JsonBuf* buf, bool isTheLast) { ...@@ -131,7 +131,7 @@ int httpWriteJsonBufBody(JsonBuf* buf, bool isTheLast) {
if (ret == 0) { if (ret == 0) {
if (compressBufLen > 0) { if (compressBufLen > 0) {
int len = sprintf(sLen, "%x\r\n", compressBufLen); int len = sprintf(sLen, "%x\r\n", compressBufLen);
httpTrace("context:%p, fd:%d, ip:%s, write body, chunkSize:%ld, compressSize:%d, last:%d, response:\n%s", httpTrace("context:%p, fd:%d, ip:%s, write body, chunkSize:%" PRIu64 ", compressSize:%d, last:%d, response:\n%s",
buf->pContext, buf->pContext->fd, buf->pContext->ipstr, srcLen, compressBufLen, isTheLast, buf->buf); buf->pContext, buf->pContext->fd, buf->pContext->ipstr, srcLen, compressBufLen, isTheLast, buf->buf);
httpWriteBufNoTrace(buf->pContext, sLen, len); httpWriteBufNoTrace(buf->pContext, sLen, len);
remain = httpWriteBufNoTrace(buf->pContext, (const char *) compressBuf, (int) compressBufLen); remain = httpWriteBufNoTrace(buf->pContext, (const char *) compressBuf, (int) compressBufLen);
...@@ -257,7 +257,7 @@ void httpJsonStringForTransMean(JsonBuf* buf, char* sVal, int maxLen) { ...@@ -257,7 +257,7 @@ void httpJsonStringForTransMean(JsonBuf* buf, char* sVal, int maxLen) {
void httpJsonInt64(JsonBuf* buf, int64_t num) { void httpJsonInt64(JsonBuf* buf, int64_t num) {
httpJsonItemToken(buf); httpJsonItemToken(buf);
httpJsonTestBuf(buf, MAX_NUM_STR_SZ); httpJsonTestBuf(buf, MAX_NUM_STR_SZ);
buf->lst += snprintf(buf->lst, MAX_NUM_STR_SZ, "%ld", num); buf->lst += snprintf(buf->lst, MAX_NUM_STR_SZ, "%" PRId64, num);
} }
void httpJsonTimestamp(JsonBuf* buf, int64_t t, bool us) { void httpJsonTimestamp(JsonBuf* buf, int64_t t, bool us) {
......
src/modules/http/src/restHandle.c
浏览文件 @ 44acd0ee
...@@ -67,10 +67,7 @@ bool restProcessSqlRequest(HttpContext* pContext, int timestampFmt) { ...@@ -67,10 +67,7 @@ bool restProcessSqlRequest(HttpContext* pContext, int timestampFmt) {
return false; return false;
} }
// for async test
/*
* for async test
* /
/* /*
if (httpCheckUsedbSql(sql)) { if (httpCheckUsedbSql(sql)) {
httpSendErrorResp(pContext, HTTP_NO_EXEC_USEDB); httpSendErrorResp(pContext, HTTP_NO_EXEC_USEDB);
......
src/modules/http/src/restJson.c
浏览文件 @ 44acd0ee
...@@ -152,7 +152,7 @@ bool restBuildSqlJson(HttpContext *pContext, HttpSqlCmd *cmd, TAOS_RES *result, ...@@ -152,7 +152,7 @@ bool restBuildSqlJson(HttpContext *pContext, HttpSqlCmd *cmd, TAOS_RES *result,
} }
if (cmd->numOfRows >= tsRestRowLimit) { if (cmd->numOfRows >= tsRestRowLimit) {
httpTrace("context:%p, fd:%d, ip:%s, user:%s, retrieve rows:%lld larger than limit:%d, abort retrieve", pContext, httpTrace("context:%p, fd:%d, ip:%s, user:%s, retrieve rows:%d larger than limit:%d, abort retrieve", pContext,
pContext->fd, pContext->ipstr, pContext->user, cmd->numOfRows, tsRestRowLimit); pContext->fd, pContext->ipstr, pContext->user, cmd->numOfRows, tsRestRowLimit);
return false; return false;
} }
...@@ -163,7 +163,7 @@ bool restBuildSqlJson(HttpContext *pContext, HttpSqlCmd *cmd, TAOS_RES *result, ...@@ -163,7 +163,7 @@ bool restBuildSqlJson(HttpContext *pContext, HttpSqlCmd *cmd, TAOS_RES *result,
return false; return false;
} }
else { else {
httpTrace("context:%p, fd:%d, ip:%s, user:%s, total rows:%lld retrieved", pContext, pContext->fd, pContext->ipstr, httpTrace("context:%p, fd:%d, ip:%s, user:%s, total rows:%d retrieved", pContext, pContext->fd, pContext->ipstr,
pContext->user, cmd->numOfRows); pContext->user, cmd->numOfRows);
return true; return true;
} }
......
src/modules/http/src/tgHandle.c
浏览文件 @ 44acd0ee
...@@ -572,7 +572,7 @@ bool tgProcessSingleMetric(HttpContext *pContext, cJSON *metric, char *db) { ...@@ -572,7 +572,7 @@ bool tgProcessSingleMetric(HttpContext *pContext, cJSON *metric, char *db) {
orderTagsLen = orderTagsLen < TSDB_MAX_TAGS ? orderTagsLen : TSDB_MAX_TAGS; orderTagsLen = orderTagsLen < TSDB_MAX_TAGS ? orderTagsLen : TSDB_MAX_TAGS;
table_cmd->tagNum = stable_cmd->tagNum = (int8_t)orderTagsLen; table_cmd->tagNum = stable_cmd->tagNum = (int8_t)orderTagsLen;
table_cmd->timestamp = stable_cmd->timestamp = httpAddToSqlCmdBuffer(pContext, "%ld", timestamp->valueint); table_cmd->timestamp = stable_cmd->timestamp = httpAddToSqlCmdBuffer(pContext, "%" PRId64, timestamp->valueint);
// stable name // stable name
char *stname = tgGetStableName(name->valuestring, fields, fieldsSize); char *stname = tgGetStableName(name->valuestring, fields, fieldsSize);
...@@ -593,7 +593,7 @@ bool tgProcessSingleMetric(HttpContext *pContext, cJSON *metric, char *db) { ...@@ -593,7 +593,7 @@ bool tgProcessSingleMetric(HttpContext *pContext, cJSON *metric, char *db) {
if (tag->type == cJSON_String) if (tag->type == cJSON_String)
stable_cmd->tagValues[i] = table_cmd->tagValues[i] = httpAddToSqlCmdBuffer(pContext, "'%s'", tag->valuestring); stable_cmd->tagValues[i] = table_cmd->tagValues[i] = httpAddToSqlCmdBuffer(pContext, "'%s'", tag->valuestring);
else if (tag->type == cJSON_Number) else if (tag->type == cJSON_Number)
stable_cmd->tagValues[i] = table_cmd->tagValues[i] = httpAddToSqlCmdBuffer(pContext, "%ld", tag->valueint); stable_cmd->tagValues[i] = table_cmd->tagValues[i] = httpAddToSqlCmdBuffer(pContext, "%" PRId64, tag->valueint);
else if (tag->type == cJSON_True) else if (tag->type == cJSON_True)
stable_cmd->tagValues[i] = table_cmd->tagValues[i] = httpAddToSqlCmdBuffer(pContext, "1"); stable_cmd->tagValues[i] = table_cmd->tagValues[i] = httpAddToSqlCmdBuffer(pContext, "1");
else if (tag->type == cJSON_False) else if (tag->type == cJSON_False)
...@@ -614,7 +614,7 @@ bool tgProcessSingleMetric(HttpContext *pContext, cJSON *metric, char *db) { ...@@ -614,7 +614,7 @@ bool tgProcessSingleMetric(HttpContext *pContext, cJSON *metric, char *db) {
if (tag->type == cJSON_String) if (tag->type == cJSON_String)
httpAddToSqlCmdBufferNoTerminal(pContext, "_%s", tag->valuestring); httpAddToSqlCmdBufferNoTerminal(pContext, "_%s", tag->valuestring);
else if (tag->type == cJSON_Number) else if (tag->type == cJSON_Number)
httpAddToSqlCmdBufferNoTerminal(pContext, "_%ld", tag->valueint); httpAddToSqlCmdBufferNoTerminal(pContext, "_%" PRId64, tag->valueint);
else if (tag->type == cJSON_False) else if (tag->type == cJSON_False)
httpAddToSqlCmdBufferNoTerminal(pContext, "_0"); httpAddToSqlCmdBufferNoTerminal(pContext, "_0");
else if (tag->type == cJSON_True) else if (tag->type == cJSON_True)
...@@ -670,7 +670,7 @@ bool tgProcessSingleMetric(HttpContext *pContext, cJSON *metric, char *db) { ...@@ -670,7 +670,7 @@ bool tgProcessSingleMetric(HttpContext *pContext, cJSON *metric, char *db) {
cJSON *tag = orderedTags[i]; cJSON *tag = orderedTags[i];
if (i != orderTagsLen - 1) { if (i != orderTagsLen - 1) {
if (tag->type == cJSON_Number) if (tag->type == cJSON_Number)
httpAddToSqlCmdBufferNoTerminal(pContext, "%ld,", tag->valueint); httpAddToSqlCmdBufferNoTerminal(pContext, "%" PRId64 ",", tag->valueint);
else if (tag->type == cJSON_String) else if (tag->type == cJSON_String)
httpAddToSqlCmdBufferNoTerminal(pContext, "'%s',", tag->valuestring); httpAddToSqlCmdBufferNoTerminal(pContext, "'%s',", tag->valuestring);
else if (tag->type == cJSON_False) else if (tag->type == cJSON_False)
...@@ -682,7 +682,7 @@ bool tgProcessSingleMetric(HttpContext *pContext, cJSON *metric, char *db) { ...@@ -682,7 +682,7 @@ bool tgProcessSingleMetric(HttpContext *pContext, cJSON *metric, char *db) {
} }
} else { } else {
if (tag->type == cJSON_Number) if (tag->type == cJSON_Number)
httpAddToSqlCmdBufferNoTerminal(pContext, "%ld)", tag->valueint); httpAddToSqlCmdBufferNoTerminal(pContext, "%" PRId64 ")", tag->valueint);
else if (tag->type == cJSON_String) else if (tag->type == cJSON_String)
httpAddToSqlCmdBufferNoTerminal(pContext, "'%s')", tag->valuestring); httpAddToSqlCmdBufferNoTerminal(pContext, "'%s')", tag->valuestring);
else if (tag->type == cJSON_False) else if (tag->type == cJSON_False)
...@@ -695,7 +695,7 @@ bool tgProcessSingleMetric(HttpContext *pContext, cJSON *metric, char *db) { ...@@ -695,7 +695,7 @@ bool tgProcessSingleMetric(HttpContext *pContext, cJSON *metric, char *db) {
} }
} }
httpAddToSqlCmdBufferNoTerminal(pContext, " values(%ld,", timestamp->valueint); httpAddToSqlCmdBufferNoTerminal(pContext, " values(%" PRId64 ",", timestamp->valueint);
for (int i = 0; i < fieldsSize; ++i) { for (int i = 0; i < fieldsSize; ++i) {
cJSON *field = cJSON_GetArrayItem(fields, i); cJSON *field = cJSON_GetArrayItem(fields, i);
if (i != fieldsSize - 1) { if (i != fieldsSize - 1) {
......
src/rpc/src/trpc.c
浏览文件 @ 44acd0ee
...@@ -169,7 +169,7 @@ static int32_t taosCompressRpcMsg(char* pCont, int32_t contLen) { ...@@ -169,7 +169,7 @@ static int32_t taosCompressRpcMsg(char* pCont, int32_t contLen) {
memcpy(pCont + overhead, buf, compLen); memcpy(pCont + overhead, buf, compLen);
pHeader->comp = 1; pHeader->comp = 1;
tTrace("compress rpc msg, before:%lld, after:%lld", contLen, compLen); tTrace("compress rpc msg, before:%d, after:%d", contLen, compLen);
finalLen = compLen + overhead; finalLen = compLen + overhead;
//tDump(pCont, contLen); //tDump(pCont, contLen);
......
src/rpc/src/tudp.c
浏览文件 @ 44acd0ee
...@@ -296,7 +296,7 @@ void *taosTransferDataViaTcp(void *argv) { ...@@ -296,7 +296,7 @@ void *taosTransferDataViaTcp(void *argv) {
} }
if (!taosCheckHandleViaTcpValid(&handleViaTcp)) { if (!taosCheckHandleViaTcpValid(&handleViaTcp)) {
tError("%s UDP server read handle via tcp invalid, handle:%ld, hash:%ld", pSet->label, handleViaTcp.handle, tError("%s UDP server read handle via tcp invalid, handle:%" PRIu64 ", hash:%" PRIu64, pSet->label, handleViaTcp.handle,
handleViaTcp.hash); handleViaTcp.hash);
taosCloseSocket(connFd); taosCloseSocket(connFd);
free(pTransfer); free(pTransfer);
......
src/sdb/src/sdbEngine.c
浏览文件 @ 44acd0ee
...@@ -375,22 +375,22 @@ int64_t sdbInsertRow(void *handle, void *row, int rowSize) { ...@@ -375,22 +375,22 @@ int64_t sdbInsertRow(void *handle, void *row, int rowSize) {
*/ */
pTable->id++; pTable->id++;
sdbVersion++; sdbVersion++;
sdbPrint("table:%s, record:%s already exist, think it successed, sdbVersion:%ld id:%d", sdbPrint("table:%s, record:%s already exist, think it successed, sdbVersion:%" PRId64 " id:%" PRId64,
pTable->name, taosIpStr(*(int32_t *)row), sdbVersion, pTable->id); pTable->name, taosIpStr(*(int32_t *)row), sdbVersion, pTable->id);
return 0; return 0;
} else { } else {
switch (pTable->keyType) { switch (pTable->keyType) {
case SDB_KEYTYPE_STRING: case SDB_KEYTYPE_STRING:
sdbError("table:%s, failed to insert record:%s sdbVersion:%ld id:%d", pTable->name, (char *)row, sdbVersion, pTable->id); sdbError("table:%s, failed to insert record:%s sdbVersion:%" PRId64 " id:%" PRId64 , pTable->name, (char *)row, sdbVersion, pTable->id);
break; break;
case SDB_KEYTYPE_UINT32: //dnodes or mnodes case SDB_KEYTYPE_UINT32: //dnodes or mnodes
sdbError("table:%s, failed to insert record:%s sdbVersion:%ld id:%d", pTable->name, taosIpStr(*(int32_t *)row), sdbVersion, pTable->id); sdbError("table:%s, failed to insert record:%s sdbVersion:%" PRId64 " id:%" PRId64, pTable->name, taosIpStr(*(int32_t *)row), sdbVersion, pTable->id);
break; break;
case SDB_KEYTYPE_AUTO: case SDB_KEYTYPE_AUTO:
sdbError("table:%s, failed to insert record:%d sdbVersion:%ld id:%d", pTable->name, *(int32_t *)row, sdbVersion, pTable->id); sdbError("table:%s, failed to insert record:%d sdbVersion:%" PRId64 " id:%" PRId64, pTable->name, *(int32_t *)row, sdbVersion, pTable->id);
break; break;
default: default:
sdbError("table:%s, failed to insert record sdbVersion:%ld id:%d", pTable->name, sdbVersion, pTable->id); sdbError("table:%s, failed to insert record sdbVersion:%" PRId64 " id:%" PRId64, pTable->name, sdbVersion, pTable->id);
break; break;
} }
return -1; return -1;
...@@ -454,19 +454,19 @@ int64_t sdbInsertRow(void *handle, void *row, int rowSize) { ...@@ -454,19 +454,19 @@ int64_t sdbInsertRow(void *handle, void *row, int rowSize) {
pTable->numOfRows++; pTable->numOfRows++;
switch (pTable->keyType) { switch (pTable->keyType) {
case SDB_KEYTYPE_STRING: case SDB_KEYTYPE_STRING:
sdbTrace("table:%s, a record is inserted:%s, sdbVersion:%ld id:%ld rowSize:%d numOfRows:%d fileSize:%ld", sdbTrace("table:%s, a record is inserted:%s, sdbVersion:%" PRId64 " id:%" PRId64 " rowSize:%d numOfRows:%d fileSize:%" PRId64,
pTable->name, (char *)row, sdbVersion, rowHead->id, rowHead->rowSize, pTable->numOfRows, pTable->size); pTable->name, (char *)row, sdbVersion, rowHead->id, rowHead->rowSize, pTable->numOfRows, pTable->size);
break; break;
case SDB_KEYTYPE_UINT32: //dnodes or mnodes case SDB_KEYTYPE_UINT32: //dnodes or mnodes
sdbTrace("table:%s, a record is inserted:%s, sdbVersion:%ld id:%ld rowSize:%d numOfRows:%d fileSize:%ld", sdbTrace("table:%s, a record is inserted:%s, sdbVersion:%" PRId64 " id:%" PRId64 " rowSize:%d numOfRows:%d fileSize:%" PRId64,
pTable->name, taosIpStr(*(int32_t *)row), sdbVersion, rowHead->id, rowHead->rowSize, pTable->numOfRows, pTable->size); pTable->name, taosIpStr(*(int32_t *)row), sdbVersion, rowHead->id, rowHead->rowSize, pTable->numOfRows, pTable->size);
break; break;
case SDB_KEYTYPE_AUTO: case SDB_KEYTYPE_AUTO:
sdbTrace("table:%s, a record is inserted:%d, sdbVersion:%ld id:%ld rowSize:%d numOfRows:%d fileSize:%ld", sdbTrace("table:%s, a record is inserted:%d, sdbVersion:%" PRId64 " id:%" PRId64 " rowSize:%d numOfRows:%d fileSize:%" PRId64,
pTable->name, *(int32_t *)row, sdbVersion, rowHead->id, rowHead->rowSize, pTable->numOfRows, pTable->size); pTable->name, *(int32_t *)row, sdbVersion, rowHead->id, rowHead->rowSize, pTable->numOfRows, pTable->size);
break; break;
default: default:
sdbTrace("table:%s, a record is inserted, sdbVersion:%ld id:%ld rowSize:%d numOfRows:%d fileSize:%ld", sdbTrace("table:%s, a record is inserted, sdbVersion:%" PRId64 " id:%" PRId64 " rowSize:%d numOfRows:%d fileSize:%" PRId64,
pTable->name, sdbVersion, rowHead->id, rowHead->rowSize, pTable->numOfRows, pTable->size); pTable->name, sdbVersion, rowHead->id, rowHead->rowSize, pTable->numOfRows, pTable->size);
break; break;
} }
...@@ -557,19 +557,19 @@ int sdbDeleteRow(void *handle, void *row) { ...@@ -557,19 +557,19 @@ int sdbDeleteRow(void *handle, void *row) {
sdbAddIntoUpdateList(pTable, SDB_TYPE_DELETE, pMetaRow); sdbAddIntoUpdateList(pTable, SDB_TYPE_DELETE, pMetaRow);
switch (pTable->keyType) { switch (pTable->keyType) {
case SDB_KEYTYPE_STRING: case SDB_KEYTYPE_STRING:
sdbTrace("table:%s, a record is deleted:%s, sdbVersion:%ld id:%ld numOfRows:%d", sdbTrace("table:%s, a record is deleted:%s, sdbVersion:%" PRId64 " id:%" PRId64 " numOfRows:%d",
pTable->name, (char *)row, sdbVersion, pTable->id, pTable->numOfRows); pTable->name, (char *)row, sdbVersion, pTable->id, pTable->numOfRows);
break; break;
case SDB_KEYTYPE_UINT32: //dnodes or mnodes case SDB_KEYTYPE_UINT32: //dnodes or mnodes
sdbTrace("table:%s, a record is deleted:%s, sdbVersion:%ld id:%ld numOfRows:%d", sdbTrace("table:%s, a record is deleted:%s, sdbVersion:%" PRId64 " id:%" PRId64 " numOfRows:%d",
pTable->name, taosIpStr(*(int32_t *)row), sdbVersion, pTable->id, pTable->numOfRows); pTable->name, taosIpStr(*(int32_t *)row), sdbVersion, pTable->id, pTable->numOfRows);
break; break;
case SDB_KEYTYPE_AUTO: case SDB_KEYTYPE_AUTO:
sdbTrace("table:%s, a record is deleted:%d, sdbVersion:%ld id:%ld numOfRows:%d", sdbTrace("table:%s, a record is deleted:%d, sdbVersion:%" PRId64 " id:%" PRId64 " numOfRows:%d",
pTable->name, *(int32_t *)row, sdbVersion, pTable->id, pTable->numOfRows); pTable->name, *(int32_t *)row, sdbVersion, pTable->id, pTable->numOfRows);
break; break;
default: default:
sdbTrace("table:%s, a record is deleted, sdbVersion:%ld id:%ld numOfRows:%d", sdbTrace("table:%s, a record is deleted, sdbVersion:%" PRId64 " id:%" PRId64 " numOfRows:%d",
pTable->name, sdbVersion, pTable->id, pTable->numOfRows); pTable->name, sdbVersion, pTable->id, pTable->numOfRows);
break; break;
} }
...@@ -604,19 +604,19 @@ int sdbUpdateRow(void *handle, void *row, int updateSize, char isUpdated) { ...@@ -604,19 +604,19 @@ int sdbUpdateRow(void *handle, void *row, int updateSize, char isUpdated) {
if (pMeta == NULL) { if (pMeta == NULL) {
switch (pTable->keyType) { switch (pTable->keyType) {
case SDB_KEYTYPE_STRING: case SDB_KEYTYPE_STRING:
sdbError("table:%s, failed to update record:%s, record is not there, sdbVersion:%ld id:%d", sdbError("table:%s, failed to update record:%s, record is not there, sdbVersion:%" PRId64 " id:%" PRId64,
pTable->name, (char *) row, sdbVersion, pTable->id); pTable->name, (char *) row, sdbVersion, pTable->id);
break; break;
case SDB_KEYTYPE_UINT32: //dnodes or mnodes case SDB_KEYTYPE_UINT32: //dnodes or mnodes
sdbError("table:%s, failed to update record:%s, record is not there, sdbVersion:%ld id:%d", sdbError("table:%s, failed to update record:%s, record is not there, sdbVersion:%" PRId64 " id:%" PRId64,
pTable->name, taosIpStr(*(int32_t *) row), sdbVersion, pTable->id); pTable->name, taosIpStr(*(int32_t *) row), sdbVersion, pTable->id);
break; break;
case SDB_KEYTYPE_AUTO: case SDB_KEYTYPE_AUTO:
sdbError("table:%s, failed to update record:%d, record is not there, sdbVersion:%ld id:%d", sdbError("table:%s, failed to update record:%d, record is not there, sdbVersion:%" PRId64 " id:%" PRId64,
pTable->name, *(int32_t *) row, sdbVersion, pTable->id); pTable->name, *(int32_t *) row, sdbVersion, pTable->id);
break; break;
default: default:
sdbError("table:%s, failed to update record, record is not there, sdbVersion:%ld id:%d", sdbError("table:%s, failed to update record, record is not there, sdbVersion:%" PRId64 " id:%" PRId64,
pTable->name, sdbVersion, pTable->id); pTable->name, sdbVersion, pTable->id);
break; break;
} }
...@@ -676,19 +676,19 @@ int sdbUpdateRow(void *handle, void *row, int updateSize, char isUpdated) { ...@@ -676,19 +676,19 @@ int sdbUpdateRow(void *handle, void *row, int updateSize, char isUpdated) {
switch (pTable->keyType) { switch (pTable->keyType) {
case SDB_KEYTYPE_STRING: case SDB_KEYTYPE_STRING:
sdbTrace("table:%s, a record is updated:%s, sdbVersion:%ld id:%ld numOfRows:%d", sdbTrace("table:%s, a record is updated:%s, sdbVersion:%" PRId64 " id:%" PRId64 " numOfRows:%" PRId64,
pTable->name, (char *)row, sdbVersion, pTable->id, pTable->numOfRows); pTable->name, (char *)row, sdbVersion, pTable->id, pTable->numOfRows);
break; break;
case SDB_KEYTYPE_UINT32: //dnodes or mnodes case SDB_KEYTYPE_UINT32: //dnodes or mnodes
sdbTrace("table:%s, a record is updated:%s, sdbVersion:%ld id:%ld numOfRows:%d", sdbTrace("table:%s, a record is updated:%s, sdbVersion:%" PRId64 " id:%" PRId64 " numOfRows:%" PRId64,
pTable->name, taosIpStr(*(int32_t *)row), sdbVersion, pTable->id, pTable->numOfRows); pTable->name, taosIpStr(*(int32_t *)row), sdbVersion, pTable->id, pTable->numOfRows);
break; break;
case SDB_KEYTYPE_AUTO: case SDB_KEYTYPE_AUTO:
sdbTrace("table:%s, a record is updated:%d, sdbVersion:%ld id:%ld numOfRows:%d", sdbTrace("table:%s, a record is updated:%d, sdbVersion:%" PRId64 " id:%" PRId64 " numOfRows:%" PRId64,
pTable->name, *(int32_t *)row, sdbVersion, pTable->id, pTable->numOfRows); pTable->name, *(int32_t *)row, sdbVersion, pTable->id, pTable->numOfRows);
break; break;
default: default:
sdbTrace("table:%s, a record is updated, sdbVersion:%ld id:%ld numOfRows:%d", pTable->name, sdbVersion, sdbTrace("table:%s, a record is updated, sdbVersion:%" PRId64 " id:%" PRId64 " numOfRows:%" PRId64, pTable->name, sdbVersion,
pTable->id, pTable->numOfRows); pTable->id, pTable->numOfRows);
break; break;
} }
...@@ -797,7 +797,7 @@ void sdbCloseTable(void *handle) { ...@@ -797,7 +797,7 @@ void sdbCloseTable(void *handle) {
pthread_mutex_destroy(&pTable->mutex); pthread_mutex_destroy(&pTable->mutex);
sdbNumOfTables--; sdbNumOfTables--;
sdbTrace("table:%s is closed, id:%ld numOfTables:%d", pTable->name, pTable->id, sdbNumOfTables); sdbTrace("table:%s is closed, id:%" PRId64 " numOfTables:%d", pTable->name, pTable->id, sdbNumOfTables);
tfree(pTable->update); tfree(pTable->update);
tfree(pTable); tfree(pTable);
...@@ -901,7 +901,7 @@ void sdbResetTable(SSdbTable *pTable) { ...@@ -901,7 +901,7 @@ void sdbResetTable(SSdbTable *pTable) {
tfree(rowHead); tfree(rowHead);
sdbPrint("table:%s is updated, sdbVerion:%ld id:%ld", pTable->name, sdbVersion, pTable->id); sdbPrint("table:%s is updated, sdbVerion:%" PRId64 " id:%" PRId64, pTable->name, sdbVersion, pTable->id);
} }
// TODO:A problem here :use snapshot file to sync another node will cause // TODO:A problem here :use snapshot file to sync another node will cause
......
src/system/detail/src/dnodeMgmt.c
浏览文件 @ 44acd0ee
...@@ -153,7 +153,7 @@ int vnodeProcessAlterStreamRequest(char *pMsg, int msgLen, SMgmtObj *pObj) { ...@@ -153,7 +153,7 @@ int vnodeProcessAlterStreamRequest(char *pMsg, int msgLen, SMgmtObj *pObj) {
} }
if (pAlter->sid >= pVnode->cfg.maxSessions || pAlter->sid < 0) { if (pAlter->sid >= pVnode->cfg.maxSessions || pAlter->sid < 0) {
dError("vid:%d sid:%d uid:%ld, sid is out of range", pAlter->vnode, pAlter->sid, pAlter->uid); dError("vid:%d sid:%d uid:%" PRIu64 ", sid is out of range", pAlter->vnode, pAlter->sid, pAlter->uid);
code = TSDB_CODE_INVALID_TABLE_ID; code = TSDB_CODE_INVALID_TABLE_ID;
goto _over; goto _over;
} }
......
src/system/detail/src/mgmtDnodeInt.c
浏览文件 @ 44acd0ee
...@@ -465,8 +465,11 @@ int mgmtCfgDynamicOptions(SDnodeObj *pDnode, char *msg) { ...@@ -465,8 +465,11 @@ int mgmtCfgDynamicOptions(SDnodeObj *pDnode, char *msg) {
} }
int mgmtSendCfgDnodeMsg(char *cont) { int mgmtSendCfgDnodeMsg(char *cont) {
#ifdef CLUSTER
char * pMsg, *pStart; char * pMsg, *pStart;
int msgLen = 0; int msgLen = 0;
#endif
SDnodeObj *pDnode; SDnodeObj *pDnode;
SCfgMsg * pCfg = (SCfgMsg *)cont; SCfgMsg * pCfg = (SCfgMsg *)cont;
uint32_t ip; uint32_t ip;
......
src/system/detail/src/mgmtMeter.c
浏览文件 @ 44acd0ee
...@@ -688,7 +688,7 @@ int mgmtCreateMeter(SDbObj *pDb, SCreateTableMsg *pCreate) { ...@@ -688,7 +688,7 @@ int mgmtCreateMeter(SDbObj *pDb, SCreateTableMsg *pCreate) {
pMeter->uid = (((uint64_t)pMeter->gid.vgId) << 40) + ((((uint64_t)pMeter->gid.sid) & ((1ul << 24) - 1ul)) << 16) + pMeter->uid = (((uint64_t)pMeter->gid.vgId) << 40) + ((((uint64_t)pMeter->gid.sid) & ((1ul << 24) - 1ul)) << 16) +
((uint64_t)sdbVersion & ((1ul << 16) - 1ul)); ((uint64_t)sdbVersion & ((1ul << 16) - 1ul));
mTrace("table:%s, create table in vgroup, vgId:%d sid:%d vnode:%d uid:%llu db:%s", mTrace("table:%s, create table in vgroup, vgId:%d sid:%d vnode:%d uid:%" PRIu64 " db:%s",
pMeter->meterId, pVgroup->vgId, sid, pVgroup->vnodeGid[0].vnode, pMeter->uid, pDb->name); pMeter->meterId, pVgroup->vgId, sid, pVgroup->vnodeGid[0].vnode, pMeter->uid, pDb->name);
} else { } else {
pMeter->uid = (((uint64_t)pMeter->createdTime) << 16) + ((uint64_t)sdbVersion & ((1ul << 16) - 1ul)); pMeter->uid = (((uint64_t)pMeter->createdTime) << 16) + ((uint64_t)sdbVersion & ((1ul << 16) - 1ul));
......
src/system/detail/src/mgmtShell.c
浏览文件 @ 44acd0ee
...@@ -257,7 +257,7 @@ int mgmtProcessMeterMetaMsg(char *pMsg, int msgLen, SConnObj *pConn) { ...@@ -257,7 +257,7 @@ int mgmtProcessMeterMetaMsg(char *pMsg, int msgLen, SConnObj *pConn) {
pRsp->code = TSDB_CODE_DB_NOT_SELECTED; pRsp->code = TSDB_CODE_DB_NOT_SELECTED;
pMsg++; pMsg++;
} else { } else {
mTrace("%s, uid:%lld meter meta is retrieved", pInfo->meterId, pMeterObj->uid); mTrace("%s, uid:%" PRIu64 " meter meta is retrieved", pInfo->meterId, pMeterObj->uid);
pRsp->code = 0; pRsp->code = 0;
pMsg += sizeof(STaosRsp); pMsg += sizeof(STaosRsp);
*pMsg = TSDB_IE_TYPE_META; *pMsg = TSDB_IE_TYPE_META;
...@@ -402,7 +402,7 @@ int mgmtProcessMultiMeterMetaMsg(char *pMsg, int msgLen, SConnObj *pConn) { ...@@ -402,7 +402,7 @@ int mgmtProcessMultiMeterMetaMsg(char *pMsg, int msgLen, SConnObj *pConn) {
if (pMeterObj == NULL || (pDbObj == NULL)) { if (pMeterObj == NULL || (pDbObj == NULL)) {
continue; continue;
} else { } else {
mTrace("%s, uid:%lld sversion:%d meter meta is retrieved", tblName, pMeterObj->uid, pMeterObj->sversion); mTrace("%s, uid:%" PRIu64 " sversion:%d meter meta is retrieved", tblName, pMeterObj->uid, pMeterObj->sversion);
pMeta = (SMultiMeterMeta *)pCurMeter; pMeta = (SMultiMeterMeta *)pCurMeter;
memcpy(pMeta->meterId, tblName, strlen(tblName)); memcpy(pMeta->meterId, tblName, strlen(tblName));
...@@ -446,7 +446,7 @@ int mgmtProcessMultiMeterMetaMsg(char *pMsg, int msgLen, SConnObj *pConn) { ...@@ -446,7 +446,7 @@ int mgmtProcessMultiMeterMetaMsg(char *pMsg, int msgLen, SConnObj *pConn) {
if (pVgroup == NULL) { if (pVgroup == NULL) {
pRsp->code = TSDB_CODE_INVALID_TABLE; pRsp->code = TSDB_CODE_INVALID_TABLE;
pNewMsg++; pNewMsg++;
mError("%s, uid:%lld sversion:%d vgId:%d pVgroup is NULL", tblName, pMeterObj->uid, pMeterObj->sversion, mError("%s, uid:%" PRIu64 " sversion:%d vgId:%d pVgroup is NULL", tblName, pMeterObj->uid, pMeterObj->sversion,
pMeterObj->gid.vgId); pMeterObj->gid.vgId);
goto _error_exit_code; goto _error_exit_code;
} }
...@@ -1078,7 +1078,7 @@ int mgmtProcessCreateTableMsg(char *pMsg, int msgLen, SConnObj *pConn) { ...@@ -1078,7 +1078,7 @@ int mgmtProcessCreateTableMsg(char *pMsg, int msgLen, SConnObj *pConn) {
STabObj* pMeter = mgmtGetMeter(pCreate->meterId); STabObj* pMeter = mgmtGetMeter(pCreate->meterId);
assert(pMeter != NULL); assert(pMeter != NULL);
mWarn("table:%s, table already created, failed to create table, ts:%lld, code:%d", pCreate->meterId, mWarn("table:%s, table already created, failed to create table, ts:%" PRId64 ", code:%d", pCreate->meterId,
pMeter->createdTime, code); pMeter->createdTime, code);
} else { // other errors } else { // other errors
mError("table:%s, failed to create table, code:%d", pCreate->meterId, code); mError("table:%s, failed to create table, code:%d", pCreate->meterId, code);
......
src/system/detail/src/vnodeCache.c
浏览文件 @ 44acd0ee
...@@ -660,8 +660,8 @@ int vnodeQueryFromCache(SMeterObj *pObj, SQuery *pQuery) { ...@@ -660,8 +660,8 @@ int vnodeQueryFromCache(SMeterObj *pObj, SQuery *pQuery) {
for (int32_t j = startPos; j < pCacheBlock->numOfPoints; ++j) { for (int32_t j = startPos; j < pCacheBlock->numOfPoints; ++j) {
TSKEY key = vnodeGetTSInCacheBlock(pCacheBlock, j); TSKEY key = vnodeGetTSInCacheBlock(pCacheBlock, j);
if (key < startkey || key > endkey) { if (key < startkey || key > endkey) {
dError("vid:%d sid:%d id:%s, timestamp in cache slot is disordered. slot:%d, pos:%d, ts:%lld, block " dError("vid:%d sid:%d id:%s, timestamp in cache slot is disordered. slot:%d, pos:%d, ts:%" PRId64 ", block "
"range:%lld-%lld", pObj->vnode, pObj->sid, pObj->meterId, pQuery->slot, j, key, startkey, endkey); "range:%" PRId64 "-%" PRId64, pObj->vnode, pObj->sid, pObj->meterId, pQuery->slot, j, key, startkey, endkey);
tfree(ids); tfree(ids);
return -TSDB_CODE_FILE_BLOCK_TS_DISORDERED; return -TSDB_CODE_FILE_BLOCK_TS_DISORDERED;
} }
...@@ -684,8 +684,8 @@ int vnodeQueryFromCache(SMeterObj *pObj, SQuery *pQuery) { ...@@ -684,8 +684,8 @@ int vnodeQueryFromCache(SMeterObj *pObj, SQuery *pQuery) {
for (int32_t j = startPos; j >= 0; --j) { for (int32_t j = startPos; j >= 0; --j) {
TSKEY key = vnodeGetTSInCacheBlock(pCacheBlock, j); TSKEY key = vnodeGetTSInCacheBlock(pCacheBlock, j);
if (key < startkey || key > endkey) { if (key < startkey || key > endkey) {
dError("vid:%d sid:%d id:%s, timestamp in cache slot is disordered. slot:%d, pos:%d, ts:%lld, block " dError("vid:%d sid:%d id:%s, timestamp in cache slot is disordered. slot:%d, pos:%d, ts:%" PRId64 ", block "
"range:%lld-%lld", pObj->vnode, pObj->sid, pObj->meterId, pQuery->slot, j, key, startkey, endkey); "range:%" PRId64 "-%" PRId64, pObj->vnode, pObj->sid, pObj->meterId, pQuery->slot, j, key, startkey, endkey);
tfree(ids); tfree(ids);
return -TSDB_CODE_FILE_BLOCK_TS_DISORDERED; return -TSDB_CODE_FILE_BLOCK_TS_DISORDERED;
} }
...@@ -967,7 +967,7 @@ void vnodeSetCommitQuery(SMeterObj *pObj, SQuery *pQuery) { ...@@ -967,7 +967,7 @@ void vnodeSetCommitQuery(SMeterObj *pObj, SQuery *pQuery) {
if (firstKey < pQuery->skey) { if (firstKey < pQuery->skey) {
pQuery->over = 1; pQuery->over = 1;
dTrace("vid:%d sid:%d id:%s, first key is small, keyFirst:%ld commitFirstKey:%ld", dTrace("vid:%d sid:%d id:%s, first key is small, keyFirst:%" PRId64 " commitFirstKey:%" PRId64 "",
pObj->vnode, pObj->sid, pObj->meterId, firstKey, pQuery->skey); pObj->vnode, pObj->sid, pObj->meterId, firstKey, pQuery->skey);
pthread_mutex_lock(&(pVnode->vmutex)); pthread_mutex_lock(&(pVnode->vmutex));
if (firstKey < pVnode->firstKey) pVnode->firstKey = firstKey; if (firstKey < pVnode->firstKey) pVnode->firstKey = firstKey;
...@@ -1019,7 +1019,7 @@ int vnodeSyncRetrieveCache(int vnode, int fd) { ...@@ -1019,7 +1019,7 @@ int vnodeSyncRetrieveCache(int vnode, int fd) {
if (taosWriteMsg(fd, &(pObj->lastKeyOnFile), sizeof(pObj->lastKeyOnFile)) <= 0) return -1; if (taosWriteMsg(fd, &(pObj->lastKeyOnFile), sizeof(pObj->lastKeyOnFile)) <= 0) return -1;
if (taosWriteMsg(fd, &(pInfo->commitPoint), sizeof(pInfo->commitPoint)) <= 0) return -1; if (taosWriteMsg(fd, &(pInfo->commitPoint), sizeof(pInfo->commitPoint)) <= 0) return -1;
dTrace("vid:%d sid:%d id:%s, send lastKey:%lld lastKeyOnFile:%lld", vnode, sid, pObj->meterId, pObj->lastKey, dTrace("vid:%d sid:%d id:%s, send lastKey:%" PRId64 " lastKeyOnFile:%" PRId64, vnode, sid, pObj->meterId, pObj->lastKey,
pObj->lastKeyOnFile); pObj->lastKeyOnFile);
slot = pInfo->commitSlot; slot = pInfo->commitSlot;
...@@ -1039,7 +1039,7 @@ int vnodeSyncRetrieveCache(int vnode, int fd) { ...@@ -1039,7 +1039,7 @@ int vnodeSyncRetrieveCache(int vnode, int fd) {
if (taosWriteMsg(fd, pBlock->offset[col], pObj->schema[col].bytes * points) <= 0) return -1; if (taosWriteMsg(fd, pBlock->offset[col], pObj->schema[col].bytes * points) <= 0) return -1;
TSKEY lastKey = *((TSKEY *)(pBlock->offset[0] + pObj->schema[0].bytes * (points - 1))); TSKEY lastKey = *((TSKEY *)(pBlock->offset[0] + pObj->schema[0].bytes * (points - 1)));
dTrace("vid:%d sid:%d id:%s, cache block is sent, points:%d lastKey:%ld", vnode, sid, pObj->meterId, points, dTrace("vid:%d sid:%d id:%s, cache block is sent, points:%d lastKey:%" PRId64, vnode, sid, pObj->meterId, points,
lastKey); lastKey);
blocksSent++; blocksSent++;
...@@ -1103,7 +1103,7 @@ int vnodeSyncRestoreCache(int vnode, int fd) { ...@@ -1103,7 +1103,7 @@ int vnodeSyncRestoreCache(int vnode, int fd) {
if (taosReadMsg(fd, &(pObj->lastKeyOnFile), sizeof(pObj->lastKeyOnFile)) <= 0) return -1; if (taosReadMsg(fd, &(pObj->lastKeyOnFile), sizeof(pObj->lastKeyOnFile)) <= 0) return -1;
if (taosReadMsg(fd, &(pInfo->commitPoint), sizeof(pInfo->commitPoint)) <= 0) return -1; if (taosReadMsg(fd, &(pInfo->commitPoint), sizeof(pInfo->commitPoint)) <= 0) return -1;
dTrace("vid:%d sid:%d id:%s, commitPoint:%d lastKeyOnFile:%ld", vnode, sid, pObj->meterId, pInfo->commitPoint, dTrace("vid:%d sid:%d id:%s, commitPoint:%d lastKeyOnFile:%" PRId64, vnode, sid, pObj->meterId, pInfo->commitPoint,
pObj->lastKeyOnFile); pObj->lastKeyOnFile);
if (vnodeList[pObj->vnode].lastKey < pObj->lastKey) vnodeList[pObj->vnode].lastKey = pObj->lastKey; if (vnodeList[pObj->vnode].lastKey < pObj->lastKey) vnodeList[pObj->vnode].lastKey = pObj->lastKey;
...@@ -1141,7 +1141,7 @@ int vnodeSyncRestoreCache(int vnode, int fd) { ...@@ -1141,7 +1141,7 @@ int vnodeSyncRestoreCache(int vnode, int fd) {
if (vnodeList[pObj->vnode].firstKey > *(TSKEY *)(pBlock->offset[0])) if (vnodeList[pObj->vnode].firstKey > *(TSKEY *)(pBlock->offset[0]))
vnodeList[pObj->vnode].firstKey = *(TSKEY *)(pBlock->offset[0]); vnodeList[pObj->vnode].firstKey = *(TSKEY *)(pBlock->offset[0]);
dTrace("vid:%d sid:%d id:%s, cache block is received, points:%d lastKey:%ld", vnode, sid, pObj->meterId, points, dTrace("vid:%d sid:%d id:%s, cache block is received, points:%d lastKey:%" PRId64, vnode, sid, pObj->meterId, points,
pObj->lastKey); pObj->lastKey);
} }
} }
......
src/system/detail/src/vnodeCommit.c
浏览文件 @ 44acd0ee
...@@ -51,7 +51,7 @@ int vnodeOpenCommitLog(int vnode, uint64_t firstV) { ...@@ -51,7 +51,7 @@ int vnodeOpenCommitLog(int vnode, uint64_t firstV) {
int64_t length = statbuf.st_size; int64_t length = statbuf.st_size;
if (length != pVnode->mappingSize) { if (length != pVnode->mappingSize) {
dError("vid:%d, logfd:%d, alloc file size:%ld not equal to mapping size:%ld", vnode, pVnode->logFd, length, dError("vid:%d, logfd:%d, alloc file size:%" PRId64 " not equal to mapping size:%" PRId64, vnode, pVnode->logFd, length,
pVnode->mappingSize); pVnode->mappingSize);
goto _err_log_open; goto _err_log_open;
} }
......
src/system/detail/src/vnodeFile.c
浏览文件 @ 44acd0ee
...@@ -197,7 +197,7 @@ int vnodeCreateNeccessaryFiles(SVnodeObj *pVnode) { ...@@ -197,7 +197,7 @@ int vnodeCreateNeccessaryFiles(SVnodeObj *pVnode) {
numOfFiles = (pVnode->lastKeyOnFile - pVnode->commitFirstKey) / tsMsPerDay[(uint8_t)pVnode->cfg.precision] / pCfg->daysPerFile; numOfFiles = (pVnode->lastKeyOnFile - pVnode->commitFirstKey) / tsMsPerDay[(uint8_t)pVnode->cfg.precision] / pCfg->daysPerFile;
if (pVnode->commitFirstKey > pVnode->lastKeyOnFile) numOfFiles = -1; if (pVnode->commitFirstKey > pVnode->lastKeyOnFile) numOfFiles = -1;
dTrace("vid:%d, commitFirstKey:%ld lastKeyOnFile:%ld numOfFiles:%d fileId:%d vnodeNumOfFiles:%d", pVnode->vnode, dTrace("vid:%d, commitFirstKey:%" PRId64 " lastKeyOnFile:%" PRId64 " numOfFiles:%d fileId:%d vnodeNumOfFiles:%d", pVnode->vnode,
pVnode->commitFirstKey, pVnode->lastKeyOnFile, numOfFiles, pVnode->fileId, pVnode->numOfFiles); pVnode->commitFirstKey, pVnode->lastKeyOnFile, numOfFiles, pVnode->fileId, pVnode->numOfFiles);
if (numOfFiles >= pVnode->numOfFiles) { if (numOfFiles >= pVnode->numOfFiles) {
...@@ -251,7 +251,7 @@ int vnodeOpenCommitFiles(SVnodeObj *pVnode, int noTempLast) { ...@@ -251,7 +251,7 @@ int vnodeOpenCommitFiles(SVnodeObj *pVnode, int noTempLast) {
fileId = pVnode->commitFileId; fileId = pVnode->commitFileId;
dTrace("vid:%d, commit fileId:%d, commitLastKey:%ld, vnodeLastKey:%ld, lastKeyOnFile:%ld numOfFiles:%d", dTrace("vid:%d, commit fileId:%d, commitLastKey:%" PRId64 ", vnodeLastKey:%" PRId64 ", lastKeyOnFile:%" PRId64 " numOfFiles:%d",
vnode, fileId, pVnode->commitLastKey, pVnode->lastKey, pVnode->lastKeyOnFile, pVnode->numOfFiles); vnode, fileId, pVnode->commitLastKey, pVnode->lastKey, pVnode->lastKeyOnFile, pVnode->numOfFiles);
int minSize = sizeof(SCompHeader) * pVnode->cfg.maxSessions + sizeof(TSCKSUM) + TSDB_FILE_HEADER_LEN; int minSize = sizeof(SCompHeader) * pVnode->cfg.maxSessions + sizeof(TSCKSUM) + TSDB_FILE_HEADER_LEN;
...@@ -506,7 +506,7 @@ void *vnodeCommitMultiToFile(SVnodeObj *pVnode, int ssid, int esid) { ...@@ -506,7 +506,7 @@ void *vnodeCommitMultiToFile(SVnodeObj *pVnode, int ssid, int esid) {
SVnodeHeadInfo headInfo; SVnodeHeadInfo headInfo;
uint8_t * pOldCompBlocks; uint8_t * pOldCompBlocks;
dPrint("vid:%d, committing to file, firstKey:%ld lastKey:%ld ssid:%d esid:%d", vnode, pVnode->firstKey, dPrint("vid:%d, committing to file, firstKey:%" PRId64 " lastKey:%" PRId64 " ssid:%d esid:%d", vnode, pVnode->firstKey,
pVnode->lastKey, ssid, esid); pVnode->lastKey, ssid, esid);
if (pVnode->lastKey == 0) goto _over; if (pVnode->lastKey == 0) goto _over;
...@@ -573,7 +573,7 @@ _again: ...@@ -573,7 +573,7 @@ _again:
memset(&query, 0, sizeof(query)); memset(&query, 0, sizeof(query));
if (vnodeOpenCommitFiles(pVnode, ssid) < 0) goto _over; if (vnodeOpenCommitFiles(pVnode, ssid) < 0) goto _over;
dTrace("vid:%d, start to commit, commitFirstKey:%ld commitLastKey:%ld", vnode, pVnode->commitFirstKey, dTrace("vid:%d, start to commit, commitFirstKey:%" PRId64 " commitLastKey:%" PRId64, vnode, pVnode->commitFirstKey,
pVnode->commitLastKey); pVnode->commitLastKey);
headLen = 0; headLen = 0;
...@@ -642,7 +642,7 @@ _again: ...@@ -642,7 +642,7 @@ _again:
read(pVnode->hfd, &pMeter->lastBlock, sizeof(SCompBlock)); read(pVnode->hfd, &pMeter->lastBlock, sizeof(SCompBlock));
} }
} else { } else {
dTrace("vid:%d sid:%d id:%s, uid:%ld is not matched w/ old:%ld, old data will be thrown away", dTrace("vid:%d sid:%d id:%s, uid:%" PRIu64 " is not matched with old:%" PRIu64 ", old data will be thrown away",
vnode, sid, pObj->meterId, pObj->uid, compInfo.uid); vnode, sid, pObj->meterId, pObj->uid, compInfo.uid);
pMeter->oldNumOfBlocks = 0; pMeter->oldNumOfBlocks = 0;
} }
...@@ -683,7 +683,7 @@ _again: ...@@ -683,7 +683,7 @@ _again:
query.sdata = data; query.sdata = data;
vnodeSetCommitQuery(pObj, &query); vnodeSetCommitQuery(pObj, &query);
dTrace("vid:%d sid:%d id:%s, start to commit, startKey:%lld slot:%d pos:%d", pObj->vnode, pObj->sid, pObj->meterId, dTrace("vid:%d sid:%d id:%s, start to commit, startKey:%" PRId64 " slot:%d pos:%d", pObj->vnode, pObj->sid, pObj->meterId,
pObj->lastKeyOnFile, query.slot, query.pos); pObj->lastKeyOnFile, query.slot, query.pos);
pointsRead = 0; pointsRead = 0;
...@@ -760,7 +760,7 @@ _again: ...@@ -760,7 +760,7 @@ _again:
pMeter->newNumOfBlocks++; pMeter->newNumOfBlocks++;
pMeter->committedPoints += (pointsRead - pointsReadLast); pMeter->committedPoints += (pointsRead - pointsReadLast);
dTrace("vid:%d sid:%d id:%s, pointsRead:%d, pointsReadLast:%d lastKey:%lld, " dTrace("vid:%d sid:%d id:%s, pointsRead:%d, pointsReadLast:%d lastKey:%" PRId64 ", "
"slot:%d pos:%d newNumOfBlocks:%d headLen:%d", "slot:%d pos:%d newNumOfBlocks:%d headLen:%d",
pObj->vnode, pObj->sid, pObj->meterId, pointsRead, pointsReadLast, pObj->lastKeyOnFile, query.slot, query.pos, pObj->vnode, pObj->sid, pObj->meterId, pointsRead, pointsReadLast, pObj->lastKeyOnFile, query.slot, query.pos,
pMeter->newNumOfBlocks, headLen); pMeter->newNumOfBlocks, headLen);
...@@ -771,7 +771,7 @@ _again: ...@@ -771,7 +771,7 @@ _again:
pointsReadLast = 0; pointsReadLast = 0;
} }
dTrace("vid:%d sid:%d id:%s, %d points are committed, lastKey:%lld slot:%d pos:%d newNumOfBlocks:%d", dTrace("vid:%d sid:%d id:%s, %d points are committed, lastKey:%" PRId64 " slot:%d pos:%d newNumOfBlocks:%d",
pObj->vnode, pObj->sid, pObj->meterId, pMeter->committedPoints, pObj->lastKeyOnFile, query.slot, query.pos, pObj->vnode, pObj->sid, pObj->meterId, pMeter->committedPoints, pObj->lastKeyOnFile, query.slot, query.pos,
pMeter->newNumOfBlocks); pMeter->newNumOfBlocks);
...@@ -1093,7 +1093,7 @@ int vnodeReadColumnToMem(int fd, SCompBlock *pBlock, SField **fields, int col, c ...@@ -1093,7 +1093,7 @@ int vnodeReadColumnToMem(int fd, SCompBlock *pBlock, SField **fields, int col, c
} }
if (len <= 0) { if (len <= 0) {
dError("failed to read col:%d, offset:%ld, reason:%s", col, tfields[col].offset, strerror(errno)); dError("failed to read col:%d, offset:%d, reason:%s", col, (int32_t)(tfields[col].offset), strerror(errno));
return -1; return -1;
} }
...@@ -1218,7 +1218,7 @@ int vnodeWriteBlockToFile(SMeterObj *pObj, SCompBlock *pCompBlock, SData *data[] ...@@ -1218,7 +1218,7 @@ int vnodeWriteBlockToFile(SMeterObj *pObj, SCompBlock *pCompBlock, SData *data[]
int dfd = pVnode->dfd; int dfd = pVnode->dfd;
if (pCompBlock->last && (points < pObj->pointsPerFileBlock * tsFileBlockMinPercent)) { if (pCompBlock->last && (points < pObj->pointsPerFileBlock * tsFileBlockMinPercent)) {
dTrace("vid:%d sid:%d id:%s, points:%d are written to last block, block stime: %ld, block etime: %ld", dTrace("vid:%d sid:%d id:%s, points:%d are written to last block, block stime: %" PRId64 ", block etime: %" PRId64,
pObj->vnode, pObj->sid, pObj->meterId, points, *((TSKEY *)(data[0]->data)), pObj->vnode, pObj->sid, pObj->meterId, points, *((TSKEY *)(data[0]->data)),
*((TSKEY * )(data[0]->data + (points - 1) * pObj->schema[0].bytes))); *((TSKEY * )(data[0]->data + (points - 1) * pObj->schema[0].bytes)));
pCompBlock->last = 1; pCompBlock->last = 1;
...@@ -1303,7 +1303,7 @@ int vnodeWriteBlockToFile(SMeterObj *pObj, SCompBlock *pCompBlock, SData *data[] ...@@ -1303,7 +1303,7 @@ int vnodeWriteBlockToFile(SMeterObj *pObj, SCompBlock *pCompBlock, SData *data[]
pCompBlock->len += wlen; pCompBlock->len += wlen;
} }
dTrace("vid:%d, vnode compStorage size is: %ld", pObj->vnode, pVnode->vnodeStatistic.compStorage); dTrace("vid:%d, vnode compStorage size is: %" PRId64, pObj->vnode, pVnode->vnodeStatistic.compStorage);
pCompBlock->algorithm = pCfg->compression; pCompBlock->algorithm = pCfg->compression;
pCompBlock->numOfPoints = points; pCompBlock->numOfPoints = points;
...@@ -1355,7 +1355,7 @@ int vnodeSearchPointInFile(SMeterObj *pObj, SQuery *pQuery) { ...@@ -1355,7 +1355,7 @@ int vnodeSearchPointInFile(SMeterObj *pObj, SQuery *pQuery) {
if (pQuery->skey < oldest) pQuery->skey = oldest; if (pQuery->skey < oldest) pQuery->skey = oldest;
} }
dTrace("vid:%d sid:%d id:%s, skey:%ld ekey:%ld oldest:%ld latest:%ld fileId:%d numOfFiles:%d", dTrace("vid:%d sid:%d id:%s, skey:%" PRId64 " ekey:%" PRId64 " oldest:%" PRId64 " latest:%" PRId64 " fileId:%d numOfFiles:%d",
pObj->vnode, pObj->sid, pObj->meterId, pQuery->skey, pQuery->ekey, oldest, latest, pVnode->fileId, pObj->vnode, pObj->sid, pObj->meterId, pQuery->skey, pQuery->ekey, oldest, latest, pVnode->fileId,
pVnode->numOfFiles); pVnode->numOfFiles);
...@@ -1663,8 +1663,8 @@ int vnodeQueryFromFile(SMeterObj *pObj, SQuery *pQuery) { ...@@ -1663,8 +1663,8 @@ int vnodeQueryFromFile(SMeterObj *pObj, SQuery *pQuery) {
for (int32_t j = startPos; j < pBlock->numOfPoints; j -= step) { for (int32_t j = startPos; j < pBlock->numOfPoints; j -= step) {
TSKEY key = vnodeGetTSInDataBlock(pQuery, j, startPositionFactor); TSKEY key = vnodeGetTSInDataBlock(pQuery, j, startPositionFactor);
if (key < startKey || key > endKey) { if (key < startKey || key > endKey) {
dError("vid:%d sid:%d id:%s, timestamp in file block disordered. slot:%d, pos:%d, ts:%lld, block " dError("vid:%d sid:%d id:%s, timestamp in file block disordered. slot:%d, pos:%d, ts:%" PRId64 ", block "
"range:%lld-%lld", pObj->vnode, pObj->sid, pObj->meterId, pQuery->slot, j, key, startKey, endKey); "range:%" PRId64 "-%" PRId64, pObj->vnode, pObj->sid, pObj->meterId, pQuery->slot, j, key, startKey, endKey);
tfree(ids); tfree(ids);
return -TSDB_CODE_FILE_BLOCK_TS_DISORDERED; return -TSDB_CODE_FILE_BLOCK_TS_DISORDERED;
} }
...@@ -1687,8 +1687,8 @@ int vnodeQueryFromFile(SMeterObj *pObj, SQuery *pQuery) { ...@@ -1687,8 +1687,8 @@ int vnodeQueryFromFile(SMeterObj *pObj, SQuery *pQuery) {
for (int32_t j = pQuery->pos; j >= 0; --j) { for (int32_t j = pQuery->pos; j >= 0; --j) {
TSKEY key = vnodeGetTSInDataBlock(pQuery, j, startPositionFactor); TSKEY key = vnodeGetTSInDataBlock(pQuery, j, startPositionFactor);
if (key < startKey || key > endKey) { if (key < startKey || key > endKey) {
dError("vid:%d sid:%d id:%s, timestamp in file block disordered. slot:%d, pos:%d, ts:%lld, block " dError("vid:%d sid:%d id:%s, timestamp in file block disordered. slot:%d, pos:%d, ts:%" PRId64 ", block "
"range:%lld-%lld", pObj->vnode, pObj->sid, pObj->meterId, pQuery->slot, j, key, startKey, endKey); "range:%" PRId64 "-%" PRId64, pObj->vnode, pObj->sid, pObj->meterId, pQuery->slot, j, key, startKey, endKey);
tfree(ids); tfree(ids);
return -TSDB_CODE_FILE_BLOCK_TS_DISORDERED; return -TSDB_CODE_FILE_BLOCK_TS_DISORDERED;
} }
......
src/system/detail/src/vnodeImport.c
浏览文件 @ 44acd0ee
...@@ -119,7 +119,7 @@ int vnodeFindKeyInCache(SImportInfo *pImport, int order) { ...@@ -119,7 +119,7 @@ int vnodeFindKeyInCache(SImportInfo *pImport, int order) {
if (pInfo->commitPoint >= pObj->pointsPerBlock) pImport->slot = (pImport->slot + 1) % pInfo->maxBlocks; if (pInfo->commitPoint >= pObj->pointsPerBlock) pImport->slot = (pImport->slot + 1) % pInfo->maxBlocks;
pImport->pos = 0; pImport->pos = 0;
pImport->key = 0; pImport->key = 0;
dTrace("vid:%d sid:%d id:%s, key:%ld, import to head of cache", pObj->vnode, pObj->sid, pObj->meterId, key); dTrace("vid:%d sid:%d id:%s, key:%" PRId64 ", import to head of cache", pObj->vnode, pObj->sid, pObj->meterId, key);
code = 0; code = 0;
} else { } else {
pImport->slot = query.slot; pImport->slot = query.slot;
...@@ -184,8 +184,8 @@ int vnodeImportPoints(SMeterObj *pObj, char *cont, int contLen, char source, voi ...@@ -184,8 +184,8 @@ int vnodeImportPoints(SMeterObj *pObj, char *cont, int contLen, char source, voi
vnodeGetValidDataRange(pObj->vnode, now, &minKey, &maxKey); vnodeGetValidDataRange(pObj->vnode, now, &minKey, &maxKey);
if (firstKey < minKey || firstKey > maxKey || lastKey < minKey || lastKey > maxKey) { if (firstKey < minKey || firstKey > maxKey || lastKey < minKey || lastKey > maxKey) {
dError( dError(
"vid:%d sid:%d id:%s, invalid timestamp to import, rows:%d firstKey: %ld lastKey: %ld minAllowedKey:%ld " "vid:%d sid:%d id:%s, invalid timestamp to import, rows:%d firstKey: %" PRId64 " lastKey: %" PRId64 " minAllowedKey:%" PRId64 " "
"maxAllowedKey:%ld", "maxAllowedKey:%" PRId64,
pObj->vnode, pObj->sid, pObj->meterId, rows, firstKey, lastKey, minKey, maxKey); pObj->vnode, pObj->sid, pObj->meterId, rows, firstKey, lastKey, minKey, maxKey);
return TSDB_CODE_TIMESTAMP_OUT_OF_RANGE; return TSDB_CODE_TIMESTAMP_OUT_OF_RANGE;
} }
...@@ -221,7 +221,7 @@ int vnodeImportPoints(SMeterObj *pObj, char *cont, int contLen, char source, voi ...@@ -221,7 +221,7 @@ int vnodeImportPoints(SMeterObj *pObj, char *cont, int contLen, char source, voi
SImportInfo import = {0}; SImportInfo import = {0};
dTrace("vid:%d sid:%d id:%s, try to import %d rows data, firstKey:%ld, lastKey:%ld, object lastKey:%ld", dTrace("vid:%d sid:%d id:%s, try to import %d rows data, firstKey:%" PRId64 ", lastKey:%" PRId64 ", object lastKey:%" PRId64,
pObj->vnode, pObj->sid, pObj->meterId, rows, firstKey, lastKey, pObj->lastKey); pObj->vnode, pObj->sid, pObj->meterId, rows, firstKey, lastKey, pObj->lastKey);
import.firstKey = firstKey; import.firstKey = firstKey;
...@@ -491,7 +491,7 @@ static int vnodeLoadNeededBlockData(SMeterObj *pObj, SImportHandle *pHandle, int ...@@ -491,7 +491,7 @@ static int vnodeLoadNeededBlockData(SMeterObj *pObj, SImportHandle *pHandle, int
lseek(dfd, pBlock->offset, SEEK_SET); lseek(dfd, pBlock->offset, SEEK_SET);
if (read(dfd, (void *)(pHandle->pField), pHandle->pFieldSize) < 0) { if (read(dfd, (void *)(pHandle->pField), pHandle->pFieldSize) < 0) {
dError("vid:%d sid:%d meterId:%s, failed to read data file, size:%ld reason:%s", pVnode->vnode, pObj->sid, dError("vid:%d sid:%d meterId:%s, failed to read data file, size:%zu reason:%s", pVnode->vnode, pObj->sid,
pObj->meterId, pHandle->pFieldSize, strerror(errno)); pObj->meterId, pHandle->pFieldSize, strerror(errno));
*code = TSDB_CODE_FILE_CORRUPTED; *code = TSDB_CODE_FILE_CORRUPTED;
return -1; return -1;
...@@ -610,7 +610,7 @@ static int vnodeCloseImportFiles(SMeterObj *pObj, SImportHandle *pHandle) { ...@@ -610,7 +610,7 @@ static int vnodeCloseImportFiles(SMeterObj *pObj, SImportHandle *pHandle) {
lseek(pVnode->nfd, 0, SEEK_END); lseek(pVnode->nfd, 0, SEEK_END);
lseek(pVnode->hfd, pHandle->nextNo0Offset, SEEK_SET); lseek(pVnode->hfd, pHandle->nextNo0Offset, SEEK_SET);
if (tsendfile(pVnode->nfd, pVnode->hfd, NULL, pHandle->hfSize - pHandle->nextNo0Offset) < 0) { if (tsendfile(pVnode->nfd, pVnode->hfd, NULL, pHandle->hfSize - pHandle->nextNo0Offset) < 0) {
dError("vid:%d sid:%d meterId:%s, failed to sendfile, size:%ld, reason:%s", pObj->vnode, pObj->sid, dError("vid:%d sid:%d meterId:%s, failed to sendfile, size:%" PRId64 ", reason:%s", pObj->vnode, pObj->sid,
pObj->meterId, pHandle->hfSize - pHandle->nextNo0Offset, strerror(errno)); pObj->meterId, pHandle->hfSize - pHandle->nextNo0Offset, strerror(errno));
return -1; return -1;
} }
...@@ -627,7 +627,7 @@ static int vnodeCloseImportFiles(SMeterObj *pObj, SImportHandle *pHandle) { ...@@ -627,7 +627,7 @@ static int vnodeCloseImportFiles(SMeterObj *pObj, SImportHandle *pHandle) {
taosCalcChecksumAppend(0, (uint8_t *)(pHandle->pHeader), pHandle->pHeaderSize); taosCalcChecksumAppend(0, (uint8_t *)(pHandle->pHeader), pHandle->pHeaderSize);
lseek(pVnode->nfd, TSDB_FILE_HEADER_LEN, SEEK_SET); lseek(pVnode->nfd, TSDB_FILE_HEADER_LEN, SEEK_SET);
if (twrite(pVnode->nfd, (void *)(pHandle->pHeader), pHandle->pHeaderSize) < 0) { if (twrite(pVnode->nfd, (void *)(pHandle->pHeader), pHandle->pHeaderSize) < 0) {
dError("vid:%d sid:%d meterId:%s, failed to wirte SCompHeader part, size:%ld, reason:%s", pObj->vnode, pObj->sid, dError("vid:%d sid:%d meterId:%s, failed to wirte SCompHeader part, size:%zu, reason:%s", pObj->vnode, pObj->sid,
pObj->meterId, pHandle->pHeaderSize, strerror(errno)); pObj->meterId, pHandle->pHeaderSize, strerror(errno));
return -1; return -1;
} }
...@@ -1518,7 +1518,7 @@ int vnodeImportDataToFiles(SImportInfo *pImport, char *payload, const int rows) ...@@ -1518,7 +1518,7 @@ int vnodeImportDataToFiles(SImportInfo *pImport, char *payload, const int rows)
assert(nrows > 0); assert(nrows > 0);
dTrace("vid:%d sid:%d meterId:%s, %d rows of data will be imported to file %d, srow:%d firstKey:%ld lastKey:%ld", dTrace("vid:%d sid:%d meterId:%s, %d rows of data will be imported to file %d, srow:%d firstKey:%" PRId64 " lastKey:%" PRId64,
pObj->vnode, pObj->sid, pObj->meterId, nrows, fid, srow, KEY_AT_INDEX(payload, pObj->bytesPerPoint, srow), pObj->vnode, pObj->sid, pObj->meterId, nrows, fid, srow, KEY_AT_INDEX(payload, pObj->bytesPerPoint, srow),
KEY_AT_INDEX(payload, pObj->bytesPerPoint, (srow + nrows - 1))); KEY_AT_INDEX(payload, pObj->bytesPerPoint, (srow + nrows - 1)));
......
src/system/detail/src/vnodeMeter.c
浏览文件 @ 44acd0ee
...@@ -353,7 +353,7 @@ int vnodeRestoreMeterObj(char *buffer, int64_t length) { ...@@ -353,7 +353,7 @@ int vnodeRestoreMeterObj(char *buffer, int64_t length) {
// taosSetSecurityInfo(pObj->vnode, pObj->sid, pObj->meterId, pObj->spi, pObj->encrypt, pObj->secret, pObj->cipheringKey); // taosSetSecurityInfo(pObj->vnode, pObj->sid, pObj->meterId, pObj->spi, pObj->encrypt, pObj->secret, pObj->cipheringKey);
dTrace("vid:%d sid:%d id:%s, meter is restored, uid:%ld", pObj->vnode, pObj->sid, pObj->meterId, pObj->uid); dTrace("vid:%d sid:%d id:%s, meter is restored, uid:%" PRIu64 "", pObj->vnode, pObj->sid, pObj->meterId, pObj->uid);
return TSDB_CODE_SUCCESS; return TSDB_CODE_SUCCESS;
} }
...@@ -493,7 +493,7 @@ int vnodeCreateMeterObj(SMeterObj *pNew, SConnSec *pSec) { ...@@ -493,7 +493,7 @@ int vnodeCreateMeterObj(SMeterObj *pNew, SConnSec *pSec) {
vnodeSaveMeterObjToFile(pNew); vnodeSaveMeterObjToFile(pNew);
// vnodeCreateMeterMgmt(pNew, pSec); // vnodeCreateMeterMgmt(pNew, pSec);
vnodeCreateStream(pNew); vnodeCreateStream(pNew);
dTrace("vid:%d, sid:%d id:%s, meterObj is created, uid:%ld", pNew->vnode, pNew->sid, pNew->meterId, pNew->uid); dTrace("vid:%d, sid:%d id:%s, meterObj is created, uid:%" PRIu64 "", pNew->vnode, pNew->sid, pNew->meterId, pNew->uid);
} }
return code; return code;
...@@ -621,7 +621,7 @@ int vnodeInsertPoints(SMeterObj *pObj, char *cont, int contLen, char source, voi ...@@ -621,7 +621,7 @@ int vnodeInsertPoints(SMeterObj *pObj, char *cont, int contLen, char source, voi
TSKEY minAllowedKey = (cfid - pVnode->maxFiles + 1)*pVnode->cfg.daysPerFile*tsMsPerDay[(uint8_t)pVnode->cfg.precision]; TSKEY minAllowedKey = (cfid - pVnode->maxFiles + 1)*pVnode->cfg.daysPerFile*tsMsPerDay[(uint8_t)pVnode->cfg.precision];
TSKEY maxAllowedKey = (cfid + 2)*pVnode->cfg.daysPerFile*tsMsPerDay[(uint8_t)pVnode->cfg.precision] - 2; TSKEY maxAllowedKey = (cfid + 2)*pVnode->cfg.daysPerFile*tsMsPerDay[(uint8_t)pVnode->cfg.precision] - 2;
if (firstKey < minAllowedKey || firstKey > maxAllowedKey || lastKey < minAllowedKey || lastKey > maxAllowedKey) { if (firstKey < minAllowedKey || firstKey > maxAllowedKey || lastKey < minAllowedKey || lastKey > maxAllowedKey) {
dError("vid:%d sid:%d id:%s, vnode lastKeyOnFile:%lld, data is out of range, numOfPoints:%d firstKey:%lld lastKey:%lld minAllowedKey:%lld maxAllowedKey:%lld", dError("vid:%d sid:%d id:%s, vnode lastKeyOnFile:%" PRId64 ", data is out of range, numOfPoints:%d firstKey:%" PRId64 " lastKey:%" PRId64 " minAllowedKey:%" PRId64 " maxAllowedKey:%" PRId64,
pObj->vnode, pObj->sid, pObj->meterId, pVnode->lastKeyOnFile, numOfPoints,firstKey, lastKey, minAllowedKey, maxAllowedKey); pObj->vnode, pObj->sid, pObj->meterId, pVnode->lastKeyOnFile, numOfPoints,firstKey, lastKey, minAllowedKey, maxAllowedKey);
return TSDB_CODE_TIMESTAMP_OUT_OF_RANGE; return TSDB_CODE_TIMESTAMP_OUT_OF_RANGE;
} }
...@@ -640,7 +640,7 @@ int vnodeInsertPoints(SMeterObj *pObj, char *cont, int contLen, char source, voi ...@@ -640,7 +640,7 @@ int vnodeInsertPoints(SMeterObj *pObj, char *cont, int contLen, char source, voi
} }
if (*((TSKEY *)pData) <= pObj->lastKey) { if (*((TSKEY *)pData) <= pObj->lastKey) {
dWarn("vid:%d sid:%d id:%s, received key:%ld not larger than lastKey:%ld", pObj->vnode, pObj->sid, pObj->meterId, dWarn("vid:%d sid:%d id:%s, received key:%" PRId64 " not larger than lastKey:%" PRId64, pObj->vnode, pObj->sid, pObj->meterId,
*((TSKEY *)pData), pObj->lastKey); *((TSKEY *)pData), pObj->lastKey);
pData += pObj->bytesPerPoint; pData += pObj->bytesPerPoint;
continue; continue;
...@@ -678,7 +678,7 @@ int vnodeInsertPoints(SMeterObj *pObj, char *cont, int contLen, char source, voi ...@@ -678,7 +678,7 @@ int vnodeInsertPoints(SMeterObj *pObj, char *cont, int contLen, char source, voi
vnodeClearMeterState(pObj, TSDB_METER_STATE_INSERTING); vnodeClearMeterState(pObj, TSDB_METER_STATE_INSERTING);
_over: _over:
dTrace("vid:%d sid:%d id:%s, %d out of %d points are inserted, lastKey:%ld source:%d, vnode total storage: %ld", dTrace("vid:%d sid:%d id:%s, %d out of %d points are inserted, lastKey:%" PRId64 " source:%d, vnode total storage: %" PRId64 "",
pObj->vnode, pObj->sid, pObj->meterId, points, numOfPoints, pObj->lastKey, source, pObj->vnode, pObj->sid, pObj->meterId, points, numOfPoints, pObj->lastKey, source,
pVnode->vnodeStatistic.totalStorage); pVnode->vnodeStatistic.totalStorage);
......
src/system/detail/src/vnodeQueryImpl.c
浏览文件 @ 44acd0ee
...@@ -108,7 +108,7 @@ static FORCE_INLINE int32_t getCompHeaderStartPosition(SVnodeCfg *pCfg) { ...@@ -108,7 +108,7 @@ static FORCE_INLINE int32_t getCompHeaderStartPosition(SVnodeCfg *pCfg) {
static FORCE_INLINE int32_t validateCompBlockOffset(SQInfo *pQInfo, SMeterObj *pMeterObj, SCompHeader *pCompHeader, static FORCE_INLINE int32_t validateCompBlockOffset(SQInfo *pQInfo, SMeterObj *pMeterObj, SCompHeader *pCompHeader,
SQueryFilesInfo *pQueryFileInfo, int32_t headerSize) { SQueryFilesInfo *pQueryFileInfo, int32_t headerSize) {
if (pCompHeader->compInfoOffset < headerSize || pCompHeader->compInfoOffset > pQueryFileInfo->headerFileSize) { if (pCompHeader->compInfoOffset < headerSize || pCompHeader->compInfoOffset > pQueryFileInfo->headerFileSize) {
dError("QInfo:%p vid:%d sid:%d id:%s, compInfoOffset:%d is not valid, size:%ld", pQInfo, pMeterObj->vnode, dError("QInfo:%p vid:%d sid:%d id:%s, compInfoOffset:%" PRId64 " is not valid, size:%" PRId64, pQInfo, pMeterObj->vnode,
pMeterObj->sid, pMeterObj->meterId, pCompHeader->compInfoOffset, pQueryFileInfo->headerFileSize); pMeterObj->sid, pMeterObj->meterId, pCompHeader->compInfoOffset, pQueryFileInfo->headerFileSize);
return -1; return -1;
...@@ -121,7 +121,7 @@ static FORCE_INLINE int32_t validateCompBlockOffset(SQInfo *pQInfo, SMeterObj *p ...@@ -121,7 +121,7 @@ static FORCE_INLINE int32_t validateCompBlockOffset(SQInfo *pQInfo, SMeterObj *p
static FORCE_INLINE int32_t validateCompBlockInfoSegment(SQInfo *pQInfo, const char *filePath, int32_t vid, static FORCE_INLINE int32_t validateCompBlockInfoSegment(SQInfo *pQInfo, const char *filePath, int32_t vid,
SCompInfo *compInfo, int64_t offset) { SCompInfo *compInfo, int64_t offset) {
if (!taosCheckChecksumWhole((uint8_t *)compInfo, sizeof(SCompInfo))) { if (!taosCheckChecksumWhole((uint8_t *)compInfo, sizeof(SCompInfo))) {
dLError("QInfo:%p vid:%d, failed to read header file:%s, file compInfo broken, offset:%lld", pQInfo, vid, filePath, dLError("QInfo:%p vid:%d, failed to read header file:%s, file compInfo broken, offset:%" PRId64, pQInfo, vid, filePath,
offset); offset);
return -1; return -1;
} }
...@@ -133,7 +133,7 @@ static FORCE_INLINE int32_t validateCompBlockSegment(SQInfo *pQInfo, const char ...@@ -133,7 +133,7 @@ static FORCE_INLINE int32_t validateCompBlockSegment(SQInfo *pQInfo, const char
uint32_t size = compInfo->numOfBlocks * sizeof(SCompBlock); uint32_t size = compInfo->numOfBlocks * sizeof(SCompBlock);
if (checksum != taosCalcChecksum(0, (uint8_t *)pBlock, size)) { if (checksum != taosCalcChecksum(0, (uint8_t *)pBlock, size)) {
dLError("QInfo:%p vid:%d, failed to read header file:%s, file compblock is broken:%ld", pQInfo, vid, filePath, dLError("QInfo:%p vid:%d, failed to read header file:%s, file compblock is broken:%zu", pQInfo, vid, filePath,
(char *)compInfo + sizeof(SCompInfo)); (char *)compInfo + sizeof(SCompInfo));
return -1; return -1;
} }
...@@ -774,7 +774,7 @@ static int32_t loadColumnIntoMem(SQuery *pQuery, SQueryFilesInfo *pQueryFileInfo ...@@ -774,7 +774,7 @@ static int32_t loadColumnIntoMem(SQuery *pQuery, SQueryFilesInfo *pQueryFileInfo
// check column data integrity // check column data integrity
if (checksum != taosCalcChecksum(0, (const uint8_t *)dst, pFields[col].len)) { if (checksum != taosCalcChecksum(0, (const uint8_t *)dst, pFields[col].len)) {
dLError("QInfo:%p, column data checksum error, file:%s, col: %d, offset:%ld", GET_QINFO_ADDR(pQuery), dLError("QInfo:%p, column data checksum error, file:%s, col: %d, offset:%" PRId64, GET_QINFO_ADDR(pQuery),
pQueryFileInfo->dataFilePath, col, offset); pQueryFileInfo->dataFilePath, col, offset);
return -1; return -1;
...@@ -816,7 +816,7 @@ static int32_t loadDataBlockFieldsInfo(SQueryRuntimeEnv *pRuntimeEnv, SCompBlock ...@@ -816,7 +816,7 @@ static int32_t loadDataBlockFieldsInfo(SQueryRuntimeEnv *pRuntimeEnv, SCompBlock
// check fields integrity // check fields integrity
if (!taosCheckChecksumWhole((uint8_t *)(*pField), size)) { if (!taosCheckChecksumWhole((uint8_t *)(*pField), size)) {
dLError("QInfo:%p vid:%d sid:%d id:%s, slot:%d, failed to read sfields, file:%s, sfields area broken:%lld", pQInfo, dLError("QInfo:%p vid:%d sid:%d id:%s, slot:%d, failed to read sfields, file:%s, sfields area broken:%" PRId64, pQInfo,
pMeterObj->vnode, pMeterObj->sid, pMeterObj->meterId, pQuery->slot, pVnodeFilesInfo->dataFilePath, pMeterObj->vnode, pMeterObj->sid, pMeterObj->meterId, pQuery->slot, pVnodeFilesInfo->dataFilePath,
pBlock->offset); pBlock->offset);
return -1; return -1;
...@@ -1637,7 +1637,7 @@ static int32_t doTSJoinFilter(SQueryRuntimeEnv *pRuntimeEnv, int32_t offset) { ...@@ -1637,7 +1637,7 @@ static int32_t doTSJoinFilter(SQueryRuntimeEnv *pRuntimeEnv, int32_t offset) {
TSKEY key = *(TSKEY *)(pCtx[0].aInputElemBuf + TSDB_KEYSIZE * offset); TSKEY key = *(TSKEY *)(pCtx[0].aInputElemBuf + TSDB_KEYSIZE * offset);
#if defined(_DEBUG_VIEW) #if defined(_DEBUG_VIEW)
printf("elem in comp ts file:%lld, key:%lld, tag:%d, id:%s, query order:%d, ts order:%d, traverse:%d, index:%d\n", printf("elem in comp ts file:%" PRId64 ", key:%" PRId64 ", tag:%d, id:%s, query order:%d, ts order:%d, traverse:%d, index:%d\n",
elem.ts, key, elem.tag, pRuntimeEnv->pMeterObj->meterId, pQuery->order.order, pRuntimeEnv->pTSBuf->tsOrder, elem.ts, key, elem.tag, pRuntimeEnv->pMeterObj->meterId, pQuery->order.order, pRuntimeEnv->pTSBuf->tsOrder,
pRuntimeEnv->pTSBuf->cur.order, pRuntimeEnv->pTSBuf->cur.tsIndex); pRuntimeEnv->pTSBuf->cur.order, pRuntimeEnv->pTSBuf->cur.tsIndex);
#endif #endif
...@@ -2819,7 +2819,7 @@ static bool getNeighborPoints(SMeterQuerySupportObj *pSupporter, SMeterObj *pMet ...@@ -2819,7 +2819,7 @@ static bool getNeighborPoints(SMeterQuerySupportObj *pSupporter, SMeterObj *pMet
* reset the status and load the data block that contains the qualified point * reset the status and load the data block that contains the qualified point
*/ */
if (Q_STATUS_EQUAL(pQuery->over, QUERY_NO_DATA_TO_CHECK)) { if (Q_STATUS_EQUAL(pQuery->over, QUERY_NO_DATA_TO_CHECK)) {
dTrace("QInfo:%p no previous data block, start fileId:%d, slot:%d, pos:%d, qrange:%lld-%lld, out of range", dTrace("QInfo:%p no previous data block, start fileId:%d, slot:%d, pos:%d, qrange:%" PRId64 "-%" PRId64 ", out of range",
GET_QINFO_ADDR(pQuery), pRuntimeEnv->startPos.fileId, pRuntimeEnv->startPos.slot, GET_QINFO_ADDR(pQuery), pRuntimeEnv->startPos.fileId, pRuntimeEnv->startPos.slot,
pRuntimeEnv->startPos.pos, pQuery->skey, pQuery->ekey); pRuntimeEnv->startPos.pos, pQuery->skey, pQuery->ekey);
...@@ -3312,8 +3312,9 @@ static bool onlyLastQuery(SQuery *pQuery) { return onlyOneQueryType(pQuery, TSDB ...@@ -3312,8 +3312,9 @@ static bool onlyLastQuery(SQuery *pQuery) { return onlyOneQueryType(pQuery, TSDB
static void changeExecuteScanOrder(SQuery *pQuery, bool metricQuery) { static void changeExecuteScanOrder(SQuery *pQuery, bool metricQuery) {
// in case of point-interpolation query, use asc order scan // in case of point-interpolation query, use asc order scan
const char* msg = "QInfo:%p scan order changed for %s query, old:%d, new:%d, qrange exchanged, old qrange:%lld-%lld, " char msg[] =
"new qrange:%lld-%lld"; "QInfo:%p scan order changed for %s query, old:%d, new:%d, qrange exchanged, old qrange:%" PRId64 "-%" PRId64 ", "
"new qrange:%" PRId64 "-%" PRId64;
// descending order query for last_row query // descending order query for last_row query
if (isFirstLastRowQuery(pQuery)) { if (isFirstLastRowQuery(pQuery)) {
...@@ -3418,7 +3419,7 @@ static int32_t doSkipDataBlock(SQueryRuntimeEnv *pRuntimeEnv) { ...@@ -3418,7 +3419,7 @@ static int32_t doSkipDataBlock(SQueryRuntimeEnv *pRuntimeEnv) {
pQuery->lastKey = (QUERY_IS_ASC_QUERY(pQuery)) ? blockInfo.keyLast : blockInfo.keyFirst; pQuery->lastKey = (QUERY_IS_ASC_QUERY(pQuery)) ? blockInfo.keyLast : blockInfo.keyFirst;
pQuery->lastKey += step; pQuery->lastKey += step;
qTrace("QInfo:%p skip rows:%d, offset:%lld", GET_QINFO_ADDR(pQuery), maxReads, pQuery->limit.offset); qTrace("QInfo:%p skip rows:%d, offset:%" PRId64 "", GET_QINFO_ADDR(pQuery), maxReads, pQuery->limit.offset);
} }
} }
...@@ -3843,7 +3844,7 @@ int32_t vnodeQuerySingleMeterPrepare(SQInfo *pQInfo, SMeterObj *pMeterObj, SMete ...@@ -3843,7 +3844,7 @@ int32_t vnodeQuerySingleMeterPrepare(SQInfo *pQInfo, SMeterObj *pMeterObj, SMete
*/ */
if ((QUERY_IS_ASC_QUERY(pQuery) && (pQuery->skey > pQuery->ekey)) || if ((QUERY_IS_ASC_QUERY(pQuery) && (pQuery->skey > pQuery->ekey)) ||
(!QUERY_IS_ASC_QUERY(pQuery) && (pQuery->ekey > pQuery->skey))) { (!QUERY_IS_ASC_QUERY(pQuery) && (pQuery->ekey > pQuery->skey))) {
dTrace("QInfo:%p no result in time range %lld-%lld, order %d", pQInfo, pQuery->skey, pQuery->ekey, dTrace("QInfo:%p no result in time range %" PRId64 "-%" PRId64 ", order %d", pQInfo, pQuery->skey, pQuery->ekey,
pQuery->order.order); pQuery->order.order);
sem_post(&pQInfo->dataReady); sem_post(&pQInfo->dataReady);
...@@ -4008,7 +4009,7 @@ void vnodeQueryFreeQInfoEx(SQInfo *pQInfo) { ...@@ -4008,7 +4009,7 @@ void vnodeQueryFreeQInfoEx(SQInfo *pQInfo) {
if (FD_VALID(pSupporter->meterOutputFd)) { if (FD_VALID(pSupporter->meterOutputFd)) {
assert(pSupporter->meterOutputMMapBuf != NULL); assert(pSupporter->meterOutputMMapBuf != NULL);
dTrace("QInfo:%p disk-based output buffer during query:%lld bytes", pQInfo, pSupporter->bufSize); dTrace("QInfo:%p disk-based output buffer during query:%" PRId64 " bytes", pQInfo, pSupporter->bufSize);
munmap(pSupporter->meterOutputMMapBuf, pSupporter->bufSize); munmap(pSupporter->meterOutputMMapBuf, pSupporter->bufSize);
tclose(pSupporter->meterOutputFd); tclose(pSupporter->meterOutputFd);
...@@ -4035,7 +4036,7 @@ int32_t vnodeMultiMeterQueryPrepare(SQInfo *pQInfo, SQuery *pQuery, void *param) ...@@ -4035,7 +4036,7 @@ int32_t vnodeMultiMeterQueryPrepare(SQInfo *pQInfo, SQuery *pQuery, void *param)
if ((QUERY_IS_ASC_QUERY(pQuery) && (pQuery->skey > pQuery->ekey)) || if ((QUERY_IS_ASC_QUERY(pQuery) && (pQuery->skey > pQuery->ekey)) ||
(!QUERY_IS_ASC_QUERY(pQuery) && (pQuery->ekey > pQuery->skey))) { (!QUERY_IS_ASC_QUERY(pQuery) && (pQuery->ekey > pQuery->skey))) {
dTrace("QInfo:%p no result in time range %lld-%lld, order %d", pQInfo, pQuery->skey, pQuery->ekey, dTrace("QInfo:%p no result in time range %" PRId64 "-%" PRId64 ", order %d", pQInfo, pQuery->skey, pQuery->ekey,
pQuery->order.order); pQuery->order.order);
sem_post(&pQInfo->dataReady); sem_post(&pQInfo->dataReady);
...@@ -4264,8 +4265,8 @@ TSKEY getQueryPositionForCacheInvalid(SQueryRuntimeEnv *pRuntimeEnv, __block_sea ...@@ -4264,8 +4265,8 @@ TSKEY getQueryPositionForCacheInvalid(SQueryRuntimeEnv *pRuntimeEnv, __block_sea
int32_t step = GET_FORWARD_DIRECTION_FACTOR(pQuery->order.order); int32_t step = GET_FORWARD_DIRECTION_FACTOR(pQuery->order.order);
dTrace( dTrace(
"QInfo:%p vid:%d sid:%d id:%s cache block is assigned to other meter, " "QInfo:%p vid:%d sid:%d id:%s cache block re-allocated to other meter, "
"try get query start position in file/cache, qrange:%lld-%lld, lastKey:%lld", "try get query start position in file/cache, qrange:%" PRId64 "-%" PRId64 ", lastKey:%" PRId64,
pQInfo, pMeterObj->vnode, pMeterObj->sid, pMeterObj->meterId, pQuery->skey, pQuery->ekey, pQuery->lastKey); pQInfo, pMeterObj->vnode, pMeterObj->sid, pMeterObj->meterId, pQuery->skey, pQuery->ekey, pQuery->lastKey);
if (step == QUERY_DESC_FORWARD_STEP) { if (step == QUERY_DESC_FORWARD_STEP) {
...@@ -4508,7 +4509,7 @@ static int64_t doScanAllDataBlocks(SQueryRuntimeEnv *pRuntimeEnv) { ...@@ -4508,7 +4509,7 @@ static int64_t doScanAllDataBlocks(SQueryRuntimeEnv *pRuntimeEnv) {
SPositionInfo *pStartPos = &pRuntimeEnv->startPos; SPositionInfo *pStartPos = &pRuntimeEnv->startPos;
assert(pQuery->slot == pStartPos->slot); assert(pQuery->slot == pStartPos->slot);
dTrace("QInfo:%p query start, qrange:%lld-%lld, lastkey:%lld, order:%d, start fileId:%d, slot:%d, pos:%d, bstatus:%d", dTrace("QInfo:%p query start, qrange:%" PRId64 "-%" PRId64 ", lastkey:%" PRId64 ", order:%d, start fileId:%d, slot:%d, pos:%d, bstatus:%d",
GET_QINFO_ADDR(pQuery), pQuery->skey, pQuery->ekey, pQuery->lastKey, pQuery->order.order, pStartPos->fileId, GET_QINFO_ADDR(pQuery), pQuery->skey, pQuery->ekey, pQuery->lastKey, pQuery->order.order, pStartPos->fileId,
pStartPos->slot, pStartPos->pos, pRuntimeEnv->blockStatus); pStartPos->slot, pStartPos->pos, pRuntimeEnv->blockStatus);
...@@ -4523,7 +4524,7 @@ static int64_t doScanAllDataBlocks(SQueryRuntimeEnv *pRuntimeEnv) { ...@@ -4523,7 +4524,7 @@ static int64_t doScanAllDataBlocks(SQueryRuntimeEnv *pRuntimeEnv) {
SBlockInfo blockInfo = {0}; SBlockInfo blockInfo = {0};
doHandleDataBlockImpl(pRuntimeEnv, &blockInfo, searchFn, &numOfRes, blockLoadStatus, &forwardStep); doHandleDataBlockImpl(pRuntimeEnv, &blockInfo, searchFn, &numOfRes, blockLoadStatus, &forwardStep);
dTrace("QInfo:%p check data block, brange:%lld-%lld, fileId:%d, slot:%d, pos:%d, bstatus:%d, rows:%d, checked:%d", dTrace("QInfo:%p check data block, brange:%" PRId64 "-%" PRId64 ", fileId:%d, slot:%d, pos:%d, bstatus:%d, rows:%d, checked:%d",
GET_QINFO_ADDR(pQuery), blockInfo.keyFirst, blockInfo.keyLast, pQuery->fileId, pQuery->slot, pQuery->pos, GET_QINFO_ADDR(pQuery), blockInfo.keyFirst, blockInfo.keyLast, pQuery->fileId, pQuery->slot, pQuery->pos,
pRuntimeEnv->blockStatus, blockInfo.size, forwardStep); pRuntimeEnv->blockStatus, blockInfo.size, forwardStep);
...@@ -4712,27 +4713,27 @@ static void printBinaryData(int32_t functionId, char *data, int32_t srcDataType) ...@@ -4712,27 +4713,27 @@ static void printBinaryData(int32_t functionId, char *data, int32_t srcDataType)
if (functionId == TSDB_FUNC_FIRST_DST || functionId == TSDB_FUNC_LAST_DST) { if (functionId == TSDB_FUNC_FIRST_DST || functionId == TSDB_FUNC_LAST_DST) {
switch (srcDataType) { switch (srcDataType) {
case TSDB_DATA_TYPE_BINARY: case TSDB_DATA_TYPE_BINARY:
printf("%ld,%s\t", *(TSKEY *)data, (data + TSDB_KEYSIZE + 1)); printf("%" PRId64 ",%s\t", *(TSKEY *)data, (data + TSDB_KEYSIZE + 1));
break; break;
case TSDB_DATA_TYPE_TINYINT: case TSDB_DATA_TYPE_TINYINT:
case TSDB_DATA_TYPE_BOOL: case TSDB_DATA_TYPE_BOOL:
printf("%ld,%d\t", *(TSKEY *)data, *(int8_t *)(data + TSDB_KEYSIZE + 1)); printf("%" PRId64 ",%d\t", *(TSKEY *)data, *(int8_t *)(data + TSDB_KEYSIZE + 1));
break; break;
case TSDB_DATA_TYPE_SMALLINT: case TSDB_DATA_TYPE_SMALLINT:
printf("%ld,%d\t", *(TSKEY *)data, *(int16_t *)(data + TSDB_KEYSIZE + 1)); printf("%" PRId64 ",%d\t", *(TSKEY *)data, *(int16_t *)(data + TSDB_KEYSIZE + 1));
break; break;
case TSDB_DATA_TYPE_BIGINT: case TSDB_DATA_TYPE_BIGINT:
case TSDB_DATA_TYPE_TIMESTAMP: case TSDB_DATA_TYPE_TIMESTAMP:
printf("%ld,%ld\t", *(TSKEY *)data, *(TSKEY *)(data + TSDB_KEYSIZE + 1)); printf("%" PRId64 ",%" PRId64 "\t", *(TSKEY *)data, *(TSKEY *)(data + TSDB_KEYSIZE + 1));
break; break;
case TSDB_DATA_TYPE_INT: case TSDB_DATA_TYPE_INT:
printf("%ld,%d\t", *(TSKEY *)data, *(int32_t *)(data + TSDB_KEYSIZE + 1)); printf("%" PRId64 ",%d\t", *(TSKEY *)data, *(int32_t *)(data + TSDB_KEYSIZE + 1));
break; break;
case TSDB_DATA_TYPE_FLOAT: case TSDB_DATA_TYPE_FLOAT:
printf("%ld,%f\t", *(TSKEY *)data, *(float *)(data + TSDB_KEYSIZE + 1)); printf("%" PRId64 ",%f\t", *(TSKEY *)data, *(float *)(data + TSDB_KEYSIZE + 1));
break; break;
case TSDB_DATA_TYPE_DOUBLE: case TSDB_DATA_TYPE_DOUBLE:
printf("%ld,%lf\t", *(TSKEY *)data, *(double *)(data + TSDB_KEYSIZE + 1)); printf("%" PRId64 ",%lf\t", *(TSKEY *)data, *(double *)(data + TSDB_KEYSIZE + 1));
break; break;
} }
} else if (functionId == TSDB_FUNC_AVG) { } else if (functionId == TSDB_FUNC_AVG) {
...@@ -4741,7 +4742,7 @@ static void printBinaryData(int32_t functionId, char *data, int32_t srcDataType) ...@@ -4741,7 +4742,7 @@ static void printBinaryData(int32_t functionId, char *data, int32_t srcDataType)
printf("%lf,%lf\t", *(double *)data, *(double *)(data + sizeof(double))); printf("%lf,%lf\t", *(double *)data, *(double *)(data + sizeof(double)));
} else if (functionId == TSDB_FUNC_TWA) { } else if (functionId == TSDB_FUNC_TWA) {
data += 1; data += 1;
printf("%lf,%ld,%ld,%ld\t", *(double *)data, *(int64_t *)(data + 8), *(int64_t *)(data + 16), printf("%lf,%" PRId64 ",%" PRId64 ",%" PRId64 "\t", *(double *)data, *(int64_t *)(data + 8), *(int64_t *)(data + 16),
*(int64_t *)(data + 24)); *(int64_t *)(data + 24));
} else if (functionId == TSDB_FUNC_MIN || functionId == TSDB_FUNC_MAX) { } else if (functionId == TSDB_FUNC_MIN || functionId == TSDB_FUNC_MAX) {
switch (srcDataType) { switch (srcDataType) {
...@@ -4754,7 +4755,7 @@ static void printBinaryData(int32_t functionId, char *data, int32_t srcDataType) ...@@ -4754,7 +4755,7 @@ static void printBinaryData(int32_t functionId, char *data, int32_t srcDataType)
break; break;
case TSDB_DATA_TYPE_BIGINT: case TSDB_DATA_TYPE_BIGINT:
case TSDB_DATA_TYPE_TIMESTAMP: case TSDB_DATA_TYPE_TIMESTAMP:
printf("%ld\t", *(int64_t *)data); printf("%" PRId64 "\t", *(int64_t *)data);
break; break;
case TSDB_DATA_TYPE_INT: case TSDB_DATA_TYPE_INT:
printf("%d\t", *(int *)data); printf("%d\t", *(int *)data);
...@@ -4770,7 +4771,7 @@ static void printBinaryData(int32_t functionId, char *data, int32_t srcDataType) ...@@ -4770,7 +4771,7 @@ static void printBinaryData(int32_t functionId, char *data, int32_t srcDataType)
if (srcDataType == TSDB_DATA_TYPE_FLOAT || srcDataType == TSDB_DATA_TYPE_DOUBLE) { if (srcDataType == TSDB_DATA_TYPE_FLOAT || srcDataType == TSDB_DATA_TYPE_DOUBLE) {
printf("%lf\t", *(float *)data); printf("%lf\t", *(float *)data);
} else { } else {
printf("%ld\t", *(int64_t *)data); printf("%" PRId64 "\t", *(int64_t *)data);
} }
} else { } else {
printf("%s\t", data); printf("%s\t", data);
...@@ -4802,7 +4803,7 @@ void UNUSED_FUNC displayInterResult(SData **pdata, SQuery *pQuery, int32_t numOf ...@@ -4802,7 +4803,7 @@ void UNUSED_FUNC displayInterResult(SData **pdata, SQuery *pQuery, int32_t numOf
} }
case TSDB_DATA_TYPE_TIMESTAMP: case TSDB_DATA_TYPE_TIMESTAMP:
case TSDB_DATA_TYPE_BIGINT: case TSDB_DATA_TYPE_BIGINT:
printf("%ld\t", *(int64_t *)(pdata[i]->data + pQuery->pSelectExpr[i].resBytes * j)); printf("%" PRId64 "\t", *(int64_t *)(pdata[i]->data + pQuery->pSelectExpr[i].resBytes * j));
break; break;
case TSDB_DATA_TYPE_INT: case TSDB_DATA_TYPE_INT:
printf("%d\t", *(int32_t *)(pdata[i]->data + pQuery->pSelectExpr[i].resBytes * j)); printf("%d\t", *(int32_t *)(pdata[i]->data + pQuery->pSelectExpr[i].resBytes * j));
...@@ -5068,7 +5069,7 @@ int32_t doMergeMetersResultsToGroupRes(SMeterQuerySupportObj *pSupporter, SQuery ...@@ -5068,7 +5069,7 @@ int32_t doMergeMetersResultsToGroupRes(SMeterQuerySupportObj *pSupporter, SQuery
displayInterResult(pQuery->sdata, pQuery, pQuery->sdata[0]->len); displayInterResult(pQuery->sdata, pQuery, pQuery->sdata[0]->len);
#endif #endif
dTrace("QInfo:%p result merge completed, elapsed time:%lld ms", GET_QINFO_ADDR(pQuery), endt - startt); dTrace("QInfo:%p result merge completed, elapsed time:%" PRId64 " ms", GET_QINFO_ADDR(pQuery), endt - startt);
tfree(pTree); tfree(pTree);
tfree(pValidMeter); tfree(pValidMeter);
tfree(posArray); tfree(posArray);
...@@ -6052,11 +6053,11 @@ static bool setCurrentQueryRange(SMeterDataInfo *pMeterDataInfo, SQuery *pQuery, ...@@ -6052,11 +6053,11 @@ static bool setCurrentQueryRange(SMeterDataInfo *pMeterDataInfo, SQuery *pQuery,
} }
if (*minval > *maxval) { if (*minval > *maxval) {
qTrace("QInfo:%p vid:%d sid:%d id:%s, no result in files, qrange:%lld-%lld, lastKey:%lld", pQInfo, pMeterObj->vnode, qTrace("QInfo:%p vid:%d sid:%d id:%s, no result in files, qrange:%" PRId64 "-%" PRId64 ", lastKey:%" PRId64, pQInfo, pMeterObj->vnode,
pMeterObj->sid, pMeterObj->meterId, pMeterQInfo->skey, pMeterQInfo->ekey, pMeterQInfo->lastKey); pMeterObj->sid, pMeterObj->meterId, pMeterQInfo->skey, pMeterQInfo->ekey, pMeterQInfo->lastKey);
return false; return false;
} else { } else {
qTrace("QInfo:%p vid:%d sid:%d id:%s, query in files, qrange:%lld-%lld, lastKey:%lld", pQInfo, pMeterObj->vnode, qTrace("QInfo:%p vid:%d sid:%d id:%s, query in files, qrange:%" PRId64 "-%" PRId64 ", lastKey:%" PRId64, pQInfo, pMeterObj->vnode,
pMeterObj->sid, pMeterObj->meterId, pMeterQInfo->skey, pMeterQInfo->ekey, pMeterQInfo->lastKey); pMeterObj->sid, pMeterObj->meterId, pMeterQInfo->skey, pMeterQInfo->ekey, pMeterQInfo->lastKey);
return true; return true;
} }
...@@ -6439,7 +6440,7 @@ void setCtxOutputPointerForSupplementScan(SMeterQuerySupportObj *pSupporter, SMe ...@@ -6439,7 +6440,7 @@ void setCtxOutputPointerForSupplementScan(SMeterQuerySupportObj *pSupporter, SMe
// the first column is always the timestamp for interval query // the first column is always the timestamp for interval query
TSKEY ts = *(TSKEY *)pRuntimeEnv->pCtx[0].aOutputBuf; TSKEY ts = *(TSKEY *)pRuntimeEnv->pCtx[0].aOutputBuf;
SMeterObj *pMeterObj = pRuntimeEnv->pMeterObj; SMeterObj *pMeterObj = pRuntimeEnv->pMeterObj;
qTrace("QInfo:%p vid:%d sid:%d id:%s, set output result pointer, ts:%lld, index:%d", GET_QINFO_ADDR(pQuery), qTrace("QInfo:%p vid:%d sid:%d id:%s, set output result pointer, ts:%" PRId64 ", index:%d", GET_QINFO_ADDR(pQuery),
pMeterObj->vnode, pMeterObj->sid, pMeterObj->meterId, ts, pMeterQueryInfo->reverseIndex); pMeterObj->vnode, pMeterObj->sid, pMeterObj->meterId, ts, pMeterQueryInfo->reverseIndex);
} }
...@@ -6838,7 +6839,7 @@ int32_t LoadDatablockOnDemand(SCompBlock *pBlock, SField **pFields, uint8_t *blk ...@@ -6838,7 +6839,7 @@ int32_t LoadDatablockOnDemand(SCompBlock *pBlock, SField **pFields, uint8_t *blk
} }
if (req == BLK_DATA_NO_NEEDED) { if (req == BLK_DATA_NO_NEEDED) {
qTrace("QInfo:%p vid:%d sid:%d id:%s, slot:%d, data block ignored, brange:%lld-%lld, rows:%d", qTrace("QInfo:%p vid:%d sid:%d id:%s, slot:%d, data block ignored, brange:%" PRId64 "-%" PRId64 ", rows:%d",
GET_QINFO_ADDR(pQuery), pMeterObj->vnode, pMeterObj->sid, pMeterObj->meterId, pQuery->slot, GET_QINFO_ADDR(pQuery), pMeterObj->vnode, pMeterObj->sid, pMeterObj->meterId, pQuery->slot,
pBlock->keyFirst, pBlock->keyLast, pBlock->numOfPoints); pBlock->keyFirst, pBlock->keyLast, pBlock->numOfPoints);
...@@ -6869,7 +6870,7 @@ int32_t LoadDatablockOnDemand(SCompBlock *pBlock, SField **pFields, uint8_t *blk ...@@ -6869,7 +6870,7 @@ int32_t LoadDatablockOnDemand(SCompBlock *pBlock, SField **pFields, uint8_t *blk
dTrace("QInfo:%p fileId:%d, slot:%d, block discarded by per-filter, ", GET_QINFO_ADDR(pQuery), pQuery->fileId, dTrace("QInfo:%p fileId:%d, slot:%d, block discarded by per-filter, ", GET_QINFO_ADDR(pQuery), pQuery->fileId,
pQuery->slot); pQuery->slot);
#endif #endif
qTrace("QInfo:%p id:%s slot:%d, data block ignored by pre-filter, fields loaded, brange:%lld-%lld, rows:%d", qTrace("QInfo:%p id:%s slot:%d, data block ignored by pre-filter, fields loaded, brange:%" PRId64 "-%" PRId64 ", rows:%d",
GET_QINFO_ADDR(pQuery), pMeterObj->meterId, pQuery->slot, pBlock->keyFirst, pBlock->keyLast, GET_QINFO_ADDR(pQuery), pMeterObj->meterId, pQuery->slot, pBlock->keyFirst, pBlock->keyLast,
pBlock->numOfPoints); pBlock->numOfPoints);
return DISK_DATA_DISCARDED; return DISK_DATA_DISCARDED;
...@@ -6982,7 +6983,7 @@ int32_t saveResult(SMeterQuerySupportObj *pSupporter, SMeterQueryInfo *pMeterQue ...@@ -6982,7 +6983,7 @@ int32_t saveResult(SMeterQuerySupportObj *pSupporter, SMeterQueryInfo *pMeterQue
TSKEY ts = *(TSKEY *)getOutputResPos(pRuntimeEnv, pData, pData->numOfElems, 0); TSKEY ts = *(TSKEY *)getOutputResPos(pRuntimeEnv, pData, pData->numOfElems, 0);
SMeterObj *pMeterObj = pRuntimeEnv->pMeterObj; SMeterObj *pMeterObj = pRuntimeEnv->pMeterObj;
qTrace("QInfo:%p vid:%d sid:%d id:%s, save results, ts:%lld, total:%d", GET_QINFO_ADDR(pQuery), pMeterObj->vnode, qTrace("QInfo:%p vid:%d sid:%d id:%s, save results, ts:%" PRId64 ", total:%d", GET_QINFO_ADDR(pQuery), pMeterObj->vnode,
pMeterObj->sid, pMeterObj->meterId, ts, pMeterQueryInfo->numOfRes + 1); pMeterObj->sid, pMeterObj->meterId, ts, pMeterQueryInfo->numOfRes + 1);
pData->numOfElems += numOfResult; pData->numOfElems += numOfResult;
...@@ -7289,7 +7290,7 @@ int32_t vnodeCopyQueryResultToMsg(void *handle, char *data, int32_t numOfRows) { ...@@ -7289,7 +7290,7 @@ int32_t vnodeCopyQueryResultToMsg(void *handle, char *data, int32_t numOfRows) {
// make sure file exist // make sure file exist
if (FD_VALID(fd)) { if (FD_VALID(fd)) {
size_t s = lseek(fd, 0, SEEK_END); size_t s = lseek(fd, 0, SEEK_END);
dTrace("QInfo:%p ts comp data return, file:%s, size:%lld", pQInfo, pQuery->sdata[0]->data, s); dTrace("QInfo:%p ts comp data return, file:%s, size:%zu", pQInfo, pQuery->sdata[0]->data, s);
lseek(fd, 0, SEEK_SET); lseek(fd, 0, SEEK_SET);
read(fd, data, s); read(fd, data, s);
......
src/system/detail/src/vnodeQueryProcess.c
浏览文件 @ 44acd0ee
...@@ -146,7 +146,9 @@ static SMeterDataInfo *queryOnMultiDataCache(SQInfo *pQInfo, SMeterDataInfo *pMe ...@@ -146,7 +146,9 @@ static SMeterDataInfo *queryOnMultiDataCache(SQInfo *pQInfo, SMeterDataInfo *pMe
if (pQuery->nAggTimeInterval == 0) { if (pQuery->nAggTimeInterval == 0) {
if ((pQuery->lastKey > pQuery->ekey && QUERY_IS_ASC_QUERY(pQuery)) || if ((pQuery->lastKey > pQuery->ekey && QUERY_IS_ASC_QUERY(pQuery)) ||
(pQuery->lastKey < pQuery->ekey && !QUERY_IS_ASC_QUERY(pQuery))) { (pQuery->lastKey < pQuery->ekey && !QUERY_IS_ASC_QUERY(pQuery))) {
dTrace("QInfo:%p vid:%d sid:%d id:%s, query completed, ignore data in cache. qrange:%lld-%lld, lastKey:%lld", dTrace(
"QInfo:%p vid:%d sid:%d id:%s, query completed, ignore data in cache. qrange:%" PRId64 "-%" PRId64 ", "
"lastKey:%" PRId64,
pQInfo, pMeterObj->vnode, pMeterObj->sid, pMeterObj->meterId, pQuery->skey, pQuery->ekey, pQInfo, pMeterObj->vnode, pMeterObj->sid, pMeterObj->meterId, pQuery->skey, pQuery->ekey,
pQuery->lastKey); pQuery->lastKey);
...@@ -162,7 +164,7 @@ static SMeterDataInfo *queryOnMultiDataCache(SQInfo *pQInfo, SMeterDataInfo *pMe ...@@ -162,7 +164,7 @@ static SMeterDataInfo *queryOnMultiDataCache(SQInfo *pQInfo, SMeterDataInfo *pMe
} }
} }
qTrace("QInfo:%p vid:%d sid:%d id:%s, query in cache, qrange:%lld-%lld, lastKey:%lld", pQInfo, pMeterObj->vnode, qTrace("QInfo:%p vid:%d sid:%d id:%s, query in cache, qrange:%" PRId64 "-%" PRId64 ", lastKey:%" PRId64, pQInfo, pMeterObj->vnode,
pMeterObj->sid, pMeterObj->meterId, pQuery->skey, pQuery->ekey, pQuery->lastKey); pMeterObj->sid, pMeterObj->meterId, pQuery->skey, pQuery->ekey, pQuery->lastKey);
/* /*
...@@ -174,7 +176,7 @@ static SMeterDataInfo *queryOnMultiDataCache(SQInfo *pQInfo, SMeterDataInfo *pMe ...@@ -174,7 +176,7 @@ static SMeterDataInfo *queryOnMultiDataCache(SQInfo *pQInfo, SMeterDataInfo *pMe
*/ */
TSKEY nextKey = getQueryStartPositionInCache(pRuntimeEnv, &pQuery->slot, &pQuery->pos, true); TSKEY nextKey = getQueryStartPositionInCache(pRuntimeEnv, &pQuery->slot, &pQuery->pos, true);
if (nextKey < 0) { if (nextKey < 0) {
qTrace("QInfo:%p vid:%d sid:%d id:%s, no data qualified in cache, cache blocks:%d, lastKey:%lld", pQInfo, qTrace("QInfo:%p vid:%d sid:%d id:%s, no data qualified in cache, cache blocks:%d, lastKey:%" PRId64, pQInfo,
pMeterObj->vnode, pMeterObj->sid, pMeterObj->meterId, pQuery->numOfBlocks, pQuery->lastKey); pMeterObj->vnode, pMeterObj->sid, pMeterObj->meterId, pQuery->numOfBlocks, pQuery->lastKey);
continue; continue;
} }
...@@ -223,7 +225,7 @@ static SMeterDataInfo *queryOnMultiDataCache(SQInfo *pQInfo, SMeterDataInfo *pMe ...@@ -223,7 +225,7 @@ static SMeterDataInfo *queryOnMultiDataCache(SQInfo *pQInfo, SMeterDataInfo *pMe
SET_CACHE_BLOCK_FLAG(pRuntimeEnv->blockStatus); SET_CACHE_BLOCK_FLAG(pRuntimeEnv->blockStatus);
SBlockInfo binfo = getBlockBasicInfo(pRuntimeEnv, pBlock, BLK_CACHE_BLOCK); SBlockInfo binfo = getBlockBasicInfo(pRuntimeEnv, pBlock, BLK_CACHE_BLOCK);
dTrace("QInfo:%p check data block, brange:%lld-%lld, fileId:%d, slot:%d, pos:%d, bstatus:%d", dTrace("QInfo:%p check data block, brange:%" PRId64 "-%" PRId64 ", fileId:%d, slot:%d, pos:%d, bstatus:%d",
GET_QINFO_ADDR(pQuery), binfo.keyFirst, binfo.keyLast, pQuery->fileId, pQuery->slot, pQuery->pos, GET_QINFO_ADDR(pQuery), binfo.keyFirst, binfo.keyLast, pQuery->fileId, pQuery->slot, pQuery->pos,
pRuntimeEnv->blockStatus); pRuntimeEnv->blockStatus);
...@@ -372,7 +374,7 @@ static SMeterDataInfo *queryOnMultiDataFiles(SQInfo *pQInfo, SMeterDataInfo *pMe ...@@ -372,7 +374,7 @@ static SMeterDataInfo *queryOnMultiDataFiles(SQInfo *pQInfo, SMeterDataInfo *pMe
stimeUnit = taosGetTimestampMs(); stimeUnit = taosGetTimestampMs();
} else if ((j % TRACE_OUTPUT_BLOCK_CNT) == 0) { } else if ((j % TRACE_OUTPUT_BLOCK_CNT) == 0) {
etimeUnit = taosGetTimestampMs(); etimeUnit = taosGetTimestampMs();
dTrace("QInfo:%p load and check %ld blocks, and continue. elapsed:%ldms", pQInfo, TRACE_OUTPUT_BLOCK_CNT, dTrace("QInfo:%p load and check %" PRId64 " blocks, and continue. elapsed:%" PRId64 " ms", pQInfo, TRACE_OUTPUT_BLOCK_CNT,
etimeUnit - stimeUnit); etimeUnit - stimeUnit);
stimeUnit = taosGetTimestampMs(); stimeUnit = taosGetTimestampMs();
} }
...@@ -391,8 +393,8 @@ static SMeterDataInfo *queryOnMultiDataFiles(SQInfo *pQInfo, SMeterDataInfo *pMe ...@@ -391,8 +393,8 @@ static SMeterDataInfo *queryOnMultiDataFiles(SQInfo *pQInfo, SMeterDataInfo *pMe
if ((pQuery->lastKey > pQuery->ekey && QUERY_IS_ASC_QUERY(pQuery)) || if ((pQuery->lastKey > pQuery->ekey && QUERY_IS_ASC_QUERY(pQuery)) ||
(pQuery->lastKey < pQuery->ekey && !QUERY_IS_ASC_QUERY(pQuery))) { (pQuery->lastKey < pQuery->ekey && !QUERY_IS_ASC_QUERY(pQuery))) {
qTrace( qTrace(
"QInfo:%p vid:%d sid:%d id:%s, query completed, no need to scan this data block. qrange:%lld-%lld, " "QInfo:%p vid:%d sid:%d id:%s, query completed, no need to scan this data block. qrange:%" PRId64 "-%" PRId64 ", "
"lastKey:%lld", "lastKey:%" PRId64,
pQInfo, pMeterObj->vnode, pMeterObj->sid, pMeterObj->meterId, pQuery->skey, pQuery->ekey, pQInfo, pMeterObj->vnode, pMeterObj->sid, pMeterObj->meterId, pQuery->skey, pQuery->ekey,
pQuery->lastKey); pQuery->lastKey);
...@@ -477,7 +479,7 @@ static bool multimeterMultioutputHelper(SQInfo *pQInfo, bool *dataInDisk, bool * ...@@ -477,7 +479,7 @@ static bool multimeterMultioutputHelper(SQInfo *pQInfo, bool *dataInDisk, bool *
vnodeSetTagValueInParam(pSupporter->pSidSet, pRuntimeEnv, pMeterSidExtInfo[index]); vnodeSetTagValueInParam(pSupporter->pSidSet, pRuntimeEnv, pMeterSidExtInfo[index]);
dTrace("QInfo:%p query on (%d): vid:%d sid:%d meterId:%s, qrange:%lld-%lld", pQInfo, index - start, pMeterObj->vnode, dTrace("QInfo:%p query on (%d): vid:%d sid:%d meterId:%s, qrange:%" PRId64 "-%" PRId64, pQInfo, index - start, pMeterObj->vnode,
pMeterObj->sid, pMeterObj->meterId, pQuery->skey, pQuery->ekey); pMeterObj->sid, pMeterObj->meterId, pQuery->skey, pQuery->ekey);
pQInfo->pObj = pMeterObj; pQInfo->pObj = pMeterObj;
...@@ -491,7 +493,7 @@ static bool multimeterMultioutputHelper(SQInfo *pQInfo, bool *dataInDisk, bool * ...@@ -491,7 +493,7 @@ static bool multimeterMultioutputHelper(SQInfo *pQInfo, bool *dataInDisk, bool *
// data in file or cache is not qualified for the query. abort // data in file or cache is not qualified for the query. abort
if (!(dataInCache || dataInDisk)) { if (!(dataInCache || dataInDisk)) {
dTrace("QInfo:%p vid:%d sid:%d meterId:%s, qrange:%lld-%lld, nores, %p", pQInfo, pMeterObj->vnode, pMeterObj->sid, dTrace("QInfo:%p vid:%d sid:%d meterId:%s, qrange:%" PRId64 "-%" PRId64 ", nores, %p", pQInfo, pMeterObj->vnode, pMeterObj->sid,
pMeterObj->meterId, pQuery->skey, pQuery->ekey, pQuery); pMeterObj->meterId, pQuery->skey, pQuery->ekey, pQuery);
return false; return false;
} }
...@@ -795,7 +797,7 @@ static void vnodeMultiMeterMultiOutputProcessor(SQInfo *pQInfo) { ...@@ -795,7 +797,7 @@ static void vnodeMultiMeterMultiOutputProcessor(SQInfo *pQInfo) {
dTrace( dTrace(
"QInfo %p vid:%d, numOfMeters:%d, index:%d, numOfGroups:%d, %d points returned, totalRead:%d totalReturn:%d," "QInfo %p vid:%d, numOfMeters:%d, index:%d, numOfGroups:%d, %d points returned, totalRead:%d totalReturn:%d,"
"next skey:%lld, offset:%lld", "next skey:%" PRId64 ", offset:%" PRId64,
pQInfo, pOneMeter->vnode, pSids->numOfSids, pSupporter->meterIdx, pSids->numOfSubSet, pQuery->pointsRead, pQInfo, pOneMeter->vnode, pSids->numOfSids, pSupporter->meterIdx, pSids->numOfSubSet, pQuery->pointsRead,
pQInfo->pointsRead, pQInfo->pointsReturned, pQuery->skey, pQuery->limit.offset); pQInfo->pointsRead, pQInfo->pointsReturned, pQuery->skey, pQuery->limit.offset);
} }
...@@ -905,7 +907,7 @@ static void vnodeMultiMeterQueryProcessor(SQInfo *pQInfo) { ...@@ -905,7 +907,7 @@ static void vnodeMultiMeterQueryProcessor(SQInfo *pQInfo) {
return; return;
} }
dTrace("QInfo:%p query start, qrange:%lld-%lld, order:%d, group:%d", pQInfo, pSupporter->rawSKey, pSupporter->rawEKey, dTrace("QInfo:%p query start, qrange:%" PRId64 "-%" PRId64 ", order:%d, group:%d", pQInfo, pSupporter->rawSKey, pSupporter->rawEKey,
pQuery->order.order, pSupporter->pSidSet->numOfSubSet); pQuery->order.order, pSupporter->pSidSet->numOfSubSet);
dTrace("QInfo:%p main query scan start", pQInfo); dTrace("QInfo:%p main query scan start", pQInfo);
...@@ -1025,7 +1027,7 @@ static void vnodeSingleMeterMultiOutputProcessor(SQInfo *pQInfo) { ...@@ -1025,7 +1027,7 @@ static void vnodeSingleMeterMultiOutputProcessor(SQInfo *pQInfo) {
TSKEY nextTimestamp = loadRequiredBlockIntoMem(pRuntimeEnv, &pRuntimeEnv->nextPos); TSKEY nextTimestamp = loadRequiredBlockIntoMem(pRuntimeEnv, &pRuntimeEnv->nextPos);
assert(nextTimestamp > 0 || ((nextTimestamp < 0) && Q_STATUS_EQUAL(pQuery->over, QUERY_NO_DATA_TO_CHECK))); assert(nextTimestamp > 0 || ((nextTimestamp < 0) && Q_STATUS_EQUAL(pQuery->over, QUERY_NO_DATA_TO_CHECK)));
dTrace("QInfo:%p vid:%d sid:%d id:%s, skip current result, offset:%lld, next qrange:%lld-%lld", pQInfo, dTrace("QInfo:%p vid:%d sid:%d id:%s, skip current result, offset:%" PRId64 ", next qrange:%" PRId64 "-%" PRId64, pQInfo,
pMeterObj->vnode, pMeterObj->sid, pMeterObj->meterId, pQuery->limit.offset, pQuery->lastKey, pQuery->ekey); pMeterObj->vnode, pMeterObj->sid, pMeterObj->meterId, pQuery->limit.offset, pQuery->lastKey, pQuery->ekey);
resetCtxOutputBuf(pRuntimeEnv); resetCtxOutputBuf(pRuntimeEnv);
...@@ -1040,7 +1042,7 @@ static void vnodeSingleMeterMultiOutputProcessor(SQInfo *pQInfo) { ...@@ -1040,7 +1042,7 @@ static void vnodeSingleMeterMultiOutputProcessor(SQInfo *pQInfo) {
TSKEY nextTimestamp = loadRequiredBlockIntoMem(pRuntimeEnv, &pRuntimeEnv->nextPos); TSKEY nextTimestamp = loadRequiredBlockIntoMem(pRuntimeEnv, &pRuntimeEnv->nextPos);
assert(nextTimestamp > 0 || ((nextTimestamp < 0) && Q_STATUS_EQUAL(pQuery->over, QUERY_NO_DATA_TO_CHECK))); assert(nextTimestamp > 0 || ((nextTimestamp < 0) && Q_STATUS_EQUAL(pQuery->over, QUERY_NO_DATA_TO_CHECK)));
dTrace("QInfo:%p vid:%d sid:%d id:%s, query abort due to buffer limitation, next qrange:%lld-%lld", pQInfo, dTrace("QInfo:%p vid:%d sid:%d id:%s, query abort due to buffer limitation, next qrange:%" PRId64 "-%" PRId64, pQInfo,
pMeterObj->vnode, pMeterObj->sid, pMeterObj->meterId, pQuery->lastKey, pQuery->ekey); pMeterObj->vnode, pMeterObj->sid, pMeterObj->meterId, pQuery->lastKey, pQuery->ekey);
} }
......
src/system/detail/src/vnodeRead.c
浏览文件 @ 44acd0ee
...@@ -583,13 +583,13 @@ void vnodeQueryData(SSchedMsg *pMsg) { ...@@ -583,13 +583,13 @@ void vnodeQueryData(SSchedMsg *pMsg) {
pQuery->slot = -1; // reset the handle pQuery->slot = -1; // reset the handle
pQuery->over = 0; pQuery->over = 0;
dTrace("vid:%d sid:%d id:%s, query in other media, order:%d, skey:%lld query:%p", pObj->vnode, pObj->sid, dTrace("vid:%d sid:%d id:%s, query in other media, order:%d, skey:%" PRId64 " query:%p", pObj->vnode, pObj->sid,
pObj->meterId, pQuery->order.order, pQuery->skey, pQuery); pObj->meterId, pQuery->order.order, pQuery->skey, pQuery);
} }
pQInfo->pointsRead += pQuery->pointsRead; pQInfo->pointsRead += pQuery->pointsRead;
dTrace("vid:%d sid:%d id:%s, %d points returned, totalRead:%d totalReturn:%d last key:%lld, query:%p", pObj->vnode, dTrace("vid:%d sid:%d id:%s, %d points returned, totalRead:%d totalReturn:%d last key:%" PRId64 ", query:%p", pObj->vnode,
pObj->sid, pObj->meterId, pQuery->pointsRead, pQInfo->pointsRead, pQInfo->pointsReturned, pQuery->lastKey, pObj->sid, pObj->meterId, pQuery->pointsRead, pQInfo->pointsRead, pQInfo->pointsReturned, pQuery->lastKey,
pQuery); pQuery);
...@@ -925,27 +925,27 @@ int vnodeSaveQueryResult(void *handle, char *data, int32_t *size) { ...@@ -925,27 +925,27 @@ int vnodeSaveQueryResult(void *handle, char *data, int32_t *size) {
static int32_t validateQueryMeterMsg(SQueryMeterMsg *pQueryMsg) { static int32_t validateQueryMeterMsg(SQueryMeterMsg *pQueryMsg) {
if (pQueryMsg->nAggTimeInterval < 0) { if (pQueryMsg->nAggTimeInterval < 0) {
dError("qmsg:%p illegal value of aggTimeInterval %ld", pQueryMsg, pQueryMsg->nAggTimeInterval); dError("qmsg:%p illegal value of aggTimeInterval %" PRId64 "", pQueryMsg, pQueryMsg->nAggTimeInterval);
return -1; return -1;
} }
if (pQueryMsg->numOfTagsCols < 0 || pQueryMsg->numOfTagsCols > TSDB_MAX_TAGS + 1) { if (pQueryMsg->numOfTagsCols < 0 || pQueryMsg->numOfTagsCols > TSDB_MAX_TAGS + 1) {
dError("qmsg:%p illegal value of numOfTagsCols %ld", pQueryMsg, pQueryMsg->numOfTagsCols); dError("qmsg:%p illegal value of numOfTagsCols %d", pQueryMsg, pQueryMsg->numOfTagsCols);
return -1; return -1;
} }
if (pQueryMsg->numOfCols <= 0 || pQueryMsg->numOfCols > TSDB_MAX_COLUMNS) { if (pQueryMsg->numOfCols <= 0 || pQueryMsg->numOfCols > TSDB_MAX_COLUMNS) {
dError("qmsg:%p illegal value of numOfCols %ld", pQueryMsg, pQueryMsg->numOfCols); dError("qmsg:%p illegal value of numOfCols %d", pQueryMsg, pQueryMsg->numOfCols);
return -1; return -1;
} }
if (pQueryMsg->numOfSids <= 0) { if (pQueryMsg->numOfSids <= 0) {
dError("qmsg:%p illegal value of numOfSids %ld", pQueryMsg, pQueryMsg->numOfSids); dError("qmsg:%p illegal value of numOfSids %d", pQueryMsg, pQueryMsg->numOfSids);
return -1; return -1;
} }
if (pQueryMsg->numOfGroupCols < 0) { if (pQueryMsg->numOfGroupCols < 0) {
dError("qmsg:%p illegal value of numOfGroupbyCols %ld", pQueryMsg, pQueryMsg->numOfGroupCols); dError("qmsg:%p illegal value of numOfGroupbyCols %d", pQueryMsg, pQueryMsg->numOfGroupCols);
return -1; return -1;
} }
...@@ -1141,9 +1141,9 @@ int32_t vnodeConvertQueryMeterMsg(SQueryMeterMsg *pQueryMsg) { ...@@ -1141,9 +1141,9 @@ int32_t vnodeConvertQueryMeterMsg(SQueryMeterMsg *pQueryMsg) {
} }
} }
dTrace("qmsg:%p query on %d meter(s), qrange:%lld-%lld, numOfGroupbyTagCols:%d, numOfTagCols:%d, timestamp order:%d, " dTrace("qmsg:%p query on %d meter(s), qrange:%" PRId64 "-%" PRId64 ", numOfGroupbyTagCols:%d, numOfTagCols:%d, timestamp order:%d, "
"tags order:%d, tags order col:%d, numOfOutputCols:%d, numOfCols:%d, interval:%lld, fillType:%d, comptslen:%d, limit:%lld, " "tags order:%d, tags order col:%d, numOfOutputCols:%d, numOfCols:%d, interval:%" PRId64 ", fillType:%d, comptslen:%d, limit:%" PRId64 ", "
"offset:%lld", "offset:%" PRId64,
pQueryMsg, pQueryMsg->numOfSids, pQueryMsg->skey, pQueryMsg->ekey, pQueryMsg->numOfGroupCols, pQueryMsg, pQueryMsg->numOfSids, pQueryMsg->skey, pQueryMsg->ekey, pQueryMsg->numOfGroupCols,
pQueryMsg->numOfTagsCols, pQueryMsg->order, pQueryMsg->orderType, pQueryMsg->orderByIdx, pQueryMsg->numOfTagsCols, pQueryMsg->order, pQueryMsg->orderType, pQueryMsg->orderByIdx,
pQueryMsg->numOfOutputCols, pQueryMsg->numOfCols, pQueryMsg->nAggTimeInterval, pQueryMsg->interpoType, pQueryMsg->numOfOutputCols, pQueryMsg->numOfCols, pQueryMsg->nAggTimeInterval, pQueryMsg->interpoType,
......
src/system/detail/src/vnodeShell.c
浏览文件 @ 44acd0ee
...@@ -215,7 +215,10 @@ void vnodeCloseShellVnode(int vnode) { ...@@ -215,7 +215,10 @@ void vnodeCloseShellVnode(int vnode) {
if (shellList[vnode] == NULL) return; if (shellList[vnode] == NULL) return;
for (int i = 0; i < vnodeList[vnode].cfg.maxSessions; ++i) { for (int i = 0; i < vnodeList[vnode].cfg.maxSessions; ++i) {
vnodeDecRefCount(shellList[vnode][i].qhandle); void* qhandle = shellList[vnode][i].qhandle;
if (qhandle != NULL) {
vnodeDecRefCount(qhandle);
}
} }
int32_t* v = malloc(sizeof(int32_t)); int32_t* v = malloc(sizeof(int32_t));
...@@ -517,7 +520,7 @@ static int vnodeCheckSubmitBlockContext(SShellSubmitBlock *pBlocks, SVnodeObj *p ...@@ -517,7 +520,7 @@ static int vnodeCheckSubmitBlockContext(SShellSubmitBlock *pBlocks, SVnodeObj *p
} }
if (pMeterObj->uid != uid) { if (pMeterObj->uid != uid) {
dError("vid:%d sid:%d id:%s, uid:%lld, uid in msg:%lld, uid mismatch", pVnode->vnode, sid, pMeterObj->meterId, dError("vid:%d sid:%d id:%s, uid:%" PRIu64 ", uid in msg:%" PRIu64 ", uid mismatch", pVnode->vnode, sid, pMeterObj->meterId,
pMeterObj->uid, uid); pMeterObj->uid, uid);
return TSDB_CODE_INVALID_SUBMIT_MSG; return TSDB_CODE_INVALID_SUBMIT_MSG;
} }
......
src/system/detail/src/vnodeStore.c
浏览文件 @ 44acd0ee
...@@ -56,7 +56,7 @@ static int vnodeInitStoreVnode(int vnode) { ...@@ -56,7 +56,7 @@ static int vnodeInitStoreVnode(int vnode) {
} }
pthread_mutex_init(&(pVnode->vmutex), NULL); pthread_mutex_init(&(pVnode->vmutex), NULL);
dPrint("vid:%d, storage initialized, version:%ld fileId:%d numOfFiles:%d", vnode, pVnode->version, pVnode->fileId, dPrint("vid:%d, storage initialized, version:%" PRIu64 " fileId:%d numOfFiles:%d", vnode, pVnode->version, pVnode->fileId,
pVnode->numOfFiles); pVnode->numOfFiles);
return TSDB_CODE_SUCCESS; return TSDB_CODE_SUCCESS;
......
src/system/detail/src/vnodeTagMgmt.c
浏览文件 @ 44acd0ee
...@@ -323,7 +323,7 @@ void tTagsPrints(SMeterSidExtInfo *pMeterInfo, tTagSchema *pSchema, tOrderIdx *p ...@@ -323,7 +323,7 @@ void tTagsPrints(SMeterSidExtInfo *pMeterInfo, tTagSchema *pSchema, tOrderIdx *p
printf("%f, ", GET_TAG_VAL(pMeterInfo, colIndex, pSchema, float)); printf("%f, ", GET_TAG_VAL(pMeterInfo, colIndex, pSchema, float));
break; break;
case TSDB_DATA_TYPE_BIGINT: case TSDB_DATA_TYPE_BIGINT:
printf("%ld, ", GET_TAG_VAL(pMeterInfo, colIndex, pSchema, int64_t)); printf("%" PRId64 ", ", GET_TAG_VAL(pMeterInfo, colIndex, pSchema, int64_t));
break; break;
case TSDB_DATA_TYPE_SMALLINT: case TSDB_DATA_TYPE_SMALLINT:
printf("%d, ", GET_TAG_VAL(pMeterInfo, colIndex, pSchema, int16_t)); printf("%d, ", GET_TAG_VAL(pMeterInfo, colIndex, pSchema, int16_t));
......
src/system/detail/src/vnodeUtil.c
浏览文件 @ 44acd0ee
...@@ -563,7 +563,7 @@ int32_t vnodeIncQueryRefCount(SQueryMeterMsg* pQueryMsg, SMeterSidExtInfo** pSid ...@@ -563,7 +563,7 @@ int32_t vnodeIncQueryRefCount(SQueryMeterMsg* pQueryMsg, SMeterSidExtInfo** pSid
continue; continue;
} else if (pMeter->uid != pSids[i]->uid || pMeter->sid != pSids[i]->sid) { } else if (pMeter->uid != pSids[i]->uid || pMeter->sid != pSids[i]->sid) {
code = TSDB_CODE_TABLE_ID_MISMATCH; code = TSDB_CODE_TABLE_ID_MISMATCH;
dError("qmsg:%p, vid:%d sid:%d id:%s uid:%lld, id mismatch. sid:%d uid:%lld in msg", pQueryMsg, dError("qmsg:%p, vid:%d sid:%d id:%s uid:%" PRIu64 ", id mismatch. sid:%d uid:%" PRId64 " in msg", pQueryMsg,
pQueryMsg->vnode, pMeter->sid, pMeter->meterId, pMeter->uid, pSids[i]->sid, pSids[i]->uid); pQueryMsg->vnode, pMeter->sid, pMeter->meterId, pMeter->uid, pSids[i]->sid, pSids[i]->uid);
vnodeSendMeterCfgMsg(pQueryMsg->vnode, pSids[i]->sid); vnodeSendMeterCfgMsg(pQueryMsg->vnode, pSids[i]->sid);
......
src/util/src/tcache.c
浏览文件 @ 44acd0ee
...@@ -588,8 +588,8 @@ void *taosAddDataIntoCache(void *handle, char *key, char *pData, int dataSize, i ...@@ -588,8 +588,8 @@ void *taosAddDataIntoCache(void *handle, char *key, char *pData, int dataSize, i
pNode = taosAddToCacheImpl(pObj, key, keyLen, pData, dataSize, keepTime * 1000L); pNode = taosAddToCacheImpl(pObj, key, keyLen, pData, dataSize, keepTime * 1000L);
if (NULL != pNode) { if (NULL != pNode) {
pTrace( pTrace(
"key:%s %p added into cache, slot:%d, addTime:%lld, expireTime:%lld, cache total:%d, " "key:%s %p added into cache, slot:%d, addTime:%" PRIu64 ", expireTime:%" PRIu64 ", cache total:%d, "
"size:%lldbytes, collision:%d", "size:%" PRId64 " bytes, collision:%d",
pNode->key, pNode, HASH_INDEX(pNode->hashVal, pObj->capacity), pNode->addTime, pNode->time, pObj->size, pNode->key, pNode, HASH_INDEX(pNode->hashVal, pObj->capacity), pNode->addTime, pNode->time, pObj->size,
pObj->totalSize, pObj->statistics.numOfCollision); pObj->totalSize, pObj->statistics.numOfCollision);
} }
...@@ -712,7 +712,7 @@ void *taosUpdateDataFromCache(void *handle, char *key, char *pData, int size, in ...@@ -712,7 +712,7 @@ void *taosUpdateDataFromCache(void *handle, char *key, char *pData, int size, in
pObj->totalSize); pObj->totalSize);
} else { } else {
pNew = taosUpdateCacheImpl(pObj, pNode, key, keyLen, pData, size, duration * 1000L); pNew = taosUpdateCacheImpl(pObj, pNode, key, keyLen, pData, size, duration * 1000L);
pTrace("key:%s updated.expireTime:%lld.refCnt:%d", key, pNode->time, pNode->refCount); pTrace("key:%s updated.expireTime:%" PRIu64 ".refCnt:%d", key, pNode->time, pNode->refCount);
} }
__cache_unlock(pObj); __cache_unlock(pObj);
......
src/util/src/thistogram.c
浏览文件 @ 44acd0ee
...@@ -453,7 +453,7 @@ void tHistogramPrint(SHistogramInfo* pHisto) { ...@@ -453,7 +453,7 @@ void tHistogramPrint(SHistogramInfo* pHisto) {
for (int32_t i = 0; i < pHisto->numOfEntries; ++i) { for (int32_t i = 0; i < pHisto->numOfEntries; ++i) {
SHistBin* pEntry = (SHistBin*)pNode->pData; SHistBin* pEntry = (SHistBin*)pNode->pData;
printf("%d: (%f, %lld)\n", i + 1, pEntry->val, pEntry->num); printf("%d: (%f, %" PRId64 ")\n", i + 1, pEntry->val, pEntry->num);
pNode = pNode->pForward[0]; pNode = pNode->pForward[0];
} }
#endif #endif
......
src/util/src/tsocket.c
浏览文件 @ 44acd0ee
...@@ -516,7 +516,7 @@ int taosCopyFds(int sfd, int dfd, int64_t len) { ...@@ -516,7 +516,7 @@ int taosCopyFds(int sfd, int dfd, int64_t len) {
int retLen = taosReadMsg(sfd, temp, (int)readLen); int retLen = taosReadMsg(sfd, temp, (int)readLen);
if (readLen != retLen) { if (readLen != retLen) {
pError("read error, readLen:%d retLen:%d len:%ld leftLen:%ld, reason:%s", readLen, retLen, len, leftLen, pError("read error, readLen:%d retLen:%d len:%" PRId64 " leftLen:%" PRId64 ", reason:%s", readLen, retLen, len, leftLen,
strerror(errno)); strerror(errno));
return -1; return -1;
} }
...@@ -524,7 +524,7 @@ int taosCopyFds(int sfd, int dfd, int64_t len) { ...@@ -524,7 +524,7 @@ int taosCopyFds(int sfd, int dfd, int64_t len) {
writeLen = taosWriteMsg(dfd, temp, readLen); writeLen = taosWriteMsg(dfd, temp, readLen);
if (readLen != writeLen) { if (readLen != writeLen) {
pError("copy error, readLen:%d writeLen:%d len:%ld leftLen:%ld, reason:%s", readLen, writeLen, len, leftLen, pError("copy error, readLen:%d writeLen:%d len:%" PRId64 " leftLen:%" PRId64 ", reason:%s", readLen, writeLen, len, leftLen,
strerror(errno)); strerror(errno));
return -1; return -1;
} }
......
src/util/src/ttokenizer.c
浏览文件 @ 44acd0ee
...@@ -228,6 +228,11 @@ static SKeyword keywordTable[] = { ...@@ -228,6 +228,11 @@ static SKeyword keywordTable[] = {
{"FILE", TK_FILE}, {"FILE", TK_FILE},
{"VNODES", TK_VNODES}, {"VNODES", TK_VNODES},
{"UNION", TK_UNION}, {"UNION", TK_UNION},
{"RATE", TK_RATE},
{"IRATE", TK_IRATE},
{"SUM_RATE", TK_SUM_RATE},
{"AVG_RATE", TK_AVG_RATE},
{"AVG_IRATE", TK_AVG_IRATE},
}; };
static const char isIdChar[] = { static const char isIdChar[] = {
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或