From 9021bfb2f1fd5d62f898c85ed2d52ac478349178 Mon Sep 17 00:00:00 2001
From: Amos Bird <amosbird@gmail.com>
Date: Thu, 15 Nov 2018 17:29:53 +0800
Subject: [PATCH] Fix variant assignments

---
 dbms/src/Dictionaries/CacheDictionary.cpp     | 89 ++++--------------
 ...acheDictionary_createAttributeWithType.cpp | 91 +++++--------------
 2 files changed, 41 insertions(+), 139 deletions(-)

diff --git a/dbms/src/Dictionaries/CacheDictionary.cpp b/dbms/src/Dictionaries/CacheDictionary.cpp
index 21920cbfbb..154fb6759f 100644
--- a/dbms/src/Dictionaries/CacheDictionary.cpp
+++ b/dbms/src/Dictionaries/CacheDictionary.cpp
@@ -454,76 +454,27 @@ CacheDictionary::Attribute CacheDictionary::createAttributeWithType(const Attrib
 
     switch (type)
     {
-        case AttributeUnderlyingType::UInt8:
-            attr.null_values = null_value.get<UInt64>();
-            attr.arrays = std::make_unique<ContainerType<UInt8>>(size);
-            bytes_allocated += size * sizeof(UInt8);
-            break;
-        case AttributeUnderlyingType::UInt16:
-            attr.null_values = null_value.get<UInt64>();
-            attr.arrays = std::make_unique<ContainerType<UInt16>>(size);
-            bytes_allocated += size * sizeof(UInt16);
-            break;
-        case AttributeUnderlyingType::UInt32:
-            attr.null_values = null_value.get<UInt64>();
-            attr.arrays = std::make_unique<ContainerType<UInt32>>(size);
-            bytes_allocated += size * sizeof(UInt32);
-            break;
-        case AttributeUnderlyingType::UInt64:
-            attr.null_values = null_value.get<UInt64>();
-            attr.arrays = std::make_unique<ContainerType<UInt64>>(size);
-            bytes_allocated += size * sizeof(UInt64);
-            break;
-        case AttributeUnderlyingType::UInt128:
-            attr.null_values = null_value.get<UInt128>();
-            attr.arrays = std::make_unique<ContainerType<UInt128>>(size);
-            bytes_allocated += size * sizeof(UInt128);
-            break;
-        case AttributeUnderlyingType::Int8:
-            attr.null_values = null_value.get<Int64>();
-            attr.arrays = std::make_unique<ContainerType<Int8>>(size);
-            bytes_allocated += size * sizeof(Int8);
-            break;
-        case AttributeUnderlyingType::Int16:
-            attr.null_values = null_value.get<Int64>();
-            attr.arrays = std::make_unique<ContainerType<Int16>>(size);
-            bytes_allocated += size * sizeof(Int16);
-            break;
-        case AttributeUnderlyingType::Int32:
-            attr.null_values = null_value.get<Int64>();
-            attr.arrays = std::make_unique<ContainerType<Int32>>(size);
-            bytes_allocated += size * sizeof(Int32);
-            break;
-        case AttributeUnderlyingType::Int64:
-            attr.null_values = null_value.get<Int64>();
-            attr.arrays = std::make_unique<ContainerType<Int64>>(size);
-            bytes_allocated += size * sizeof(Int64);
-            break;
-        case AttributeUnderlyingType::Decimal32:
-            attr.null_values = null_value.get<Decimal32>();
-            attr.arrays = std::make_unique<ContainerType<Decimal32>>(size);
-            bytes_allocated += size * sizeof(Decimal32);
-            break;
-        case AttributeUnderlyingType::Decimal64:
-            attr.null_values = null_value.get<Decimal64>();
-            attr.arrays = std::make_unique<ContainerType<Decimal64>>(size);
-            bytes_allocated += size * sizeof(Decimal64);
-            break;
-        case AttributeUnderlyingType::Decimal128:
-            attr.null_values = null_value.get<Decimal128>();
-            attr.arrays = std::make_unique<ContainerType<Decimal128>>(size);
-            bytes_allocated += size * sizeof(Decimal128);
-            break;
-        case AttributeUnderlyingType::Float32:
-            attr.null_values = null_value.get<Float64>();
-            attr.arrays = std::make_unique<ContainerType<Float32>>(size);
-            bytes_allocated += size * sizeof(Float32);
-            break;
-        case AttributeUnderlyingType::Float64:
-            attr.null_values = null_value.get<Float64>();
-            attr.arrays = std::make_unique<ContainerType<Float64>>(size);
-            bytes_allocated += size * sizeof(Float64);
+#define DISPATCH(TYPE) \
+        case AttributeUnderlyingType::TYPE: \
+            attr.null_values = TYPE(null_value.get<typename NearestFieldType<TYPE>::Type>()); \
+            attr.arrays = std::make_unique<ContainerType<TYPE>>(size); \
+            bytes_allocated += size * sizeof(TYPE); \
             break;
+        DISPATCH(UInt8)
+        DISPATCH(UInt16)
+        DISPATCH(UInt32)
+        DISPATCH(UInt64)
+        DISPATCH(UInt128)
+        DISPATCH(Int8)
+        DISPATCH(Int16)
+        DISPATCH(Int32)
+        DISPATCH(Int64)
+        DISPATCH(Decimal32)
+        DISPATCH(Decimal64)
+        DISPATCH(Decimal128)
+        DISPATCH(Float32)
+        DISPATCH(Float64)
+#undef DISPATCH
         case AttributeUnderlyingType::String:
             attr.null_values = null_value.get<String>();
             attr.arrays = std::make_unique<ContainerType<StringRef>>(size);
diff --git a/dbms/src/Dictionaries/ComplexKeyCacheDictionary_createAttributeWithType.cpp b/dbms/src/Dictionaries/ComplexKeyCacheDictionary_createAttributeWithType.cpp
index 60f5139067..91b74ef834 100644
--- a/dbms/src/Dictionaries/ComplexKeyCacheDictionary_createAttributeWithType.cpp
+++ b/dbms/src/Dictionaries/ComplexKeyCacheDictionary_createAttributeWithType.cpp
@@ -9,76 +9,27 @@ ComplexKeyCacheDictionary::Attribute ComplexKeyCacheDictionary::createAttributeW
 
     switch (type)
     {
-        case AttributeUnderlyingType::UInt8:
-            attr.null_values = null_value.get<UInt64>();
-            attr.arrays = std::make_unique<ContainerType<UInt8>>(size);
-            bytes_allocated += size * sizeof(UInt8);
-            break;
-        case AttributeUnderlyingType::UInt16:
-            attr.null_values = null_value.get<UInt64>();
-            attr.arrays = std::make_unique<ContainerType<UInt16>>(size);
-            bytes_allocated += size * sizeof(UInt16);
-            break;
-        case AttributeUnderlyingType::UInt32:
-            attr.null_values = null_value.get<UInt64>();
-            attr.arrays = std::make_unique<ContainerType<UInt32>>(size);
-            bytes_allocated += size * sizeof(UInt32);
-            break;
-        case AttributeUnderlyingType::UInt64:
-            attr.null_values = null_value.get<UInt64>();
-            attr.arrays = std::make_unique<ContainerType<UInt64>>(size);
-            bytes_allocated += size * sizeof(UInt64);
-            break;
-        case AttributeUnderlyingType::UInt128:
-            attr.null_values = null_value.get<UInt128>();
-            attr.arrays = std::make_unique<ContainerType<UInt128>>(size);
-            bytes_allocated += size * sizeof(UInt128);
-            break;
-        case AttributeUnderlyingType::Int8:
-            attr.null_values = null_value.get<Int64>();
-            attr.arrays = std::make_unique<ContainerType<Int8>>(size);
-            bytes_allocated += size * sizeof(Int8);
-            break;
-        case AttributeUnderlyingType::Int16:
-            attr.null_values = null_value.get<Int64>();
-            attr.arrays = std::make_unique<ContainerType<Int16>>(size);
-            bytes_allocated += size * sizeof(Int16);
-            break;
-        case AttributeUnderlyingType::Int32:
-            attr.null_values = null_value.get<Int64>();
-            attr.arrays = std::make_unique<ContainerType<Int32>>(size);
-            bytes_allocated += size * sizeof(Int32);
-            break;
-        case AttributeUnderlyingType::Int64:
-            attr.null_values = null_value.get<Int64>();
-            attr.arrays = std::make_unique<ContainerType<Int64>>(size);
-            bytes_allocated += size * sizeof(Int64);
-            break;
-        case AttributeUnderlyingType::Float32:
-            attr.null_values = null_value.get<Float64>();
-            attr.arrays = std::make_unique<ContainerType<Float32>>(size);
-            bytes_allocated += size * sizeof(Float32);
-            break;
-        case AttributeUnderlyingType::Float64:
-            attr.null_values = null_value.get<Float64>();
-            attr.arrays = std::make_unique<ContainerType<Float64>>(size);
-            bytes_allocated += size * sizeof(Float64);
-            break;
-        case AttributeUnderlyingType::Decimal32:
-            attr.null_values = null_value.get<Decimal32>();
-            attr.arrays = std::make_unique<ContainerType<Decimal32>>(size);
-            bytes_allocated += size * sizeof(Decimal32);
-            break;
-        case AttributeUnderlyingType::Decimal64:
-            attr.null_values = null_value.get<Decimal64>();
-            attr.arrays = std::make_unique<ContainerType<Decimal64>>(size);
-            bytes_allocated += size * sizeof(Decimal64);
-            break;
-        case AttributeUnderlyingType::Decimal128:
-            attr.null_values = null_value.get<Decimal128>();
-            attr.arrays = std::make_unique<ContainerType<Decimal128>>(size);
-            bytes_allocated += size * sizeof(Decimal128);
-            break;
+#define DISPATCH(TYPE) \
+        case AttributeUnderlyingType::TYPE: \
+            attr.null_values = TYPE(null_value.get<typename NearestFieldType<TYPE>::Type>()); \
+            attr.arrays = std::make_unique<ContainerType<TYPE>>(size); \
+            bytes_allocated += size * sizeof(TYPE); \
+            break;
+        DISPATCH(UInt8)
+        DISPATCH(UInt16)
+        DISPATCH(UInt32)
+        DISPATCH(UInt64)
+        DISPATCH(UInt128)
+        DISPATCH(Int8)
+        DISPATCH(Int16)
+        DISPATCH(Int32)
+        DISPATCH(Int64)
+        DISPATCH(Decimal32)
+        DISPATCH(Decimal64)
+        DISPATCH(Decimal128)
+        DISPATCH(Float32)
+        DISPATCH(Float64)
+#undef DISPATCH
         case AttributeUnderlyingType::String:
             attr.null_values = null_value.get<String>();
             attr.arrays = std::make_unique<ContainerType<StringRef>>(size);
-- 
GitLab