未验证 提交 5cfd2145 编写于 作者: S slguan 提交者: GitHub

Merge branch 'develop' into feature/slguan

......@@ -355,16 +355,16 @@ int tsCompressINTImp(const char *const input, const int nelements, char *const o
tmp_bit = (LONG_BYTES * BITS_PER_BYTE) - BUILDIN_CLZL(zigzag_value);
}
if (elems + 1 <= selector_to_elems[(uint8_t)selector] && elems + 1 <= selector_to_elems[(uint8_t)bit_to_selector[(uint8_t)tmp_bit]]) {
if (elems + 1 <= selector_to_elems[(int)selector] && elems + 1 <= selector_to_elems[(int)(bit_to_selector[(int)tmp_bit])]) {
// If can hold another one.
selector = selector > bit_to_selector[(uint8_t)tmp_bit] ? selector : bit_to_selector[(uint8_t)tmp_bit];
selector = selector > bit_to_selector[(int)tmp_bit] ? selector : bit_to_selector[(int)tmp_bit];
elems++;
bit = bit_per_integer[(uint8_t)selector];
bit = bit_per_integer[(int)selector];
} else {
// if cannot hold another one.
while (elems < selector_to_elems[(uint8_t)selector]) selector++;
elems = selector_to_elems[(uint8_t)selector];
bit = bit_per_integer[(uint8_t)selector];
while (elems < selector_to_elems[(int)selector]) selector++;
elems = selector_to_elems[(int)selector];
bit = bit_per_integer[(int)selector];
break;
}
prev_value_tmp = curr_value;
......@@ -455,8 +455,8 @@ int tsDecompressINTImp(const char *const input, const int nelements, char *const
memcpy(&w, ip, LONG_BYTES);
char selector = (char)(w & INT64MASK(4)); // selector = 4
char bit = bit_per_integer[(uint8_t)selector]; // bit = 3
int elems = selector_to_elems[(uint8_t)selector];
char bit = bit_per_integer[(int)selector]; // bit = 3
int elems = selector_to_elems[(int)selector];
for (int i = 0; i < elems; i++) {
uint64_t zigzag_value;
......
......@@ -510,7 +510,7 @@ uint32_t tSQLGetToken(char* z, uint32_t* tokenType) {
if ((z[i] == 'a' || z[i] == 's' || z[i] == 'm' || z[i] == 'h' || z[i] == 'd' || z[i] == 'n' || z[i] == 'y' ||
z[i] == 'w' || z[i] == 'A' || z[i] == 'S' || z[i] == 'M' || z[i] == 'H' || z[i] == 'D' || z[i] == 'N' ||
z[i] == 'Y' || z[i] == 'W') &&
(isIdChar[(uint8_t)z[i + 1]] == 0)) {
(isIdChar[(int)(z[i + 1])] == 0)) {
*tokenType = TK_VARIABLE;
i += 1;
return i;
......@@ -551,7 +551,7 @@ uint32_t tSQLGetToken(char* z, uint32_t* tokenType) {
case 't':
case 'F':
case 'f': {
for (i = 1; ((z[i] & 0x80) == 0) && isIdChar[(uint8_t)z[i]]; i++) {
for (i = 1; ((z[i] & 0x80) == 0) && isIdChar[(int)(z[i])]; i++) {
}
if ((i == 4 && strncasecmp(z, "true", 4) == 0) || (i == 5 && strncasecmp(z, "false", 5) == 0)) {
......@@ -560,10 +560,10 @@ uint32_t tSQLGetToken(char* z, uint32_t* tokenType) {
}
}
default: {
if (((*z & 0x80) != 0) || !isIdChar[(uint8_t)(*z)]) {
if (((*z & 0x80) != 0) || !isIdChar[(int)(*z)]) {
break;
}
for (i = 1; ((z[i] & 0x80) == 0) && isIdChar[(uint8_t)z[i]]; i++) {
for (i = 1; ((z[i] & 0x80) == 0) && isIdChar[(int)(z[i])]; i++) {
}
*tokenType = tSQLKeywordCode(z, i);
return i;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册