diff --git a/dbms/include/DB/Storages/StorageChunks.h b/dbms/include/DB/Storages/StorageChunks.h index 1a4ab061f05..24bf560aab7 100644 --- a/dbms/include/DB/Storages/StorageChunks.h +++ b/dbms/include/DB/Storages/StorageChunks.h @@ -16,7 +16,7 @@ namespace DB class StorageChunks : public StorageLog { public: - static StoragePtr create(const std::string & path_, const std::string & name_, NamesAndTypesListPtr columns_, Context & context); + static StoragePtr create(const std::string & path_, const std::string & name_, const std::string & database_name_, NamesAndTypesListPtr columns_, Context & context); void addReference(); void removeReference(); diff --git a/dbms/src/Storages/StorageChunks.cpp b/dbms/src/Storages/StorageChunks.cpp index c96f0c379cf..5be2c4dd5cc 100644 --- a/dbms/src/Storages/StorageChunks.cpp +++ b/dbms/src/Storages/StorageChunks.cpp @@ -9,9 +9,9 @@ namespace DB { -StoragePtr StorageChunks::create(const std::string & path_, const std::string & name_, NamesAndTypesListPtr columns_, Context & context_) +StoragePtr StorageChunks::create(const std::string & path_, const std::string & name_, const std::string & database_name_, NamesAndTypesListPtr columns_, Context & context_) { - return (new StorageChunks(path_, name_, columns_, context_))->thisPtr(); + return (new StorageChunks(path_, name_, database_name_, columns_, context_))->thisPtr(); } void StorageChunks::addReference() @@ -72,10 +72,10 @@ BlockOutputStreamPtr StorageChunks::writeToNewChunk( marks.push_back(mark); } - return StorageLog::write(this, NULL); + return StorageLog::write(NULL); } -StorageChunks(const std::string& path_, const std::string& name_, const std::string & database_name_, NamesAndTypesListPtr columns_, Context & context_) +StorageChunks::StorageChunks(const std::string & path_, const std::string & name_, const std::string & database_name_, NamesAndTypesListPtr columns_, Context & context_) : StorageLog(path_, name_, columns_), database_name(database_name_), index_loaded(false), reference_counter(path_ + escapeForFileName(name_) + "/refcount.txt"), context(context_) {} void StorageChunks::loadIndex() @@ -94,7 +94,7 @@ void StorageChunks::loadIndex() size_t mark; readStringBinary(name, index); - readIntBinary(mark); + readIntBinary(mark, index); chunk_indices[name] = marks.size(); marks.push_back(mark); @@ -121,3 +121,5 @@ void StorageChunks::dropThis() InterpreterDropQuery interpreter(query_ptr, context); interpreter.execute(); } + +}