Skip to content

Commit 0600012

Browse files
committed
fix
1 parent 959fe57 commit 0600012

File tree

2 files changed

+2
-21
lines changed

2 files changed

+2
-21
lines changed

clickhouse/client.cpp

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -436,13 +436,10 @@ bool Client::Impl::ReceivePacket(uint64_t* server_packet) {
436436
return false;
437437
}
438438

439-
std::string columns_metadata;
440-
if (!WireFormat::ReadString(*input_, &columns_metadata)) {
439+
// columns metadata
440+
if (!WireFormat::SkipString(*input_)) {
441441
return false;
442442
}
443-
if (events_) {
444-
events_->OnColumnsMetadata(columns_metadata);
445-
}
446443
return true;
447444
}
448445

clickhouse/query.h

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,6 @@ class QueryEvents {
6666

6767
virtual void OnProgress(const Progress& progress) = 0;
6868

69-
virtual void OnColumnsMetadata(const std::string& columns_metadata) = 0;
70-
7169
virtual void OnFinish() = 0;
7270
};
7371

@@ -76,7 +74,6 @@ using ExceptionCallback = std::function<void(const Exception& e)>;
7674
using ProgressCallback = std::function<void(const Progress& progress)>;
7775
using SelectCallback = std::function<void(const Block& block)>;
7876
using SelectCancelableCallback = std::function<bool(const Block& block)>;
79-
using ColumnsMetadataCallback = std::function<bool(const std::string& columns_metadata)>;
8077

8178

8279
class Query : public QueryEvents {
@@ -119,12 +116,6 @@ class Query : public QueryEvents {
119116
return *this;
120117
}
121118

122-
/// Set handler for receiving a metedata of column of query.
123-
inline Query& OnColumnsMetadata(ColumnsMetadataCallback cb) {
124-
columns_metadata_cb_ = std::move(cb);
125-
return *this;
126-
}
127-
128119
static const std::string default_query_id;
129120

130121
private:
@@ -158,12 +149,6 @@ class Query : public QueryEvents {
158149
}
159150
}
160151

161-
void OnColumnsMetadata(const std::string& columns_metadata) override {
162-
if (columns_metadata_cb_) {
163-
columns_metadata_cb_(columns_metadata);
164-
}
165-
}
166-
167152
void OnFinish() override {
168153
}
169154

@@ -174,7 +159,6 @@ class Query : public QueryEvents {
174159
ProgressCallback progress_cb_;
175160
SelectCallback select_cb_;
176161
SelectCancelableCallback select_cancelable_cb_;
177-
ColumnsMetadataCallback columns_metadata_cb_;
178162
};
179163

180164
}

0 commit comments

Comments
 (0)