Merge pull request #19312 from taosdata/feature/3_liaohj
refactor: disable all asserts.
This commit is contained in:
commit
43bc021eb0
|
@ -117,12 +117,18 @@ ELSE ()
|
||||||
IF (${BUILD_SANITIZER})
|
IF (${BUILD_SANITIZER})
|
||||||
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Werror=return-type -fPIC -gdwarf-2 -fsanitize=address -fsanitize=undefined -fsanitize-recover=all -fsanitize=float-divide-by-zero -fsanitize=float-cast-overflow -fno-sanitize=shift-base -fno-sanitize=alignment -g3 -Wformat=0")
|
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Werror=return-type -fPIC -gdwarf-2 -fsanitize=address -fsanitize=undefined -fsanitize-recover=all -fsanitize=float-divide-by-zero -fsanitize=float-cast-overflow -fno-sanitize=shift-base -fno-sanitize=alignment -g3 -Wformat=0")
|
||||||
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wno-literal-suffix -Werror=return-type -fPIC -gdwarf-2 -fsanitize=address -fsanitize=undefined -fsanitize-recover=all -fsanitize=float-divide-by-zero -fsanitize=float-cast-overflow -fno-sanitize=shift-base -fno-sanitize=alignment -g3 -Wformat=0")
|
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wno-literal-suffix -Werror=return-type -fPIC -gdwarf-2 -fsanitize=address -fsanitize=undefined -fsanitize-recover=all -fsanitize=float-divide-by-zero -fsanitize=float-cast-overflow -fno-sanitize=shift-base -fno-sanitize=alignment -g3 -Wformat=0")
|
||||||
MESSAGE(STATUS "Will compile with Address Sanitizer!")
|
MESSAGE(STATUS "Compile with Address Sanitizer!")
|
||||||
ELSE ()
|
ELSE ()
|
||||||
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Werror=return-type -fPIC -gdwarf-2 -g3 -Wformat=2 -Wno-format-nonliteral -Wno-format-truncation -Wno-format-y2k")
|
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Werror=return-type -fPIC -gdwarf-2 -g3 -Wformat=2 -Wno-format-nonliteral -Wno-format-truncation -Wno-format-y2k")
|
||||||
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wno-literal-suffix -Werror=return-type -fPIC -gdwarf-2 -g3 -Wformat=2 -Wno-format-nonliteral -Wno-format-truncation -Wno-format-y2k")
|
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wno-literal-suffix -Werror=return-type -fPIC -gdwarf-2 -g3 -Wformat=2 -Wno-format-nonliteral -Wno-format-truncation -Wno-format-y2k")
|
||||||
ENDIF ()
|
ENDIF ()
|
||||||
|
|
||||||
|
# disable all assert
|
||||||
|
IF ((${DISABLE_ASSERT} MATCHES "true") OR (${DISABLE_ASSERTS} MATCHES "true"))
|
||||||
|
ADD_DEFINITIONS(-DDISABLE_ASSERT)
|
||||||
|
MESSAGE(STATUS "Disable all asserts")
|
||||||
|
ENDIF()
|
||||||
|
|
||||||
INCLUDE(CheckCCompilerFlag)
|
INCLUDE(CheckCCompilerFlag)
|
||||||
IF (TD_ARM_64 OR TD_ARM_32)
|
IF (TD_ARM_64 OR TD_ARM_32)
|
||||||
SET(COMPILER_SUPPORT_SSE42 false)
|
SET(COMPILER_SUPPORT_SSE42 false)
|
||||||
|
@ -155,7 +161,7 @@ ELSE ()
|
||||||
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mavx2")
|
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mavx2")
|
||||||
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mavx2")
|
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mavx2")
|
||||||
ENDIF()
|
ENDIF()
|
||||||
MESSAGE(STATUS "SIMD instructions (AVX/AVX2) is ACTIVATED")
|
MESSAGE(STATUS "SIMD instructions (FMA/AVX/AVX2) is ACTIVATED")
|
||||||
ENDIF()
|
ENDIF()
|
||||||
|
|
||||||
ENDIF ()
|
ENDIF ()
|
||||||
|
|
|
@ -85,12 +85,19 @@ void taosPrintLongString(const char *flags, ELogLevel level, int32_t dflag, cons
|
||||||
|
|
||||||
bool taosAssertDebug(bool condition, const char *file, int32_t line, const char *format, ...);
|
bool taosAssertDebug(bool condition, const char *file, int32_t line, const char *format, ...);
|
||||||
bool taosAssertRelease(bool condition);
|
bool taosAssertRelease(bool condition);
|
||||||
|
|
||||||
|
// Disable all asserts that may compromise the performance.
|
||||||
|
#if defined DISABLE_ASSERT
|
||||||
|
#define ASSERT(condition)
|
||||||
|
#define ASSERTS(condition, ...)
|
||||||
|
#else
|
||||||
#define ASSERTS(condition, ...) taosAssertDebug(condition, __FILE__, __LINE__, __VA_ARGS__)
|
#define ASSERTS(condition, ...) taosAssertDebug(condition, __FILE__, __LINE__, __VA_ARGS__)
|
||||||
#ifdef NDEBUG
|
#ifdef NDEBUG
|
||||||
#define ASSERT(condition) taosAssertRelease(condition)
|
#define ASSERT(condition) taosAssertRelease(condition)
|
||||||
#else
|
#else
|
||||||
#define ASSERT(condition) taosAssertDebug(condition, __FILE__, __LINE__, "assert info not provided")
|
#define ASSERT(condition) taosAssertDebug(condition, __FILE__, __LINE__, "assert info not provided")
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
// clang-format off
|
// clang-format off
|
||||||
#define uFatal(...) { if (uDebugFlag & DEBUG_FATAL) { taosPrintLog("UTL FATAL", DEBUG_FATAL, tsLogEmbedded ? 255 : uDebugFlag, __VA_ARGS__); }}
|
#define uFatal(...) { if (uDebugFlag & DEBUG_FATAL) { taosPrintLog("UTL FATAL", DEBUG_FATAL, tsLogEmbedded ? 255 : uDebugFlag, __VA_ARGS__); }}
|
||||||
|
|
|
@ -273,42 +273,90 @@ int32_t tsDecompressINTImp(const char *const input, const int32_t nelements, cha
|
||||||
char bit = bit_per_integer[(int32_t)selector]; // bit = 3
|
char bit = bit_per_integer[(int32_t)selector]; // bit = 3
|
||||||
int32_t elems = selector_to_elems[(int32_t)selector];
|
int32_t elems = selector_to_elems[(int32_t)selector];
|
||||||
|
|
||||||
for (int32_t i = 0; i < elems; i++) {
|
// Optimize the performance, by remove the constantly switch operation.
|
||||||
|
int32_t v = 0;
|
||||||
uint64_t zigzag_value;
|
uint64_t zigzag_value;
|
||||||
|
|
||||||
|
switch (type) {
|
||||||
|
case TSDB_DATA_TYPE_BIGINT: {
|
||||||
|
for (int32_t i = 0; i < elems; i++) {
|
||||||
if (selector == 0 || selector == 1) {
|
if (selector == 0 || selector == 1) {
|
||||||
zigzag_value = 0;
|
zigzag_value = 0;
|
||||||
} else {
|
} else {
|
||||||
zigzag_value = ((w >> (4 + bit * i)) & INT64MASK(bit));
|
zigzag_value = ((w >> (4 + v)) & INT64MASK(bit));
|
||||||
}
|
}
|
||||||
|
|
||||||
int64_t diff = ZIGZAG_DECODE(int64_t, zigzag_value);
|
int64_t diff = ZIGZAG_DECODE(int64_t, zigzag_value);
|
||||||
int64_t curr_value = diff + prev_value;
|
int64_t curr_value = diff + prev_value;
|
||||||
prev_value = curr_value;
|
prev_value = curr_value;
|
||||||
|
|
||||||
switch (type) {
|
|
||||||
case TSDB_DATA_TYPE_BIGINT:
|
|
||||||
*((int64_t *)output + _pos) = (int64_t)curr_value;
|
*((int64_t *)output + _pos) = (int64_t)curr_value;
|
||||||
_pos++;
|
_pos++;
|
||||||
break;
|
|
||||||
case TSDB_DATA_TYPE_INT:
|
v += bit;
|
||||||
|
if ((++count) == nelements) break;
|
||||||
|
}
|
||||||
|
} break;
|
||||||
|
case TSDB_DATA_TYPE_INT: {
|
||||||
|
for (int32_t i = 0; i < elems; i++) {
|
||||||
|
if (selector == 0 || selector == 1) {
|
||||||
|
zigzag_value = 0;
|
||||||
|
} else {
|
||||||
|
zigzag_value = ((w >> (4 + v)) & INT64MASK(bit));
|
||||||
|
}
|
||||||
|
|
||||||
|
int64_t diff = ZIGZAG_DECODE(int64_t, zigzag_value);
|
||||||
|
int64_t curr_value = diff + prev_value;
|
||||||
|
prev_value = curr_value;
|
||||||
|
|
||||||
*((int32_t *)output + _pos) = (int32_t)curr_value;
|
*((int32_t *)output + _pos) = (int32_t)curr_value;
|
||||||
_pos++;
|
_pos++;
|
||||||
break;
|
|
||||||
case TSDB_DATA_TYPE_SMALLINT:
|
v += bit;
|
||||||
|
if ((++count) == nelements) break;
|
||||||
|
}
|
||||||
|
} break;
|
||||||
|
case TSDB_DATA_TYPE_SMALLINT: {
|
||||||
|
for (int32_t i = 0; i < elems; i++) {
|
||||||
|
if (selector == 0 || selector == 1) {
|
||||||
|
zigzag_value = 0;
|
||||||
|
} else {
|
||||||
|
zigzag_value = ((w >> (4 + v)) & INT64MASK(bit));
|
||||||
|
}
|
||||||
|
|
||||||
|
int64_t diff = ZIGZAG_DECODE(int64_t, zigzag_value);
|
||||||
|
int64_t curr_value = diff + prev_value;
|
||||||
|
prev_value = curr_value;
|
||||||
|
|
||||||
*((int16_t *)output + _pos) = (int16_t)curr_value;
|
*((int16_t *)output + _pos) = (int16_t)curr_value;
|
||||||
_pos++;
|
_pos++;
|
||||||
break;
|
|
||||||
case TSDB_DATA_TYPE_TINYINT:
|
v += bit;
|
||||||
|
if ((++count) == nelements) break;
|
||||||
|
}
|
||||||
|
} break;
|
||||||
|
|
||||||
|
case TSDB_DATA_TYPE_TINYINT: {
|
||||||
|
for (int32_t i = 0; i < elems; i++) {
|
||||||
|
if (selector == 0 || selector == 1) {
|
||||||
|
zigzag_value = 0;
|
||||||
|
} else {
|
||||||
|
zigzag_value = ((w >> (4 + v)) & INT64MASK(bit));
|
||||||
|
}
|
||||||
|
|
||||||
|
int64_t diff = ZIGZAG_DECODE(int64_t, zigzag_value);
|
||||||
|
int64_t curr_value = diff + prev_value;
|
||||||
|
prev_value = curr_value;
|
||||||
|
|
||||||
*((int8_t *)output + _pos) = (int8_t)curr_value;
|
*((int8_t *)output + _pos) = (int8_t)curr_value;
|
||||||
_pos++;
|
_pos++;
|
||||||
break;
|
|
||||||
default:
|
v += bit;
|
||||||
perror("Wrong integer types.\n");
|
if ((++count) == nelements) break;
|
||||||
return -1;
|
|
||||||
}
|
}
|
||||||
count++;
|
} break;
|
||||||
if (count == nelements) break;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ip += LONG_BYTES;
|
ip += LONG_BYTES;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -758,7 +806,7 @@ int32_t tsDecompressDoubleImp(const char *const input, const int32_t nelements,
|
||||||
uint64_t prev_value = 0;
|
uint64_t prev_value = 0;
|
||||||
|
|
||||||
for (int32_t i = 0; i < nelements; i++) {
|
for (int32_t i = 0; i < nelements; i++) {
|
||||||
if (i % 2 == 0) {
|
if ((i & 0x01) == 0) {
|
||||||
flags = input[ipos++];
|
flags = input[ipos++];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue