From 6e814034c1442c5b31e9ae7b807add88aca3f1b3 Mon Sep 17 00:00:00 2001 From: stdpain Date: Sat, 12 Dec 2020 17:40:56 +0800 Subject: [PATCH] convert reference to pointer --- be/src/exec/broker_reader.cpp | 2 +- be/src/exec/broker_reader.h | 2 +- be/src/exec/buffered_reader.cpp | 2 +- be/src/exec/buffered_reader.h | 2 +- be/src/exec/file_reader.h | 2 +- be/src/exec/json_scanner.cpp | 2 +- be/src/exec/local_file_reader.cpp | 8 ++++---- be/src/exec/local_file_reader.h | 2 +- be/src/runtime/stream_load/stream_load_pipe.h | 14 +++++++------- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/be/src/exec/broker_reader.cpp b/be/src/exec/broker_reader.cpp index e60f8eae3859a1..64e587e65e0f84 100644 --- a/be/src/exec/broker_reader.cpp +++ b/be/src/exec/broker_reader.cpp @@ -122,7 +122,7 @@ Status BrokerReader::open() { } //not support -Status BrokerReader::read_one_message(std::unique_ptr& buf, size_t* length) { +Status BrokerReader::read_one_message(std::unique_ptr* buf, size_t* length) { return Status::NotSupported("Not support"); } diff --git a/be/src/exec/broker_reader.h b/be/src/exec/broker_reader.h index eb297cb958fa0a..d6efc8e9843569 100644 --- a/be/src/exec/broker_reader.h +++ b/be/src/exec/broker_reader.h @@ -50,7 +50,7 @@ class BrokerReader : public FileReader { virtual Status read(uint8_t* buf, size_t* buf_len, bool* eof) override; virtual Status readat(int64_t position, int64_t nbytes, int64_t* bytes_read, void* out) override; - virtual Status read_one_message(std::unique_ptr& buf, size_t* length) override; + virtual Status read_one_message(std::unique_ptr* buf, size_t* length) override; virtual int64_t size() override; virtual Status seek(int64_t position) override; virtual Status tell(int64_t* position) override; diff --git a/be/src/exec/buffered_reader.cpp b/be/src/exec/buffered_reader.cpp index b405d7a02efada..e9eb0e96472ff0 100644 --- a/be/src/exec/buffered_reader.cpp +++ b/be/src/exec/buffered_reader.cpp @@ -50,7 +50,7 @@ Status BufferedReader::open() { } //not support -Status BufferedReader::read_one_message(std::unique_ptr& buf, size_t* length) { +Status BufferedReader::read_one_message(std::unique_ptr* buf, size_t* length) { return Status::NotSupported("Not support"); } diff --git a/be/src/exec/buffered_reader.h b/be/src/exec/buffered_reader.h index 4c26a6de030a6d..1eb185c13cc97e 100644 --- a/be/src/exec/buffered_reader.h +++ b/be/src/exec/buffered_reader.h @@ -41,7 +41,7 @@ class BufferedReader : public FileReader { virtual Status read(uint8_t* buf, size_t* buf_len, bool* eof) override; virtual Status readat(int64_t position, int64_t nbytes, int64_t* bytes_read, void* out) override; - virtual Status read_one_message(std::unique_ptr& buf, size_t* length) override; + virtual Status read_one_message(std::unique_ptr* buf, size_t* length) override; virtual int64_t size() override; virtual Status seek(int64_t position) override; virtual Status tell(int64_t* position) override; diff --git a/be/src/exec/file_reader.h b/be/src/exec/file_reader.h index ff9d503e819f8c..6c7cb32394f9fa 100644 --- a/be/src/exec/file_reader.h +++ b/be/src/exec/file_reader.h @@ -41,7 +41,7 @@ class FileReader { * if read eof then return Status::OK and length is set 0 and buf is set NULL, * other return readed bytes. */ - virtual Status read_one_message(std::unique_ptr& buf, size_t* length) = 0; + virtual Status read_one_message(std::unique_ptr* buf, size_t* length) = 0; virtual int64_t size() = 0; virtual Status seek(int64_t position) = 0; virtual Status tell(int64_t* position) = 0; diff --git a/be/src/exec/json_scanner.cpp b/be/src/exec/json_scanner.cpp index a74b4e6bba8b3b..9ad24d9367c5cc 100644 --- a/be/src/exec/json_scanner.cpp +++ b/be/src/exec/json_scanner.cpp @@ -274,7 +274,7 @@ void JsonReader::_close() { Status JsonReader::_parse_json_doc(bool* eof) { std::unique_ptr json_str; size_t length = 0; - RETURN_IF_ERROR(_file_reader->read_one_message(json_str, &length)); + RETURN_IF_ERROR(_file_reader->read_one_message(&json_str, &length)); if (length == 0) { *eof = true; return Status::OK(); diff --git a/be/src/exec/local_file_reader.cpp b/be/src/exec/local_file_reader.cpp index a6a64069c5e8dd..04a795ac5cf0cf 100644 --- a/be/src/exec/local_file_reader.cpp +++ b/be/src/exec/local_file_reader.cpp @@ -53,17 +53,17 @@ bool LocalFileReader::closed() { } // Read all bytes -Status LocalFileReader::read_one_message(std::unique_ptr& buf, size_t* length) { +Status LocalFileReader::read_one_message(std::unique_ptr* buf, size_t* length) { bool eof; int64_t file_size = size() - _current_offset; if (file_size <= 0) { - buf.reset(); + buf->reset(); *length = 0; return Status::OK(); } *length = file_size; - buf.reset(new uint8_t[file_size]); - read(buf.get(), length, &eof); + buf->reset(new uint8_t[file_size]); + read(buf->get(), length, &eof); return Status::OK(); } diff --git a/be/src/exec/local_file_reader.h b/be/src/exec/local_file_reader.h index af44a8921f8348..4a302cca2d1bc8 100644 --- a/be/src/exec/local_file_reader.h +++ b/be/src/exec/local_file_reader.h @@ -38,7 +38,7 @@ class LocalFileReader : public FileReader { virtual Status read(uint8_t* buf, size_t* buf_len, bool* eof) override; virtual Status readat(int64_t position, int64_t nbytes, int64_t* bytes_read, void* out) override; - virtual Status read_one_message(std::unique_ptr& buf, size_t* length) override; + virtual Status read_one_message(std::unique_ptr* buf, size_t* length) override; virtual int64_t size() override; virtual Status seek(int64_t position) override; virtual Status tell(int64_t* position) override; diff --git a/be/src/runtime/stream_load/stream_load_pipe.h b/be/src/runtime/stream_load/stream_load_pipe.h index f7420b8d9e7076..0861da5181023c 100644 --- a/be/src/runtime/stream_load/stream_load_pipe.h +++ b/be/src/runtime/stream_load/stream_load_pipe.h @@ -86,7 +86,7 @@ class StreamLoadPipe : public MessageBodySink, public FileReader { // If _total_length == -1, this should be a Kafka routine load task, // just get the next buffer directly from the buffer queue, because one buffer contains a complete piece of data. // Otherwise, this should be a stream load task that needs to read the specified amount of data. - Status read_one_message(std::unique_ptr& data, size_t* length) override { + Status read_one_message(std::unique_ptr* data, size_t* length) override { if (_total_length < -1) { std::stringstream ss; ss << "invalid, _total_length is: " << _total_length; @@ -102,10 +102,10 @@ class StreamLoadPipe : public MessageBodySink, public FileReader { } // _total_length > 0, read the entire data - data.reset(new uint8_t[_total_length]); + data->reset(new uint8_t[_total_length]); *length = _total_length; bool eof = false; - Status st = read(data.get(), length, &eof); + Status st = read(data->get(), length, &eof); if (eof) { *length = 0; } @@ -188,7 +188,7 @@ class StreamLoadPipe : public MessageBodySink, public FileReader { private: // read the next buffer from _buf_queue - Status _read_next_buffer(std::unique_ptr& data, size_t* length) { + Status _read_next_buffer(std::unique_ptr* data, size_t* length) { std::unique_lock l(_lock); while (!_cancelled && !_finished && _buf_queue.empty()) { _get_cond.wait(l); @@ -200,14 +200,14 @@ class StreamLoadPipe : public MessageBodySink, public FileReader { // finished if (_buf_queue.empty()) { DCHECK(_finished); - data.reset(); + data->reset(); *length = 0; return Status::OK(); } auto buf = _buf_queue.front(); *length = buf->remaining(); - data.reset(new uint8_t[*length]); - buf->get_bytes((char*)(data.get()), *length); + data->reset(new uint8_t[*length]); + buf->get_bytes((char*)(data->get()), *length); _buf_queue.pop_front(); _buffered_bytes -= buf->limit;