Fixes after merge with master, move some part of code to object storage

This commit is contained in:
kssenii
2024-02-19 16:43:49 +01:00
parent 1cccb3ccdf
commit 0552f44f70
32 changed files with 498 additions and 330 deletions
@@ -20,12 +20,10 @@ StoragePtr TableFunctionObjectStorageCluster<Definition, StorageSettings, Config
const std::string & table_name, ColumnsDescription /*cached_columns*/, bool is_insert_query) const
{
using Base = TableFunctionObjectStorage<Definition, StorageSettings, Configuration>;
auto configuration = Base::getConfiguration();
bool structure_argument_was_provided = configuration->structure != "auto";
ColumnsDescription columns;
if (structure_argument_was_provided)
if (configuration->structure != "auto")
columns = parseColumnsListFromString(configuration->structure, context);
else if (!Base::structure_hint.empty())
columns = Base::structure_hint;
@@ -58,8 +56,7 @@ StoragePtr TableFunctionObjectStorageCluster<Definition, StorageSettings, Config
StorageID(Base::getDatabaseName(), table_name),
columns,
ConstraintsDescription{},
context,
structure_argument_was_provided);
context);
}
storage->startup();