thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-22 07:31:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

zkutil_test: fixed error [#METR-10687].

Browse Source
This commit is contained in:
Alexey Milovidov 2014-05-08 23:03:22 +04:00
parent 6e83aa2253
commit f855ff1803
1 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
libs/libzkutil/src/tests/zkutil_test.cpp
View File

@ -34,6 +34,27 @@ void waitForWatch(zkutil::WatchFuture & future)
}
void readUntilSpace(std::string & s, DB::ReadBuffer & buf)
{
s = "";
while (!buf.eof())
{
if (isspace(*buf.position()))
return;
s.push_back(*buf.position());
++buf.position();
}
}
void readMaybeQuoted(std::string & s, DB::ReadBuffer & buf)
{
if (!buf.eof() && *buf.position() == '\'')
DB::readQuotedString(s, buf);
else
readUntilSpace(s, buf);
}
int main(int argc, char ** argv)
{
try
@ -85,19 +106,17 @@ int main(int argc, char ** argv)
{
DB::ReadBufferFromString in(line);
std::string path;
std::string data;
std::string mode;
DB::assertString("create", in);
DB::skipWhitespaceIfAny(in);
if (!in.eof() && *in.position() == '\'')
DB::readQuotedString(data, in);
else
DB::readString(data, in);
readMaybeQuoted(path, in);
DB::skipWhitespaceIfAny(in);
DB::readString(mode, in);
readMaybeQuoted(data, in);
DB::skipWhitespaceIfAny(in);
readUntilSpace(mode, in);
zkutil::CreateMode::type m;
if (mode == "p")
@ -156,12 +175,7 @@ int main(int argc, char ** argv)
DB::assertString("set", in);
DB::skipWhitespaceIfAny(in);
if (!in.eof() && *in.position() == '\'')
DB::readQuotedString(data, in);
else
DB::readString(data, in);
readMaybeQuoted(data, in);
DB::skipWhitespaceIfAny(in);
if (!in.eof())