From d1f30e0166c4cccb1a382c6b171d61b0c4fd20bc Mon Sep 17 00:00:00 2001
From: Jiachen1018 <lijiachen15@huawei.com>
Date: Fri, 29 Mar 2024 17:46:38 +0800
Subject: [PATCH] rm useless in cache_variant_t

---
 storage/tianchi/tse_cbo.cc |  3 ---
 storage/tianchi/tse_srv.h  | 10 ----------
 2 files changed, 13 deletions(-)

diff --git a/storage/tianchi/tse_cbo.cc b/storage/tianchi/tse_cbo.cc
index 7b24310..205ffaa 100644
--- a/storage/tianchi/tse_cbo.cc
+++ b/storage/tianchi/tse_cbo.cc
@@ -22,7 +22,6 @@
 
 void r_key2variant(tse_key *rKey, KEY_PART_INFO *cur_index_part, cache_variant_t *ret_val, cache_variant_t * value, uint32_t key_offset)
 {
-  ret_val->is_null = 0;
   if (rKey->cmp_type == CMP_TYPE_NULL) {
     *ret_val = *value;
     rKey->cmp_type = CMP_TYPE_CLOSE_INTERNAL;
@@ -30,7 +29,6 @@ void r_key2variant(tse_key *rKey, KEY_PART_INFO *cur_index_part, cache_variant_t
   }
 
   enum_field_types field_type = cur_index_part->field->real_type();
-  ret_val->type = field_type;
   uint32_t offset = 0;
   if (cur_index_part->field->is_nullable()) {
     /* The first byte in the field tells if this is an SQL NULL value */
@@ -59,7 +57,6 @@ void r_key2variant(tse_key *rKey, KEY_PART_INFO *cur_index_part, cache_variant_t
       ret_val->v_bigint = *(int64_t *)const_cast<uchar *>(key);
       break;
     default:
-      ret_val->is_null = 1;
       break;
   }
 }
diff --git a/storage/tianchi/tse_srv.h b/storage/tianchi/tse_srv.h
index 56c59fb..1922adb 100644
--- a/storage/tianchi/tse_srv.h
+++ b/storage/tianchi/tse_srv.h
@@ -112,16 +112,6 @@ typedef struct cache_st_variant {
         unsigned long long v_ubigint;
         double v_real;
     };
-
-    union {
-        struct {
-            short type;
-            unsigned char is_null;
-            unsigned char is_hex;
-        };
-
-        unsigned int ctrl;
-    };
 } cache_variant_t;
 
 typedef enum {
-- 
Gitee