Merge branch 'master' of https://github.com/kekekekule/ClickHouse into dict_lifetime

dbms/src/Storages/System/StorageSystemDictionaries.cpp

@@ -36,10 +36,12 @@ NamesAndTypesList StorageSystemDictionaries::getNamesAndTypes()
         {"element_count", std::make_shared<DataTypeUInt64>()},
         {"load_factor", std::make_shared<DataTypeFloat64>()},
         {"source", std::make_shared<DataTypeString>()},
+        {"dictionary_lifetime_min", std::make_shared<DataTypeUInt64>()},
+        {"dictionary_lifetime_max", std::make_shared<DataTypeUInt64>()},
         {"loading_start_time", std::make_shared<DataTypeDateTime>()},
         {"loading_duration", std::make_shared<DataTypeFloat32>()},
         //{ "creation_time", std::make_shared<DataTypeDateTime>() },
-        {"last_exception", std::make_shared<DataTypeString>()},
+        {"last_exception", std::make_shared<DataTypeString>()}
     };
 }
 
@@ -62,6 +64,7 @@ void StorageSystemDictionaries::fillData(MutableColumns & res_columns, const Con
         std::exception_ptr last_exception = load_result.exception;
 
         const auto dict_ptr = std::dynamic_pointer_cast<const IDictionaryBase>(load_result.object);
+
         if (dict_ptr)
         {
             res_columns[i++]->insert(dict_ptr->getTypeName());
@@ -77,12 +80,18 @@ void StorageSystemDictionaries::fillData(MutableColumns & res_columns, const Con
             res_columns[i++]->insert(dict_ptr->getLoadFactor());
             res_columns[i++]->insert(dict_ptr->getSource()->toString());
 
+            const auto & lifetime = dict_ptr->getLifetime();
+            res_columns[i++]->insert(lifetime.min_sec);
+            res_columns[i++]->insert(lifetime.max_sec);
+
             if (!last_exception)
                 last_exception = dict_ptr->getLastException();
+
+
         }
         else
         {
-            for (size_t j = 0; j != 10; ++j)
+            for (size_t j = 0; j != 12; ++j) // Number of empty fields if dict_ptr is null
                 res_columns[i++]->insertDefault();
         }
 
@@ -93,7 +102,9 @@ void StorageSystemDictionaries::fillData(MutableColumns & res_columns, const Con
             res_columns[i++]->insert(getExceptionMessage(last_exception, false));
         else
             res_columns[i++]->insertDefault();
+
     }
 }
 
 }
+