Skip to content

T
TDengine

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

通知 1185
Star 22015
Fork 4786
T
TDengine

体验新版 GitCode，发现更多精彩内容 >>

未验证 提交 67a94707 编写于 作者: X Xiaoyu Wang 提交者： GitHub
浏览文件
操作

Merge pull request #20104 from taosdata/feat/3.0_wxy 

enh: drop tables syntax optimization
上级 62936f22 a94fd9ec
显示空白变更内容
内联 并排
Showing with 700 addition and 598 deletion
source/dnode/mnode/impl/src/mndMain.c
浏览文件 @ 67a94707
......@@ -716,7 +716,7 @@ int32_t mndProcessRpcMsg(SRpcMsg *pMsg) {
} else if (code == 0) {
mGTrace("msg:%p, successfully processed", pMsg);
} else {
mGError("msg:%p, failed to process since %s, app:%p type:%s", pMsg, terrstr(), pMsg->info.ahandle,
mGError("msg:%p, failed to process since %s, app:%p type:%s", pMsg, tstrerror(code), pMsg->info.ahandle,
TMSG_INFO(pMsg->msgType));
}
......
source/dnode/mnode/impl/src/mndStb.c
浏览文件 @ 67a94707
......@@ -893,7 +893,7 @@ static int32_t mndProcessTtlTimer(SRpcMsg *pReq) {
static int32_t mndFindSuperTableTagIndex(const SStbObj *pStb, const char *tagName) {
for (int32_t tag = 0; tag < pStb->numOfTags; tag++) {
if (strcasecmp(pStb->pTags[tag].name, tagName) == 0) {
if (strcmp(pStb->pTags[tag].name, tagName) == 0) {
return tag;
}
}
......@@ -903,7 +903,7 @@ static int32_t mndFindSuperTableTagIndex(const SStbObj *pStb, const char *tagNam
static int32_t mndFindSuperTableColumnIndex(const SStbObj *pStb, const char *colName) {
for (int32_t col = 0; col < pStb->numOfColumns; col++) {
if (strcasecmp(pStb->pColumns[col].name, colName) == 0) {
if (strcmp(pStb->pColumns[col].name, colName) == 0) {
return col;
}
}
......
source/libs/parser/inc/sql.y
浏览文件 @ 67a94707
......@@ -301,7 +301,7 @@ create_subtable_clause(A) ::=
%type multi_drop_clause { SNodeList* }
%destructor multi_drop_clause { nodesDestroyList($$); }
multi_drop_clause(A) ::= drop_table_clause(B). { A = createNodeList(pCxt, B); }
multi_drop_clause(A) ::= multi_drop_clause(B) drop_table_clause(C). { A = addNodeToList(pCxt, B, C); }
multi_drop_clause(A) ::= multi_drop_clause(B) NK_COMMA drop_table_clause(C). { A = addNodeToList(pCxt, B, C); }
drop_table_clause(A) ::= exists_opt(B) full_table_name(C). { A = createDropTableClause(pCxt, B, C); }
......
source/libs/parser/src/sql.c
浏览文件 @ 67a94707
......@@ -139,17 +139,17 @@ typedef union {
#define ParseCTX_FETCH
#define ParseCTX_STORE
#define YYFALLBACK 1
#define YYNSTATE 742
#define YYNSTATE 743
#define YYNRULE 563
#define YYNTOKEN 328
#define YY_MAX_SHIFT 741
#define YY_MIN_SHIFTREDUCE 1101
#define YY_MAX_SHIFTREDUCE 1663
#define YY_ERROR_ACTION 1664
#define YY_ACCEPT_ACTION 1665
#define YY_NO_ACTION 1666
#define YY_MIN_REDUCE 1667
#define YY_MAX_REDUCE 2229
#define YY_MAX_SHIFT 742
#define YY_MIN_SHIFTREDUCE 1102
#define YY_MAX_SHIFTREDUCE 1664
#define YY_ERROR_ACTION 1665
#define YY_ACCEPT_ACTION 1666
#define YY_NO_ACTION 1667
#define YY_MIN_REDUCE 1668
#define YY_MAX_REDUCE 2230
/************* End control #defines *******************************************/
#define YY_NLOOKAHEAD ((int)(sizeof(yy_lookahead)/sizeof(yy_lookahead[0])))
......@@ -218,281 +218,281 @@ typedef union {
*********** Begin parsing tables **********************************************/
#define YY_ACTTAB_COUNT (2749)
static const YYACTIONTYPE yy_action[] = {
/* 0 */ 1940, 2205, 1799, 606, 481, 2200, 482, 1703, 490, 1810,
/* 10 */ 482, 1703, 45, 43, 1591, 1938, 618, 31, 176, 178,
/* 20 */ 379, 2204, 1440, 38, 37, 2201, 2203, 44, 42, 41,
/* 30 */ 40, 39, 1861, 1521, 140, 1438, 1465, 2041, 1874, 347,
/* 40 */ 1923, 2027, 38, 37, 612, 357, 44, 42, 41, 40,
/* 50 */ 39, 424, 2023, 2205, 1872, 38, 37, 2200, 1516, 44,
/* 60 */ 42, 41, 40, 39, 18, 499, 384, 1468, 2059, 1867,
/* 70 */ 1869, 1446, 1665, 2204, 167, 606, 645, 2201, 2202, 1775,
/* 80 */ 1153, 2009, 1152, 647, 45, 43, 2019, 2025, 360, 569,
/* 90 */ 1134, 330, 379, 2200, 1440, 220, 14, 641, 340, 181,
/* 100 */ 2137, 2138, 549, 138, 2142, 1521, 140, 1438, 2206, 182,
/* 110 */ 601, 1154, 2040, 2201, 595, 547, 2076, 545, 738, 324,
/* 120 */ 2042, 651, 2044, 2045, 646, 644, 641, 632, 2094, 1136,
/* 130 */ 1516, 1139, 1140, 1523, 1524, 630, 18, 480, 392, 1550,
/* 140 */ 485, 1709, 391, 1446, 1690, 1261, 673, 672, 671, 1265,
/* 150 */ 670, 1267, 1268, 669, 1270, 666, 176, 1276, 663, 1278,
/* 160 */ 1279, 660, 657, 1496, 1506, 1940, 606, 616, 14, 1522,
/* 170 */ 1525, 267, 2137, 605, 382, 133, 604, 370, 1924, 2200,
/* 180 */ 1937, 618, 161, 569, 1441, 617, 1439, 2200, 2009, 358,
/* 190 */ 738, 1823, 630, 270, 593, 182, 1551, 140, 1872, 2201,
/* 200 */ 595, 499, 2206, 182, 630, 1523, 1524, 2201, 595, 589,
/* 210 */ 1444, 1445, 247, 1495, 1498, 1499, 1500, 1501, 1502, 1503,
/* 220 */ 1504, 1505, 643, 639, 1514, 1515, 1517, 1518, 1519, 1520,
/* 230 */ 2, 61, 497, 92, 1933, 1496, 1506, 584, 106, 685,
/* 240 */ 122, 1522, 1525, 121, 120, 119, 118, 117, 116, 115,
/* 250 */ 114, 113, 141, 1595, 351, 166, 1441, 1679, 1439, 1465,
/* 260 */ 1813, 608, 180, 2137, 2138, 1464, 138, 2142, 48, 34,
/* 270 */ 377, 1545, 1546, 1547, 1548, 1549, 1553, 1554, 1555, 1556,
/* 280 */ 48, 61, 1444, 1445, 1221, 1495, 1498, 1499, 1500, 1501,
/* 290 */ 1502, 1503, 1504, 1505, 643, 639, 1514, 1515, 1517, 1518,
/* 300 */ 1519, 1520, 2, 2027, 11, 45, 43, 44, 42, 41,
/* 310 */ 40, 39, 1465, 379, 2023, 1440, 352, 741, 350, 349,
/* 320 */ 1223, 522, 590, 585, 578, 524, 1521, 1465, 1438, 489,
/* 330 */ 2041, 295, 485, 1709, 606, 35, 288, 38, 37, 602,
/* 340 */ 411, 44, 42, 41, 40, 39, 175, 523, 2019, 2025,
/* 350 */ 361, 1516, 731, 727, 723, 719, 293, 18, 86, 641,
/* 360 */ 487, 2059, 413, 409, 1446, 140, 483, 558, 416, 648,
/* 370 */ 415, 2144, 136, 1153, 2009, 1152, 647, 45, 43, 1526,
/* 380 */ 1466, 1816, 2205, 185, 11, 379, 9, 1440, 61, 14,
/* 390 */ 279, 280, 65, 107, 414, 278, 286, 2141, 1521, 1467,
/* 400 */ 1438, 633, 1497, 2101, 1154, 2040, 1736, 631, 1689, 2076,
/* 410 */ 631, 738, 168, 2042, 651, 2044, 2045, 646, 1668, 641,
/* 420 */ 185, 132, 677, 1516, 187, 1865, 1523, 1524, 520, 627,
/* 430 */ 183, 2137, 2138, 185, 138, 2142, 1446, 631, 1821, 122,
/* 440 */ 11, 1821, 121, 120, 119, 118, 117, 116, 115, 114,
/* 450 */ 113, 132, 2009, 570, 2166, 194, 1496, 1506, 525, 1874,
/* 460 */ 100, 46, 1522, 1525, 273, 635, 367, 2101, 1821, 272,
/* 470 */ 1359, 1360, 535, 534, 533, 1872, 1653, 1441, 1797, 1439,
/* 480 */ 137, 529, 1814, 738, 61, 528, 1403, 462, 241, 1904,
/* 490 */ 527, 532, 83, 1304, 1305, 82, 526, 237, 1523, 1524,
/* 500 */ 1868, 1869, 1466, 1444, 1445, 1660, 1495, 1498, 1499, 1500,
/* 510 */ 1501, 1502, 1503, 1504, 1505, 643, 639, 1514, 1515, 1517,
/* 520 */ 1518, 1519, 1520, 2, 535, 534, 533, 1446, 1496, 1506,
/* 530 */ 1667, 1874, 137, 529, 1522, 1525, 631, 528, 345, 631,
/* 540 */ 185, 685, 527, 532, 269, 198, 197, 1872, 526, 1441,
/* 550 */ 54, 1439, 617, 422, 131, 130, 129, 128, 127, 126,
/* 560 */ 125, 124, 123, 1414, 1415, 418, 676, 1821, 461, 417,
/* 570 */ 1821, 41, 40, 39, 2041, 1444, 1445, 617, 1495, 1498,
/* 580 */ 1499, 1500, 1501, 1502, 1503, 1504, 1505, 643, 639, 1514,
/* 590 */ 1515, 1517, 1518, 1519, 1520, 2, 45, 43, 1467, 615,
/* 600 */ 1919, 1933, 86, 1659, 379, 2059, 1440, 631, 594, 631,
/* 610 */ 569, 190, 2200, 648, 2200, 1376, 1377, 1521, 2009, 1438,
/* 620 */ 647, 423, 221, 432, 626, 1817, 1933, 593, 182, 2206,
/* 630 */ 182, 61, 2201, 595, 2201, 595, 185, 171, 1821, 1688,
/* 640 */ 1821, 442, 1516, 516, 512, 508, 504, 218, 631, 2040,
/* 650 */ 441, 1375, 1378, 2076, 1619, 1446, 110, 2042, 651, 2044,
/* 660 */ 2045, 646, 447, 641, 49, 371, 1531, 1687, 45, 43,
/* 670 */ 2129, 2204, 1465, 164, 2128, 2125, 379, 697, 1440, 1821,
/* 680 */ 46, 540, 1823, 2009, 87, 1686, 2144, 216, 1806, 1521,
/* 690 */ 1685, 1438, 142, 38, 37, 2100, 550, 44, 42, 41,
/* 700 */ 40, 39, 738, 581, 580, 1617, 1618, 1620, 1621, 1622,
/* 710 */ 234, 2009, 2140, 1684, 1516, 38, 37, 1523, 1524, 44,
/* 720 */ 42, 41, 40, 39, 236, 543, 33, 1446, 235, 2009,
/* 730 */ 537, 1798, 38, 37, 2009, 233, 44, 42, 41, 40,
/* 740 */ 39, 1683, 594, 269, 1552, 2144, 2200, 1496, 1506, 1874,
/* 750 */ 631, 27, 14, 1522, 1525, 215, 209, 2009, 13, 12,
/* 760 */ 214, 593, 182, 495, 448, 1873, 2201, 595, 1441, 382,
/* 770 */ 1439, 2139, 69, 1588, 738, 68, 2059, 164, 1682, 207,
/* 780 */ 1808, 1821, 1630, 185, 588, 2009, 1823, 89, 335, 1523,
/* 790 */ 1524, 356, 1977, 551, 1444, 1445, 1468, 1495, 1498, 1499,
/* 800 */ 1500, 1501, 1502, 1503, 1504, 1505, 643, 639, 1514, 1515,
/* 810 */ 1517, 1518, 1519, 1520, 2, 1497, 185, 32, 1804, 1496,
/* 820 */ 1506, 333, 2009, 1463, 683, 1522, 1525, 1557, 164, 587,
/* 830 */ 455, 709, 707, 469, 1874, 152, 468, 1824, 238, 683,
/* 840 */ 1441, 372, 1439, 154, 153, 680, 679, 678, 151, 1681,
/* 850 */ 1872, 438, 1678, 470, 1564, 675, 440, 1919, 154, 153,
/* 860 */ 680, 679, 678, 151, 531, 530, 1444, 1445, 192, 1495,
/* 870 */ 1498, 1499, 1500, 1501, 1502, 1503, 1504, 1505, 643, 639,
/* 880 */ 1514, 1515, 1517, 1518, 1519, 1520, 2, 698, 53, 1791,
/* 890 */ 631, 681, 165, 2009, 1865, 1677, 2009, 308, 348, 1733,
/* 900 */ 631, 38, 37, 1796, 498, 44, 42, 41, 40, 39,
/* 910 */ 428, 306, 72, 242, 1818, 71, 1676, 1919, 642, 38,
/* 920 */ 37, 1821, 1874, 44, 42, 41, 40, 39, 196, 383,
/* 930 */ 51, 1821, 3, 203, 477, 475, 472, 597, 1872, 2009,
/* 940 */ 466, 191, 524, 460, 459, 458, 457, 454, 453, 452,
/* 950 */ 451, 450, 446, 445, 444, 443, 332, 435, 434, 433,
/* 960 */ 2009, 430, 429, 346, 523, 715, 714, 713, 712, 389,
/* 970 */ 61, 711, 710, 144, 705, 704, 703, 702, 701, 700,
/* 980 */ 699, 156, 695, 694, 693, 388, 387, 690, 689, 688,
/* 990 */ 687, 686, 631, 631, 1675, 38, 37, 564, 2002, 44,
/* 1000 */ 42, 41, 40, 39, 1440, 631, 239, 565, 1607, 108,
/* 1010 */ 2041, 683, 1995, 631, 631, 631, 1468, 1438, 1587, 628,
/* 1020 */ 8, 1674, 1673, 1821, 1821, 1672, 1671, 629, 610, 614,
/* 1030 */ 154, 153, 680, 679, 678, 151, 1821, 682, 2009, 1465,
/* 1040 */ 1865, 2059, 1670, 569, 1821, 1821, 1821, 2200, 152, 609,
/* 1050 */ 80, 79, 421, 1446, 2009, 189, 647, 631, 163, 2041,
/* 1060 */ 399, 302, 2206, 182, 1851, 2009, 2009, 2201, 595, 2009,
/* 1070 */ 2009, 283, 598, 2027, 331, 1139, 1140, 407, 1449, 405,
/* 1080 */ 401, 397, 394, 414, 2023, 2040, 2009, 1680, 1821, 2076,
/* 1090 */ 2059, 1812, 109, 2042, 651, 2044, 2045, 646, 648, 641,
/* 1100 */ 738, 1409, 2023, 2009, 179, 647, 2129, 1776, 385, 631,
/* 1110 */ 373, 2125, 2149, 1584, 425, 638, 164, 2028, 2019, 2025,
/* 1120 */ 374, 631, 185, 386, 184, 1823, 2041, 426, 2023, 641,
/* 1130 */ 2003, 146, 2155, 134, 2040, 289, 2019, 2025, 2076, 1710,
/* 1140 */ 1821, 109, 2042, 651, 2044, 2045, 646, 641, 641, 2169,
/* 1150 */ 152, 143, 1821, 149, 2100, 2129, 245, 2059, 2041, 373,
/* 1160 */ 2125, 246, 2019, 2025, 73, 609, 1441, 2030, 1439, 1723,
/* 1170 */ 2009, 226, 647, 641, 224, 569, 1716, 228, 230, 2200,
/* 1180 */ 227, 229, 1497, 232, 1714, 553, 231, 552, 733, 2059,
/* 1190 */ 264, 536, 1444, 1445, 2206, 182, 90, 648, 538, 2201,
/* 1200 */ 595, 2040, 2009, 1412, 647, 2076, 541, 2041, 109, 2042,
/* 1210 */ 651, 2044, 2045, 646, 81, 641, 2032, 63, 63, 251,
/* 1220 */ 179, 152, 2129, 1662, 1663, 52, 373, 2125, 1584, 1452,
/* 1230 */ 47, 276, 568, 2040, 70, 13, 12, 2076, 2059, 1448,
/* 1240 */ 109, 2042, 651, 2044, 2045, 646, 648, 641, 2156, 1183,
/* 1250 */ 582, 2009, 2220, 647, 2129, 105, 150, 556, 373, 2125,
/* 1260 */ 152, 1542, 63, 47, 47, 102, 2041, 219, 258, 2163,
/* 1270 */ 1616, 1615, 253, 691, 613, 655, 150, 152, 2060, 135,
/* 1280 */ 150, 390, 2040, 1373, 281, 1184, 2076, 623, 1704, 109,
/* 1290 */ 2042, 651, 2044, 2045, 646, 1202, 641, 2059, 692, 599,
/* 1300 */ 2041, 2220, 569, 2129, 1928, 648, 2200, 373, 2125, 285,
/* 1310 */ 2009, 1862, 647, 1254, 2159, 1558, 1507, 301, 2176, 607,
/* 1320 */ 1200, 2206, 182, 263, 266, 1, 2201, 595, 1282, 1286,
/* 1330 */ 1293, 2059, 1291, 155, 4, 393, 398, 344, 1396, 648,
/* 1340 */ 296, 2040, 195, 427, 2009, 2076, 647, 1468, 109, 2042,
/* 1350 */ 651, 2044, 2045, 646, 431, 641, 1929, 464, 436, 1463,
/* 1360 */ 2220, 449, 2129, 1921, 463, 456, 373, 2125, 465, 473,
/* 1370 */ 471, 200, 474, 2041, 476, 2040, 478, 576, 1469, 2076,
/* 1380 */ 479, 488, 109, 2042, 651, 2044, 2045, 646, 1471, 641,
/* 1390 */ 1451, 491, 376, 375, 2220, 206, 2129, 1466, 492, 208,
/* 1400 */ 373, 2125, 1454, 1470, 2059, 493, 1472, 211, 494, 496,
/* 1410 */ 517, 2194, 648, 1521, 1156, 1447, 518, 2009, 213, 647,
/* 1420 */ 84, 85, 2041, 521, 500, 217, 519, 1986, 1811, 223,
/* 1430 */ 334, 1983, 1807, 112, 225, 297, 555, 88, 1516, 1982,
/* 1440 */ 559, 157, 148, 158, 1809, 557, 240, 243, 2040, 1805,
/* 1450 */ 159, 1446, 2076, 2059, 566, 109, 2042, 651, 2044, 2045,
/* 1460 */ 646, 648, 641, 160, 583, 2175, 2009, 2220, 647, 2129,
/* 1470 */ 621, 2160, 2174, 373, 2125, 573, 563, 7, 2151, 592,
/* 1480 */ 579, 2170, 362, 586, 2148, 574, 2041, 257, 572, 571,
/* 1490 */ 172, 260, 249, 259, 603, 560, 600, 2040, 637, 252,
/* 1500 */ 363, 2076, 1584, 139, 109, 2042, 651, 2044, 2045, 646,
/* 1510 */ 265, 641, 1467, 271, 2223, 2199, 2104, 2059, 2129, 262,
/* 1520 */ 611, 95, 373, 2125, 2145, 648, 1473, 298, 366, 1934,
/* 1530 */ 2009, 624, 647, 619, 299, 620, 1948, 1947, 1946, 369,
/* 1540 */ 625, 97, 99, 300, 60, 101, 2110, 1866, 653, 1822,
/* 1550 */ 292, 734, 1792, 327, 2041, 2001, 261, 336, 337, 312,
/* 1560 */ 737, 2040, 735, 303, 1455, 2076, 1450, 2000, 109, 2042,
/* 1570 */ 651, 2044, 2045, 646, 305, 641, 307, 50, 1999, 77,
/* 1580 */ 2102, 1996, 2129, 395, 2041, 2059, 373, 2125, 396, 1431,
/* 1590 */ 1458, 1460, 1432, 648, 188, 326, 316, 400, 2009, 1994,
/* 1600 */ 647, 404, 1993, 639, 1514, 1515, 1517, 1518, 1519, 1520,
/* 1610 */ 402, 403, 406, 1992, 2041, 2059, 1991, 408, 410, 1990,
/* 1620 */ 412, 78, 1399, 648, 1398, 1960, 1959, 1958, 2009, 2040,
/* 1630 */ 647, 419, 420, 2076, 1957, 1956, 109, 2042, 651, 2044,
/* 1640 */ 2045, 646, 1350, 641, 2041, 2059, 1912, 1911, 634, 1909,
/* 1650 */ 2129, 145, 1908, 648, 373, 2125, 1907, 1910, 2009, 2040,
/* 1660 */ 647, 1906, 1905, 2076, 193, 437, 110, 2042, 651, 2044,
/* 1670 */ 2045, 646, 1903, 641, 1902, 2059, 1901, 1900, 2041, 439,
/* 1680 */ 2129, 1914, 1899, 648, 636, 2125, 1898, 1897, 2009, 649,
/* 1690 */ 647, 1896, 1895, 2076, 1894, 1893, 110, 2042, 651, 2044,
/* 1700 */ 2045, 646, 1892, 641, 1891, 2041, 1890, 1889, 1888, 2059,
/* 1710 */ 2129, 1887, 1886, 1885, 339, 2125, 1884, 648, 1883, 2040,
/* 1720 */ 147, 1882, 2009, 2076, 647, 1913, 169, 2042, 651, 2044,
/* 1730 */ 2045, 646, 1881, 641, 1880, 1879, 2059, 1352, 1878, 1877,
/* 1740 */ 467, 1876, 1875, 1739, 648, 1229, 199, 1738, 201, 2009,
/* 1750 */ 1737, 647, 2029, 2040, 2041, 202, 1735, 2076, 1699, 204,
/* 1760 */ 168, 2042, 651, 2044, 2045, 646, 75, 641, 177, 1142,
/* 1770 */ 484, 1141, 1698, 486, 1973, 1967, 205, 1955, 596, 2221,
/* 1780 */ 2040, 212, 1954, 76, 2076, 2059, 1932, 110, 2042, 651,
/* 1790 */ 2044, 2045, 646, 648, 641, 1800, 1176, 1734, 2009, 210,
/* 1800 */ 647, 2129, 2167, 1732, 501, 503, 2126, 502, 1730, 506,
/* 1810 */ 507, 505, 1728, 509, 1726, 510, 2041, 1713, 513, 511,
/* 1820 */ 515, 514, 1712, 1695, 1802, 62, 1298, 1297, 1801, 2040,
/* 1830 */ 1724, 222, 706, 2076, 1220, 1219, 318, 2042, 651, 2044,
/* 1840 */ 2045, 646, 1218, 641, 1217, 1214, 708, 2059, 2041, 1212,
/* 1850 */ 1213, 1211, 1717, 353, 354, 648, 539, 1715, 355, 1694,
/* 1860 */ 2009, 542, 647, 1693, 544, 1692, 548, 111, 546, 1419,
/* 1870 */ 1421, 1972, 1418, 1405, 55, 1966, 561, 1953, 1951, 2059,
/* 1880 */ 591, 1423, 2205, 26, 368, 66, 162, 648, 16, 244,
/* 1890 */ 19, 2040, 2009, 1632, 647, 2076, 575, 2041, 169, 2042,
/* 1900 */ 651, 2044, 2045, 646, 577, 641, 567, 28, 58, 248,
/* 1910 */ 562, 359, 5, 59, 2041, 250, 1614, 170, 255, 256,
/* 1920 */ 6, 254, 20, 2040, 30, 64, 1647, 2076, 2059, 2030,
/* 1930 */ 325, 2042, 651, 2044, 2045, 646, 645, 641, 29, 21,
/* 1940 */ 1606, 2009, 1652, 647, 91, 2059, 2041, 1653, 17, 1646,
/* 1950 */ 378, 2222, 364, 648, 1651, 1650, 365, 1581, 2009, 1580,
/* 1960 */ 647, 1952, 57, 268, 1950, 56, 1949, 1931, 94, 93,
/* 1970 */ 173, 2041, 2040, 274, 1930, 96, 2076, 2059, 287, 324,
/* 1980 */ 2042, 651, 2044, 2045, 646, 648, 641, 275, 2095, 2040,
/* 1990 */ 2009, 1612, 647, 2076, 102, 2041, 325, 2042, 651, 2044,
/* 2000 */ 2045, 646, 2059, 641, 22, 277, 282, 380, 622, 67,
/* 2010 */ 648, 12, 23, 1456, 1543, 2009, 1533, 647, 174, 284,
/* 2020 */ 2041, 554, 1511, 98, 1532, 2076, 2059, 10, 320, 2042,
/* 2030 */ 651, 2044, 2045, 646, 648, 641, 2079, 640, 36, 2009,
/* 2040 */ 1509, 647, 1508, 1480, 15, 24, 2040, 186, 1488, 25,
/* 2050 */ 2076, 2059, 654, 325, 2042, 651, 2044, 2045, 646, 648,
/* 2060 */ 641, 650, 652, 381, 2009, 656, 647, 1283, 658, 659,
/* 2070 */ 2040, 661, 1280, 1277, 2076, 662, 664, 309, 2042, 651,
/* 2080 */ 2044, 2045, 646, 2041, 641, 1271, 665, 667, 1260, 1269,
/* 2090 */ 668, 674, 290, 103, 104, 2040, 1292, 1275, 1274, 2076,
/* 2100 */ 1273, 1272, 310, 2042, 651, 2044, 2045, 646, 74, 641,
/* 2110 */ 2041, 1288, 1174, 684, 2059, 1208, 1207, 1206, 1205, 291,
/* 2120 */ 1204, 1203, 648, 1201, 1227, 1199, 1198, 2009, 1197, 647,
/* 2130 */ 696, 1195, 2041, 1194, 1193, 1192, 1191, 1190, 1189, 1224,
/* 2140 */ 1222, 2059, 1186, 1185, 1182, 1181, 1180, 1179, 1731, 648,
/* 2150 */ 716, 1729, 717, 718, 2009, 720, 647, 722, 2040, 1727,
/* 2160 */ 724, 726, 2076, 2059, 721, 311, 2042, 651, 2044, 2045,
/* 2170 */ 646, 648, 641, 1725, 725, 728, 2009, 729, 647, 1711,
/* 2180 */ 730, 732, 1131, 1691, 294, 2040, 736, 740, 1442, 2076,
/* 2190 */ 304, 739, 317, 2042, 651, 2044, 2045, 646, 1666, 641,
/* 2200 */ 1666, 1666, 1666, 1666, 1666, 1666, 1666, 2040, 1666, 1666,
/* 2210 */ 1666, 2076, 2041, 1666, 321, 2042, 651, 2044, 2045, 646,
/* 2220 */ 1666, 641, 1666, 1666, 1666, 1666, 1666, 1666, 1666, 2041,
/* 2230 */ 1666, 1666, 1666, 1666, 1666, 1666, 1666, 1666, 1666, 1666,
/* 2240 */ 1666, 1666, 1666, 2059, 1666, 1666, 2041, 1666, 1666, 1666,
/* 2250 */ 1666, 648, 1666, 1666, 1666, 1666, 2009, 1666, 647, 1666,
/* 2260 */ 2059, 1666, 1666, 1666, 1666, 1666, 1666, 1666, 648, 1666,
/* 2270 */ 1666, 1666, 1666, 2009, 1666, 647, 1666, 2059, 2041, 1666,
/* 2280 */ 1666, 1666, 1666, 1666, 1666, 648, 1666, 2040, 1666, 1666,
/* 2290 */ 2009, 2076, 647, 1666, 313, 2042, 651, 2044, 2045, 646,
/* 2300 */ 1666, 641, 1666, 2041, 2040, 1666, 1666, 1666, 2076, 2059,
/* 2310 */ 1666, 322, 2042, 651, 2044, 2045, 646, 648, 641, 1666,
/* 2320 */ 1666, 2040, 2009, 1666, 647, 2076, 1666, 2041, 314, 2042,
/* 2330 */ 651, 2044, 2045, 646, 2059, 641, 1666, 1666, 1666, 1666,
/* 2340 */ 1666, 1666, 648, 1666, 1666, 1666, 1666, 2009, 1666, 647,
/* 2350 */ 1666, 1666, 2041, 2040, 1666, 1666, 1666, 2076, 2059, 1666,
/* 2360 */ 323, 2042, 651, 2044, 2045, 646, 648, 641, 1666, 1666,
/* 2370 */ 1666, 2009, 1666, 647, 1666, 1666, 1666, 1666, 2040, 1666,
/* 2380 */ 1666, 1666, 2076, 2059, 1666, 315, 2042, 651, 2044, 2045,
/* 2390 */ 646, 648, 641, 1666, 1666, 1666, 2009, 1666, 647, 1666,
/* 2400 */ 1666, 1666, 2040, 1666, 1666, 1666, 2076, 1666, 1666, 328,
/* 2410 */ 2042, 651, 2044, 2045, 646, 2041, 641, 1666, 1666, 1666,
/* 2420 */ 1666, 1666, 1666, 1666, 1666, 1666, 1666, 2040, 1666, 1666,
/* 2430 */ 1666, 2076, 1666, 1666, 329, 2042, 651, 2044, 2045, 646,
/* 2440 */ 1666, 641, 2041, 1666, 1666, 1666, 2059, 1666, 1666, 1666,
/* 2450 */ 1666, 1666, 1666, 1666, 648, 1666, 1666, 1666, 1666, 2009,
/* 2460 */ 1666, 647, 1666, 1666, 2041, 1666, 1666, 1666, 1666, 1666,
/* 2470 */ 1666, 1666, 1666, 2059, 1666, 1666, 1666, 1666, 1666, 1666,
/* 2480 */ 1666, 648, 1666, 1666, 1666, 1666, 2009, 1666, 647, 1666,
/* 2490 */ 2040, 1666, 1666, 1666, 2076, 2059, 1666, 2053, 2042, 651,
/* 2500 */ 2044, 2045, 646, 648, 641, 1666, 1666, 1666, 2009, 1666,
/* 2510 */ 647, 1666, 1666, 1666, 1666, 1666, 1666, 2040, 1666, 1666,
/* 2520 */ 1666, 2076, 1666, 1666, 2052, 2042, 651, 2044, 2045, 646,
/* 2530 */ 1666, 641, 1666, 1666, 1666, 1666, 1666, 1666, 1666, 2040,
/* 2540 */ 1666, 1666, 1666, 2076, 2041, 1666, 2051, 2042, 651, 2044,
/* 2550 */ 2045, 646, 1666, 641, 1666, 1666, 1666, 1666, 1666, 1666,
/* 2560 */ 1666, 2041, 1666, 1666, 1666, 1666, 1666, 1666, 1666, 1666,
/* 2570 */ 1666, 1666, 1666, 1666, 1666, 2059, 1666, 1666, 2041, 1666,
/* 2580 */ 1666, 1666, 1666, 648, 1666, 1666, 1666, 1666, 2009, 1666,
/* 2590 */ 647, 1666, 2059, 1666, 1666, 1666, 1666, 1666, 1666, 1666,
/* 2600 */ 648, 1666, 1666, 1666, 1666, 2009, 1666, 647, 1666, 2059,
/* 2610 */ 2041, 1666, 1666, 1666, 1666, 1666, 1666, 648, 1666, 2040,
/* 2620 */ 1666, 1666, 2009, 2076, 647, 1666, 341, 2042, 651, 2044,
/* 2630 */ 2045, 646, 1666, 641, 1666, 2041, 2040, 1666, 1666, 1666,
/* 2640 */ 2076, 2059, 1666, 342, 2042, 651, 2044, 2045, 646, 648,
/* 2650 */ 641, 1666, 1666, 2040, 2009, 1666, 647, 2076, 1666, 2041,
/* 2660 */ 338, 2042, 651, 2044, 2045, 646, 2059, 641, 1666, 1666,
/* 2670 */ 1666, 1666, 1666, 1666, 648, 1666, 1666, 1666, 1666, 2009,
/* 2680 */ 1666, 647, 1666, 1666, 1666, 2040, 1666, 1666, 1666, 2076,
/* 2690 */ 2059, 1666, 343, 2042, 651, 2044, 2045, 646, 648, 641,
/* 2700 */ 1666, 1666, 1666, 2009, 1666, 647, 1666, 1666, 1666, 1666,
/* 2710 */ 649, 1666, 1666, 1666, 2076, 1666, 1666, 320, 2042, 651,
/* 2720 */ 2044, 2045, 646, 1666, 641, 1666, 1666, 1666, 1666, 1666,
/* 2730 */ 1666, 1666, 1666, 1666, 2040, 1666, 1666, 1666, 2076, 1666,
/* 2740 */ 1666, 319, 2042, 651, 2044, 2045, 646, 1666, 641,
/* 0 */ 1941, 2206, 1798, 607, 482, 2201, 483, 1704, 491, 1811,
/* 10 */ 483, 1704, 45, 43, 1592, 1939, 619, 31, 176, 178,
/* 20 */ 380, 2205, 1441, 38, 37, 2202, 2204, 44, 42, 41,
/* 30 */ 40, 39, 1862, 1522, 139, 1439, 1466, 2042, 1875, 347,
/* 40 */ 1924, 2028, 38, 37, 613, 358, 44, 42, 41, 40,
/* 50 */ 39, 425, 2024, 2206, 1873, 38, 37, 2201, 1517, 44,
/* 60 */ 42, 41, 40, 39, 18, 686, 385, 1469, 2060, 1868,
/* 70 */ 1870, 1447, 1666, 2205, 167, 607, 646, 2202, 2203, 1776,
/* 80 */ 1154, 2010, 1153, 648, 45, 43, 2020, 2026, 361, 570,
/* 90 */ 1135, 330, 380, 2201, 1441, 220, 14, 642, 340, 181,
/* 100 */ 2138, 2139, 550, 137, 2143, 1522, 139, 1439, 2207, 182,
/* 110 */ 602, 1155, 2041, 2202, 596, 548, 2077, 546, 739, 324,
/* 120 */ 2043, 652, 2045, 2046, 647, 645, 642, 633, 2095, 1137,
/* 130 */ 1517, 1140, 1141, 1524, 1525, 631, 18, 481, 393, 1551,
/* 140 */ 486, 1710, 392, 1447, 1691, 1262, 674, 673, 672, 1266,
/* 150 */ 671, 1268, 1269, 670, 1271, 667, 176, 1277, 664, 1279,
/* 160 */ 1280, 661, 658, 1497, 1507, 1941, 607, 617, 14, 1523,
/* 170 */ 1526, 267, 2138, 606, 383, 133, 605, 371, 1925, 2201,
/* 180 */ 1938, 619, 161, 570, 1442, 618, 1440, 2201, 2010, 359,
/* 190 */ 739, 1824, 631, 270, 594, 182, 1552, 139, 1873, 2202,
/* 200 */ 596, 500, 2207, 182, 631, 1524, 1525, 2202, 596, 590,
/* 210 */ 1445, 1446, 247, 1496, 1499, 1500, 1501, 1502, 1503, 1504,
/* 220 */ 1505, 1506, 644, 640, 1515, 1516, 1518, 1519, 1520, 1521,
/* 230 */ 2, 61, 498, 92, 1934, 1497, 1507, 585, 106, 686,
/* 240 */ 122, 1523, 1526, 121, 120, 119, 118, 117, 116, 115,
/* 250 */ 114, 113, 140, 1596, 352, 166, 1442, 1680, 1440, 1466,
/* 260 */ 1814, 609, 180, 2138, 2139, 1465, 137, 2143, 48, 34,
/* 270 */ 378, 1546, 1547, 1548, 1549, 1550, 1554, 1555, 1556, 1557,
/* 280 */ 48, 61, 1445, 1446, 1222, 1496, 1499, 1500, 1501, 1502,
/* 290 */ 1503, 1504, 1505, 1506, 644, 640, 1515, 1516, 1518, 1519,
/* 300 */ 1520, 1521, 2, 2028, 11, 45, 43, 44, 42, 41,
/* 310 */ 40, 39, 1466, 380, 2024, 1441, 353, 742, 351, 350,
/* 320 */ 1224, 523, 591, 586, 579, 525, 1522, 1466, 1439, 490,
/* 330 */ 2042, 295, 486, 1710, 607, 35, 288, 38, 37, 603,
/* 340 */ 412, 44, 42, 41, 40, 39, 175, 524, 2020, 2026,
/* 350 */ 362, 1517, 732, 728, 724, 720, 293, 18, 86, 642,
/* 360 */ 488, 2060, 414, 410, 1447, 139, 484, 559, 417, 649,
/* 370 */ 416, 2145, 349, 1154, 2010, 1153, 648, 45, 43, 1527,
/* 380 */ 1467, 1817, 2206, 185, 11, 380, 9, 1441, 61, 14,
/* 390 */ 279, 280, 65, 107, 415, 278, 286, 2142, 1522, 1468,
/* 400 */ 1439, 634, 1498, 2102, 1155, 2041, 1737, 632, 1690, 2077,
/* 410 */ 632, 739, 168, 2043, 652, 2045, 2046, 647, 1669, 642,
/* 420 */ 185, 132, 678, 1517, 187, 1866, 1524, 1525, 521, 628,
/* 430 */ 183, 2138, 2139, 185, 137, 2143, 1447, 632, 1822, 122,
/* 440 */ 11, 1822, 121, 120, 119, 118, 117, 116, 115, 114,
/* 450 */ 113, 132, 2010, 571, 2167, 194, 1497, 1507, 526, 1875,
/* 460 */ 100, 46, 1523, 1526, 273, 636, 368, 2102, 1822, 272,
/* 470 */ 1360, 1361, 536, 535, 534, 1873, 1654, 1442, 2031, 1440,
/* 480 */ 136, 530, 1815, 739, 61, 529, 1404, 463, 241, 1905,
/* 490 */ 528, 533, 83, 1305, 1306, 82, 527, 237, 1524, 1525,
/* 500 */ 1869, 1870, 1467, 1445, 1446, 1661, 1496, 1499, 1500, 1501,
/* 510 */ 1502, 1503, 1504, 1505, 1506, 644, 640, 1515, 1516, 1518,
/* 520 */ 1519, 1520, 1521, 2, 536, 535, 534, 2033, 1497, 1507,
/* 530 */ 1668, 1875, 136, 530, 1523, 1526, 632, 529, 345, 632,
/* 540 */ 185, 1447, 528, 533, 269, 198, 197, 1873, 527, 1442,
/* 550 */ 54, 1440, 618, 423, 131, 130, 129, 128, 127, 126,
/* 560 */ 125, 124, 123, 1415, 1416, 419, 677, 1822, 462, 418,
/* 570 */ 1822, 41, 40, 39, 2042, 1445, 1446, 618, 1496, 1499,
/* 580 */ 1500, 1501, 1502, 1503, 1504, 1505, 1506, 644, 640, 1515,
/* 590 */ 1516, 1518, 1519, 1520, 1521, 2, 45, 43, 1468, 616,
/* 600 */ 1920, 1934, 86, 1660, 380, 2060, 1441, 632, 595, 632,
/* 610 */ 570, 190, 2201, 649, 2201, 1377, 1378, 1522, 2010, 1439,
/* 620 */ 648, 424, 221, 433, 627, 1818, 1934, 594, 182, 2207,
/* 630 */ 182, 61, 2202, 596, 2202, 596, 185, 171, 1822, 1689,
/* 640 */ 1822, 443, 1517, 517, 513, 509, 505, 218, 632, 2041,
/* 650 */ 442, 1376, 1379, 2077, 1620, 1447, 110, 2043, 652, 2045,
/* 660 */ 2046, 647, 448, 642, 49, 372, 1532, 1688, 45, 43,
/* 670 */ 2130, 2205, 1466, 164, 2129, 2126, 380, 698, 1441, 1822,
/* 680 */ 46, 541, 1824, 2010, 87, 1687, 2145, 216, 1807, 1522,
/* 690 */ 1686, 1439, 141, 38, 37, 2101, 551, 44, 42, 41,
/* 700 */ 40, 39, 739, 582, 581, 1618, 1619, 1621, 1622, 1623,
/* 710 */ 234, 2010, 2141, 1685, 1517, 38, 37, 1524, 1525, 44,
/* 720 */ 42, 41, 40, 39, 236, 544, 33, 1447, 235, 2010,
/* 730 */ 538, 1799, 38, 37, 2010, 233, 44, 42, 41, 40,
/* 740 */ 39, 1684, 595, 269, 1553, 2145, 2201, 1497, 1507, 1875,
/* 750 */ 632, 27, 14, 1523, 1526, 215, 209, 2010, 13, 12,
/* 760 */ 214, 594, 182, 496, 449, 1874, 2202, 596, 1442, 383,
/* 770 */ 1440, 2140, 69, 1589, 739, 68, 2060, 164, 1683, 207,
/* 780 */ 1809, 1822, 1631, 185, 589, 2010, 1824, 89, 335, 1524,
/* 790 */ 1525, 357, 1978, 552, 1445, 1446, 1469, 1496, 1499, 1500,
/* 800 */ 1501, 1502, 1503, 1504, 1505, 1506, 644, 640, 1515, 1516,
/* 810 */ 1518, 1519, 1520, 1521, 2, 1498, 185, 32, 1805, 1497,
/* 820 */ 1507, 333, 2010, 1464, 684, 1523, 1526, 1558, 164, 588,
/* 830 */ 456, 710, 708, 470, 1875, 152, 469, 1825, 238, 684,
/* 840 */ 1442, 373, 1440, 154, 153, 681, 680, 679, 151, 1682,
/* 850 */ 1873, 439, 1679, 471, 1565, 676, 441, 1920, 154, 153,
/* 860 */ 681, 680, 679, 151, 532, 531, 1445, 1446, 192, 1496,
/* 870 */ 1499, 1500, 1501, 1502, 1503, 1504, 1505, 1506, 644, 640,
/* 880 */ 1515, 1516, 1518, 1519, 1520, 1521, 2, 699, 53, 1792,
/* 890 */ 632, 682, 165, 2010, 1866, 1678, 2010, 308, 348, 1734,
/* 900 */ 632, 38, 37, 1797, 499, 44, 42, 41, 40, 39,
/* 910 */ 429, 306, 72, 242, 1819, 71, 1677, 1920, 643, 38,
/* 920 */ 37, 1822, 1875, 44, 42, 41, 40, 39, 196, 384,
/* 930 */ 51, 1822, 3, 203, 478, 476, 473, 598, 1873, 2010,
/* 940 */ 467, 191, 525, 461, 460, 459, 458, 455, 454, 453,
/* 950 */ 452, 451, 447, 446, 445, 444, 332, 436, 435, 434,
/* 960 */ 2010, 431, 430, 346, 524, 716, 715, 714, 713, 390,
/* 970 */ 61, 712, 711, 143, 706, 705, 704, 703, 702, 701,
/* 980 */ 700, 156, 696, 695, 694, 389, 388, 691, 690, 689,
/* 990 */ 688, 687, 632, 632, 1676, 38, 37, 565, 2003, 44,
/* 1000 */ 42, 41, 40, 39, 1441, 632, 239, 566, 1608, 108,
/* 1010 */ 2042, 684, 1996, 632, 632, 632, 1469, 1439, 1588, 629,
/* 1020 */ 8, 1675, 1674, 1822, 1822, 1673, 1672, 630, 611, 615,
/* 1030 */ 154, 153, 681, 680, 679, 151, 1822, 683, 2010, 1466,
/* 1040 */ 1866, 2060, 1671, 570, 1822, 1822, 1822, 2201, 152, 610,
/* 1050 */ 80, 79, 422, 1447, 2010, 189, 648, 632, 163, 2042,
/* 1060 */ 400, 302, 2207, 182, 1852, 2010, 2010, 2202, 596, 2010,
/* 1070 */ 2010, 283, 599, 2028, 331, 1140, 1141, 408, 1450, 406,
/* 1080 */ 402, 398, 395, 415, 2024, 2041, 2010, 1681, 1822, 2077,
/* 1090 */ 2060, 1813, 109, 2043, 652, 2045, 2046, 647, 649, 642,
/* 1100 */ 739, 1410, 2024, 2010, 179, 648, 2130, 1777, 386, 632,
/* 1110 */ 374, 2126, 2150, 1585, 426, 639, 164, 2029, 2020, 2026,
/* 1120 */ 375, 632, 185, 387, 184, 1824, 2042, 427, 2024, 642,
/* 1130 */ 2004, 145, 2156, 134, 2041, 289, 2020, 2026, 2077, 1800,
/* 1140 */ 1822, 109, 2043, 652, 2045, 2046, 647, 642, 642, 52,
/* 1150 */ 152, 142, 1822, 149, 2101, 2130, 569, 2060, 2042, 374,
/* 1160 */ 2126, 246, 2020, 2026, 73, 610, 1442, 1711, 1440, 1724,
/* 1170 */ 2010, 226, 648, 642, 224, 570, 1717, 228, 230, 2201,
/* 1180 */ 227, 229, 1498, 147, 232, 245, 554, 231, 553, 2060,
/* 1190 */ 2170, 537, 1445, 1446, 2207, 182, 1715, 649, 539, 2202,
/* 1200 */ 596, 2041, 2010, 1413, 648, 2077, 1449, 2042, 109, 2043,
/* 1210 */ 652, 2045, 2046, 647, 81, 642, 734, 63, 542, 63,
/* 1220 */ 179, 251, 2130, 1663, 1664, 90, 374, 2126, 1585, 1453,
/* 1230 */ 152, 47, 276, 2041, 70, 13, 12, 2077, 2060, 105,
/* 1240 */ 109, 2043, 652, 2045, 2046, 647, 649, 642, 2157, 102,
/* 1250 */ 264, 2010, 2221, 648, 2130, 583, 150, 557, 374, 2126,
/* 1260 */ 152, 1543, 63, 47, 47, 219, 2042, 258, 2061, 2164,
/* 1270 */ 1617, 656, 1616, 692, 253, 150, 152, 135, 1184, 150,
/* 1280 */ 391, 1929, 2041, 614, 1374, 281, 2077, 624, 1705, 109,
/* 1290 */ 2043, 652, 2045, 2046, 647, 1203, 642, 2060, 693, 600,
/* 1300 */ 2042, 2221, 570, 2130, 1863, 649, 2201, 374, 2126, 285,
/* 1310 */ 2010, 2160, 648, 1255, 1185, 1559, 1508, 301, 2177, 608,
/* 1320 */ 1201, 2207, 182, 263, 1283, 266, 2202, 596, 1287, 1294,
/* 1330 */ 1292, 2060, 155, 1, 399, 4, 394, 296, 344, 649,
/* 1340 */ 1397, 2041, 195, 428, 2010, 2077, 648, 1469, 109, 2043,
/* 1350 */ 652, 2045, 2046, 647, 432, 642, 1930, 1452, 437, 465,
/* 1360 */ 2221, 1464, 2130, 450, 1922, 457, 374, 2126, 464, 466,
/* 1370 */ 472, 474, 200, 2042, 475, 2041, 477, 577, 479, 2077,
/* 1380 */ 1470, 480, 109, 2043, 652, 2045, 2046, 647, 489, 642,
/* 1390 */ 1472, 206, 377, 376, 2221, 492, 2130, 1467, 493, 208,
/* 1400 */ 374, 2126, 1455, 1471, 2060, 494, 1473, 211, 495, 497,
/* 1410 */ 1157, 2195, 649, 1522, 518, 1448, 519, 2010, 213, 648,
/* 1420 */ 84, 85, 2042, 522, 217, 501, 520, 1987, 1812, 223,
/* 1430 */ 1808, 334, 225, 112, 1984, 1983, 556, 558, 1517, 88,
/* 1440 */ 240, 148, 157, 158, 1810, 1806, 297, 560, 2041, 159,
/* 1450 */ 160, 1447, 2077, 2060, 243, 109, 2043, 652, 2045, 2046,
/* 1460 */ 647, 649, 642, 561, 567, 584, 2010, 2221, 648, 2130,
/* 1470 */ 622, 2176, 564, 374, 2126, 2175, 574, 580, 593, 363,
/* 1480 */ 587, 2161, 575, 7, 2149, 2171, 2042, 2152, 573, 249,
/* 1490 */ 172, 257, 259, 252, 260, 572, 261, 2041, 638, 364,
/* 1500 */ 604, 2077, 2224, 1585, 109, 2043, 652, 2045, 2046, 647,
/* 1510 */ 601, 642, 138, 1468, 265, 262, 2105, 2060, 2130, 612,
/* 1520 */ 2200, 2146, 374, 2126, 367, 649, 271, 1474, 95, 1935,
/* 1530 */ 2010, 620, 648, 625, 298, 621, 1949, 1948, 1947, 299,
/* 1540 */ 370, 626, 97, 99, 1823, 60, 2111, 300, 101, 303,
/* 1550 */ 1793, 292, 735, 1867, 2042, 327, 736, 654, 738, 336,
/* 1560 */ 312, 2041, 326, 50, 1456, 2077, 1451, 316, 109, 2043,
/* 1570 */ 652, 2045, 2046, 647, 305, 642, 307, 2002, 2001, 2000,
/* 1580 */ 2103, 77, 2130, 337, 2042, 2060, 374, 2126, 1997, 396,
/* 1590 */ 1459, 1461, 397, 649, 1432, 1433, 188, 401, 2010, 1995,
/* 1600 */ 648, 405, 403, 640, 1515, 1516, 1518, 1519, 1520, 1521,
/* 1610 */ 404, 1994, 407, 1993, 2042, 2060, 409, 1992, 411, 1991,
/* 1620 */ 413, 78, 1400, 649, 1399, 1961, 1960, 1959, 2010, 2041,
/* 1630 */ 648, 420, 421, 2077, 1958, 1957, 109, 2043, 652, 2045,
/* 1640 */ 2046, 647, 1351, 642, 2042, 2060, 1913, 1912, 635, 1910,
/* 1650 */ 2130, 144, 1909, 649, 374, 2126, 1908, 1911, 2010, 2041,
/* 1660 */ 648, 1907, 1906, 2077, 193, 438, 110, 2043, 652, 2045,
/* 1670 */ 2046, 647, 1904, 642, 1903, 2060, 1902, 1901, 2042, 440,
/* 1680 */ 2130, 1915, 1900, 649, 637, 2126, 1899, 1898, 2010, 650,
/* 1690 */ 648, 1897, 1896, 2077, 1895, 1894, 110, 2043, 652, 2045,
/* 1700 */ 2046, 647, 1893, 642, 1892, 2042, 1891, 1890, 1889, 2060,
/* 1710 */ 2130, 1888, 1887, 1886, 339, 2126, 1885, 649, 1884, 2041,
/* 1720 */ 146, 1883, 2010, 2077, 648, 1914, 169, 2043, 652, 2045,
/* 1730 */ 2046, 647, 1882, 642, 1881, 1880, 2060, 1353, 1879, 1878,
/* 1740 */ 468, 1877, 1876, 1740, 649, 1230, 199, 1739, 201, 2010,
/* 1750 */ 1738, 648, 2030, 2041, 2042, 202, 1736, 2077, 1700, 204,
/* 1760 */ 168, 2043, 652, 2045, 2046, 647, 75, 642, 177, 1143,
/* 1770 */ 485, 1142, 1699, 487, 1974, 1968, 205, 1956, 597, 2222,
/* 1780 */ 2041, 212, 1955, 76, 2077, 2060, 1933, 110, 2043, 652,
/* 1790 */ 2045, 2046, 647, 649, 642, 1801, 1177, 1735, 2010, 210,
/* 1800 */ 648, 2130, 2168, 1733, 502, 504, 2127, 503, 1731, 507,
/* 1810 */ 508, 506, 1729, 510, 1727, 511, 2042, 1714, 514, 512,
/* 1820 */ 516, 515, 1713, 1696, 1803, 62, 1299, 1298, 1802, 2041,
/* 1830 */ 1725, 222, 707, 2077, 1221, 1220, 318, 2043, 652, 2045,
/* 1840 */ 2046, 647, 1219, 642, 1218, 1215, 709, 2060, 2042, 1213,
/* 1850 */ 1214, 1212, 1718, 354, 355, 649, 540, 1716, 356, 1695,
/* 1860 */ 2010, 543, 648, 1694, 545, 1693, 549, 111, 547, 1420,
/* 1870 */ 1422, 1973, 1419, 1406, 55, 1967, 562, 1954, 1952, 2060,
/* 1880 */ 592, 1424, 2206, 26, 369, 66, 162, 649, 16, 244,
/* 1890 */ 19, 2041, 2010, 1633, 648, 2077, 576, 2042, 169, 2043,
/* 1900 */ 652, 2045, 2046, 647, 578, 642, 568, 28, 58, 248,
/* 1910 */ 563, 360, 5, 59, 2042, 250, 1615, 170, 255, 256,
/* 1920 */ 6, 254, 20, 2041, 30, 64, 1648, 2077, 2060, 2031,
/* 1930 */ 325, 2043, 652, 2045, 2046, 647, 646, 642, 29, 21,
/* 1940 */ 1607, 2010, 1653, 648, 91, 2060, 2042, 1654, 17, 1647,
/* 1950 */ 379, 2223, 365, 649, 1652, 1651, 366, 1582, 2010, 1581,
/* 1960 */ 648, 1953, 57, 268, 1951, 56, 1950, 1932, 94, 93,
/* 1970 */ 173, 2042, 2041, 274, 1931, 96, 2077, 2060, 287, 324,
/* 1980 */ 2043, 652, 2045, 2046, 647, 649, 642, 275, 2096, 2041,
/* 1990 */ 2010, 1613, 648, 2077, 102, 2042, 325, 2043, 652, 2045,
/* 2000 */ 2046, 647, 2060, 642, 22, 277, 282, 381, 623, 67,
/* 2010 */ 649, 12, 23, 1457, 1544, 2010, 1534, 648, 174, 284,
/* 2020 */ 2042, 555, 1512, 98, 1533, 2077, 2060, 10, 320, 2043,
/* 2030 */ 652, 2045, 2046, 647, 649, 642, 2080, 641, 36, 2010,
/* 2040 */ 1510, 648, 1509, 1481, 15, 24, 2041, 186, 1489, 25,
/* 2050 */ 2077, 2060, 655, 325, 2043, 652, 2045, 2046, 647, 649,
/* 2060 */ 642, 651, 653, 382, 2010, 657, 648, 1284, 659, 660,
/* 2070 */ 2041, 662, 1281, 1278, 2077, 663, 665, 309, 2043, 652,
/* 2080 */ 2045, 2046, 647, 2042, 642, 1272, 666, 668, 1261, 1270,
/* 2090 */ 669, 675, 290, 103, 104, 2041, 1293, 1276, 1275, 2077,
/* 2100 */ 1274, 1273, 310, 2043, 652, 2045, 2046, 647, 74, 642,
/* 2110 */ 2042, 1289, 1175, 685, 2060, 1209, 1208, 1207, 1206, 291,
/* 2120 */ 1205, 1204, 649, 1202, 1228, 1200, 1199, 2010, 1198, 648,
/* 2130 */ 697, 1196, 2042, 1195, 1194, 1193, 1192, 1191, 1190, 1225,
/* 2140 */ 1223, 2060, 1187, 1186, 1183, 1182, 1181, 1180, 1732, 649,
/* 2150 */ 717, 1730, 718, 719, 2010, 721, 648, 723, 2041, 1728,
/* 2160 */ 725, 727, 2077, 2060, 722, 311, 2043, 652, 2045, 2046,
/* 2170 */ 647, 649, 642, 1726, 726, 729, 2010, 730, 648, 1712,
/* 2180 */ 731, 733, 1132, 1692, 294, 2041, 737, 741, 1443, 2077,
/* 2190 */ 304, 740, 317, 2043, 652, 2045, 2046, 647, 1667, 642,
/* 2200 */ 1667, 1667, 1667, 1667, 1667, 1667, 1667, 2041, 1667, 1667,
/* 2210 */ 1667, 2077, 2042, 1667, 321, 2043, 652, 2045, 2046, 647,
/* 2220 */ 1667, 642, 1667, 1667, 1667, 1667, 1667, 1667, 1667, 2042,
/* 2230 */ 1667, 1667, 1667, 1667, 1667, 1667, 1667, 1667, 1667, 1667,
/* 2240 */ 1667, 1667, 1667, 2060, 1667, 1667, 2042, 1667, 1667, 1667,
/* 2250 */ 1667, 649, 1667, 1667, 1667, 1667, 2010, 1667, 648, 1667,
/* 2260 */ 2060, 1667, 1667, 1667, 1667, 1667, 1667, 1667, 649, 1667,
/* 2270 */ 1667, 1667, 1667, 2010, 1667, 648, 1667, 2060, 2042, 1667,
/* 2280 */ 1667, 1667, 1667, 1667, 1667, 649, 1667, 2041, 1667, 1667,
/* 2290 */ 2010, 2077, 648, 1667, 313, 2043, 652, 2045, 2046, 647,
/* 2300 */ 1667, 642, 1667, 2042, 2041, 1667, 1667, 1667, 2077, 2060,
/* 2310 */ 1667, 322, 2043, 652, 2045, 2046, 647, 649, 642, 1667,
/* 2320 */ 1667, 2041, 2010, 1667, 648, 2077, 1667, 2042, 314, 2043,
/* 2330 */ 652, 2045, 2046, 647, 2060, 642, 1667, 1667, 1667, 1667,
/* 2340 */ 1667, 1667, 649, 1667, 1667, 1667, 1667, 2010, 1667, 648,
/* 2350 */ 1667, 1667, 2042, 2041, 1667, 1667, 1667, 2077, 2060, 1667,
/* 2360 */ 323, 2043, 652, 2045, 2046, 647, 649, 642, 1667, 1667,
/* 2370 */ 1667, 2010, 1667, 648, 1667, 1667, 1667, 1667, 2041, 1667,
/* 2380 */ 1667, 1667, 2077, 2060, 1667, 315, 2043, 652, 2045, 2046,
/* 2390 */ 647, 649, 642, 1667, 1667, 1667, 2010, 1667, 648, 1667,
/* 2400 */ 1667, 1667, 2041, 1667, 1667, 1667, 2077, 1667, 1667, 328,
/* 2410 */ 2043, 652, 2045, 2046, 647, 2042, 642, 1667, 1667, 1667,
/* 2420 */ 1667, 1667, 1667, 1667, 1667, 1667, 1667, 2041, 1667, 1667,
/* 2430 */ 1667, 2077, 1667, 1667, 329, 2043, 652, 2045, 2046, 647,
/* 2440 */ 1667, 642, 2042, 1667, 1667, 1667, 2060, 1667, 1667, 1667,
/* 2450 */ 1667, 1667, 1667, 1667, 649, 1667, 1667, 1667, 1667, 2010,
/* 2460 */ 1667, 648, 1667, 1667, 2042, 1667, 1667, 1667, 1667, 1667,
/* 2470 */ 1667, 1667, 1667, 2060, 1667, 1667, 1667, 1667, 1667, 1667,
/* 2480 */ 1667, 649, 1667, 1667, 1667, 1667, 2010, 1667, 648, 1667,
/* 2490 */ 2041, 1667, 1667, 1667, 2077, 2060, 1667, 2054, 2043, 652,
/* 2500 */ 2045, 2046, 647, 649, 642, 1667, 1667, 1667, 2010, 1667,
/* 2510 */ 648, 1667, 1667, 1667, 1667, 1667, 1667, 2041, 1667, 1667,
/* 2520 */ 1667, 2077, 1667, 1667, 2053, 2043, 652, 2045, 2046, 647,
/* 2530 */ 1667, 642, 1667, 1667, 1667, 1667, 1667, 1667, 1667, 2041,
/* 2540 */ 1667, 1667, 1667, 2077, 2042, 1667, 2052, 2043, 652, 2045,
/* 2550 */ 2046, 647, 1667, 642, 1667, 1667, 1667, 1667, 1667, 1667,
/* 2560 */ 1667, 2042, 1667, 1667, 1667, 1667, 1667, 1667, 1667, 1667,
/* 2570 */ 1667, 1667, 1667, 1667, 1667, 2060, 1667, 1667, 2042, 1667,
/* 2580 */ 1667, 1667, 1667, 649, 1667, 1667, 1667, 1667, 2010, 1667,
/* 2590 */ 648, 1667, 2060, 1667, 1667, 1667, 1667, 1667, 1667, 1667,
/* 2600 */ 649, 1667, 1667, 1667, 1667, 2010, 1667, 648, 1667, 2060,
/* 2610 */ 2042, 1667, 1667, 1667, 1667, 1667, 1667, 649, 1667, 2041,
/* 2620 */ 1667, 1667, 2010, 2077, 648, 1667, 341, 2043, 652, 2045,
/* 2630 */ 2046, 647, 1667, 642, 1667, 2042, 2041, 1667, 1667, 1667,
/* 2640 */ 2077, 2060, 1667, 342, 2043, 652, 2045, 2046, 647, 649,
/* 2650 */ 642, 1667, 1667, 2041, 2010, 1667, 648, 2077, 1667, 2042,
/* 2660 */ 338, 2043, 652, 2045, 2046, 647, 2060, 642, 1667, 1667,
/* 2670 */ 1667, 1667, 1667, 1667, 649, 1667, 1667, 1667, 1667, 2010,
/* 2680 */ 1667, 648, 1667, 1667, 1667, 2041, 1667, 1667, 1667, 2077,
/* 2690 */ 2060, 1667, 343, 2043, 652, 2045, 2046, 647, 649, 642,
/* 2700 */ 1667, 1667, 1667, 2010, 1667, 648, 1667, 1667, 1667, 1667,
/* 2710 */ 650, 1667, 1667, 1667, 2077, 1667, 1667, 320, 2043, 652,
/* 2720 */ 2045, 2046, 647, 1667, 642, 1667, 1667, 1667, 1667, 1667,
/* 2730 */ 1667, 1667, 1667, 1667, 2041, 1667, 1667, 1667, 2077, 1667,
/* 2740 */ 1667, 319, 2043, 652, 2045, 2046, 647, 1667, 642,
};
static const YYCODETYPE yy_lookahead[] = {
/* 0 */ 377, 439, 0, 339, 335, 443, 337, 338, 335, 363,
......@@ -542,14 +542,14 @@ static const YYCODETYPE yy_lookahead[] = {
/* 440 */ 232, 370, 24, 25, 26, 27, 28, 29, 30, 31,
/* 450 */ 32, 353, 375, 454, 455, 58, 163, 164, 360, 362,
/* 460 */ 343, 96, 169, 170, 166, 424, 369, 426, 370, 171,
/* 470 */ 163, 164, 66, 67, 68, 378, 97, 184, 0, 186,
/* 470 */ 163, 164, 66, 67, 68, 378, 97, 184, 47, 186,
/* 480 */ 74, 75, 365, 118, 96, 79, 188, 80, 190, 0,
/* 490 */ 84, 85, 95, 133, 134, 98, 90, 127, 133, 134,
/* 500 */ 376, 377, 20, 210, 211, 176, 213, 214, 215, 216,
/* 510 */ 217, 218, 219, 220, 221, 222, 223, 224, 225, 226,
/* 520 */ 227, 228, 229, 230, 66, 67, 68, 71, 163, 164,
/* 520 */ 227, 228, 229, 230, 66, 67, 68, 96, 163, 164,
/* 530 */ 0, 362, 74, 75, 169, 170, 339, 79, 369, 339,
/* 540 */ 248, 63, 84, 85, 165, 138, 139, 378, 90, 184,
/* 540 */ 248, 71, 84, 85, 165, 138, 139, 378, 90, 184,
/* 550 */ 353, 186, 339, 353, 24, 25, 26, 27, 28, 29,
/* 560 */ 30, 31, 32, 193, 194, 394, 107, 370, 161, 398,
/* 570 */ 370, 14, 15, 16, 331, 210, 211, 339, 213, 214,
......@@ -609,54 +609,54 @@ static const YYCODETYPE yy_lookahead[] = {
/* 1110 */ 431, 432, 246, 247, 22, 64, 362, 364, 409, 410,
/* 1120 */ 411, 339, 248, 353, 445, 371, 331, 35, 375, 420,
/* 1130 */ 394, 42, 453, 44, 406, 353, 409, 410, 410, 0,
/* 1140 */ 370, 413, 414, 415, 416, 417, 418, 420, 420, 385,
/* 1150 */ 44, 423, 370, 425, 426, 427, 58, 362, 331, 431,
/* 1160 */ 432, 165, 409, 410, 107, 370, 184, 47, 186, 0,
/* 1140 */ 370, 413, 414, 415, 416, 417, 418, 420, 420, 165,
/* 1150 */ 44, 423, 370, 425, 426, 427, 172, 362, 331, 431,
/* 1160 */ 432, 165, 409, 410, 107, 370, 184, 0, 186, 0,
/* 1170 */ 375, 100, 377, 420, 103, 439, 0, 100, 100, 443,
/* 1180 */ 103, 103, 163, 100, 0, 196, 103, 198, 49, 362,
/* 1190 */ 467, 22, 210, 211, 458, 459, 98, 370, 22, 463,
/* 1200 */ 464, 406, 375, 97, 377, 410, 22, 331, 413, 414,
/* 1210 */ 415, 416, 417, 418, 157, 420, 96, 44, 44, 44,
/* 1220 */ 425, 44, 427, 133, 134, 165, 431, 432, 247, 186,
/* 1230 */ 44, 44, 172, 406, 44, 1, 2, 410, 362, 35,
/* 1240 */ 413, 414, 415, 416, 417, 418, 370, 420, 453, 35,
/* 1250 */ 456, 375, 425, 377, 427, 96, 44, 394, 431, 432,
/* 1260 */ 44, 210, 44, 44, 44, 106, 331, 341, 450, 442,
/* 1270 */ 97, 97, 97, 13, 97, 44, 44, 44, 362, 44,
/* 1280 */ 44, 341, 406, 97, 97, 71, 410, 97, 338, 413,
/* 1180 */ 103, 103, 163, 44, 100, 58, 196, 103, 198, 362,
/* 1190 */ 385, 22, 210, 211, 458, 459, 0, 370, 22, 463,
/* 1200 */ 464, 406, 375, 97, 377, 410, 35, 331, 413, 414,
/* 1210 */ 415, 416, 417, 418, 157, 420, 49, 44, 22, 44,
/* 1220 */ 425, 44, 427, 133, 134, 98, 431, 432, 247, 186,
/* 1230 */ 44, 44, 44, 406, 44, 1, 2, 410, 362, 96,
/* 1240 */ 413, 414, 415, 416, 417, 418, 370, 420, 453, 106,
/* 1250 */ 467, 375, 425, 377, 427, 456, 44, 394, 431, 432,
/* 1260 */ 44, 210, 44, 44, 44, 341, 331, 450, 362, 442,
/* 1270 */ 97, 44, 97, 13, 97, 44, 44, 44, 35, 44,
/* 1280 */ 341, 385, 406, 97, 97, 97, 410, 97, 338, 413,
/* 1290 */ 414, 415, 416, 417, 418, 35, 420, 362, 13, 271,
/* 1300 */ 331, 425, 439, 427, 385, 370, 443, 431, 432, 97,
/* 1310 */ 375, 374, 377, 97, 385, 97, 97, 97, 442, 441,
/* 1320 */ 35, 458, 459, 433, 460, 444, 463, 464, 97, 97,
/* 1330 */ 97, 362, 97, 97, 250, 408, 48, 407, 182, 370,
/* 1340 */ 396, 406, 42, 382, 375, 410, 377, 20, 413, 414,
/* 1350 */ 415, 416, 417, 418, 382, 420, 385, 162, 380, 20,
/* 1360 */ 425, 339, 427, 339, 380, 382, 431, 432, 380, 94,
/* 1370 */ 339, 339, 347, 331, 339, 406, 339, 442, 20, 410,
/* 1380 */ 333, 333, 413, 414, 415, 416, 417, 418, 20, 420,
/* 1390 */ 186, 401, 12, 13, 425, 345, 427, 20, 377, 345,
/* 1300 */ 331, 425, 439, 427, 374, 370, 443, 431, 432, 97,
/* 1310 */ 375, 385, 377, 97, 71, 97, 97, 97, 442, 441,
/* 1320 */ 35, 458, 459, 433, 97, 460, 463, 464, 97, 97,
/* 1330 */ 97, 362, 97, 444, 48, 250, 408, 396, 407, 370,
/* 1340 */ 182, 406, 42, 382, 375, 410, 377, 20, 413, 414,
/* 1350 */ 415, 416, 417, 418, 382, 420, 385, 186, 380, 162,
/* 1360 */ 425, 20, 427, 339, 339, 382, 431, 432, 380, 380,
/* 1370 */ 339, 94, 339, 331, 347, 406, 339, 442, 339, 410,
/* 1380 */ 20, 333, 413, 414, 415, 416, 417, 418, 333, 420,
/* 1390 */ 20, 345, 12, 13, 425, 401, 427, 20, 377, 345,
/* 1400 */ 431, 432, 22, 20, 362, 340, 20, 345, 395, 340,
/* 1410 */ 342, 442, 370, 33, 52, 35, 342, 375, 345, 377,
/* 1420 */ 345, 345, 331, 362, 339, 345, 333, 375, 362, 362,
/* 1430 */ 333, 375, 362, 339, 362, 401, 199, 96, 58, 375,
/* 1440 */ 189, 362, 403, 362, 362, 405, 343, 343, 406, 362,
/* 1450 */ 362, 71, 410, 362, 339, 413, 414, 415, 416, 417,
/* 1460 */ 418, 370, 420, 362, 258, 449, 375, 425, 377, 427,
/* 1470 */ 257, 385, 449, 431, 432, 375, 377, 266, 452, 175,
/* 1480 */ 375, 385, 375, 375, 442, 268, 331, 451, 267, 251,
/* 1490 */ 449, 447, 390, 448, 272, 400, 270, 406, 118, 390,
/* 1500 */ 275, 410, 247, 370, 413, 414, 415, 416, 417, 418,
/* 1510 */ 461, 420, 20, 343, 468, 462, 425, 362, 427, 408,
/* 1520 */ 339, 343, 431, 432, 412, 370, 20, 390, 340, 388,
/* 1530 */ 375, 167, 377, 375, 390, 375, 375, 375, 375, 375,
/* 1540 */ 387, 343, 343, 358, 96, 96, 430, 375, 366, 370,
/* 1550 */ 343, 36, 352, 402, 331, 0, 446, 391, 391, 356,
/* 1560 */ 333, 406, 334, 339, 184, 410, 186, 0, 413, 414,
/* 1570 */ 415, 416, 417, 418, 344, 420, 329, 397, 0, 42,
/* 1580 */ 425, 0, 427, 35, 331, 362, 431, 432, 204, 35,
/* 1590 */ 210, 211, 35, 370, 35, 356, 356, 204, 375, 0,
/* 1600 */ 377, 204, 0, 223, 224, 225, 226, 227, 228, 229,
/* 1610 */ 35, 35, 204, 0, 331, 362, 0, 35, 22, 0,
/* 1410 */ 52, 442, 370, 33, 342, 35, 342, 375, 345, 377,
/* 1420 */ 345, 345, 331, 362, 345, 339, 333, 375, 362, 362,
/* 1430 */ 362, 333, 362, 339, 375, 375, 199, 405, 58, 96,
/* 1440 */ 343, 403, 362, 362, 362, 362, 401, 189, 406, 362,
/* 1450 */ 362, 71, 410, 362, 343, 413, 414, 415, 416, 417,
/* 1460 */ 418, 370, 420, 400, 339, 258, 375, 425, 377, 427,
/* 1470 */ 257, 449, 377, 431, 432, 449, 375, 375, 175, 375,
/* 1480 */ 375, 385, 268, 266, 442, 385, 331, 452, 267, 390,
/* 1490 */ 449, 451, 448, 390, 447, 251, 446, 406, 118, 275,
/* 1500 */ 272, 410, 468, 247, 413, 414, 415, 416, 417, 418,
/* 1510 */ 270, 420, 370, 20, 461, 408, 425, 362, 427, 339,
/* 1520 */ 462, 412, 431, 432, 340, 370, 343, 20, 343, 388,
/* 1530 */ 375, 375, 377, 167, 390, 375, 375, 375, 375, 390,
/* 1540 */ 375, 387, 343, 343, 370, 96, 430, 358, 96, 339,
/* 1550 */ 352, 343, 36, 375, 331, 402, 334, 366, 333, 391,
/* 1560 */ 356, 406, 356, 397, 184, 410, 186, 356, 413, 414,
/* 1570 */ 415, 416, 417, 418, 344, 420, 329, 0, 0, 0,
/* 1580 */ 425, 42, 427, 391, 331, 362, 431, 432, 0, 35,
/* 1590 */ 210, 211, 204, 370, 35, 35, 35, 204, 375, 0,
/* 1600 */ 377, 204, 35, 223, 224, 225, 226, 227, 228, 229,
/* 1610 */ 35, 0, 204, 0, 331, 362, 35, 0, 22, 0,
/* 1620 */ 35, 191, 186, 370, 184, 0, 0, 0, 375, 406,
/* 1630 */ 377, 180, 179, 410, 0, 0, 413, 414, 415, 416,
/* 1640 */ 417, 418, 47, 420, 331, 362, 0, 0, 425, 0,
......@@ -771,7 +771,7 @@ static const YYCODETYPE yy_lookahead[] = {
/* 2730 */ 469, 469, 469, 469, 406, 469, 469, 469, 410, 469,
/* 2740 */ 469, 413, 414, 415, 416, 417, 418, 469, 420,
};
#define YY_SHIFT_COUNT (741)
#define YY_SHIFT_COUNT (742)
#define YY_SHIFT_MIN (0)
#define YY_SHIFT_MAX (2183)
static const unsigned short int yy_shift_ofst[] = {
......@@ -788,68 +788,68 @@ static const unsigned short int yy_shift_ofst[] = {
/* 100 */ 115, 16, 115, 16, 16, 16, 115, 176, 803, 34,
/* 110 */ 34, 219, 458, 982, 982, 982, 982, 982, 982, 982,
/* 120 */ 982, 982, 982, 982, 982, 982, 982, 982, 982, 982,
/* 130 */ 982, 982, 217, 379, 307, 360, 2, 249, 578, 578,
/* 140 */ 578, 478, 152, 152, 249, 245, 245, 245, 260, 208,
/* 150 */ 16, 456, 16, 456, 456, 459, 606, 36, 36, 36,
/* 130 */ 982, 982, 217, 379, 307, 360, 249, 578, 578, 578,
/* 140 */ 2, 152, 152, 249, 245, 245, 245, 138, 260, 208,
/* 150 */ 16, 470, 16, 470, 470, 459, 606, 36, 36, 36,
/* 160 */ 36, 36, 36, 36, 36, 298, 418, 406, 47, 329,
/* 170 */ 444, 60, 69, 239, 652, 353, 776, 1030, 834, 996,
/* 180 */ 866, 981, 668, 866, 888, 769, 1019, 1084, 1288, 1156,
/* 190 */ 1300, 1327, 1300, 1195, 1339, 1339, 1300, 1195, 1195, 1339,
/* 200 */ 1275, 1339, 1339, 1339, 1358, 1358, 1368, 138, 1377, 138,
/* 210 */ 1383, 1386, 138, 1383, 138, 138, 138, 1339, 138, 1362,
/* 220 */ 1362, 1358, 16, 16, 16, 16, 16, 16, 16, 16,
/* 230 */ 16, 16, 16, 1339, 1358, 456, 456, 456, 1237, 1341,
/* 240 */ 1368, 176, 1251, 1377, 176, 1339, 1327, 1327, 456, 1206,
/* 250 */ 1213, 456, 1206, 1213, 456, 456, 16, 1211, 1304, 1206,
/* 260 */ 1217, 1221, 1238, 1084, 1225, 1222, 1226, 1255, 245, 1492,
/* 270 */ 1339, 1383, 176, 176, 1506, 1213, 456, 456, 456, 456,
/* 280 */ 456, 1213, 456, 1364, 176, 459, 176, 245, 1448, 1449,
/* 290 */ 456, 606, 1339, 176, 1515, 1358, 2749, 2749, 2749, 2749,
/* 180 */ 866, 981, 668, 866, 888, 769, 1019, 1085, 1286, 1158,
/* 190 */ 1300, 1327, 1300, 1197, 1341, 1341, 1300, 1197, 1197, 1341,
/* 200 */ 1277, 1341, 1341, 1341, 1360, 1360, 1370, 138, 1377, 138,
/* 210 */ 1383, 1386, 138, 1383, 138, 138, 138, 1341, 138, 1358,
/* 220 */ 1358, 1360, 16, 16, 16, 16, 16, 16, 16, 16,
/* 230 */ 16, 16, 16, 1341, 1360, 470, 470, 470, 1237, 1343,
/* 240 */ 1370, 176, 1258, 1377, 176, 1341, 1327, 1327, 470, 1207,
/* 250 */ 1213, 470, 1207, 1213, 470, 470, 16, 1217, 1303, 1207,
/* 260 */ 1214, 1221, 1244, 1085, 1224, 1228, 1240, 1256, 245, 1493,
/* 270 */ 1341, 1383, 176, 176, 1507, 1213, 470, 470, 470, 470,
/* 280 */ 470, 1213, 470, 1366, 176, 459, 176, 245, 1449, 1452,
/* 290 */ 470, 606, 1341, 176, 1516, 1360, 2749, 2749, 2749, 2749,
/* 300 */ 2749, 2749, 2749, 2749, 2749, 899, 589, 530, 677, 685,
/* 310 */ 707, 911, 731, 15, 724, 893, 903, 987, 987, 987,
/* 320 */ 987, 987, 987, 987, 987, 987, 716, 596, 295, 295,
/* 330 */ 407, 161, 489, 397, 81, 370, 263, 263, 557, 757,
/* 340 */ 582, 557, 557, 557, 1012, 791, 1092, 1089, 1057, 1071,
/* 350 */ 1077, 1078, 1083, 1169, 1176, 1184, 989, 1004, 1106, 1098,
/* 360 */ 1173, 1174, 1175, 1090, 1028, 66, 1060, 1177, 1186, 1187,
/* 370 */ 1190, 1212, 1216, 1234, 1218, 1043, 1204, 1051, 1219, 1120,
/* 380 */ 1220, 1231, 1232, 1233, 1235, 1236, 1159, 1260, 1285, 1214,
/* 390 */ 1139, 1555, 1567, 1578, 1537, 1581, 1548, 1384, 1554, 1557,
/* 400 */ 1559, 1393, 1599, 1575, 1576, 1397, 1602, 1408, 1613, 1582,
/* 410 */ 1616, 1596, 1619, 1585, 1430, 1436, 1440, 1625, 1626, 1627,
/* 420 */ 1451, 1453, 1634, 1635, 1595, 1646, 1647, 1649, 1609, 1652,
/* 430 */ 1656, 1657, 1661, 1662, 1672, 1674, 1676, 1512, 1630, 1677,
/* 440 */ 1527, 1681, 1682, 1686, 1687, 1691, 1692, 1694, 1695, 1702,
/* 450 */ 1704, 1706, 1707, 1708, 1711, 1712, 1713, 1678, 1716, 1718,
/* 460 */ 1721, 1725, 1732, 1734, 1715, 1735, 1738, 1739, 1604, 1741,
/* 470 */ 1742, 1743, 1688, 1710, 1747, 1690, 1750, 1697, 1756, 1758,
/* 480 */ 1717, 1727, 1724, 1705, 1755, 1723, 1757, 1726, 1772, 1736,
/* 490 */ 1744, 1774, 1775, 1777, 1760, 1606, 1782, 1786, 1795, 1731,
/* 500 */ 1797, 1803, 1769, 1759, 1766, 1808, 1776, 1761, 1771, 1812,
/* 510 */ 1778, 1767, 1780, 1814, 1783, 1773, 1781, 1817, 1822, 1823,
/* 520 */ 1824, 1720, 1728, 1791, 1805, 1828, 1799, 1800, 1807, 1809,
/* 530 */ 1788, 1802, 1810, 1815, 1827, 1816, 1830, 1831, 1852, 1832,
/* 540 */ 1806, 1857, 1836, 1826, 1859, 1829, 1863, 1833, 1865, 1844,
/* 550 */ 1847, 1834, 1835, 1837, 1784, 1787, 1871, 1709, 1789, 1838,
/* 560 */ 1875, 1699, 1854, 1745, 1722, 1877, 1878, 1746, 1733, 1879,
/* 570 */ 1846, 1636, 1811, 1796, 1813, 1740, 1665, 1748, 1648, 1818,
/* 580 */ 1864, 1869, 1819, 1821, 1825, 1842, 1843, 1874, 1872, 1882,
/* 590 */ 1848, 1880, 1670, 1845, 1850, 1922, 1895, 1696, 1891, 1914,
/* 600 */ 1917, 1919, 1920, 1921, 1860, 1862, 1916, 1719, 1918, 1923,
/* 610 */ 1961, 1964, 1966, 1967, 1873, 1929, 1705, 1926, 1908, 1890,
/* 620 */ 1894, 1909, 1910, 1840, 1913, 1974, 1936, 1853, 1927, 1888,
/* 630 */ 1705, 1931, 1968, 1785, 1794, 1793, 2009, 1991, 1804, 1940,
/* 640 */ 1925, 1941, 1943, 1942, 1945, 1971, 1948, 1949, 2000, 1946,
/* 650 */ 2026, 1849, 1953, 1955, 1970, 2017, 2028, 1969, 1975, 2033,
/* 660 */ 1973, 1976, 2036, 1979, 1988, 2041, 1990, 1992, 2052, 1994,
/* 670 */ 1977, 1978, 1980, 1981, 2066, 1983, 1997, 2048, 1998, 2061,
/* 680 */ 2012, 2048, 2048, 2089, 2047, 2049, 2080, 2081, 2082, 2083,
/* 690 */ 2085, 2086, 2088, 2090, 2091, 2093, 2053, 2037, 2075, 2096,
/* 700 */ 2098, 2099, 2113, 2101, 2102, 2103, 2068, 1788, 2105, 1802,
/* 710 */ 2107, 2108, 2109, 2110, 2124, 2112, 2148, 2115, 2104, 2114,
/* 720 */ 2151, 2120, 2116, 2118, 2159, 2125, 2126, 2122, 2173, 2140,
/* 730 */ 2129, 2141, 2179, 2146, 2147, 2183, 2162, 2165, 2166, 2168,
/* 740 */ 2170, 2167,
/* 340 */ 582, 557, 557, 557, 1012, 791, 1092, 1089, 1057, 1139,
/* 350 */ 1071, 1077, 1078, 1084, 1169, 1176, 1196, 990, 1004, 1106,
/* 360 */ 1127, 1173, 1175, 1177, 1090, 1028, 66, 984, 1186, 1187,
/* 370 */ 1188, 1190, 1212, 1216, 1234, 1218, 1043, 1171, 1051, 1219,
/* 380 */ 431, 1220, 1227, 1231, 1232, 1233, 1235, 1143, 1260, 1285,
/* 390 */ 1243, 1167, 1577, 1578, 1579, 1539, 1588, 1554, 1388, 1559,
/* 400 */ 1560, 1561, 1393, 1599, 1567, 1575, 1397, 1611, 1408, 1613,
/* 410 */ 1581, 1617, 1596, 1619, 1585, 1430, 1436, 1440, 1625, 1626,
/* 420 */ 1627, 1451, 1453, 1634, 1635, 1595, 1646, 1647, 1649, 1609,
/* 430 */ 1652, 1656, 1657, 1661, 1662, 1672, 1674, 1676, 1512, 1630,
/* 440 */ 1677, 1527, 1681, 1682, 1686, 1687, 1691, 1692, 1694, 1695,
/* 450 */ 1702, 1704, 1706, 1707, 1708, 1711, 1712, 1713, 1678, 1716,
/* 460 */ 1718, 1721, 1725, 1732, 1734, 1715, 1735, 1738, 1739, 1604,
/* 470 */ 1741, 1742, 1743, 1688, 1710, 1747, 1690, 1750, 1697, 1756,
/* 480 */ 1758, 1717, 1727, 1724, 1705, 1755, 1723, 1757, 1726, 1772,
/* 490 */ 1736, 1744, 1774, 1775, 1777, 1760, 1606, 1782, 1786, 1795,
/* 500 */ 1731, 1797, 1803, 1769, 1759, 1766, 1808, 1776, 1761, 1771,
/* 510 */ 1812, 1778, 1767, 1780, 1814, 1783, 1773, 1781, 1817, 1822,
/* 520 */ 1823, 1824, 1720, 1728, 1791, 1805, 1828, 1799, 1800, 1807,
/* 530 */ 1809, 1788, 1802, 1810, 1815, 1827, 1816, 1830, 1831, 1852,
/* 540 */ 1832, 1806, 1857, 1836, 1826, 1859, 1829, 1863, 1833, 1865,
/* 550 */ 1844, 1847, 1834, 1835, 1837, 1784, 1787, 1871, 1709, 1789,
/* 560 */ 1838, 1875, 1699, 1854, 1745, 1722, 1877, 1878, 1746, 1733,
/* 570 */ 1879, 1846, 1636, 1811, 1796, 1813, 1740, 1665, 1748, 1648,
/* 580 */ 1818, 1864, 1869, 1819, 1821, 1825, 1842, 1843, 1874, 1872,
/* 590 */ 1882, 1848, 1880, 1670, 1845, 1850, 1922, 1895, 1696, 1891,
/* 600 */ 1914, 1917, 1919, 1920, 1921, 1860, 1862, 1916, 1719, 1918,
/* 610 */ 1923, 1961, 1964, 1966, 1967, 1873, 1929, 1705, 1926, 1908,
/* 620 */ 1890, 1894, 1909, 1910, 1840, 1913, 1974, 1936, 1853, 1927,
/* 630 */ 1888, 1705, 1931, 1968, 1785, 1794, 1793, 2009, 1991, 1804,
/* 640 */ 1940, 1925, 1941, 1943, 1942, 1945, 1971, 1948, 1949, 2000,
/* 650 */ 1946, 2026, 1849, 1953, 1955, 1970, 2017, 2028, 1969, 1975,
/* 660 */ 2033, 1973, 1976, 2036, 1979, 1988, 2041, 1990, 1992, 2052,
/* 670 */ 1994, 1977, 1978, 1980, 1981, 2066, 1983, 1997, 2048, 1998,
/* 680 */ 2061, 2012, 2048, 2048, 2089, 2047, 2049, 2080, 2081, 2082,
/* 690 */ 2083, 2085, 2086, 2088, 2090, 2091, 2093, 2053, 2037, 2075,
/* 700 */ 2096, 2098, 2099, 2113, 2101, 2102, 2103, 2068, 1788, 2105,
/* 710 */ 1802, 2107, 2108, 2109, 2110, 2124, 2112, 2148, 2115, 2104,
/* 720 */ 2114, 2151, 2120, 2116, 2118, 2159, 2125, 2126, 2122, 2173,
/* 730 */ 2140, 2129, 2141, 2179, 2146, 2147, 2183, 2162, 2165, 2166,
/* 740 */ 2168, 2170, 2167,
};
#define YY_REDUCE_COUNT (304)
#define YY_REDUCE_MIN (-438)
......@@ -868,101 +868,101 @@ static const short yy_reduce_ofst[] = {
/* 100 */ 674, 472, 782, 415, 560, 754, 770, -105, -288, -93,
/* 110 */ -93, -75, -272, -187, 77, 308, 336, 354, 359, 382,
/* 120 */ 410, 447, 518, 521, 564, 585, 663, 690, 691, 694,
/* 130 */ 695, 711, -342, -41, -206, 124, 257, 516, -41, 274,
/* 140 */ 333, 117, -23, 41, 483, 230, 487, 547, 434, 269,
/* 130 */ 695, 711, -342, -41, -206, 124, 516, -41, 274, 333,
/* 140 */ 117, -23, 41, 483, 230, 487, 547, 257, 434, 269,
/* 150 */ 466, 50, 387, 519, 665, 706, 537, -354, 325, 417,
/* 160 */ 455, 492, 550, 555, 492, 598, 755, 756, 764, 723,
/* 170 */ 794, 926, 818, 916, 916, 940, 919, 950, 937, 929,
/* 180 */ 878, 878, 864, 878, 890, 881, 916, 927, 930, 944,
/* 190 */ 961, 971, 972, 978, 1022, 1024, 983, 984, 988, 1031,
/* 200 */ 1025, 1032, 1035, 1037, 1047, 1048, 990, 1050, 1021, 1054,
/* 210 */ 1065, 1013, 1062, 1069, 1073, 1075, 1076, 1085, 1080, 1068,
/* 220 */ 1074, 1093, 1061, 1066, 1067, 1070, 1072, 1079, 1081, 1082,
/* 230 */ 1087, 1088, 1101, 1094, 1097, 1052, 1056, 1064, 1040, 1039,
/* 240 */ 1034, 1103, 1095, 1099, 1104, 1115, 1086, 1096, 1100, 1016,
/* 250 */ 1102, 1105, 1023, 1109, 1107, 1108, 916, 1026, 1036, 1041,
/* 260 */ 1045, 1044, 1110, 1111, 1046, 1053, 1049, 878, 1133, 1112,
/* 270 */ 1181, 1188, 1170, 1178, 1141, 1137, 1158, 1160, 1161, 1162,
/* 280 */ 1163, 1144, 1164, 1153, 1198, 1185, 1199, 1179, 1116, 1182,
/* 290 */ 1172, 1200, 1224, 1207, 1228, 1227, 1180, 1151, 1166, 1167,
/* 300 */ 1203, 1239, 1240, 1230, 1247,
/* 160 */ 455, 492, 550, 555, 492, 598, 755, 756, 805, 783,
/* 170 */ 799, 924, 817, 906, 906, 939, 896, 950, 930, 926,
/* 180 */ 878, 878, 865, 878, 890, 889, 906, 928, 931, 941,
/* 190 */ 961, 971, 972, 978, 1024, 1025, 983, 988, 989, 1031,
/* 200 */ 1027, 1033, 1037, 1039, 1048, 1055, 994, 1046, 1021, 1054,
/* 210 */ 1065, 1013, 1062, 1069, 1073, 1075, 1076, 1086, 1079, 1072,
/* 220 */ 1074, 1093, 1061, 1066, 1067, 1068, 1070, 1080, 1081, 1082,
/* 230 */ 1083, 1087, 1088, 1094, 1098, 1052, 1059, 1060, 1032, 1038,
/* 240 */ 1045, 1097, 1063, 1095, 1111, 1125, 1096, 1100, 1101, 1022,
/* 250 */ 1099, 1102, 1026, 1103, 1104, 1105, 906, 1035, 1040, 1041,
/* 260 */ 1044, 1047, 1050, 1107, 1034, 1058, 1053, 878, 1142, 1109,
/* 270 */ 1180, 1184, 1183, 1185, 1141, 1144, 1156, 1160, 1161, 1162,
/* 280 */ 1163, 1149, 1165, 1154, 1199, 1189, 1200, 1174, 1116, 1191,
/* 290 */ 1178, 1198, 1210, 1208, 1222, 1225, 1166, 1153, 1168, 1192,
/* 300 */ 1204, 1206, 1211, 1230, 1247,
};
static const YYACTIONTYPE yy_default[] = {
/* 0 */ 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664,
/* 10 */ 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664,
/* 20 */ 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664,
/* 30 */ 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664,
/* 40 */ 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664,
/* 50 */ 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664,
/* 60 */ 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664,
/* 70 */ 1664, 1664, 1664, 1922, 1664, 1664, 1664, 1664, 1664, 1664,
/* 80 */ 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1743, 1664, 1664,
/* 90 */ 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664,
/* 100 */ 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1741, 1915, 2131,
/* 110 */ 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664,
/* 120 */ 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664,
/* 130 */ 1664, 1664, 1664, 2143, 1664, 1664, 1743, 1664, 2143, 2143,
/* 140 */ 2143, 1741, 2103, 2103, 1664, 1664, 1664, 1664, 1976, 1664,
/* 150 */ 1664, 1664, 1664, 1664, 1664, 1850, 1664, 1664, 1664, 1664,
/* 160 */ 1664, 1874, 1664, 1664, 1664, 1968, 1664, 1664, 2168, 2224,
/* 170 */ 1664, 1664, 2171, 1664, 1664, 1664, 1927, 1664, 1803, 2158,
/* 180 */ 2135, 2149, 2208, 2136, 2133, 2152, 1664, 2162, 1664, 1961,
/* 190 */ 1920, 1664, 1920, 1917, 1664, 1664, 1920, 1917, 1917, 1664,
/* 200 */ 1794, 1664, 1664, 1664, 1664, 1664, 1664, 1743, 1664, 1743,
/* 210 */ 1664, 1664, 1743, 1664, 1743, 1743, 1743, 1664, 1743, 1721,
/* 220 */ 1721, 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664,
/* 230 */ 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1988, 1974,
/* 240 */ 1664, 1741, 1970, 1664, 1741, 1664, 1664, 1664, 1664, 2179,
/* 250 */ 2177, 1664, 2179, 2177, 1664, 1664, 1664, 2193, 2189, 2179,
/* 260 */ 2197, 2195, 2164, 2162, 2227, 2214, 2210, 2149, 1664, 1664,
/* 270 */ 1664, 1664, 1741, 1741, 1664, 2177, 1664, 1664, 1664, 1664,
/* 280 */ 1664, 2177, 1664, 1664, 1741, 1664, 1741, 1664, 1664, 1819,
/* 290 */ 1664, 1664, 1664, 1741, 1696, 1664, 1963, 1979, 1945, 1945,
/* 300 */ 1853, 1853, 1853, 1744, 1669, 1664, 1664, 1664, 1664, 1664,
/* 310 */ 1664, 1664, 1664, 1664, 1664, 1664, 1664, 2192, 2191, 2058,
/* 320 */ 1664, 2107, 2106, 2105, 2096, 2057, 1815, 1664, 2056, 2055,
/* 330 */ 1664, 1664, 1664, 1664, 1664, 1664, 1936, 1935, 2049, 1664,
/* 340 */ 1664, 2050, 2048, 2047, 1664, 1664, 1664, 1664, 1664, 1664,
/* 350 */ 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664,
/* 360 */ 1664, 1664, 1664, 1664, 2211, 2215, 1664, 1664, 1664, 1664,
/* 370 */ 1664, 1664, 1664, 2132, 1664, 1664, 1664, 1664, 1664, 2031,
/* 380 */ 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664,
/* 390 */ 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664,
/* 400 */ 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664,
/* 410 */ 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664,
/* 420 */ 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664,
/* 430 */ 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664,
/* 440 */ 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664,
/* 450 */ 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664,
/* 460 */ 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664,
/* 470 */ 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664,
/* 480 */ 1664, 1664, 1701, 2036, 1664, 1664, 1664, 1664, 1664, 1664,
/* 490 */ 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664,
/* 500 */ 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664,
/* 510 */ 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664,
/* 520 */ 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664,
/* 530 */ 1782, 1781, 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664,
/* 540 */ 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664,
/* 550 */ 1664, 1664, 1664, 1664, 2040, 1664, 1664, 1664, 1664, 1664,
/* 560 */ 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664, 2207,
/* 570 */ 2165, 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664,
/* 580 */ 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664, 2031,
/* 590 */ 1664, 2190, 1664, 1664, 2205, 1664, 2209, 1664, 1664, 1664,
/* 600 */ 1664, 1664, 1664, 1664, 2142, 2138, 1664, 1664, 2134, 1664,
/* 610 */ 1664, 1664, 1664, 1664, 1664, 1664, 2039, 1664, 1664, 1664,
/* 620 */ 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664,
/* 630 */ 2030, 1664, 2093, 1664, 1664, 1664, 2127, 1664, 1664, 2078,
/* 640 */ 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664, 2040,
/* 650 */ 1664, 2043, 1664, 1664, 1664, 1664, 1664, 1847, 1664, 1664,
/* 660 */ 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664,
/* 670 */ 1832, 1830, 1829, 1828, 1664, 1825, 1664, 1860, 1664, 1664,
/* 680 */ 1664, 1856, 1855, 1664, 1664, 1664, 1664, 1664, 1664, 1664,
/* 690 */ 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1762, 1664,
/* 700 */ 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1754, 1664, 1753,
/* 710 */ 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664,
/* 720 */ 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664,
/* 730 */ 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664,
/* 740 */ 1664, 1664,
/* 0 */ 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665,
/* 10 */ 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665,
/* 20 */ 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665,
/* 30 */ 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665,
/* 40 */ 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665,
/* 50 */ 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665,
/* 60 */ 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665,
/* 70 */ 1665, 1665, 1665, 1923, 1665, 1665, 1665, 1665, 1665, 1665,
/* 80 */ 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1744, 1665, 1665,
/* 90 */ 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665,
/* 100 */ 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1742, 1916, 2132,
/* 110 */ 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665,
/* 120 */ 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665,
/* 130 */ 1665, 1665, 1665, 2144, 1665, 1665, 1665, 2144, 2144, 2144,
/* 140 */ 1742, 2104, 2104, 1665, 1665, 1665, 1665, 1744, 1977, 1665,
/* 150 */ 1665, 1665, 1665, 1665, 1665, 1851, 1665, 1665, 1665, 1665,
/* 160 */ 1665, 1875, 1665, 1665, 1665, 1969, 1665, 1665, 2169, 2225,
/* 170 */ 1665, 1665, 2172, 1665, 1665, 1665, 1928, 1665, 1804, 2159,
/* 180 */ 2136, 2150, 2209, 2137, 2134, 2153, 1665, 2163, 1665, 1962,
/* 190 */ 1921, 1665, 1921, 1918, 1665, 1665, 1921, 1918, 1918, 1665,
/* 200 */ 1795, 1665, 1665, 1665, 1665, 1665, 1665, 1744, 1665, 1744,
/* 210 */ 1665, 1665, 1744, 1665, 1744, 1744, 1744, 1665, 1744, 1722,
/* 220 */ 1722, 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665,
/* 230 */ 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1989, 1975,
/* 240 */ 1665, 1742, 1971, 1665, 1742, 1665, 1665, 1665, 1665, 2180,
/* 250 */ 2178, 1665, 2180, 2178, 1665, 1665, 1665, 2194, 2190, 2180,
/* 260 */ 2198, 2196, 2165, 2163, 2228, 2215, 2211, 2150, 1665, 1665,
/* 270 */ 1665, 1665, 1742, 1742, 1665, 2178, 1665, 1665, 1665, 1665,
/* 280 */ 1665, 2178, 1665, 1665, 1742, 1665, 1742, 1665, 1665, 1820,
/* 290 */ 1665, 1665, 1665, 1742, 1697, 1665, 1964, 1980, 1946, 1946,
/* 300 */ 1854, 1854, 1854, 1745, 1670, 1665, 1665, 1665, 1665, 1665,
/* 310 */ 1665, 1665, 1665, 1665, 1665, 1665, 1665, 2193, 2192, 2059,
/* 320 */ 1665, 2108, 2107, 2106, 2097, 2058, 1816, 1665, 2057, 2056,
/* 330 */ 1665, 1665, 1665, 1665, 1665, 1665, 1937, 1936, 2050, 1665,
/* 340 */ 1665, 2051, 2049, 2048, 1665, 1665, 1665, 1665, 1665, 1665,
/* 350 */ 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665,
/* 360 */ 1665, 1665, 1665, 1665, 1665, 2212, 2216, 1665, 1665, 1665,
/* 370 */ 1665, 1665, 1665, 1665, 2133, 1665, 1665, 1665, 1665, 1665,
/* 380 */ 2032, 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665,
/* 390 */ 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665,
/* 400 */ 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665,
/* 410 */ 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665,
/* 420 */ 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665,
/* 430 */ 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665,
/* 440 */ 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665,
/* 450 */ 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665,
/* 460 */ 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665,
/* 470 */ 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665,
/* 480 */ 1665, 1665, 1665, 1702, 2037, 1665, 1665, 1665, 1665, 1665,
/* 490 */ 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665,
/* 500 */ 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665,
/* 510 */ 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665,
/* 520 */ 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665,
/* 530 */ 1665, 1783, 1782, 1665, 1665, 1665, 1665, 1665, 1665, 1665,
/* 540 */ 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665,
/* 550 */ 1665, 1665, 1665, 1665, 1665, 2041, 1665, 1665, 1665, 1665,
/* 560 */ 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665,
/* 570 */ 2208, 2166, 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665,
/* 580 */ 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665,
/* 590 */ 2032, 1665, 2191, 1665, 1665, 2206, 1665, 2210, 1665, 1665,
/* 600 */ 1665, 1665, 1665, 1665, 1665, 2143, 2139, 1665, 1665, 2135,
/* 610 */ 1665, 1665, 1665, 1665, 1665, 1665, 1665, 2040, 1665, 1665,
/* 620 */ 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665,
/* 630 */ 1665, 2031, 1665, 2094, 1665, 1665, 1665, 2128, 1665, 1665,
/* 640 */ 2079, 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665,
/* 650 */ 2041, 1665, 2044, 1665, 1665, 1665, 1665, 1665, 1848, 1665,
/* 660 */ 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665,
/* 670 */ 1665, 1833, 1831, 1830, 1829, 1665, 1826, 1665, 1861, 1665,
/* 680 */ 1665, 1665, 1857, 1856, 1665, 1665, 1665, 1665, 1665, 1665,
/* 690 */ 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1763,
/* 700 */ 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1755, 1665,
/* 710 */ 1754, 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665,
/* 720 */ 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665,
/* 730 */ 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665,
/* 740 */ 1665, 1665, 1665,
};
/********** End of lemon-generated parsing tables *****************************/
......@@ -2023,7 +2023,7 @@ static const char *const yyRuleName[] = {
/* 147 */ "multi_create_clause ::= multi_create_clause create_subtable_clause",
/* 148 */ "create_subtable_clause ::= not_exists_opt full_table_name USING full_table_name specific_cols_opt TAGS NK_LP expression_list NK_RP table_options",
/* 149 */ "multi_drop_clause ::= drop_table_clause",
/* 150 */ "multi_drop_clause ::= multi_drop_clause drop_table_clause",
/* 150 */ "multi_drop_clause ::= multi_drop_clause NK_COMMA drop_table_clause",
/* 151 */ "drop_table_clause ::= exists_opt full_table_name",
/* 152 */ "specific_cols_opt ::=",
/* 153 */ "specific_cols_opt ::= NK_LP col_name_list NK_RP",
......@@ -3203,7 +3203,7 @@ static const struct {
{ 357, -2 }, /* (147) multi_create_clause ::= multi_create_clause create_subtable_clause */
{ 365, -10 }, /* (148) create_subtable_clause ::= not_exists_opt full_table_name USING full_table_name specific_cols_opt TAGS NK_LP expression_list NK_RP table_options */
{ 359, -1 }, /* (149) multi_drop_clause ::= drop_table_clause */
{ 359, -2 }, /* (150) multi_drop_clause ::= multi_drop_clause drop_table_clause */
{ 359, -3 }, /* (150) multi_drop_clause ::= multi_drop_clause NK_COMMA drop_table_clause */
{ 368, -2 }, /* (151) drop_table_clause ::= exists_opt full_table_name */
{ 366, 0 }, /* (152) specific_cols_opt ::= */
{ 366, -3 }, /* (153) specific_cols_opt ::= NK_LP col_name_list NK_RP */
......@@ -4138,6 +4138,7 @@ static YYACTIONTYPE yy_reduce(
yymsp[0].minor.yy110 = yylhsminor.yy110;
break;
case 125: /* retention_list ::= retention_list NK_COMMA retention */
case 150: /* multi_drop_clause ::= multi_drop_clause NK_COMMA drop_table_clause */ yytestcase(yyruleno==150);
case 157: /* column_def_list ::= column_def_list NK_COMMA column_def */ yytestcase(yyruleno==157);
case 201: /* rollup_func_list ::= rollup_func_list NK_COMMA rollup_func_name */ yytestcase(yyruleno==201);
case 206: /* col_name_list ::= col_name_list NK_COMMA col_name */ yytestcase(yyruleno==206);
......@@ -4225,7 +4226,6 @@ static YYACTIONTYPE yy_reduce(
yymsp[-5].minor.yy42 = yylhsminor.yy42;
break;
case 147: /* multi_create_clause ::= multi_create_clause create_subtable_clause */
case 150: /* multi_drop_clause ::= multi_drop_clause drop_table_clause */ yytestcase(yyruleno==150);
case 434: /* when_then_list ::= when_then_list when_then_expr */ yytestcase(yyruleno==434);
{ yylhsminor.yy110 = addNodeToList(pCxt, yymsp[-1].minor.yy110, yymsp[0].minor.yy42); }
yymsp[-1].minor.yy110 = yylhsminor.yy110;
......
source/libs/parser/test/parInitialDTest.cpp
浏览文件 @ 67a94707
......@@ -245,6 +245,7 @@ TEST_F(ParserInitialDTest, dropTable) {
useDb("root", "test");
run("DROP TABLE t1");
run("DROP TABLE t1, st1s1, st1s2");
}
TEST_F(ParserInitialDTest, dropTopic) {
......
tests/system-test/0-others/taosShell.py
浏览文件 @ 67a94707
......@@ -373,7 +373,7 @@ class TDTestCase:
version = 'version: ' + version
retVal = retVal.replace("\n", "")
retVal = retVal.replace("\r", "")
if retVal != version:
if retVal.startswith(version) == False:
print ("return version: [%s]"%retVal)
print ("dict version: [%s]"%version)
tdLog.exit("taos -V version not match")
......
tools/shell/inc/shellInt.h
浏览文件 @ 67a94707
......@@ -86,7 +86,7 @@ typedef struct {
const char* promptContinue;
const char* osname;
int32_t promptSize;
char programVersion[32];
char programVersion[256];
} SShellOsDetails;
typedef struct {
......
tools/shell/src/shellArguments.c
浏览文件 @ 67a94707
......@@ -413,7 +413,9 @@ int32_t shellParseArgs(int32_t argc, char *argv[]) {
sprintf(shell.info.promptHeader, "%s> ", cusPrompt);
shell.info.promptContinue = TAOS_CONSOLE_PROMPT_CONTINUE;
shell.info.promptSize = strlen(shell.info.promptHeader);
snprintf(shell.info.programVersion, sizeof(shell.info.programVersion), "version: %s", version);
snprintf(shell.info.programVersion, sizeof(shell.info.programVersion),
"version: %s compatible_version: %s\ngitinfo: %s\nbuildInfo: %s", version, compatible_version, gitinfo,
buildinfo);
#if defined(_TD_WINDOWS_64) || defined(_TD_WINDOWS_32)
shell.info.osname = "Windows";
......
utils/test/c/tmq_taosx_ci.c
浏览文件 @ 67a94707
......@@ -23,18 +23,18 @@
static int running = 1;
TdFilePtr g_fp = NULL;
typedef struct{
typedef struct {
bool snapShot;
bool dropTable;
bool subTable;
int srcVgroups;
int dstVgroups;
char dir[64];
}Config;
} Config;
Config g_conf = {0};
static TAOS* use_db(){
static TAOS* use_db() {
TAOS* pConn = taos_connect("localhost", "root", "taosdata", NULL, 0);
if (pConn == NULL) {
return NULL;
......@@ -53,12 +53,12 @@ static void msg_process(TAOS_RES* msg) {
printf("-----------topic-------------: %s\n", tmq_get_topic_name(msg));
printf("db: %s\n", tmq_get_db_name(msg));
printf("vg: %d\n", tmq_get_vgroup_id(msg));
TAOS *pConn = use_db();
TAOS* pConn = use_db();
if (tmq_get_res_type(msg) == TMQ_RES_TABLE_META || tmq_get_res_type(msg) == TMQ_RES_METADATA) {
char* result = tmq_get_json_meta(msg);
if (result) {
printf("meta result: %s\n", result);
if(g_fp && strcmp(result, "") != 0){
if (g_fp && strcmp(result, "") != 0) {
taosFprintfFile(g_fp, result);
taosFprintfFile(g_fp, "\n");
}
......@@ -77,24 +77,23 @@ static void msg_process(TAOS_RES* msg) {
taos_close(pConn);
}
int buildDatabase(TAOS* pConn, TAOS_RES* pRes){
int buildDatabase(TAOS* pConn, TAOS_RES* pRes) {
/* test for TD-20612 start*/
pRes = taos_query(pConn,"create table tb1 (ts timestamp, c1 int, c2 int)");
pRes = taos_query(pConn, "create table tb1 (ts timestamp, c1 int, c2 int)");
if (taos_errno(pRes) != 0) {
printf("failed to create super table st1, reason:%s\n", taos_errstr(pRes));
return -1;
}
taos_free_result(pRes);
pRes = taos_query(pConn,"insert into tb1 (ts, c1) values(1669092069069, 0)");
pRes = taos_query(pConn, "insert into tb1 (ts, c1) values(1669092069069, 0)");
if (taos_errno(pRes) != 0) {
printf("failed to create super table st1, reason:%s\n", taos_errstr(pRes));
return -1;
}
taos_free_result(pRes);
pRes = taos_query(pConn,"insert into tb1 (ts, c2) values(1669092069069, 1)");
pRes = taos_query(pConn, "insert into tb1 (ts, c2) values(1669092069069, 1)");
if (taos_errno(pRes) != 0) {
printf("failed to create super table st1, reason:%s\n", taos_errstr(pRes));
return -1;
......@@ -154,7 +153,10 @@ int buildDatabase(TAOS* pConn, TAOS_RES* pRes){
}
taos_free_result(pRes);
pRes = taos_query(pConn, "insert into ct3 values(1626006833600, 5, 6, 'c') ct1 values(1626006833601, 2, 3, 'sds') (1626006833602, 4, 5, 'ddd') ct0 values(1626006833603, 4, 3, 'hwj') ct1 values(now+5s, 23, 32, 's21ds')");
pRes = taos_query(
pConn,
"insert into ct3 values(1626006833600, 5, 6, 'c') ct1 values(1626006833601, 2, 3, 'sds') (1626006833602, 4, 5, "
"'ddd') ct0 values(1626006833603, 4, 3, 'hwj') ct1 values(now+5s, 23, 32, 's21ds')");
if (taos_errno(pRes) != 0) {
printf("failed to insert into ct3, reason:%s\n", taos_errstr(pRes));
return -1;
......@@ -175,7 +177,9 @@ int buildDatabase(TAOS* pConn, TAOS_RES* pRes){
}
taos_free_result(pRes);
pRes = taos_query(pConn, "insert into ct3 values(1626006833605, 53, 63, 'cffffffffffffffffffffffffffff', 8989898899999) (1626006833609, 51, 62, 'c333', 940)");
pRes = taos_query(pConn,
"insert into ct3 values(1626006833605, 53, 63, 'cffffffffffffffffffffffffffff', 8989898899999) "
"(1626006833609, 51, 62, 'c333', 940)");
if (taos_errno(pRes) != 0) {
printf("failed to insert into ct3, reason:%s\n", taos_errstr(pRes));
return -1;
......@@ -210,8 +214,8 @@ int buildDatabase(TAOS* pConn, TAOS_RES* pRes){
}
taos_free_result(pRes);
if(g_conf.dropTable){
pRes = taos_query(pConn, "drop table ct3 ct1");
if (g_conf.dropTable) {
pRes = taos_query(pConn, "drop table ct3, ct1");
if (taos_errno(pRes) != 0) {
printf("failed to drop child table ct3, reason:%s\n", taos_errstr(pRes));
return -1;
......@@ -275,7 +279,7 @@ int buildDatabase(TAOS* pConn, TAOS_RES* pRes){
}
taos_free_result(pRes);
if(g_conf.dropTable){
if (g_conf.dropTable) {
pRes = taos_query(pConn, "drop table n1");
if (taos_errno(pRes) != 0) {
printf("failed to drop normal table n1, reason:%s\n", taos_errstr(pRes));
......@@ -319,7 +323,7 @@ int buildDatabase(TAOS* pConn, TAOS_RES* pRes){
}
taos_free_result(pRes);
if(g_conf.dropTable){
if (g_conf.dropTable) {
pRes = taos_query(pConn,
"create stable if not exists st1 (ts timestamp, c1 int, c2 float, c3 binary(16)) tags(t1 int, t3 "
"nchar(8), t4 bool)");
......@@ -355,7 +359,9 @@ int buildDatabase(TAOS* pConn, TAOS_RES* pRes){
}
taos_free_result(pRes);
pRes = taos_query(pConn, "create table if not exists stt1 using stt tags(2, \"stt1\", true) sttb1 using sttb tags(4, \"sttb1\", true) "
pRes = taos_query(
pConn,
"create table if not exists stt1 using stt tags(2, \"stt1\", true) sttb1 using sttb tags(4, \"sttb1\", true) "
"stt2 using stt tags(43, \"stt2\", false) sttb2 using sttb tags(54, \"sttb2\", true)");
if (taos_errno(pRes) != 0) {
printf("failed to create child table stt1, reason:%s\n", taos_errstr(pRes));
......@@ -363,8 +369,12 @@ int buildDatabase(TAOS* pConn, TAOS_RES* pRes){
}
taos_free_result(pRes);
pRes = taos_query(pConn, "insert into stt1 values(now + 2s, 3, 2, 'stt1') stt3 using stt tags(23, \"stt3\", true) values(now + 1s, 1, 2, 'stt3') sttb3 using sttb tags(4, \"sttb3\", true) values(now + 2s, 13, 22, 'sttb3') "
"stt4 using stt tags(433, \"stt4\", false) values(now + 3s, 21, 21, 'stt4') sttb4 using sttb tags(543, \"sttb4\", true) values(now + 4s, 16, 25, 'sttb4')");
pRes =
taos_query(pConn,
"insert into stt1 values(now + 2s, 3, 2, 'stt1') stt3 using stt tags(23, \"stt3\", true) values(now + "
"1s, 1, 2, 'stt3') sttb3 using sttb tags(4, \"sttb3\", true) values(now + 2s, 13, 22, 'sttb3') "
"stt4 using stt tags(433, \"stt4\", false) values(now + 3s, 21, 21, 'stt4') sttb4 using sttb "
"tags(543, \"sttb4\", true) values(now + 4s, 16, 25, 'sttb4')");
if (taos_errno(pRes) != 0) {
printf("failed to create child table stt1, reason:%s\n", taos_errstr(pRes));
return -1;
......@@ -374,8 +384,10 @@ int buildDatabase(TAOS* pConn, TAOS_RES* pRes){
return 0;
}
int buildStable(TAOS* pConn, TAOS_RES* pRes){
pRes = taos_query(pConn, "CREATE STABLE `meters` (`ts` TIMESTAMP, `current` FLOAT, `voltage` INT, `phase` FLOAT) TAGS (`groupid` INT, `location` VARCHAR(16))");
int buildStable(TAOS* pConn, TAOS_RES* pRes) {
pRes = taos_query(pConn,
"CREATE STABLE `meters` (`ts` TIMESTAMP, `current` FLOAT, `voltage` INT, `phase` FLOAT) TAGS "
"(`groupid` INT, `location` VARCHAR(16))");
if (taos_errno(pRes) != 0) {
printf("failed to create super table meters, reason:%s\n", taos_errstr(pRes));
return -1;
......@@ -396,7 +408,9 @@ int buildStable(TAOS* pConn, TAOS_RES* pRes){
}
taos_free_result(pRes);
pRes = taos_query(pConn, "create stream meters_summary_s into meters_summary as select _wstart, max(current) as current, groupid, location from meters partition by groupid, location interval(10m)");
pRes = taos_query(pConn,
"create stream meters_summary_s into meters_summary as select _wstart, max(current) as current, "
"groupid, location from meters partition by groupid, location interval(10m)");
if (taos_errno(pRes) != 0) {
printf("failed to create super table meters_summary, reason:%s\n", taos_errstr(pRes));
return -1;
......@@ -471,9 +485,9 @@ int32_t init_env() {
}
taos_free_result(pRes);
if(g_conf.subTable){
if (g_conf.subTable) {
buildStable(pConn, pRes);
}else{
} else {
buildDatabase(pConn, pRes);
}
......@@ -496,14 +510,14 @@ int32_t create_topic() {
}
taos_free_result(pRes);
if(g_conf.subTable){
if (g_conf.subTable) {
pRes = taos_query(pConn, "create topic meters_summary_t1 with meta as stable meters_summary");
if (taos_errno(pRes) != 0) {
printf("failed to create topic meters_summary_t1, reason:%s\n", taos_errstr(pRes));
return -1;
}
taos_free_result(pRes);
}else{
} else {
pRes = taos_query(pConn, "create topic topic_db with meta as database abc1");
if (taos_errno(pRes) != 0) {
printf("failed to create topic topic_db, reason:%s\n", taos_errstr(pRes));
......@@ -530,7 +544,7 @@ tmq_t* build_consumer() {
tmq_conf_set(conf, "enable.auto.commit", "true");
tmq_conf_set(conf, "enable.heartbeat.background", "true");
if(g_conf.snapShot){
if (g_conf.snapShot) {
tmq_conf_set(conf, "experimental.snapshot.enable", "true");
}
......@@ -543,9 +557,9 @@ tmq_t* build_consumer() {
tmq_list_t* build_topic_list() {
tmq_list_t* topic_list = tmq_list_new();
if(g_conf.subTable){
if (g_conf.subTable) {
tmq_list_append(topic_list, "meters_summary_t1");
}else{
} else {
tmq_list_append(topic_list, "topic_db");
}
return topic_list;
......@@ -566,7 +580,7 @@ void basic_consume_loop(tmq_t* tmq, tmq_list_t* topics) {
cnt++;
msg_process(tmqmessage);
taos_free_result(tmqmessage);
}else{
} else {
break;
}
}
......@@ -582,10 +596,10 @@ void initLogFile() {
char f1[256] = {0};
char f2[256] = {0};
if(g_conf.snapShot){
if (g_conf.snapShot) {
sprintf(f1, "%s/../log/tmq_taosx_tmp_snapshot.source", g_conf.dir);
sprintf(f2, "%s/../log/tmq_taosx_tmp_snapshot.result", g_conf.dir);
}else{
} else {
sprintf(f1, "%s/../log/tmq_taosx_tmp.source", g_conf.dir);
sprintf(f2, "%s/../log/tmq_taosx_tmp.result", g_conf.dir);
}
......@@ -603,84 +617,169 @@ void initLogFile() {
exit(-1);
}
if(g_conf.snapShot){
if(g_conf.subTable){
char *result[] = {
"{\"type\":\"create\",\"tableType\":\"super\",\"tableName\":\"meters_summary\",\"columns\":[{\"name\":\"_wstart\",\"type\":9},{\"name\":\"current\",\"type\":6},{\"name\":\"groupid\",\"type\":4},{\"name\":\"location\",\"type\":8,\"length\":16}],\"tags\":[{\"name\":\"group_id\",\"type\":14}]}",
"{\"type\":\"create\",\"tableType\":\"child\",\"tableName\":\"t_d2a450ee819dcf7576f0282d9ac22dbc\",\"using\":\"meters_summary\",\"tagNum\":1,\"tags\":[{\"name\":\"group_id\",\"type\":14,\"value\":1.313555008277358e+19}],\"createList\":[]}"
};
for(int i = 0; i < sizeof(result)/sizeof(result[0]); i++){
if (g_conf.snapShot) {
if (g_conf.subTable) {
char* result[] = {
"{\"type\":\"create\",\"tableType\":\"super\",\"tableName\":\"meters_summary\",\"columns\":[{\"name\":\"_"
"wstart\",\"type\":9},{\"name\":\"current\",\"type\":6},{\"name\":\"groupid\",\"type\":4},{\"name\":"
"\"location\",\"type\":8,\"length\":16}],\"tags\":[{\"name\":\"group_id\",\"type\":14}]}",
"{\"type\":\"create\",\"tableType\":\"child\",\"tableName\":\"t_d2a450ee819dcf7576f0282d9ac22dbc\",\"using\":"
"\"meters_summary\",\"tagNum\":1,\"tags\":[{\"name\":\"group_id\",\"type\":14,\"value\":1.313555008277358e+"
"19}],\"createList\":[]}"};
for (int i = 0; i < sizeof(result) / sizeof(result[0]); i++) {
taosFprintfFile(pFile2, result[i]);
taosFprintfFile(pFile2, "\n");
}
}else{
char *result[] = {
"{\"type\":\"create\",\"tableType\":\"normal\",\"tableName\":\"tb1\",\"columns\":[{\"name\":\"ts\",\"type\":9},{\"name\":\"c1\",\"type\":4},{\"name\":\"c2\",\"type\":4}],\"tags\":[]}",
"{\"type\":\"create\",\"tableType\":\"super\",\"tableName\":\"st1\",\"columns\":[{\"name\":\"ts\",\"type\":9},{\"name\":\"c1\",\"type\":4},{\"name\":\"c2\",\"type\":6},{\"name\":\"c3\",\"type\":8,\"length\":64},{\"name\":\"c4\",\"type\":5}],\"tags\":[{\"name\":\"t1\",\"type\":4},{\"name\":\"t3\",\"type\":10,\"length\":8},{\"name\":\"t4\",\"type\":1},{\"name\":\"t2\",\"type\":8,\"length\":64}]}",
"{\"type\":\"create\",\"tableType\":\"child\",\"tableName\":\"ct0\",\"using\":\"st1\",\"tagNum\":4,\"tags\":[{\"name\":\"t1\",\"type\":4,\"value\":1000},{\"name\":\"t3\",\"type\":10,\"value\":\"\\\"ttt\\\"\"},{\"name\":\"t4\",\"type\":1,\"value\":1}],\"createList\":[]}",
"{\"type\":\"create\",\"tableType\":\"child\",\"tableName\":\"ct1\",\"using\":\"st1\",\"tagNum\":4,\"tags\":[{\"name\":\"t1\",\"type\":4,\"value\":2000}],\"createList\":[]}",
"{\"type\":\"create\",\"tableType\":\"child\",\"tableName\":\"ct2\",\"using\":\"st1\",\"tagNum\":4,\"tags\":[],\"createList\":[]}",
"{\"type\":\"create\",\"tableType\":\"child\",\"tableName\":\"ct3\",\"using\":\"st1\",\"tagNum\":4,\"tags\":[{\"name\":\"t1\",\"type\":4,\"value\":5000}],\"createList\":[]}",
"{\"type\":\"create\",\"tableType\":\"normal\",\"tableName\":\"n1\",\"columns\":[{\"name\":\"ts\",\"type\":9},{\"name\":\"c2\",\"type\":10,\"length\":8},{\"name\":\"cc3\",\"type\":5}],\"tags\":[]}",
"{\"type\":\"create\",\"tableType\":\"super\",\"tableName\":\"jt\",\"columns\":[{\"name\":\"ts\",\"type\":9},{\"name\":\"i\",\"type\":4}],\"tags\":[{\"name\":\"t\",\"type\":15}]}",
"{\"type\":\"create\",\"tableType\":\"child\",\"tableName\":\"jt1\",\"using\":\"jt\",\"tagNum\":1,\"tags\":[{\"name\":\"t\",\"type\":15,\"value\":\"{\\\"k1\\\":1,\\\"k2\\\":\\\"hello\\\"}\"}],\"createList\":[]}",
"{\"type\":\"create\",\"tableType\":\"child\",\"tableName\":\"jt2\",\"using\":\"jt\",\"tagNum\":1,\"tags\":[],\"createList\":[]}",
"{\"type\":\"create\",\"tableType\":\"super\",\"tableName\":\"stt\",\"columns\":[{\"name\":\"ts\",\"type\":9},{\"name\":\"c1\",\"type\":4},{\"name\":\"c2\",\"type\":6},{\"name\":\"c3\",\"type\":8,\"length\":16}],\"tags\":[{\"name\":\"t1\",\"type\":4},{\"name\":\"t3\",\"type\":10,\"length\":8},{\"name\":\"t4\",\"type\":1}]}",
"{\"type\":\"create\",\"tableType\":\"super\",\"tableName\":\"sttb\",\"columns\":[{\"name\":\"ts\",\"type\":9},{\"name\":\"c1\",\"type\":4},{\"name\":\"c2\",\"type\":6},{\"name\":\"c3\",\"type\":8,\"length\":16}],\"tags\":[{\"name\":\"t1\",\"type\":4},{\"name\":\"t3\",\"type\":10,\"length\":8},{\"name\":\"t4\",\"type\":1}]}",
"{\"type\":\"create\",\"tableType\":\"child\",\"tableName\":\"stt1\",\"using\":\"stt\",\"tagNum\":3,\"tags\":[{\"name\":\"t1\",\"type\":4,\"value\":2},{\"name\":\"t3\",\"type\":10,\"value\":\"\\\"stt1\\\"\"},{\"name\":\"t4\",\"type\":1,\"value\":1}],\"createList\":[]}",
"{\"type\":\"create\",\"tableType\":\"child\",\"tableName\":\"sttb1\",\"using\":\"sttb\",\"tagNum\":3,\"tags\":[{\"name\":\"t1\",\"type\":4,\"value\":4},{\"name\":\"t3\",\"type\":10,\"value\":\"\\\"sttb1\\\"\"},{\"name\":\"t4\",\"type\":1,\"value\":1}],\"createList\":[]}",
"{\"type\":\"create\",\"tableType\":\"child\",\"tableName\":\"stt2\",\"using\":\"stt\",\"tagNum\":3,\"tags\":[{\"name\":\"t1\",\"type\":4,\"value\":43},{\"name\":\"t3\",\"type\":10,\"value\":\"\\\"stt2\\\"\"},{\"name\":\"t4\",\"type\":1,\"value\":0}],\"createList\":[]}",
"{\"type\":\"create\",\"tableType\":\"child\",\"tableName\":\"sttb2\",\"using\":\"sttb\",\"tagNum\":3,\"tags\":[{\"name\":\"t1\",\"type\":4,\"value\":54},{\"name\":\"t3\",\"type\":10,\"value\":\"\\\"sttb2\\\"\"},{\"name\":\"t4\",\"type\":1,\"value\":1}],\"createList\":[]}",
"{\"type\":\"create\",\"tableType\":\"child\",\"tableName\":\"stt3\",\"using\":\"stt\",\"tagNum\":3,\"tags\":[{\"name\":\"t1\",\"type\":4,\"value\":23},{\"name\":\"t3\",\"type\":10,\"value\":\"\\\"stt3\\\"\"},{\"name\":\"t4\",\"type\":1,\"value\":1}],\"createList\":[]}",
"{\"type\":\"create\",\"tableType\":\"child\",\"tableName\":\"sttb3\",\"using\":\"sttb\",\"tagNum\":3,\"tags\":[{\"name\":\"t1\",\"type\":4,\"value\":4},{\"name\":\"t3\",\"type\":10,\"value\":\"\\\"sttb3\\\"\"},{\"name\":\"t4\",\"type\":1,\"value\":1}],\"createList\":[]}",
"{\"type\":\"create\",\"tableType\":\"child\",\"tableName\":\"stt4\",\"using\":\"stt\",\"tagNum\":3,\"tags\":[{\"name\":\"t1\",\"type\":4,\"value\":433},{\"name\":\"t3\",\"type\":10,\"value\":\"\\\"stt4\\\"\"},{\"name\":\"t4\",\"type\":1,\"value\":0}],\"createList\":[]}",
"{\"type\":\"create\",\"tableType\":\"child\",\"tableName\":\"sttb4\",\"using\":\"sttb\",\"tagNum\":3,\"tags\":[{\"name\":\"t1\",\"type\":4,\"value\":543},{\"name\":\"t3\",\"type\":10,\"value\":\"\\\"sttb4\\\"\"},{\"name\":\"t4\",\"type\":1,\"value\":1}],\"createList\":[]}"
};
for(int i = 0; i < sizeof(result)/sizeof(result[0]); i++){
} else {
char* result[] = {
"{\"type\":\"create\",\"tableType\":\"normal\",\"tableName\":\"tb1\",\"columns\":[{\"name\":\"ts\",\"type\":"
"9},{\"name\":\"c1\",\"type\":4},{\"name\":\"c2\",\"type\":4}],\"tags\":[]}",
"{\"type\":\"create\",\"tableType\":\"super\",\"tableName\":\"st1\",\"columns\":[{\"name\":\"ts\",\"type\":9}"
",{\"name\":\"c1\",\"type\":4},{\"name\":\"c2\",\"type\":6},{\"name\":\"c3\",\"type\":8,\"length\":64},{"
"\"name\":\"c4\",\"type\":5}],\"tags\":[{\"name\":\"t1\",\"type\":4},{\"name\":\"t3\",\"type\":10,\"length\":"
"8},{\"name\":\"t4\",\"type\":1},{\"name\":\"t2\",\"type\":8,\"length\":64}]}",
"{\"type\":\"create\",\"tableType\":\"child\",\"tableName\":\"ct0\",\"using\":\"st1\",\"tagNum\":4,\"tags\":["
"{\"name\":\"t1\",\"type\":4,\"value\":1000},{\"name\":\"t3\",\"type\":10,\"value\":\"\\\"ttt\\\"\"},{"
"\"name\":\"t4\",\"type\":1,\"value\":1}],\"createList\":[]}",
"{\"type\":\"create\",\"tableType\":\"child\",\"tableName\":\"ct1\",\"using\":\"st1\",\"tagNum\":4,\"tags\":["
"{\"name\":\"t1\",\"type\":4,\"value\":2000}],\"createList\":[]}",
"{\"type\":\"create\",\"tableType\":\"child\",\"tableName\":\"ct2\",\"using\":\"st1\",\"tagNum\":4,\"tags\":["
"],\"createList\":[]}",
"{\"type\":\"create\",\"tableType\":\"child\",\"tableName\":\"ct3\",\"using\":\"st1\",\"tagNum\":4,\"tags\":["
"{\"name\":\"t1\",\"type\":4,\"value\":5000}],\"createList\":[]}",
"{\"type\":\"create\",\"tableType\":\"normal\",\"tableName\":\"n1\",\"columns\":[{\"name\":\"ts\",\"type\":9}"
",{\"name\":\"c2\",\"type\":10,\"length\":8},{\"name\":\"cc3\",\"type\":5}],\"tags\":[]}",
"{\"type\":\"create\",\"tableType\":\"super\",\"tableName\":\"jt\",\"columns\":[{\"name\":\"ts\",\"type\":9},"
"{\"name\":\"i\",\"type\":4}],\"tags\":[{\"name\":\"t\",\"type\":15}]}",
"{\"type\":\"create\",\"tableType\":\"child\",\"tableName\":\"jt1\",\"using\":\"jt\",\"tagNum\":1,\"tags\":[{"
"\"name\":\"t\",\"type\":15,\"value\":\"{\\\"k1\\\":1,\\\"k2\\\":\\\"hello\\\"}\"}],\"createList\":[]}",
"{\"type\":\"create\",\"tableType\":\"child\",\"tableName\":\"jt2\",\"using\":\"jt\",\"tagNum\":1,\"tags\":[]"
",\"createList\":[]}",
"{\"type\":\"create\",\"tableType\":\"super\",\"tableName\":\"stt\",\"columns\":[{\"name\":\"ts\",\"type\":9}"
",{\"name\":\"c1\",\"type\":4},{\"name\":\"c2\",\"type\":6},{\"name\":\"c3\",\"type\":8,\"length\":16}],"
"\"tags\":[{\"name\":\"t1\",\"type\":4},{\"name\":\"t3\",\"type\":10,\"length\":8},{\"name\":\"t4\",\"type\":"
"1}]}",
"{\"type\":\"create\",\"tableType\":\"super\",\"tableName\":\"sttb\",\"columns\":[{\"name\":\"ts\",\"type\":"
"9},{\"name\":\"c1\",\"type\":4},{\"name\":\"c2\",\"type\":6},{\"name\":\"c3\",\"type\":8,\"length\":16}],"
"\"tags\":[{\"name\":\"t1\",\"type\":4},{\"name\":\"t3\",\"type\":10,\"length\":8},{\"name\":\"t4\",\"type\":"
"1}]}",
"{\"type\":\"create\",\"tableType\":\"child\",\"tableName\":\"stt1\",\"using\":\"stt\",\"tagNum\":3,\"tags\":"
"[{\"name\":\"t1\",\"type\":4,\"value\":2},{\"name\":\"t3\",\"type\":10,\"value\":\"\\\"stt1\\\"\"},{"
"\"name\":\"t4\",\"type\":1,\"value\":1}],\"createList\":[]}",
"{\"type\":\"create\",\"tableType\":\"child\",\"tableName\":\"sttb1\",\"using\":\"sttb\",\"tagNum\":3,"
"\"tags\":[{\"name\":\"t1\",\"type\":4,\"value\":4},{\"name\":\"t3\",\"type\":10,\"value\":\"\\\"sttb1\\\"\"}"
",{\"name\":\"t4\",\"type\":1,\"value\":1}],\"createList\":[]}",
"{\"type\":\"create\",\"tableType\":\"child\",\"tableName\":\"stt2\",\"using\":\"stt\",\"tagNum\":3,\"tags\":"
"[{\"name\":\"t1\",\"type\":4,\"value\":43},{\"name\":\"t3\",\"type\":10,\"value\":\"\\\"stt2\\\"\"},{"
"\"name\":\"t4\",\"type\":1,\"value\":0}],\"createList\":[]}",
"{\"type\":\"create\",\"tableType\":\"child\",\"tableName\":\"sttb2\",\"using\":\"sttb\",\"tagNum\":3,"
"\"tags\":[{\"name\":\"t1\",\"type\":4,\"value\":54},{\"name\":\"t3\",\"type\":10,\"value\":"
"\"\\\"sttb2\\\"\"},{\"name\":\"t4\",\"type\":1,\"value\":1}],\"createList\":[]}",
"{\"type\":\"create\",\"tableType\":\"child\",\"tableName\":\"stt3\",\"using\":\"stt\",\"tagNum\":3,\"tags\":"
"[{\"name\":\"t1\",\"type\":4,\"value\":23},{\"name\":\"t3\",\"type\":10,\"value\":\"\\\"stt3\\\"\"},{"
"\"name\":\"t4\",\"type\":1,\"value\":1}],\"createList\":[]}",
"{\"type\":\"create\",\"tableType\":\"child\",\"tableName\":\"sttb3\",\"using\":\"sttb\",\"tagNum\":3,"
"\"tags\":[{\"name\":\"t1\",\"type\":4,\"value\":4},{\"name\":\"t3\",\"type\":10,\"value\":\"\\\"sttb3\\\"\"}"
",{\"name\":\"t4\",\"type\":1,\"value\":1}],\"createList\":[]}",
"{\"type\":\"create\",\"tableType\":\"child\",\"tableName\":\"stt4\",\"using\":\"stt\",\"tagNum\":3,\"tags\":"
"[{\"name\":\"t1\",\"type\":4,\"value\":433},{\"name\":\"t3\",\"type\":10,\"value\":\"\\\"stt4\\\"\"},{"
"\"name\":\"t4\",\"type\":1,\"value\":0}],\"createList\":[]}",
"{\"type\":\"create\",\"tableType\":\"child\",\"tableName\":\"sttb4\",\"using\":\"sttb\",\"tagNum\":3,"
"\"tags\":[{\"name\":\"t1\",\"type\":4,\"value\":543},{\"name\":\"t3\",\"type\":10,\"value\":"
"\"\\\"sttb4\\\"\"},{\"name\":\"t4\",\"type\":1,\"value\":1}],\"createList\":[]}"};
for (int i = 0; i < sizeof(result) / sizeof(result[0]); i++) {
taosFprintfFile(pFile2, result[i]);
taosFprintfFile(pFile2, "\n");
}
}
}else{
if(g_conf.subTable){
char *result[] = {
"{\"type\":\"create\",\"tableType\":\"super\",\"tableName\":\"meters_summary\",\"columns\":[{\"name\":\"_wstart\",\"type\":9},{\"name\":\"current\",\"type\":6},{\"name\":\"groupid\",\"type\":4},{\"name\":\"location\",\"type\":8,\"length\":16}],\"tags\":[{\"name\":\"group_id\",\"type\":14}]}",
"{\"type\":\"create\",\"tableType\":\"child\",\"tableName\":\"t_d2a450ee819dcf7576f0282d9ac22dbc\",\"using\":\"meters_summary\",\"tagNum\":1,\"tags\":[{\"name\":\"group_id\",\"type\":14,\"value\":1.313555008277358e+19}],\"createList\":[]}"
};
} else {
if (g_conf.subTable) {
char* result[] = {
"{\"type\":\"create\",\"tableType\":\"super\",\"tableName\":\"meters_summary\",\"columns\":[{\"name\":\"_"
"wstart\",\"type\":9},{\"name\":\"current\",\"type\":6},{\"name\":\"groupid\",\"type\":4},{\"name\":"
"\"location\",\"type\":8,\"length\":16}],\"tags\":[{\"name\":\"group_id\",\"type\":14}]}",
"{\"type\":\"create\",\"tableType\":\"child\",\"tableName\":\"t_d2a450ee819dcf7576f0282d9ac22dbc\",\"using\":"
"\"meters_summary\",\"tagNum\":1,\"tags\":[{\"name\":\"group_id\",\"type\":14,\"value\":1.313555008277358e+"
"19}],\"createList\":[]}"};
for(int i = 0; i < sizeof(result)/sizeof(result[0]); i++){
for (int i = 0; i < sizeof(result) / sizeof(result[0]); i++) {
taosFprintfFile(pFile2, result[i]);
taosFprintfFile(pFile2, "\n");
}
}else{
char *result[] = {
"{\"type\":\"create\",\"tableType\":\"normal\",\"tableName\":\"tb1\",\"columns\":[{\"name\":\"ts\",\"type\":9},{\"name\":\"c1\",\"type\":4},{\"name\":\"c2\",\"type\":4}],\"tags\":[]}",
"{\"type\":\"create\",\"tableType\":\"super\",\"tableName\":\"st1\",\"columns\":[{\"name\":\"ts\",\"type\":9},{\"name\":\"c1\",\"type\":4},{\"name\":\"c2\",\"type\":6},{\"name\":\"c3\",\"type\":8,\"length\":16}],\"tags\":[{\"name\":\"t1\",\"type\":4},{\"name\":\"t3\",\"type\":10,\"length\":8},{\"name\":\"t4\",\"type\":1}]}",
"{\"type\":\"create\",\"tableType\":\"child\",\"tableName\":\"ct0\",\"using\":\"st1\",\"tagNum\":3,\"tags\":[{\"name\":\"t1\",\"type\":4,\"value\":1000},{\"name\":\"t3\",\"type\":10,\"value\":\"\\\"ttt\\\"\"},{\"name\":\"t4\",\"type\":1,\"value\":1}],\"createList\":[]}",
"{\"type\":\"create\",\"tableType\":\"child\",\"tableName\":\"ct1\",\"using\":\"st1\",\"tagNum\":3,\"tags\":[{\"name\":\"t1\",\"type\":4,\"value\":2000}],\"createList\":[]}",
"{\"type\":\"create\",\"tableType\":\"child\",\"tableName\":\"ct2\",\"using\":\"st1\",\"tagNum\":3,\"tags\":[],\"createList\":[]}",
"{\"type\":\"create\",\"tableType\":\"child\",\"tableName\":\"ct3\",\"using\":\"st1\",\"tagNum\":3,\"tags\":[{\"name\":\"t1\",\"type\":4,\"value\":3000}],\"createList\":[]}",
"{\"type\":\"alter\",\"tableType\":\"super\",\"tableName\":\"st1\",\"alterType\":5,\"colName\":\"c4\",\"colType\":5}",
"{\"type\":\"alter\",\"tableType\":\"super\",\"tableName\":\"st1\",\"alterType\":7,\"colName\":\"c3\",\"colType\":8,\"colLength\":64}",
"{\"type\":\"alter\",\"tableType\":\"super\",\"tableName\":\"st1\",\"alterType\":1,\"colName\":\"t2\",\"colType\":8,\"colLength\":64}",
"{\"type\":\"alter\",\"tableType\":\"child\",\"tableName\":\"ct3\",\"alterType\":4,\"colName\":\"t1\",\"colValue\":\"5000\",\"colValueNull\":false}",
} else {
char* result[] = {
"{\"type\":\"create\",\"tableType\":\"normal\",\"tableName\":\"tb1\",\"columns\":[{\"name\":\"ts\",\"type\":"
"9},{\"name\":\"c1\",\"type\":4},{\"name\":\"c2\",\"type\":4}],\"tags\":[]}",
"{\"type\":\"create\",\"tableType\":\"super\",\"tableName\":\"st1\",\"columns\":[{\"name\":\"ts\",\"type\":9}"
",{\"name\":\"c1\",\"type\":4},{\"name\":\"c2\",\"type\":6},{\"name\":\"c3\",\"type\":8,\"length\":16}],"
"\"tags\":[{\"name\":\"t1\",\"type\":4},{\"name\":\"t3\",\"type\":10,\"length\":8},{\"name\":\"t4\",\"type\":"
"1}]}",
"{\"type\":\"create\",\"tableType\":\"child\",\"tableName\":\"ct0\",\"using\":\"st1\",\"tagNum\":3,\"tags\":["
"{\"name\":\"t1\",\"type\":4,\"value\":1000},{\"name\":\"t3\",\"type\":10,\"value\":\"\\\"ttt\\\"\"},{"
"\"name\":\"t4\",\"type\":1,\"value\":1}],\"createList\":[]}",
"{\"type\":\"create\",\"tableType\":\"child\",\"tableName\":\"ct1\",\"using\":\"st1\",\"tagNum\":3,\"tags\":["
"{\"name\":\"t1\",\"type\":4,\"value\":2000}],\"createList\":[]}",
"{\"type\":\"create\",\"tableType\":\"child\",\"tableName\":\"ct2\",\"using\":\"st1\",\"tagNum\":3,\"tags\":["
"],\"createList\":[]}",
"{\"type\":\"create\",\"tableType\":\"child\",\"tableName\":\"ct3\",\"using\":\"st1\",\"tagNum\":3,\"tags\":["
"{\"name\":\"t1\",\"type\":4,\"value\":3000}],\"createList\":[]}",
"{\"type\":\"alter\",\"tableType\":\"super\",\"tableName\":\"st1\",\"alterType\":5,\"colName\":\"c4\","
"\"colType\":5}",
"{\"type\":\"alter\",\"tableType\":\"super\",\"tableName\":\"st1\",\"alterType\":7,\"colName\":\"c3\","
"\"colType\":8,\"colLength\":64}",
"{\"type\":\"alter\",\"tableType\":\"super\",\"tableName\":\"st1\",\"alterType\":1,\"colName\":\"t2\","
"\"colType\":8,\"colLength\":64}",
"{\"type\":\"alter\",\"tableType\":\"child\",\"tableName\":\"ct3\",\"alterType\":4,\"colName\":\"t1\","
"\"colValue\":\"5000\",\"colValueNull\":false}",
"{\"type\":\"delete\",\"sql\":\"delete from `ct3` where `ts` >= 1626006833600 and `ts` <= 1626006833605\"}",
"{\"type\":\"create\",\"tableType\":\"normal\",\"tableName\":\"n1\",\"columns\":[{\"name\":\"ts\",\"type\":9},{\"name\":\"c1\",\"type\":4},{\"name\":\"c2\",\"type\":10,\"length\":4}],\"tags\":[]}",
"{\"type\":\"alter\",\"tableType\":\"normal\",\"tableName\":\"n1\",\"alterType\":5,\"colName\":\"c3\",\"colType\":5}",
"{\"type\":\"alter\",\"tableType\":\"normal\",\"tableName\":\"n1\",\"alterType\":7,\"colName\":\"c2\",\"colType\":10,\"colLength\":8}",
"{\"type\":\"alter\",\"tableType\":\"normal\",\"tableName\":\"n1\",\"alterType\":10,\"colName\":\"c3\",\"colNewName\":\"cc3\"}",
"{\"type\":\"create\",\"tableType\":\"normal\",\"tableName\":\"n1\",\"columns\":[{\"name\":\"ts\",\"type\":9}"
",{\"name\":\"c1\",\"type\":4},{\"name\":\"c2\",\"type\":10,\"length\":4}],\"tags\":[]}",
"{\"type\":\"alter\",\"tableType\":\"normal\",\"tableName\":\"n1\",\"alterType\":5,\"colName\":\"c3\","
"\"colType\":5}",
"{\"type\":\"alter\",\"tableType\":\"normal\",\"tableName\":\"n1\",\"alterType\":7,\"colName\":\"c2\","
"\"colType\":10,\"colLength\":8}",
"{\"type\":\"alter\",\"tableType\":\"normal\",\"tableName\":\"n1\",\"alterType\":10,\"colName\":\"c3\","
"\"colNewName\":\"cc3\"}",
"{\"type\":\"alter\",\"tableType\":\"normal\",\"tableName\":\"n1\",\"alterType\":9}",
"{\"type\":\"alter\",\"tableType\":\"normal\",\"tableName\":\"n1\",\"alterType\":6,\"colName\":\"c1\"}",
"{\"type\":\"create\",\"tableType\":\"super\",\"tableName\":\"jt\",\"columns\":[{\"name\":\"ts\",\"type\":9},{\"name\":\"i\",\"type\":4}],\"tags\":[{\"name\":\"t\",\"type\":15}]}",
"{\"type\":\"create\",\"tableType\":\"child\",\"tableName\":\"jt1\",\"using\":\"jt\",\"tagNum\":1,\"tags\":[{\"name\":\"t\",\"type\":15,\"value\":\"{\\\"k1\\\":1,\\\"k2\\\":\\\"hello\\\"}\"}],\"createList\":[]}",
"{\"type\":\"create\",\"tableType\":\"child\",\"tableName\":\"jt2\",\"using\":\"jt\",\"tagNum\":1,\"tags\":[],\"createList\":[]}",
"{\"type\":\"create\",\"tableType\":\"super\",\"tableName\":\"stt\",\"columns\":[{\"name\":\"ts\",\"type\":9},{\"name\":\"c1\",\"type\":4},{\"name\":\"c2\",\"type\":6},{\"name\":\"c3\",\"type\":8,\"length\":16}],\"tags\":[{\"name\":\"t1\",\"type\":4},{\"name\":\"t3\",\"type\":10,\"length\":8},{\"name\":\"t4\",\"type\":1}]}",
"{\"type\":\"create\",\"tableType\":\"super\",\"tableName\":\"sttb\",\"columns\":[{\"name\":\"ts\",\"type\":9},{\"name\":\"c1\",\"type\":4},{\"name\":\"c2\",\"type\":6},{\"name\":\"c3\",\"type\":8,\"length\":16}],\"tags\":[{\"name\":\"t1\",\"type\":4},{\"name\":\"t3\",\"type\":10,\"length\":8},{\"name\":\"t4\",\"type\":1}]}",
"{\"type\":\"create\",\"tableType\":\"child\",\"tableName\":\"stt1\",\"using\":\"stt\",\"tagNum\":3,\"tags\":[{\"name\":\"t1\",\"type\":4,\"value\":2},{\"name\":\"t3\",\"type\":10,\"value\":\"\\\"stt1\\\"\"},{\"name\":\"t4\",\"type\":1,\"value\":1}],\"createList\":[{\"tableName\":\"stt1\",\"using\":\"stt\",\"tagNum\":3,\"tags\":[{\"name\":\"t1\",\"type\":4,\"value\":2},{\"name\":\"t3\",\"type\":10,\"value\":\"\\\"stt1\\\"\"},{\"name\":\"t4\",\"type\":1,\"value\":1}]},{\"tableName\":\"sttb1\",\"using\":\"sttb\",\"tagNum\":3,\"tags\":[{\"name\":\"t1\",\"type\":4,\"value\":4},{\"name\":\"t3\",\"type\":10,\"value\":\"\\\"sttb1\\\"\"},{\"name\":\"t4\",\"type\":1,\"value\":1}]},{\"tableName\":\"stt2\",\"using\":\"stt\",\"tagNum\":3,\"tags\":[{\"name\":\"t1\",\"type\":4,\"value\":43},{\"name\":\"t3\",\"type\":10,\"value\":\"\\\"stt2\\\"\"},{\"name\":\"t4\",\"type\":1,\"value\":0}]},{\"tableName\":\"sttb2\",\"using\":\"sttb\",\"tagNum\":3,\"tags\":[{\"name\":\"t1\",\"type\":4,\"value\":54},{\"name\":\"t3\",\"type\":10,\"value\":\"\\\"sttb2\\\"\"},{\"name\":\"t4\",\"type\":1,\"value\":1}]}]}",
"{\"type\":\"create\",\"tableType\":\"child\",\"tableName\":\"stt3\",\"using\":\"stt\",\"tagNum\":3,\"tags\":[{\"name\":\"t1\",\"type\":4,\"value\":23},{\"name\":\"t3\",\"type\":10,\"value\":\"\\\"stt3\\\"\"},{\"name\":\"t4\",\"type\":1,\"value\":1}],\"createList\":[{\"tableName\":\"stt3\",\"using\":\"stt\",\"tagNum\":3,\"tags\":[{\"name\":\"t1\",\"type\":4,\"value\":23},{\"name\":\"t3\",\"type\":10,\"value\":\"\\\"stt3\\\"\"},{\"name\":\"t4\",\"type\":1,\"value\":1}]},{\"tableName\":\"sttb3\",\"using\":\"sttb\",\"tagNum\":3,\"tags\":[{\"name\":\"t1\",\"type\":4,\"value\":4},{\"name\":\"t3\",\"type\":10,\"value\":\"\\\"sttb3\\\"\"},{\"name\":\"t4\",\"type\":1,\"value\":1}]},{\"tableName\":\"stt4\",\"using\":\"stt\",\"tagNum\":3,\"tags\":[{\"name\":\"t1\",\"type\":4,\"value\":433},{\"name\":\"t3\",\"type\":10,\"value\":\"\\\"stt4\\\"\"},{\"name\":\"t4\",\"type\":1,\"value\":0}]},{\"tableName\":\"sttb4\",\"using\":\"sttb\",\"tagNum\":3,\"tags\":[{\"name\":\"t1\",\"type\":4,\"value\":543},{\"name\":\"t3\",\"type\":10,\"value\":\"\\\"sttb4\\\"\"},{\"name\":\"t4\",\"type\":1,\"value\":1}]}]}"
};
for(int i = 0; i < sizeof(result)/sizeof(result[0]); i++){
"{\"type\":\"create\",\"tableType\":\"super\",\"tableName\":\"jt\",\"columns\":[{\"name\":\"ts\",\"type\":9},"
"{\"name\":\"i\",\"type\":4}],\"tags\":[{\"name\":\"t\",\"type\":15}]}",
"{\"type\":\"create\",\"tableType\":\"child\",\"tableName\":\"jt1\",\"using\":\"jt\",\"tagNum\":1,\"tags\":[{"
"\"name\":\"t\",\"type\":15,\"value\":\"{\\\"k1\\\":1,\\\"k2\\\":\\\"hello\\\"}\"}],\"createList\":[]}",
"{\"type\":\"create\",\"tableType\":\"child\",\"tableName\":\"jt2\",\"using\":\"jt\",\"tagNum\":1,\"tags\":[]"
",\"createList\":[]}",
"{\"type\":\"create\",\"tableType\":\"super\",\"tableName\":\"stt\",\"columns\":[{\"name\":\"ts\",\"type\":9}"
",{\"name\":\"c1\",\"type\":4},{\"name\":\"c2\",\"type\":6},{\"name\":\"c3\",\"type\":8,\"length\":16}],"
"\"tags\":[{\"name\":\"t1\",\"type\":4},{\"name\":\"t3\",\"type\":10,\"length\":8},{\"name\":\"t4\",\"type\":"
"1}]}",
"{\"type\":\"create\",\"tableType\":\"super\",\"tableName\":\"sttb\",\"columns\":[{\"name\":\"ts\",\"type\":"
"9},{\"name\":\"c1\",\"type\":4},{\"name\":\"c2\",\"type\":6},{\"name\":\"c3\",\"type\":8,\"length\":16}],"
"\"tags\":[{\"name\":\"t1\",\"type\":4},{\"name\":\"t3\",\"type\":10,\"length\":8},{\"name\":\"t4\",\"type\":"
"1}]}",
"{\"type\":\"create\",\"tableType\":\"child\",\"tableName\":\"stt1\",\"using\":\"stt\",\"tagNum\":3,\"tags\":"
"[{\"name\":\"t1\",\"type\":4,\"value\":2},{\"name\":\"t3\",\"type\":10,\"value\":\"\\\"stt1\\\"\"},{"
"\"name\":\"t4\",\"type\":1,\"value\":1}],\"createList\":[{\"tableName\":\"stt1\",\"using\":\"stt\","
"\"tagNum\":3,\"tags\":[{\"name\":\"t1\",\"type\":4,\"value\":2},{\"name\":\"t3\",\"type\":10,\"value\":"
"\"\\\"stt1\\\"\"},{\"name\":\"t4\",\"type\":1,\"value\":1}]},{\"tableName\":\"sttb1\",\"using\":\"sttb\","
"\"tagNum\":3,\"tags\":[{\"name\":\"t1\",\"type\":4,\"value\":4},{\"name\":\"t3\",\"type\":10,\"value\":"
"\"\\\"sttb1\\\"\"},{\"name\":\"t4\",\"type\":1,\"value\":1}]},{\"tableName\":\"stt2\",\"using\":\"stt\","
"\"tagNum\":3,\"tags\":[{\"name\":\"t1\",\"type\":4,\"value\":43},{\"name\":\"t3\",\"type\":10,\"value\":"
"\"\\\"stt2\\\"\"},{\"name\":\"t4\",\"type\":1,\"value\":0}]},{\"tableName\":\"sttb2\",\"using\":\"sttb\","
"\"tagNum\":3,\"tags\":[{\"name\":\"t1\",\"type\":4,\"value\":54},{\"name\":\"t3\",\"type\":10,\"value\":"
"\"\\\"sttb2\\\"\"},{\"name\":\"t4\",\"type\":1,\"value\":1}]}]}",
"{\"type\":\"create\",\"tableType\":\"child\",\"tableName\":\"stt3\",\"using\":\"stt\",\"tagNum\":3,\"tags\":"
"[{\"name\":\"t1\",\"type\":4,\"value\":23},{\"name\":\"t3\",\"type\":10,\"value\":\"\\\"stt3\\\"\"},{"
"\"name\":\"t4\",\"type\":1,\"value\":1}],\"createList\":[{\"tableName\":\"stt3\",\"using\":\"stt\","
"\"tagNum\":3,\"tags\":[{\"name\":\"t1\",\"type\":4,\"value\":23},{\"name\":\"t3\",\"type\":10,\"value\":"
"\"\\\"stt3\\\"\"},{\"name\":\"t4\",\"type\":1,\"value\":1}]},{\"tableName\":\"sttb3\",\"using\":\"sttb\","
"\"tagNum\":3,\"tags\":[{\"name\":\"t1\",\"type\":4,\"value\":4},{\"name\":\"t3\",\"type\":10,\"value\":"
"\"\\\"sttb3\\\"\"},{\"name\":\"t4\",\"type\":1,\"value\":1}]},{\"tableName\":\"stt4\",\"using\":\"stt\","
"\"tagNum\":3,\"tags\":[{\"name\":\"t1\",\"type\":4,\"value\":433},{\"name\":\"t3\",\"type\":10,\"value\":"
"\"\\\"stt4\\\"\"},{\"name\":\"t4\",\"type\":1,\"value\":0}]},{\"tableName\":\"sttb4\",\"using\":\"sttb\","
"\"tagNum\":3,\"tags\":[{\"name\":\"t1\",\"type\":4,\"value\":543},{\"name\":\"t3\",\"type\":10,\"value\":"
"\"\\\"sttb4\\\"\"},{\"name\":\"t4\",\"type\":1,\"value\":1}]}]}"};
for (int i = 0; i < sizeof(result) / sizeof(result[0]); i++) {
taosFprintfFile(pFile2, result[i]);
taosFprintfFile(pFile2, "\n");
}
......@@ -692,23 +791,23 @@ void initLogFile() {
int main(int argc, char* argv[]) {
for (int32_t i = 1; i < argc; i++) {
if(strcmp(argv[i], "-c") == 0){
if (strcmp(argv[i], "-c") == 0) {
tstrncpy(g_conf.dir, argv[++i], sizeof(g_conf.dir));
}else if(strcmp(argv[i], "-s") == 0){
} else if (strcmp(argv[i], "-s") == 0) {
g_conf.snapShot = true;
}else if(strcmp(argv[i], "-d") == 0){
} else if (strcmp(argv[i], "-d") == 0) {
g_conf.dropTable = true;
}else if(strcmp(argv[i], "-sv") == 0){
} else if (strcmp(argv[i], "-sv") == 0) {
g_conf.srcVgroups = atol(argv[++i]);
}else if(strcmp(argv[i], "-dv") == 0){
} else if (strcmp(argv[i], "-dv") == 0) {
g_conf.dstVgroups = atol(argv[++i]);
}else if(strcmp(argv[i], "-t") == 0){
} else if (strcmp(argv[i], "-t") == 0) {
g_conf.subTable = true;
}
}
printf("env init\n");
if(strlen(g_conf.dir) != 0){
if (strlen(g_conf.dir) != 0) {
initLogFile();
}
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或