thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-23 02:00:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed build [#CONV-6705].

Browse Source
This commit is contained in:
Michael Kolupaev 2013-02-07 13:07:13 +00:00
parent 6f2c6559c8
commit 17ba747e56
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dbms/include/DB/Storages/StorageChunks.h
View File

@ -16,7 +16,7 @@ namespace DB
class StorageChunks : public StorageLog class StorageChunks : public StorageLog
{ {
public: 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 addReference();
void removeReference(); void removeReference();

12
dbms/src/Storages/StorageChunks.cpp
View File

@ -9,9 +9,9 @@
namespace DB 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() void StorageChunks::addReference()
@ -72,10 +72,10 @@ BlockOutputStreamPtr StorageChunks::writeToNewChunk(
marks.push_back(mark); 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_) {} : StorageLog(path_, name_, columns_), database_name(database_name_), index_loaded(false), reference_counter(path_ + escapeForFileName(name_) + "/refcount.txt"), context(context_) {}
void StorageChunks::loadIndex() void StorageChunks::loadIndex()
@ -94,7 +94,7 @@ void StorageChunks::loadIndex()
size_t mark; size_t mark;
readStringBinary(name, index); readStringBinary(name, index);
readIntBinary<UInt64>(mark); readIntBinary<UInt64>(mark, index);
chunk_indices[name] = marks.size(); chunk_indices[name] = marks.size();
marks.push_back(mark); marks.push_back(mark);
@ -121,3 +121,5 @@ void StorageChunks::dropThis()
InterpreterDropQuery interpreter(query_ptr, context); InterpreterDropQuery interpreter(query_ptr, context);
interpreter.execute(); interpreter.execute();
} }
}