thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-17 21:24:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
Alexander Tokmakov 2019-11-07 17:52:12 +03:00
parent d4a065cc90
commit 075edf03ca
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dbms/src/Databases/DatabaseLazy.h
View File

@ -94,7 +94,7 @@ private:
time_t metadata_modification_time;
CacheExpirationQueue::iterator expiration_iterator;
CachedTable() {}
CachedTable() = delete;
CachedTable(const StoragePtr & table_, time_t last_touched_, time_t metadata_modification_time_)
: table(table_), last_touched(last_touched_), metadata_modification_time(metadata_modification_time_) {}
};

2
dbms/src/Databases/DatabaseWithDictionaries.cpp
View File

@ -52,7 +52,7 @@ void DatabaseWithDictionaries::detachDictionary(const String & dictionary_name,
}
void DatabaseWithDictionaries::createDictionary( const Context & context, const String & dictionary_name, const ASTPtr & query)
void DatabaseWithDictionaries::createDictionary(const Context & context, const String & dictionary_name, const ASTPtr & query)
{
const auto & settings = context.getSettingsRef();

4
dbms/src/Storages/StorageFile.cpp
View File

@ -101,7 +101,7 @@ static std::string getTablePath(const std::string & table_dir_path, const std::s
}
/// Both db_dir_path and table_path must be converted to absolute paths (in particular, path cannot contain '..').
static void checkCreationIsAllowed(Context & context_global, const std::string & db_dir_path, const std::string & table_path)
static void checkCreationIsAllowed(const Context & context_global, const std::string & db_dir_path, const std::string & table_path)
{
if (context_global.getApplicationType() != Context::ApplicationType::SERVER)
return;
@ -358,7 +358,7 @@ void registerStorageFile(StorageFactory & factory)
String format_name = engine_args[0]->as<ASTLiteral &>().value.safeGet<String>();
StorageFile::CommonArguments common_args{args.database_name, args.table_name, format_name,
args.columns, args.constraints,args.context};
args.columns, args.constraints, args.context};
if (engine_args.size() == 1) /// Table in database
return StorageFile::create(args.relative_data_path, common_args);

4
dbms/src/Storages/StorageFile.h
View File

@ -49,7 +49,7 @@ public:
const std::string & format_name;
const ColumnsDescription & columns;
const ConstraintsDescription & constraints;
Context & context;
const Context & context;
};
protected:
@ -71,7 +71,7 @@ private:
std::string table_name;
std::string database_name;
std::string format_name;
Context & context_global;
const Context & context_global;
int table_fd = -1;

4
dbms/tests/queries/0_stateless/01018_ddl_dictionaries_create.sql
View File

@ -91,7 +91,7 @@ CREATE DICTIONARY memory_db.dict2
PRIMARY KEY key_column
SOURCE(CLICKHOUSE(HOST 'localhost' PORT 9000 USER 'default' TABLE 'table_for_dict' PASSWORD '' DB 'database_for_dict'))
LIFETIME(MIN 1 MAX 10)
LAYOUT(FLAT()); -- {serverError 1}
LAYOUT(FLAT()); -- {serverError 48}
SHOW CREATE DICTIONARY memory_db.dict2; -- {serverError 487}
@ -116,7 +116,7 @@ CREATE DICTIONARY lazy_db.dict3
PRIMARY KEY key_column, second_column
SOURCE(CLICKHOUSE(HOST 'localhost' PORT 9000 USER 'default' TABLE 'table_for_dict' PASSWORD '' DB 'database_for_dict'))
LIFETIME(MIN 1 MAX 10)
LAYOUT(COMPLEX_KEY_HASHED()); -- {serverError 1}
LAYOUT(COMPLEX_KEY_HASHED()); -- {serverError 48}
DROP DATABASE IF EXISTS lazy_db;