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

fixes

Browse Source
This commit is contained in:
Alexander Tokmakov 2021-07-27 19:57:28 +03:00
parent 2929cf3ba8
commit 378dcef813
4 changed files with 50 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Common/ZooKeeper/ZooKeeperImpl.cpp
View File

@ -1225,7 +1225,7 @@ void ZooKeeper::logOperationIfNeeded(const ZooKeeperRequestPtr & request, const
if (request) if (request)
{ {
request->createLogElements(elems); request->createLogElements(elems);
log_type = ZooKeeperLogElement::SEND; log_type = ZooKeeperLogElement::REQUEST;
} }
else else
{ {
@ -1237,7 +1237,7 @@ void ZooKeeper::logOperationIfNeeded(const ZooKeeperRequestPtr & request, const
if (response) if (response)
{ {
response->fillLogElements(elems, 0); response->fillLogElements(elems, 0);
log_type = ZooKeeperLogElement::RECEIVE; log_type = ZooKeeperLogElement::RESPONSE;
} }
if (finalize) if (finalize)

14
src/Interpreters/ZooKeeperLog.cpp
View File

@ -24,8 +24,8 @@ NamesAndTypesList ZooKeeperLogElement::getNamesAndTypes()
auto type_enum = std::make_shared<DataTypeEnum8>( auto type_enum = std::make_shared<DataTypeEnum8>(
DataTypeEnum8::Values DataTypeEnum8::Values
{ {
{"Send", static_cast<Int8>(SEND)}, {"Request", static_cast<Int8>(REQUEST)},
{"Receive", static_cast<Int8>(RECEIVE)}, {"Response", static_cast<Int8>(RESPONSE)},
{"Finalize", static_cast<Int8>(FINALIZE)}, {"Finalize", static_cast<Int8>(FINALIZE)},
}); });
@ -86,7 +86,6 @@ NamesAndTypesList ZooKeeperLogElement::getNamesAndTypes()
auto watch_type_enum = std::make_shared<DataTypeEnum8>( auto watch_type_enum = std::make_shared<DataTypeEnum8>(
DataTypeEnum8::Values DataTypeEnum8::Values
{ {
{"NONE", 0},
{"CREATED", static_cast<Int8>(Coordination::Event::CREATED)}, {"CREATED", static_cast<Int8>(Coordination::Event::CREATED)},
{"DELETED", static_cast<Int8>(Coordination::Event::DELETED)}, {"DELETED", static_cast<Int8>(Coordination::Event::DELETED)},
{"CHANGED", static_cast<Int8>(Coordination::Event::CHANGED)}, {"CHANGED", static_cast<Int8>(Coordination::Event::CHANGED)},
@ -98,7 +97,6 @@ NamesAndTypesList ZooKeeperLogElement::getNamesAndTypes()
auto watch_state_enum = std::make_shared<DataTypeEnum16>( auto watch_state_enum = std::make_shared<DataTypeEnum16>(
DataTypeEnum16::Values DataTypeEnum16::Values
{ {
{"NONE", 0},
{"EXPIRED_SESSION", static_cast<Int16>(Coordination::State::EXPIRED_SESSION)}, {"EXPIRED_SESSION", static_cast<Int16>(Coordination::State::EXPIRED_SESSION)},
{"AUTH_FAILED", static_cast<Int16>(Coordination::State::AUTH_FAILED)}, {"AUTH_FAILED", static_cast<Int16>(Coordination::State::AUTH_FAILED)},
{"CONNECTING", static_cast<Int16>(Coordination::State::CONNECTING)}, {"CONNECTING", static_cast<Int16>(Coordination::State::CONNECTING)},
@ -134,8 +132,8 @@ NamesAndTypesList ZooKeeperLogElement::getNamesAndTypes()
{"zxid", std::make_shared<DataTypeInt64>()}, {"zxid", std::make_shared<DataTypeInt64>()},
{"error", std::make_shared<DataTypeNullable>(error_enum)}, {"error", std::make_shared<DataTypeNullable>(error_enum)},
{"watch_type", watch_type_enum}, {"watch_type", std::make_shared<DataTypeNullable>(watch_type_enum)},
{"watch_state", watch_state_enum}, {"watch_state", std::make_shared<DataTypeNullable>(watch_state_enum)},
{"path_created", std::make_shared<DataTypeString>()}, {"path_created", std::make_shared<DataTypeString>()},
@ -182,8 +180,8 @@ void ZooKeeperLogElement::appendToBlock(MutableColumns & columns) const
columns[i++]->insert(zxid); columns[i++]->insert(zxid);
columns[i++]->insert(error ? Field(*error) : Field()); columns[i++]->insert(error ? Field(*error) : Field());
columns[i++]->insert(watch_type); columns[i++]->insert(watch_type ? Field(*watch_type) : Field());
columns[i++]->insert(watch_state); columns[i++]->insert(watch_state ? Field(*watch_state) : Field());
columns[i++]->insert(path_created); columns[i++]->insert(path_created);

10
src/Interpreters/ZooKeeperLog.h
View File

@ -14,8 +14,8 @@ struct ZooKeeperLogElement
enum Type enum Type
{ {
UNKNOWN = 0, UNKNOWN = 0,
SEND = 1, REQUEST = 1,
RECEIVE = 2, RESPONSE = 2,
FINALIZE = 3 FINALIZE = 3
}; };
@ -38,7 +38,7 @@ struct ZooKeeperLogElement
bool is_sequential = false; bool is_sequential = false;
/// remove, check, set /// remove, check, set
std::optional<Int32> version = 0; std::optional<Int32> version;
/// multi /// multi
UInt32 requests_size = 0; UInt32 requests_size = 0;
@ -49,8 +49,8 @@ struct ZooKeeperLogElement
std::optional<Int32> error; std::optional<Int32> error;
/// watch /// watch
Int32 watch_type = 0; std::optional<Int32> watch_type;
Int32 watch_state = 0; std::optional<Int32> watch_state;
/// create /// create
String path_created; String path_created;

74
tests/queries/0_stateless/01158_zookeeper_log.reference
View File

@ -1,40 +1,40 @@
log log
Receive 0 Watch /test/01158/default/rmt/log 0 0 0 0 0 ZOK CHILD CONNECTED 0 0 0 0 Response 0 Watch /test/01158/default/rmt/log 0 0 \N 0 0 ZOK CHILD CONNECTED 0 0 0 0
Send 0 Create /test/01158/default/rmt/log 0 0 0 0 4 \N NONE NONE 0 0 0 0 Request 0 Create /test/01158/default/rmt/log 0 0 \N 0 4 \N \N \N 0 0 0 0
Receive 0 Create /test/01158/default/rmt/log 0 0 0 0 4 ZOK NONE NONE /test/01158/default/rmt/log 0 0 0 0 Response 0 Create /test/01158/default/rmt/log 0 0 \N 0 4 ZOK \N \N /test/01158/default/rmt/log 0 0 0 0
Send 0 Create /test/01158/default/rmt/log/log- 0 1 0 0 1 \N NONE NONE 0 0 0 0 Request 0 Create /test/01158/default/rmt/log/log- 0 1 \N 0 1 \N \N \N 0 0 0 0
Receive 0 Create /test/01158/default/rmt/log/log- 0 1 0 0 1 ZOK NONE NONE /test/01158/default/rmt/log/log-0000000000 0 0 0 0 Response 0 Create /test/01158/default/rmt/log/log- 0 1 \N 0 1 ZOK \N \N /test/01158/default/rmt/log/log-0000000000 0 0 0 0
parts parts
Send 0 Multi 0 0 0 5 0 \N NONE NONE 0 0 0 0 Request 0 Multi 0 0 \N 5 0 \N \N \N 0 0 0 0
Send 0 Create /test/01158/default/rmt/log/log- 0 1 0 0 1 \N NONE NONE 0 0 0 0 Request 0 Create /test/01158/default/rmt/log/log- 0 1 \N 0 1 \N \N \N 0 0 0 0
Send 0 Remove /test/01158/default/rmt/block_numbers/all/block-0000000000 0 0 -1 0 2 \N NONE NONE 0 0 0 0 Request 0 Remove /test/01158/default/rmt/block_numbers/all/block-0000000000 0 0 -1 0 2 \N \N \N 0 0 0 0
Send 0 Remove /test/01158/default/rmt/temp/abandonable_lock-0000000000 0 0 -1 0 3 \N NONE NONE 0 0 0 0 Request 0 Remove /test/01158/default/rmt/temp/abandonable_lock-0000000000 0 0 -1 0 3 \N \N \N 0 0 0 0
Send 0 Create /test/01158/default/rmt/blocks/all_6308706741995381342_2495791770474910886 0 0 0 0 4 \N NONE NONE 0 0 0 0 Request 0 Create /test/01158/default/rmt/blocks/all_6308706741995381342_2495791770474910886 0 0 \N 0 4 \N \N \N 0 0 0 0
Send 0 Create /test/01158/default/rmt/replicas/1/parts/all_0_0_0 0 0 0 0 5 \N NONE NONE 0 0 0 0 Request 0 Create /test/01158/default/rmt/replicas/1/parts/all_0_0_0 0 0 \N 0 5 \N \N \N 0 0 0 0
Receive 0 Multi 0 0 0 5 0 ZOK NONE NONE 0 0 0 0 Response 0 Multi 0 0 \N 5 0 ZOK \N \N 0 0 0 0
Receive 0 Create /test/01158/default/rmt/log/log- 0 1 0 0 1 ZOK NONE NONE /test/01158/default/rmt/log/log-0000000000 0 0 0 0 Response 0 Create /test/01158/default/rmt/log/log- 0 1 \N 0 1 ZOK \N \N /test/01158/default/rmt/log/log-0000000000 0 0 0 0
Receive 0 Remove /test/01158/default/rmt/block_numbers/all/block-0000000000 0 0 -1 0 2 ZOK NONE NONE 0 0 0 0 Response 0 Remove /test/01158/default/rmt/block_numbers/all/block-0000000000 0 0 -1 0 2 ZOK \N \N 0 0 0 0
Receive 0 Remove /test/01158/default/rmt/temp/abandonable_lock-0000000000 0 0 -1 0 3 ZOK NONE NONE 0 0 0 0 Response 0 Remove /test/01158/default/rmt/temp/abandonable_lock-0000000000 0 0 -1 0 3 ZOK \N \N 0 0 0 0
Receive 0 Create /test/01158/default/rmt/blocks/all_6308706741995381342_2495791770474910886 0 0 0 0 4 ZOK NONE NONE /test/01158/default/rmt/blocks/all_6308706741995381342_2495791770474910886 0 0 0 0 Response 0 Create /test/01158/default/rmt/blocks/all_6308706741995381342_2495791770474910886 0 0 \N 0 4 ZOK \N \N /test/01158/default/rmt/blocks/all_6308706741995381342_2495791770474910886 0 0 0 0
Receive 0 Create /test/01158/default/rmt/replicas/1/parts/all_0_0_0 0 0 0 0 5 ZOK NONE NONE /test/01158/default/rmt/replicas/1/parts/all_0_0_0 0 0 0 0 Response 0 Create /test/01158/default/rmt/replicas/1/parts/all_0_0_0 0 0 \N 0 5 ZOK \N \N /test/01158/default/rmt/replicas/1/parts/all_0_0_0 0 0 0 0
Send 0 Exists /test/01158/default/rmt/replicas/1/parts/all_0_0_0 0 0 0 0 0 \N NONE NONE 0 0 0 0 Request 0 Exists /test/01158/default/rmt/replicas/1/parts/all_0_0_0 0 0 \N 0 0 \N \N \N 0 0 0 0
Receive 0 Exists /test/01158/default/rmt/replicas/1/parts/all_0_0_0 0 0 0 0 0 ZOK NONE NONE 0 0 96 0 Response 0 Exists /test/01158/default/rmt/replicas/1/parts/all_0_0_0 0 0 \N 0 0 ZOK \N \N 0 0 96 0
blocks blocks
Send 0 Multi 0 0 0 3 0 \N NONE NONE 0 0 0 0 Request 0 Multi 0 0 \N 3 0 \N \N \N 0 0 0 0
Send 0 Create /test/01158/default/rmt/blocks/all_6308706741995381342_2495791770474910886 0 0 0 0 1 \N NONE NONE 0 0 0 0 Request 0 Create /test/01158/default/rmt/blocks/all_6308706741995381342_2495791770474910886 0 0 \N 0 1 \N \N \N 0 0 0 0
Send 0 Remove /test/01158/default/rmt/blocks/all_6308706741995381342_2495791770474910886 0 0 -1 0 2 \N NONE NONE 0 0 0 0 Request 0 Remove /test/01158/default/rmt/blocks/all_6308706741995381342_2495791770474910886 0 0 -1 0 2 \N \N \N 0 0 0 0
Send 0 Create /test/01158/default/rmt/temp/abandonable_lock- 1 1 0 0 3 \N NONE NONE 0 0 0 0 Request 0 Create /test/01158/default/rmt/temp/abandonable_lock- 1 1 \N 0 3 \N \N \N 0 0 0 0
Receive 0 Multi 0 0 0 3 0 ZOK NONE NONE 0 0 0 0 Response 0 Multi 0 0 \N 3 0 ZOK \N \N 0 0 0 0
Receive 0 Create /test/01158/default/rmt/blocks/all_6308706741995381342_2495791770474910886 0 0 0 0 1 ZOK NONE NONE /test/01158/default/rmt/blocks/all_6308706741995381342_2495791770474910886 0 0 0 0 Response 0 Create /test/01158/default/rmt/blocks/all_6308706741995381342_2495791770474910886 0 0 \N 0 1 ZOK \N \N /test/01158/default/rmt/blocks/all_6308706741995381342_2495791770474910886 0 0 0 0
Receive 0 Remove /test/01158/default/rmt/blocks/all_6308706741995381342_2495791770474910886 0 0 -1 0 2 ZOK NONE NONE 0 0 0 0 Response 0 Remove /test/01158/default/rmt/blocks/all_6308706741995381342_2495791770474910886 0 0 -1 0 2 ZOK \N \N 0 0 0 0
Receive 0 Create /test/01158/default/rmt/temp/abandonable_lock- 1 1 0 0 3 ZOK NONE NONE /test/01158/default/rmt/temp/abandonable_lock-0000000000 0 0 0 0 Response 0 Create /test/01158/default/rmt/temp/abandonable_lock- 1 1 \N 0 3 ZOK \N \N /test/01158/default/rmt/temp/abandonable_lock-0000000000 0 0 0 0
Send 0 Multi 0 0 0 3 0 \N NONE NONE 0 0 0 0 Request 0 Multi 0 0 \N 3 0 \N \N \N 0 0 0 0
Send 0 Create /test/01158/default/rmt/blocks/all_6308706741995381342_2495791770474910886 0 0 0 0 1 \N NONE NONE 0 0 0 0 Request 0 Create /test/01158/default/rmt/blocks/all_6308706741995381342_2495791770474910886 0 0 \N 0 1 \N \N \N 0 0 0 0
Send 0 Remove /test/01158/default/rmt/blocks/all_6308706741995381342_2495791770474910886 0 0 -1 0 2 \N NONE NONE 0 0 0 0 Request 0 Remove /test/01158/default/rmt/blocks/all_6308706741995381342_2495791770474910886 0 0 -1 0 2 \N \N \N 0 0 0 0
Send 0 Create /test/01158/default/rmt/temp/abandonable_lock- 1 1 0 0 3 \N NONE NONE 0 0 0 0 Request 0 Create /test/01158/default/rmt/temp/abandonable_lock- 1 1 \N 0 3 \N \N \N 0 0 0 0
Receive 0 Multi 0 0 0 3 0 ZNODEEXISTS NONE NONE 0 0 0 0 Response 0 Multi 0 0 \N 3 0 ZNODEEXISTS \N \N 0 0 0 0
Receive 0 Error /test/01158/default/rmt/blocks/all_6308706741995381342_2495791770474910886 0 0 0 0 1 ZNODEEXISTS NONE NONE 0 0 0 0 Response 0 Error /test/01158/default/rmt/blocks/all_6308706741995381342_2495791770474910886 0 0 \N 0 1 ZNODEEXISTS \N \N 0 0 0 0
Receive 0 Error /test/01158/default/rmt/blocks/all_6308706741995381342_2495791770474910886 0 0 -1 0 2 ZRUNTIMEINCONSISTENCY NONE NONE 0 0 0 0 Response 0 Error /test/01158/default/rmt/blocks/all_6308706741995381342_2495791770474910886 0 0 -1 0 2 ZRUNTIMEINCONSISTENCY \N \N 0 0 0 0
Receive 0 Error /test/01158/default/rmt/temp/abandonable_lock- 1 1 0 0 3 ZRUNTIMEINCONSISTENCY NONE NONE 0 0 0 0 Response 0 Error /test/01158/default/rmt/temp/abandonable_lock- 1 1 \N 0 3 ZRUNTIMEINCONSISTENCY \N \N 0 0 0 0
Send 0 Get /test/01158/default/rmt/blocks/all_6308706741995381342_2495791770474910886 0 0 0 0 0 \N NONE NONE 0 0 0 0 Request 0 Get /test/01158/default/rmt/blocks/all_6308706741995381342_2495791770474910886 0 0 \N 0 0 \N \N \N 0 0 0 0
Receive 0 Get /test/01158/default/rmt/blocks/all_6308706741995381342_2495791770474910886 0 0 0 0 0 ZOK NONE NONE 0 0 9 0 Response 0 Get /test/01158/default/rmt/blocks/all_6308706741995381342_2495791770474910886 0 0 \N 0 0 ZOK \N \N 0 0 9 0