Skip to content

T
TDengine

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

通知 1193
Star 22018
Fork 4786
T
TDengine
提交 1ceaf9bd 编写于 作者: wmmhello's avatar wmmhello
浏览文件
操作

[TD-6347]<feature>(query):restrict like to be followed only by strings

上级 3197488e
隐藏空白更改
内联 并排
Showing with 218 addition and 173 deletion
src/client/src/tscSQLParser.c
浏览文件 @ 1ceaf9bd
......@@ -3563,7 +3563,6 @@ int32_t setShowInfo(SSqlObj* pSql, struct SSqlInfo* pInfo) {
const char* msg3 = "database name too long";
const char* msg5 = "database name is empty";
const char* msg6 = "pattern string is empty";
const char* msg7 = "pattern is invalid";
/*
* database prefix in pInfo->pMiscInfo->a[0]
......@@ -3596,10 +3595,6 @@ int32_t setShowInfo(SSqlObj* pSql, struct SSqlInfo* pInfo) {
// show table/stable like 'xxxx', set the like pattern for show tables
SStrToken* pPattern = &pShowInfo->pattern;
if (pPattern->type != 0) {
if (pPattern->type == TK_ID && pPattern->z[0] == TS_BACKQUOTE_CHAR) {
return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg7);
}
pPattern->n = stringProcess(pPattern->z, pPattern->n);
if (pPattern->n <= 0) {
......
src/query/inc/sql.y
浏览文件 @ 1ceaf9bd
......@@ -107,7 +107,7 @@ cmd ::= SHOW dbPrefix(X) TABLES. {
setShowOptions(pInfo, TSDB_MGMT_TABLE_TABLE, &X, 0);
}
cmd ::= SHOW dbPrefix(X) TABLES LIKE ids(Y). {
cmd ::= SHOW dbPrefix(X) TABLES LIKE STRING(Y). {
setShowOptions(pInfo, TSDB_MGMT_TABLE_TABLE, &X, &Y);
}
......@@ -115,7 +115,7 @@ cmd ::= SHOW dbPrefix(X) STABLES. {
setShowOptions(pInfo, TSDB_MGMT_TABLE_METRIC, &X, 0);
}
cmd ::= SHOW dbPrefix(X) STABLES LIKE ids(Y). {
cmd ::= SHOW dbPrefix(X) STABLES LIKE STRING(Y). {
SStrToken token;
tSetDbName(&token, &X);
setShowOptions(pInfo, TSDB_MGMT_TABLE_METRIC, &token, &Y);
......
src/query/src/sql.c
浏览文件 @ 1ceaf9bd
......@@ -416,94 +416,93 @@ typedef union {
** yy_default[] Default action for each state.
**
*********** Begin parsing tables **********************************************/
#define YY_ACTTAB_COUNT (858)
#define YY_ACTTAB_COUNT (845)
static const YYACTIONTYPE yy_action[] = {
/* 0 */ 102, 668, 668, 1166, 161, 1167, 312, 810, 260, 669,
/* 10 */ 669, 813, 391, 241, 37, 38, 24, 41, 42, 1084,
/* 20 */ 1076, 263, 31, 30, 29, 1089, 1223, 40, 344, 45,
/* 30 */ 43, 46, 44, 1073, 1074, 55, 1077, 36, 35, 298,
/* 40 */ 299, 34, 33, 32, 37, 38, 213, 41, 42, 250,
/* 50 */ 84, 263, 31, 30, 29, 214, 1223, 40, 344, 45,
/* 60 */ 43, 46, 44, 933, 392, 1223, 256, 36, 35, 211,
/* 70 */ 215, 34, 33, 32, 293, 292, 128, 122, 133, 1223,
/* 0 */ 102, 668, 668, 1166, 159, 1167, 310, 810, 258, 669,
/* 10 */ 669, 813, 391, 239, 37, 38, 24, 41, 42, 1084,
/* 20 */ 1076, 261, 31, 30, 29, 1089, 1223, 40, 342, 45,
/* 30 */ 43, 46, 44, 1073, 1074, 55, 1077, 36, 35, 296,
/* 40 */ 297, 34, 33, 32, 37, 38, 211, 41, 42, 248,
/* 50 */ 84, 261, 31, 30, 29, 212, 1223, 40, 342, 45,
/* 60 */ 43, 46, 44, 933, 392, 1223, 254, 36, 35, 209,
/* 70 */ 213, 34, 33, 32, 291, 290, 128, 122, 133, 1223,
/* 80 */ 1223, 1226, 1225, 132, 1075, 138, 141, 131, 37, 38,
/* 90 */ 85, 41, 42, 983, 135, 263, 31, 30, 29, 668,
/* 100 */ 196, 40, 344, 45, 43, 46, 44, 669, 340, 287,
/* 90 */ 85, 41, 42, 983, 135, 261, 31, 30, 29, 668,
/* 100 */ 194, 40, 342, 45, 43, 46, 44, 669, 338, 285,
/* 110 */ 13, 36, 35, 1105, 101, 34, 33, 32, 37, 38,
/* 120 */ 58, 41, 42, 60, 246, 263, 31, 30, 29, 220,
/* 130 */ 286, 40, 344, 45, 43, 46, 44, 316, 97, 1223,
/* 140 */ 96, 36, 35, 668, 104, 34, 33, 32, 340, 37,
/* 150 */ 39, 669, 41, 42, 1105, 176, 263, 31, 30, 29,
/* 160 */ 1114, 862, 40, 344, 45, 43, 46, 44, 34, 33,
/* 170 */ 32, 244, 36, 35, 302, 221, 34, 33, 32, 206,
/* 180 */ 204, 202, 379, 59, 51, 1223, 201, 148, 147, 146,
/* 120 */ 58, 41, 42, 60, 244, 261, 31, 30, 29, 218,
/* 130 */ 284, 40, 342, 45, 43, 46, 44, 314, 97, 1223,
/* 140 */ 96, 36, 35, 668, 104, 34, 33, 32, 338, 37,
/* 150 */ 39, 669, 41, 42, 1105, 174, 261, 31, 30, 29,
/* 160 */ 1114, 862, 40, 342, 45, 43, 46, 44, 34, 33,
/* 170 */ 32, 242, 36, 35, 300, 219, 34, 33, 32, 204,
/* 180 */ 202, 200, 377, 59, 51, 1223, 199, 148, 147, 146,
/* 190 */ 145, 618, 619, 620, 621, 622, 623, 624, 625, 626,
/* 200 */ 627, 628, 629, 630, 631, 159, 993, 242, 38, 278,
/* 210 */ 41, 42, 59, 196, 263, 31, 30, 29, 282, 281,
/* 220 */ 40, 344, 45, 43, 46, 44, 984, 222, 243, 1111,
/* 230 */ 36, 35, 1087, 196, 34, 33, 32, 1223, 41, 42,
/* 240 */ 387, 1021, 263, 31, 30, 29, 822, 823, 40, 344,
/* 250 */ 45, 43, 46, 44, 390, 389, 645, 253, 36, 35,
/* 260 */ 704, 1087, 34, 33, 32, 67, 338, 386, 385, 337,
/* 270 */ 336, 335, 384, 334, 333, 332, 383, 331, 382, 381,
/* 200 */ 627, 628, 629, 630, 631, 157, 993, 240, 38, 276,
/* 210 */ 41, 42, 59, 194, 261, 31, 30, 29, 280, 279,
/* 220 */ 40, 342, 45, 43, 46, 44, 984, 220, 241, 1111,
/* 230 */ 36, 35, 1087, 194, 34, 33, 32, 1223, 41, 42,
/* 240 */ 385, 1021, 261, 31, 30, 29, 822, 823, 40, 342,
/* 250 */ 45, 43, 46, 44, 390, 388, 645, 251, 36, 35,
/* 260 */ 704, 1087, 34, 33, 32, 67, 336, 384, 383, 335,
/* 270 */ 334, 333, 382, 332, 331, 330, 381, 329, 380, 379,
/* 280 */ 1052, 1040, 1041, 1042, 1043, 1044, 1045, 1046, 1047, 1048,
/* 290 */ 1049, 1050, 1051, 1053, 1054, 234, 877, 25, 1215, 866,
/* 290 */ 1049, 1050, 1051, 1053, 1054, 232, 877, 25, 1215, 866,
/* 300 */ 1164, 869, 1165, 872, 776, 59, 59, 773, 1223, 774,
/* 310 */ 868, 775, 871, 867, 219, 870, 234, 877, 59, 1245,
/* 320 */ 866, 227, 869, 1214, 872, 342, 266, 144, 143, 142,
/* 330 */ 226, 239, 240, 1223, 352, 91, 5, 62, 186, 268,
/* 340 */ 269, 259, 315, 185, 111, 116, 107, 115, 272, 59,
/* 350 */ 254, 356, 239, 240, 1087, 1087, 346, 45, 43, 46,
/* 360 */ 44, 67, 327, 386, 385, 36, 35, 1086, 384, 34,
/* 370 */ 33, 32, 383, 68, 382, 381, 100, 59, 264, 1060,
/* 310 */ 868, 775, 871, 867, 217, 870, 232, 877, 59, 1245,
/* 320 */ 866, 225, 869, 1214, 872, 340, 264, 144, 143, 142,
/* 330 */ 224, 237, 238, 1223, 350, 91, 5, 62, 184, 266,
/* 340 */ 267, 257, 313, 183, 111, 116, 107, 115, 270, 59,
/* 350 */ 252, 354, 237, 238, 1087, 1087, 344, 45, 43, 46,
/* 360 */ 44, 67, 325, 384, 383, 36, 35, 1086, 382, 34,
/* 370 */ 33, 32, 381, 68, 380, 379, 100, 59, 262, 1060,
/* 380 */ 47, 1058, 1059, 36, 35, 1237, 1061, 34, 33, 32,
/* 390 */ 1062, 86, 1063, 1064, 357, 285, 343, 83, 1087, 59,
/* 400 */ 752, 47, 215, 267, 235, 265, 248, 355, 354, 59,
/* 410 */ 1090, 59, 1223, 294, 1226, 878, 873, 874, 342, 59,
/* 420 */ 59, 91, 358, 777, 270, 274, 1087, 271, 875, 364,
/* 430 */ 363, 876, 369, 368, 273, 262, 878, 873, 874, 215,
/* 440 */ 158, 156, 155, 255, 359, 182, 257, 1090, 1087, 1223,
/* 450 */ 1090, 1226, 1213, 237, 365, 130, 366, 6, 1087, 68,
/* 460 */ 1087, 238, 1223, 1223, 367, 371, 217, 379, 1087, 1087,
/* 470 */ 218, 1223, 223, 216, 224, 225, 1223, 1105, 105, 794,
/* 480 */ 1223, 229, 1223, 1223, 1223, 1223, 230, 273, 842, 231,
/* 490 */ 228, 1223, 791, 212, 245, 273, 1223, 88, 183, 1223,
/* 500 */ 1223, 273, 99, 1223, 98, 89, 345, 1, 184, 819,
/* 510 */ 3, 197, 1088, 829, 1078, 297, 296, 830, 76, 10,
/* 520 */ 762, 79, 319, 163, 764, 349, 321, 71, 763, 261,
/* 530 */ 54, 48, 348, 906, 60, 289, 60, 879, 71, 667,
/* 540 */ 103, 295, 71, 289, 1177, 82, 841, 9, 15, 1176,
/* 550 */ 14, 9, 251, 9, 347, 121, 17, 120, 16, 361,
/* 560 */ 360, 77, 80, 322, 783, 798, 784, 1173, 781, 865,
/* 570 */ 782, 19, 1172, 18, 127, 252, 126, 751, 21, 370,
/* 580 */ 20, 140, 139, 283, 160, 1113, 26, 1124, 1121, 1122,
/* 590 */ 1106, 290, 1126, 162, 1156, 167, 308, 1155, 1154, 1153,
/* 600 */ 178, 1085, 179, 1083, 180, 181, 998, 324, 157, 809,
/* 610 */ 325, 1103, 326, 301, 329, 330, 69, 209, 65, 341,
/* 620 */ 168, 169, 992, 247, 303, 317, 353, 305, 1244, 81,
/* 630 */ 882, 28, 118, 78, 1243, 1240, 170, 187, 171, 362,
/* 640 */ 313, 172, 311, 1236, 309, 124, 1235, 307, 1232, 173,
/* 650 */ 188, 1018, 66, 304, 61, 175, 70, 210, 980, 134,
/* 660 */ 978, 136, 300, 137, 976, 975, 275, 199, 200, 972,
/* 670 */ 971, 970, 969, 968, 967, 966, 203, 205, 962, 960,
/* 680 */ 958, 27, 207, 955, 208, 951, 328, 174, 288, 87,
/* 690 */ 92, 380, 306, 373, 129, 372, 374, 375, 236, 376,
/* 700 */ 258, 323, 377, 378, 388, 931, 276, 232, 277, 930,
/* 710 */ 233, 279, 997, 996, 112, 113, 280, 929, 912, 284,
/* 720 */ 911, 318, 289, 11, 90, 291, 786, 52, 974, 973,
/* 730 */ 1019, 191, 149, 189, 190, 192, 193, 195, 150, 194,
/* 740 */ 965, 2, 1056, 151, 964, 4, 152, 1020, 957, 53,
/* 750 */ 177, 956, 93, 818, 74, 816, 815, 812, 1066, 811,
/* 760 */ 75, 166, 820, 164, 249, 831, 165, 22, 825, 94,
/* 770 */ 63, 827, 95, 310, 347, 314, 12, 64, 49, 23,
/* 780 */ 320, 50, 104, 106, 56, 682, 108, 109, 57, 110,
/* 790 */ 717, 715, 714, 713, 711, 710, 709, 706, 672, 339,
/* 800 */ 114, 7, 903, 901, 881, 904, 880, 902, 8, 883,
/* 810 */ 350, 351, 72, 754, 780, 117, 119, 60, 73, 123,
/* 820 */ 125, 779, 753, 750, 698, 696, 688, 694, 690, 692,
/* 830 */ 686, 684, 720, 719, 718, 716, 712, 708, 707, 198,
/* 840 */ 670, 635, 935, 934, 934, 934, 934, 934, 934, 934,
/* 850 */ 934, 934, 934, 934, 934, 934, 153, 154,
/* 390 */ 1062, 86, 1063, 1064, 355, 283, 341, 83, 1087, 59,
/* 400 */ 752, 47, 213, 265, 233, 263, 246, 353, 352, 59,
/* 410 */ 1090, 59, 1223, 292, 1226, 878, 873, 874, 340, 59,
/* 420 */ 59, 91, 356, 777, 268, 272, 1087, 269, 875, 362,
/* 430 */ 361, 876, 367, 366, 271, 260, 878, 873, 874, 213,
/* 440 */ 156, 154, 153, 253, 357, 180, 255, 1090, 1087, 1223,
/* 450 */ 1090, 1226, 1213, 235, 363, 130, 364, 6, 1087, 68,
/* 460 */ 1087, 236, 1223, 1223, 365, 369, 215, 377, 1087, 1087,
/* 470 */ 216, 1223, 221, 214, 222, 223, 1223, 1105, 105, 794,
/* 480 */ 1223, 227, 1223, 1223, 1223, 1223, 228, 271, 842, 229,
/* 490 */ 226, 1223, 791, 210, 243, 271, 1223, 88, 181, 1223,
/* 500 */ 1223, 271, 99, 1223, 98, 89, 343, 1, 182, 819,
/* 510 */ 3, 195, 1088, 829, 1078, 295, 294, 830, 76, 10,
/* 520 */ 762, 79, 317, 161, 764, 347, 319, 71, 763, 259,
/* 530 */ 54, 48, 346, 906, 60, 287, 60, 879, 71, 667,
/* 540 */ 103, 293, 71, 287, 1177, 82, 841, 9, 15, 1176,
/* 550 */ 14, 9, 249, 9, 345, 121, 17, 120, 16, 359,
/* 560 */ 358, 77, 80, 320, 783, 798, 784, 1173, 781, 865,
/* 570 */ 782, 19, 1172, 18, 127, 250, 126, 751, 21, 368,
/* 580 */ 20, 140, 139, 281, 158, 1113, 26, 1124, 1121, 1122,
/* 590 */ 1106, 288, 1126, 160, 1156, 165, 306, 1155, 1154, 1153,
/* 600 */ 176, 1085, 177, 1083, 178, 179, 998, 322, 155, 809,
/* 610 */ 323, 1103, 324, 299, 327, 328, 69, 207, 65, 339,
/* 620 */ 166, 315, 992, 245, 301, 167, 351, 303, 1244, 81,
/* 630 */ 882, 28, 118, 78, 1243, 1240, 168, 185, 169, 360,
/* 640 */ 311, 170, 309, 1236, 307, 124, 1235, 305, 1232, 171,
/* 650 */ 186, 1018, 66, 302, 61, 173, 70, 208, 980, 134,
/* 660 */ 978, 136, 298, 137, 976, 975, 273, 197, 198, 972,
/* 670 */ 971, 970, 969, 968, 967, 966, 201, 203, 958, 205,
/* 680 */ 955, 27, 206, 951, 53, 326, 286, 87, 92, 304,
/* 690 */ 378, 129, 370, 371, 372, 373, 374, 234, 256, 321,
/* 700 */ 375, 376, 386, 931, 274, 230, 275, 930, 231, 112,
/* 710 */ 997, 996, 277, 113, 278, 929, 912, 282, 911, 287,
/* 720 */ 316, 11, 90, 786, 974, 52, 973, 188, 1019, 187,
/* 730 */ 189, 190, 191, 193, 192, 149, 150, 965, 2, 1056,
/* 740 */ 151, 152, 964, 957, 956, 175, 1020, 172, 4, 289,
/* 750 */ 93, 818, 74, 816, 815, 812, 811, 75, 162, 1066,
/* 760 */ 820, 831, 163, 164, 825, 94, 247, 827, 95, 308,
/* 770 */ 63, 22, 345, 312, 12, 49, 64, 23, 318, 50,
/* 780 */ 104, 106, 56, 682, 108, 109, 57, 110, 717, 715,
/* 790 */ 714, 713, 711, 710, 709, 706, 672, 337, 114, 7,
/* 800 */ 903, 901, 881, 904, 880, 902, 883, 8, 348, 349,
/* 810 */ 72, 754, 73, 117, 753, 119, 750, 123, 125, 60,
/* 820 */ 698, 696, 688, 780, 694, 690, 779, 692, 686, 684,
/* 830 */ 720, 719, 718, 716, 712, 708, 707, 196, 670, 635,
/* 840 */ 387, 644, 642, 389, 935,
};
static const YYCODETYPE yy_lookahead[] = {
/* 0 */ 211, 1, 1, 279, 203, 281, 282, 5, 210, 9,
......@@ -568,30 +567,30 @@ static const YYCODETYPE yy_lookahead[] = {
/* 590 */ 251, 251, 203, 203, 280, 203, 203, 280, 280, 280,
/* 600 */ 255, 251, 203, 203, 203, 203, 203, 203, 64, 123,
/* 610 */ 203, 267, 203, 275, 203, 203, 203, 203, 203, 203,
/* 620 */ 266, 265, 203, 275, 275, 136, 203, 275, 203, 141,
/* 620 */ 266, 136, 203, 275, 275, 265, 203, 275, 203, 141,
/* 630 */ 121, 140, 203, 143, 203, 203, 264, 203, 263, 203,
/* 640 */ 139, 262, 134, 203, 133, 203, 203, 132, 203, 261,
/* 650 */ 203, 203, 203, 135, 203, 259, 203, 203, 203, 203,
/* 660 */ 203, 203, 129, 203, 203, 203, 203, 203, 203, 203,
/* 670 */ 203, 203, 203, 203, 203, 203, 203, 203, 203, 203,
/* 680 */ 203, 145, 203, 203, 203, 203, 93, 260, 205, 205,
/* 690 */ 205, 117, 205, 55, 100, 99, 96, 98, 205, 59,
/* 700 */ 205, 205, 97, 95, 88, 5, 158, 205, 5, 5,
/* 710 */ 205, 158, 215, 215, 211, 211, 5, 5, 104, 147,
/* 720 */ 103, 119, 125, 86, 126, 101, 87, 86, 205, 205,
/* 730 */ 224, 218, 206, 223, 222, 221, 219, 217, 206, 220,
/* 740 */ 205, 212, 242, 206, 205, 207, 206, 226, 205, 257,
/* 750 */ 256, 205, 101, 87, 101, 123, 123, 5, 242, 5,
/* 760 */ 86, 101, 87, 86, 1, 87, 86, 137, 87, 86,
/* 770 */ 101, 87, 86, 86, 47, 1, 86, 101, 86, 137,
/* 780 */ 119, 86, 120, 82, 91, 5, 90, 74, 91, 90,
/* 790 */ 9, 5, 5, 5, 5, 5, 5, 5, 89, 16,
/* 800 */ 82, 86, 9, 9, 87, 9, 87, 9, 86, 121,
/* 810 */ 28, 63, 17, 5, 123, 152, 152, 101, 17, 152,
/* 820 */ 152, 123, 5, 87, 5, 5, 5, 5, 5, 5,
/* 830 */ 5, 5, 5, 5, 5, 5, 5, 5, 5, 101,
/* 840 */ 89, 64, 0, 284, 284, 284, 284, 284, 284, 284,
/* 850 */ 284, 284, 284, 284, 284, 284, 22, 22, 284, 284,
/* 680 */ 203, 145, 203, 203, 257, 93, 205, 205, 205, 205,
/* 690 */ 117, 100, 99, 55, 96, 98, 59, 205, 205, 205,
/* 700 */ 97, 95, 88, 5, 158, 205, 5, 5, 205, 211,
/* 710 */ 215, 215, 158, 211, 5, 5, 104, 147, 103, 125,
/* 720 */ 119, 86, 126, 87, 205, 86, 205, 222, 224, 223,
/* 730 */ 218, 221, 219, 217, 220, 206, 206, 205, 212, 242,
/* 740 */ 206, 206, 205, 205, 205, 256, 226, 260, 207, 101,
/* 750 */ 101, 87, 101, 123, 123, 5, 5, 86, 86, 242,
/* 760 */ 87, 87, 86, 101, 87, 86, 1, 87, 86, 86,
/* 770 */ 101, 137, 47, 1, 86, 86, 101, 137, 119, 86,
/* 780 */ 120, 82, 91, 5, 90, 74, 91, 90, 9, 5,
/* 790 */ 5, 5, 5, 5, 5, 5, 89, 16, 82, 86,
/* 800 */ 9, 9, 87, 9, 87, 9, 121, 86, 28, 63,
/* 810 */ 17, 5, 17, 152, 5, 152, 87, 152, 152, 101,
/* 820 */ 5, 5, 5, 123, 5, 5, 123, 5, 5, 5,
/* 830 */ 5, 5, 5, 5, 5, 5, 5, 101, 89, 64,
/* 840 */ 22, 9, 9, 22, 0, 284, 284, 284, 284, 284,
/* 850 */ 284, 284, 284, 284, 284, 284, 284, 284, 284, 284,
/* 860 */ 284, 284, 284, 284, 284, 284, 284, 284, 284, 284,
/* 870 */ 284, 284, 284, 284, 284, 284, 284, 284, 284, 284,
/* 880 */ 284, 284, 284, 284, 284, 284, 284, 284, 284, 284,
......@@ -610,12 +609,11 @@ static const YYCODETYPE yy_lookahead[] = {
/* 1010 */ 284, 284, 284, 284, 284, 284, 284, 284, 284, 284,
/* 1020 */ 284, 284, 284, 284, 284, 284, 284, 284, 284, 284,
/* 1030 */ 284, 284, 284, 284, 284, 284, 284, 284, 284, 284,
/* 1040 */ 284, 284, 284, 284, 284, 284, 284, 284, 284, 284,
/* 1050 */ 284, 284, 284, 284, 284, 284, 284, 284, 284,
/* 1040 */ 284, 284, 284, 284, 284, 284,
};
#define YY_SHIFT_COUNT (392)
#define YY_SHIFT_MIN (0)
#define YY_SHIFT_MAX (842)
#define YY_SHIFT_MAX (844)
static const unsigned short int yy_shift_ofst[] = {
/* 0 */ 249, 163, 163, 259, 259, 60, 315, 294, 294, 294,
/* 10 */ 98, 1, 1, 1, 1, 1, 1, 1, 1, 1,
......@@ -623,8 +621,8 @@ static const unsigned short int yy_shift_ofst[] = {
/* 30 */ 294, 294, 294, 294, 294, 294, 294, 294, 294, 294,
/* 40 */ 294, 294, 294, 294, 294, 294, 294, 294, 302, 302,
/* 50 */ 302, 335, 335, 116, 1, 20, 1, 1, 1, 1,
/* 60 */ 1, 373, 60, 48, 48, 88, 88, 255, 858, 858,
/* 70 */ 858, 302, 302, 302, 2, 2, 395, 395, 395, 395,
/* 60 */ 1, 373, 60, 48, 48, 88, 88, 255, 845, 845,
/* 70 */ 845, 302, 302, 302, 2, 2, 395, 395, 395, 395,
/* 80 */ 395, 395, 395, 1, 1, 1, 438, 1, 1, 1,
/* 90 */ 335, 335, 1, 1, 1, 1, 408, 408, 408, 408,
/* 100 */ 391, 335, 1, 1, 1, 1, 1, 1, 1, 1,
......@@ -632,35 +630,35 @@ static const unsigned short int yy_shift_ofst[] = {
/* 120 */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
/* 130 */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
/* 140 */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
/* 150 */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
/* 160 */ 544, 544, 544, 486, 486, 486, 486, 544, 488, 490,
/* 170 */ 489, 491, 501, 508, 511, 515, 518, 533, 536, 544,
/* 180 */ 544, 544, 593, 593, 574, 60, 60, 544, 544, 594,
/* 190 */ 596, 638, 600, 599, 640, 605, 608, 574, 255, 544,
/* 200 */ 544, 616, 616, 544, 616, 544, 616, 544, 544, 858,
/* 210 */ 858, 30, 74, 104, 104, 104, 135, 193, 221, 270,
/* 220 */ 328, 328, 328, 328, 328, 328, 10, 113, 346, 346,
/* 230 */ 346, 346, 254, 276, 371, 62, 24, 127, 127, 305,
/* 240 */ 308, 185, 374, 22, 410, 418, 478, 422, 426, 430,
/* 250 */ 278, 417, 420, 433, 435, 437, 439, 441, 444, 446,
/* 260 */ 450, 507, 528, 509, 452, 398, 405, 406, 559, 563,
/* 270 */ 522, 421, 424, 459, 428, 499, 700, 548, 703, 704,
/* 280 */ 553, 711, 712, 614, 617, 572, 597, 602, 637, 598,
/* 290 */ 639, 641, 624, 651, 666, 653, 632, 633, 752, 754,
/* 300 */ 674, 675, 677, 678, 680, 681, 660, 683, 684, 686,
/* 310 */ 763, 687, 669, 630, 727, 774, 676, 642, 690, 602,
/* 320 */ 692, 661, 695, 662, 701, 693, 696, 713, 780, 697,
/* 330 */ 699, 781, 786, 787, 788, 789, 790, 791, 792, 709,
/* 340 */ 783, 718, 793, 794, 715, 717, 719, 796, 798, 688,
/* 350 */ 722, 782, 748, 795, 663, 664, 716, 716, 716, 716,
/* 360 */ 691, 698, 801, 667, 668, 716, 716, 716, 808, 817,
/* 370 */ 736, 716, 819, 820, 821, 822, 823, 824, 825, 826,
/* 380 */ 827, 828, 829, 830, 831, 832, 833, 738, 751, 834,
/* 390 */ 835, 777, 842,
/* 150 */ 1, 1, 1, 1, 1, 1, 1, 1, 544, 544,
/* 160 */ 544, 486, 486, 486, 486, 544, 488, 490, 485, 491,
/* 170 */ 501, 508, 511, 515, 518, 533, 536, 544, 544, 544,
/* 180 */ 592, 592, 573, 60, 60, 544, 544, 591, 593, 638,
/* 190 */ 598, 597, 637, 603, 606, 573, 255, 544, 544, 614,
/* 200 */ 614, 544, 614, 544, 614, 544, 544, 845, 845, 30,
/* 210 */ 74, 104, 104, 104, 135, 193, 221, 270, 328, 328,
/* 220 */ 328, 328, 328, 328, 10, 113, 346, 346, 346, 346,
/* 230 */ 254, 276, 371, 62, 24, 127, 127, 305, 308, 185,
/* 240 */ 374, 22, 410, 418, 478, 422, 426, 430, 278, 417,
/* 250 */ 420, 433, 435, 437, 439, 441, 444, 446, 450, 507,
/* 260 */ 528, 509, 452, 398, 405, 406, 559, 563, 522, 421,
/* 270 */ 424, 459, 428, 499, 698, 546, 701, 702, 554, 709,
/* 280 */ 710, 612, 615, 570, 594, 601, 635, 596, 636, 639,
/* 290 */ 648, 649, 664, 651, 630, 631, 750, 751, 671, 673,
/* 300 */ 672, 674, 676, 677, 662, 679, 680, 682, 765, 683,
/* 310 */ 669, 634, 725, 772, 675, 640, 688, 601, 689, 659,
/* 320 */ 693, 660, 699, 691, 694, 711, 778, 695, 697, 779,
/* 330 */ 784, 785, 786, 787, 788, 789, 790, 707, 781, 716,
/* 340 */ 791, 792, 713, 715, 717, 794, 796, 685, 721, 780,
/* 350 */ 746, 793, 661, 663, 718, 718, 718, 718, 700, 703,
/* 360 */ 795, 665, 666, 718, 718, 718, 806, 809, 729, 718,
/* 370 */ 815, 816, 817, 819, 820, 822, 823, 824, 825, 826,
/* 380 */ 827, 828, 829, 830, 831, 736, 749, 832, 818, 833,
/* 390 */ 821, 775, 844,
};
#define YY_REDUCE_COUNT (210)
#define YY_REDUCE_COUNT (208)
#define YY_REDUCE_MIN (-276)
#define YY_REDUCE_MAX (546)
#define YY_REDUCE_MAX (541)
static const short yy_reduce_ofst[] = {
/* 0 */ -138, 53, 53, 152, 152, -211, -202, 131, 168, -201,
/* 10 */ -199, -20, 9, 102, 103, 146, 174, 196, 206, 208,
......@@ -678,12 +676,11 @@ static const short yy_reduce_ofst[] = {
/* 130 */ 449, 451, 453, 454, 455, 456, 457, 458, 460, 461,
/* 140 */ 462, 463, 464, 465, 466, 467, 468, 469, 470, 471,
/* 150 */ 472, 473, 474, 475, 476, 477, 479, 480, 481, 482,
/* 160 */ 483, 484, 485, 338, 348, 349, 352, 487, 344, 354,
/* 170 */ 356, 372, 375, 379, 388, 427, 396, 492, 494, 493,
/* 180 */ 495, 496, 497, 498, 500, 503, 504, 502, 505, 506,
/* 190 */ 510, 512, 513, 514, 517, 519, 520, 516, 521, 523,
/* 200 */ 524, 526, 532, 535, 537, 539, 540, 543, 546, 529,
/* 210 */ 538,
/* 160 */ 483, 338, 348, 349, 352, 484, 344, 354, 360, 372,
/* 170 */ 375, 379, 388, 487, 396, 427, 489, 492, 493, 494,
/* 180 */ 495, 496, 497, 498, 502, 500, 503, 504, 506, 505,
/* 190 */ 512, 510, 513, 514, 516, 517, 520, 519, 521, 529,
/* 200 */ 530, 532, 534, 537, 535, 538, 539, 526, 541,
};
static const YYACTIONTYPE yy_default[] = {
/* 0 */ 932, 1055, 994, 1065, 981, 991, 1228, 1228, 1228, 1228,
......@@ -701,30 +698,30 @@ static const YYACTIONTYPE yy_default[] = {
/* 120 */ 932, 932, 932, 932, 932, 932, 932, 932, 932, 932,
/* 130 */ 932, 932, 932, 932, 979, 932, 977, 932, 932, 932,
/* 140 */ 932, 932, 932, 932, 932, 932, 932, 932, 932, 932,
/* 150 */ 932, 932, 932, 932, 932, 932, 932, 932, 932, 950,
/* 160 */ 954, 954, 954, 932, 932, 932, 932, 954, 1170, 1174,
/* 170 */ 1151, 1168, 1162, 1146, 1144, 1142, 1150, 1135, 1178, 954,
/* 180 */ 954, 954, 999, 999, 995, 991, 991, 954, 954, 1017,
/* 190 */ 1015, 1013, 1005, 1011, 1007, 1009, 1003, 982, 932, 954,
/* 200 */ 954, 989, 989, 954, 989, 954, 989, 954, 954, 1039,
/* 210 */ 1057, 1227, 932, 1179, 1169, 1227, 932, 1210, 1209, 932,
/* 220 */ 1218, 1217, 1216, 1208, 1207, 1206, 932, 932, 1202, 1205,
/* 230 */ 1204, 1203, 932, 932, 1181, 932, 932, 1212, 1211, 932,
/* 240 */ 932, 932, 932, 932, 932, 932, 1132, 932, 932, 932,
/* 250 */ 1157, 1175, 1171, 932, 932, 932, 932, 932, 932, 932,
/* 260 */ 932, 1182, 932, 932, 932, 932, 932, 932, 932, 932,
/* 270 */ 1096, 932, 932, 1067, 932, 932, 932, 932, 932, 932,
/* 280 */ 932, 932, 932, 932, 932, 932, 1107, 932, 932, 932,
/* 290 */ 932, 932, 1119, 1118, 932, 932, 932, 932, 932, 932,
/* 150 */ 932, 932, 932, 932, 932, 932, 932, 950, 954, 954,
/* 160 */ 954, 932, 932, 932, 932, 954, 1170, 1174, 1151, 1168,
/* 170 */ 1162, 1146, 1144, 1142, 1150, 1135, 1178, 954, 954, 954,
/* 180 */ 999, 999, 995, 991, 991, 954, 954, 1017, 1015, 1013,
/* 190 */ 1005, 1011, 1007, 1009, 1003, 982, 932, 954, 954, 989,
/* 200 */ 989, 954, 989, 954, 989, 954, 954, 1039, 1057, 1227,
/* 210 */ 932, 1179, 1169, 1227, 932, 1210, 1209, 932, 1218, 1217,
/* 220 */ 1216, 1208, 1207, 1206, 932, 932, 1202, 1205, 1204, 1203,
/* 230 */ 932, 932, 1181, 932, 932, 1212, 1211, 932, 932, 932,
/* 240 */ 932, 932, 932, 932, 1132, 932, 932, 932, 1157, 1175,
/* 250 */ 1171, 932, 932, 932, 932, 932, 932, 932, 932, 1182,
/* 260 */ 932, 932, 932, 932, 932, 932, 932, 932, 1096, 932,
/* 270 */ 932, 1067, 932, 932, 932, 932, 932, 932, 932, 932,
/* 280 */ 932, 932, 932, 932, 1107, 932, 932, 932, 932, 932,
/* 290 */ 1119, 1118, 932, 932, 932, 932, 932, 932, 932, 932,
/* 300 */ 932, 932, 932, 932, 932, 932, 932, 932, 932, 932,
/* 310 */ 932, 932, 1163, 932, 1158, 932, 1152, 932, 932, 1079,
/* 310 */ 1163, 932, 1158, 932, 1152, 932, 932, 1079, 932, 932,
/* 320 */ 932, 932, 932, 932, 932, 932, 932, 932, 932, 932,
/* 330 */ 932, 932, 932, 932, 932, 932, 932, 932, 932, 932,
/* 340 */ 932, 932, 932, 932, 932, 932, 932, 932, 932, 932,
/* 350 */ 932, 932, 932, 932, 932, 932, 1246, 1241, 1242, 1239,
/* 360 */ 932, 932, 932, 932, 932, 1238, 1233, 1234, 932, 932,
/* 370 */ 932, 1231, 932, 932, 932, 932, 932, 932, 932, 932,
/* 380 */ 932, 932, 932, 932, 932, 932, 932, 1023, 932, 961,
/* 350 */ 932, 932, 932, 932, 1246, 1241, 1242, 1239, 932, 932,
/* 360 */ 932, 932, 932, 1238, 1233, 1234, 932, 932, 932, 1231,
/* 370 */ 932, 932, 932, 932, 932, 932, 932, 932, 932, 932,
/* 380 */ 932, 932, 932, 932, 932, 1023, 932, 932, 961, 932,
/* 390 */ 959, 932, 932,
};
/********** End of lemon-generated parsing tables *****************************/
......@@ -1350,9 +1347,9 @@ static const char *const yyRuleName[] = {
/* 22 */ "cmd ::= SHOW CREATE STABLE ids cpxName",
/* 23 */ "cmd ::= SHOW CREATE DATABASE ids",
/* 24 */ "cmd ::= SHOW dbPrefix TABLES",
/* 25 */ "cmd ::= SHOW dbPrefix TABLES LIKE ids",
/* 25 */ "cmd ::= SHOW dbPrefix TABLES LIKE STRING",
/* 26 */ "cmd ::= SHOW dbPrefix STABLES",
/* 27 */ "cmd ::= SHOW dbPrefix STABLES LIKE ids",
/* 27 */ "cmd ::= SHOW dbPrefix STABLES LIKE STRING",
/* 28 */ "cmd ::= SHOW dbPrefix VGROUPS",
/* 29 */ "cmd ::= DROP TABLE ifexists ids cpxName",
/* 30 */ "cmd ::= DROP STABLE ifexists ids cpxName",
......@@ -2129,9 +2126,9 @@ static const YYCODETYPE yyRuleInfoLhs[] = {
202, /* (22) cmd ::= SHOW CREATE STABLE ids cpxName */
202, /* (23) cmd ::= SHOW CREATE DATABASE ids */
202, /* (24) cmd ::= SHOW dbPrefix TABLES */
202, /* (25) cmd ::= SHOW dbPrefix TABLES LIKE ids */
202, /* (25) cmd ::= SHOW dbPrefix TABLES LIKE STRING */
202, /* (26) cmd ::= SHOW dbPrefix STABLES */
202, /* (27) cmd ::= SHOW dbPrefix STABLES LIKE ids */
202, /* (27) cmd ::= SHOW dbPrefix STABLES LIKE STRING */
202, /* (28) cmd ::= SHOW dbPrefix VGROUPS */
202, /* (29) cmd ::= DROP TABLE ifexists ids cpxName */
202, /* (30) cmd ::= DROP STABLE ifexists ids cpxName */
......@@ -2449,9 +2446,9 @@ static const signed char yyRuleInfoNRhs[] = {
-5, /* (22) cmd ::= SHOW CREATE STABLE ids cpxName */
-4, /* (23) cmd ::= SHOW CREATE DATABASE ids */
-3, /* (24) cmd ::= SHOW dbPrefix TABLES */
-5, /* (25) cmd ::= SHOW dbPrefix TABLES LIKE ids */
-5, /* (25) cmd ::= SHOW dbPrefix TABLES LIKE STRING */
-3, /* (26) cmd ::= SHOW dbPrefix STABLES */
-5, /* (27) cmd ::= SHOW dbPrefix STABLES LIKE ids */
-5, /* (27) cmd ::= SHOW dbPrefix STABLES LIKE STRING */
-3, /* (28) cmd ::= SHOW dbPrefix VGROUPS */
-5, /* (29) cmd ::= DROP TABLE ifexists ids cpxName */
-5, /* (30) cmd ::= DROP STABLE ifexists ids cpxName */
......@@ -2869,7 +2866,7 @@ static YYACTIONTYPE yy_reduce(
setShowOptions(pInfo, TSDB_MGMT_TABLE_TABLE, &yymsp[-1].minor.yy0, 0);
}
break;
case 25: /* cmd ::= SHOW dbPrefix TABLES LIKE ids */
case 25: /* cmd ::= SHOW dbPrefix TABLES LIKE STRING */
{
setShowOptions(pInfo, TSDB_MGMT_TABLE_TABLE, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0);
}
......@@ -2879,7 +2876,7 @@ static YYACTIONTYPE yy_reduce(
setShowOptions(pInfo, TSDB_MGMT_TABLE_METRIC, &yymsp[-1].minor.yy0, 0);
}
break;
case 27: /* cmd ::= SHOW dbPrefix STABLES LIKE ids */
case 27: /* cmd ::= SHOW dbPrefix STABLES LIKE STRING */
{
SStrToken token;
tSetDbName(&token, &yymsp[-3].minor.yy0);
......
tests/develop-test/2-query/TD-6347.py 0 → 100644
浏览文件 @ 1ceaf9bd
###################################################################
# Copyright (c) 2021 by TAOS Technologies, Inc.
# All rights reserved.
#
# This file is proprietary and confidential to TAOS Technologies.
# No part of this file may be reproduced, stored, transmitted,
# disclosed or used in any form or by any means other than as
# expressly provided by the written permission from Jianhui Tao
#
###################################################################
# -*- coding: utf-8 -*-
import sys
from util.log import *
from util.cases import *
from util.sql import *
class TDTestCase:
def caseDescription(self):
'''
case1:[TD-6347] restrict like to be followed only by strings
'''
return
def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor(), logSql)
self._conn = conn
def run(self):
print("running {}".format(__file__))
tdSql.prepare()
tdSql.execute('create stable st_1(ts timestamp , value int ) tags (ind int)')
tdSql.execute('create stable st_2(ts timestamp , value int ) tags (ind int)')
tdSql.execute('create table tb_1 using st_1 tags(1)')
tdSql.execute('create table tb_2 using st_1 tags(2)')
tdSql.error('show tables like tb__')
tdSql.error('show stables like st__')
tdSql.query('show tables like "tb__"')
tdSql.checkRows(2)
tdSql.query('show stables like "st__"')
tdSql.checkRows(2)
def stop(self):
tdSql.close()
tdLog.success("%s successfully executed" % __file__)
tdCases.addWindows(__file__, TDTestCase())
tdCases.addLinux(__file__, TDTestCase())
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或