Fix several wrong usages

src/Functions/hasColumnInTable.cpp

@@ -114,7 +114,7 @@ void FunctionHasColumnInTable::executeImpl(Block & block, const ColumnNumbers &
     if (host_name.empty())
     {
         const StoragePtr & table = DatabaseCatalog::instance().getTable({database_name, table_name});
-        has_column = table->getColumns().has(column_name);
+        has_column = table->getColumns().hasPhysical(column_name);
     }
     else
     {

src/Storages/StorageBuffer.cpp

@@ -199,8 +199,8 @@ Pipes StorageBuffer::read(
                     boost::range::remove_erase(columns_intersection, column_name);
                     continue;
                 }
-                const auto & dst_col = dest_columns.get(column_name);
-                const auto & col = our_columns.get(column_name);
+                const auto & dst_col = dest_columns.getPhysical(column_name);
+                const auto & col = our_columns.getPhysical(column_name);
                 if (!dst_col.type->equals(*col.type))
                 {
                     LOG_WARNING(log, "Destination table " << destination_id.getNameForLogs()

src/Storages/StorageMaterializedView.h

@@ -23,9 +23,6 @@ public:
     ASTPtr getInnerQuery() const { return inner_query->clone(); }
     bool hasInnerTable() const { return has_inner_table; }
 
-    //NameAndTypePair getColumn(const String & column_name) const override;
-    //bool hasColumn(const String & column_name) const override;
-
     StorageInMemoryMetadata getInMemoryMetadata() const override;
 
     bool supportsSampling() const override { return getTargetTable()->supportsSampling(); }

src/Storages/StorageMerge.cpp

@@ -464,7 +464,7 @@ void StorageMerge::convertingSourceStream(const Block & header, const Context &
         if (!header_column.type->equals(*before_column.type.get()) && processed_stage > QueryProcessingStage::FetchColumns)
         {
             NamesAndTypesList source_columns = getSampleBlock().getNamesAndTypesList();
-            auto virtual_column = getColumns().get("_table");
+            auto virtual_column = *getVirtuals().tryGetByName("_table");
             source_columns.emplace_back(NameAndTypePair{virtual_column.name, virtual_column.type});
             auto syntax_result = SyntaxAnalyzer(context).analyze(where_expression, source_columns);
             ExpressionActionsPtr actions = ExpressionAnalyzer{where_expression, syntax_result, context}.getActions(false, false);

src/Storages/StorageMySQL.cpp

@@ -76,7 +76,7 @@ Pipes StorageMySQL::read(
     Block sample_block;
     for (const String & column_name : column_names_)
     {
-        auto column_data = getColumns().get(column_name);
+        auto column_data = getColumns().getPhysical(column_name);
         sample_block.insert({ column_data.type, column_data.name });
     }
 

src/Storages/StorageXDBC.cpp

@@ -62,7 +62,7 @@ std::vector<std::pair<std::string, std::string>> StorageXDBC::getReadURIParams(c
     NamesAndTypesList cols;
     for (const String & name : column_names)
     {
-        auto column_data = getColumns().get(name);
+        auto column_data = getColumns().getPhysical(name);
         cols.emplace_back(column_data.name, column_data.type);
     }
     return bridge_helper->getURLParams(cols.toString(), max_block_size);

src/Storages/System/StorageSystemBuildOptions.generated.cpp

-// .cpp autogenerated by cmake
-
-#define BUILD_DETERMINISTIC 0
-
-const char * auto_config_build[]
-{
-    "VERSION_FULL", "ClickHouse 20.4.1.1",
-    "VERSION_DESCRIBE", "v20.4.1.1-prestable",
-    "VERSION_INTEGER", "20004001",
-
-#if BUILD_DETERMINISTIC
-    "SYSTEM", "Linux",
-#else
-    "VERSION_GITHASH", "05da1bff8b5826608d05618dab984cdf8f96e679",
-    "VERSION_REVISION", "54434",
-    "BUILD_DATE", "2020-04-26",
-    "SYSTEM", "Linux-4.15.0-46-generic",
-#endif
-
-    "BUILD_TYPE", "RELWITHDEBINFO",
-    "SYSTEM_PROCESSOR", "x86_64",
-    "LIBRARY_ARCHITECTURE", "x86_64-linux-gnu",
-    "CMAKE_VERSION", "3.10.2",
-    "C_COMPILER", "/usr/bin/clang-9",
-    "C_COMPILER_VERSION", "9.0.0",
-    "CXX_COMPILER", "/usr/bin/clang++-9",
-    "CXX_COMPILER_VERSION", "9.0.0",
-    "C_FLAGS", "  -gdwarf-aranges -msse4.1 -msse4.2 -mpopcnt  -Wall -Wno-unused-command-line-argument  -fno-omit-frame-pointer -Werror -O2 -g -DNDEBUG -O3  -fno-pie",
-    "CXX_FLAGS", " -std=c++2a -fsized-deallocation  -gdwarf-aranges -msse4.1 -msse4.2 -mpopcnt   -Wall -Wno-unused-command-line-argument  -Wnon-virtual-dtor -fno-omit-frame-pointer -Werror -O2 -g -DNDEBUG -O3  -fno-pie",
-    "LINK_FLAGS", " -fuse-ld=/usr/bin/ld.gold -rdynamic -Wl,--no-undefined -Wl,-no-pie",
-    "BUILD_COMPILE_DEFINITIONS", "",
-    "BUILD_INCLUDE_DIRECTORIES", "/home/alesap/code/cpp/ClickHouse/includes/configs",
-    "STATIC", "ON",
-    "SPLIT_BINARY", "",
-    "USE_EMBEDDED_COMPILER", "0",
-    "USE_GLIBC_COMPATIBILITY", "ON",
-    "USE_JEMALLOC", "ON",
-    "USE_MIMALLOC", "",
-    "USE_UNWIND", "ON",
-    "USE_ICU", "1",
-    "USE_H3", "1",
-    "USE_MYSQL", "1",
-    "USE_RE2_ST", "1",
-    "USE_LIBGSASL", "1",
-    "USE_RDKAFKA", "1",
-    "USE_CAPNP", "1",
-    "USE_POCO_SQLODBC", "",
-    "USE_POCO_DATAODBC", "1",
-    "USE_POCO_MONGODB", "1",
-    "USE_POCO_NETSSL", "1",
-    "USE_BASE64", "1",
-    "USE_XXHASH", "1",
-    "USE_HDFS", "1",
-    "USE_SNAPPY", "ON",
-    "USE_PARQUET", "1",
-    "USE_PROTOBUF", "1",
-    "USE_BROTLI", "1",
-    "USE_SSL", "1",
-    "USE_HYPERSCAN", "1",
-    "USE_SIMDJSON", "ON",
-    "USE_POCO_REDIS", "1",
-
-    nullptr, nullptr
-};

src/Storages/tests/gtest_storage_log.cpp

@@ -80,7 +80,7 @@ std::string writeData(int rows, DB::StoragePtr & table, DB::Context & context)
         const auto & storage_columns = table->getColumns();
         ColumnWithTypeAndName column;
         column.name = "a";
-        column.type = storage_columns.get("a").type;
+        column.type = storage_columns.getPhysical("a").type;
         auto col = column.type->createColumn();
         ColumnUInt64::Container & vec = typeid_cast<ColumnUInt64 &>(*col).getData();