From d2d7cd854c68245b60e0aaf41d7f3fd7f8afe3d0 Mon Sep 17 00:00:00 2001 From: yihaoDeng Date: Sat, 30 Mar 2024 10:21:23 +0000 Subject: [PATCH] Merge branch '3.0' into feature/compressData --- source/common/src/tcol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/common/src/tcol.c b/source/common/src/tcol.c index bcb3935a15..6ca23f626f 100644 --- a/source/common/src/tcol.c +++ b/source/common/src/tcol.c @@ -356,7 +356,7 @@ int8_t validColEncode(uint8_t type, uint8_t l1) { return TSDB_COLVAL_ENCODE_SIMPLE8B == l1 || TSDB_COLVAL_ENCODE_XOR == l1 ? 1 : 0; } else if (type >= TSDB_DATA_TYPE_FLOAT && type <= TSDB_DATA_TYPE_DOUBLE) { return TSDB_COLVAL_ENCODE_DELTAD == l1 ? 1 : 0; - } else if ((type == TSDB_DATA_TYPE_VARCHAR && type == TSDB_DATA_TYPE_NCHAR) || type == TSDB_DATA_TYPE_JSON || + } else if ((type == TSDB_DATA_TYPE_VARCHAR || type == TSDB_DATA_TYPE_NCHAR) || type == TSDB_DATA_TYPE_JSON || type == TSDB_DATA_TYPE_VARBINARY) { if (l1 >= TSDB_COLVAL_ENCODE_NOCHANGE || l1 <= TSDB_COLVAL_ENCODE_DELTAD) { return 1;