This is an automated email from the ASF dual-hosted git repository.
ashingau pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new e5b05c93f08 [fix](jni) fix jni_reader function name get_nex_block to
get_next_block (#29943)
e5b05c93f08 is described below
commit e5b05c93f086abdfddd2e0112a62b83f54791557
Author: nanfeng <nanfeng_...@163.com>
AuthorDate: Mon Jan 15 11:38:08 2024 +0800
[fix](jni) fix jni_reader function name get_nex_block to get_next_block
(#29943)
---
be/src/vec/exec/format/avro/avro_jni_reader.cpp | 2 +-
be/src/vec/exec/format/jni_reader.cpp | 2 +-
be/src/vec/exec/format/table/hudi_jni_reader.cpp | 2 +-
be/src/vec/exec/format/table/max_compute_jni_reader.cpp | 2 +-
be/src/vec/exec/format/table/paimon_reader.cpp | 2 +-
be/src/vec/exec/jni_connector.cpp | 2 +-
be/src/vec/exec/jni_connector.h | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/be/src/vec/exec/format/avro/avro_jni_reader.cpp
b/be/src/vec/exec/format/avro/avro_jni_reader.cpp
index 0877e8406b5..ec08c58d18a 100644
--- a/be/src/vec/exec/format/avro/avro_jni_reader.cpp
+++ b/be/src/vec/exec/format/avro/avro_jni_reader.cpp
@@ -43,7 +43,7 @@ AvroJNIReader::AvroJNIReader(RuntimeProfile* profile, const
TFileScanRangeParams
AvroJNIReader::~AvroJNIReader() = default;
Status AvroJNIReader::get_next_block(Block* block, size_t* read_rows, bool*
eof) {
- RETURN_IF_ERROR(_jni_connector->get_nex_block(block, read_rows, eof));
+ RETURN_IF_ERROR(_jni_connector->get_next_block(block, read_rows, eof));
if (*eof) {
RETURN_IF_ERROR(_jni_connector->close());
}
diff --git a/be/src/vec/exec/format/jni_reader.cpp
b/be/src/vec/exec/format/jni_reader.cpp
index 02002ed2560..625c79ffff2 100644
--- a/be/src/vec/exec/format/jni_reader.cpp
+++ b/be/src/vec/exec/format/jni_reader.cpp
@@ -63,7 +63,7 @@ MockJniReader::MockJniReader(const
std::vector<SlotDescriptor*>& file_slot_descs
}
Status MockJniReader::get_next_block(Block* block, size_t* read_rows, bool*
eof) {
- RETURN_IF_ERROR(_jni_connector->get_nex_block(block, read_rows, eof));
+ RETURN_IF_ERROR(_jni_connector->get_next_block(block, read_rows, eof));
if (*eof) {
RETURN_IF_ERROR(_jni_connector->close());
}
diff --git a/be/src/vec/exec/format/table/hudi_jni_reader.cpp
b/be/src/vec/exec/format/table/hudi_jni_reader.cpp
index bd6b40f3f1a..1cba7da7c65 100644
--- a/be/src/vec/exec/format/table/hudi_jni_reader.cpp
+++ b/be/src/vec/exec/format/table/hudi_jni_reader.cpp
@@ -80,7 +80,7 @@ HudiJniReader::HudiJniReader(const TFileScanRangeParams&
scan_params,
}
Status HudiJniReader::get_next_block(Block* block, size_t* read_rows, bool*
eof) {
- RETURN_IF_ERROR(_jni_connector->get_nex_block(block, read_rows, eof));
+ RETURN_IF_ERROR(_jni_connector->get_next_block(block, read_rows, eof));
if (*eof) {
RETURN_IF_ERROR(_jni_connector->close());
}
diff --git a/be/src/vec/exec/format/table/max_compute_jni_reader.cpp
b/be/src/vec/exec/format/table/max_compute_jni_reader.cpp
index 2884c413103..152b9571279 100644
--- a/be/src/vec/exec/format/table/max_compute_jni_reader.cpp
+++ b/be/src/vec/exec/format/table/max_compute_jni_reader.cpp
@@ -81,7 +81,7 @@ MaxComputeJniReader::MaxComputeJniReader(const
MaxComputeTableDescriptor* mc_des
}
Status MaxComputeJniReader::get_next_block(Block* block, size_t* read_rows,
bool* eof) {
- RETURN_IF_ERROR(_jni_connector->get_nex_block(block, read_rows, eof));
+ RETURN_IF_ERROR(_jni_connector->get_next_block(block, read_rows, eof));
if (*eof) {
RETURN_IF_ERROR(_jni_connector->close());
}
diff --git a/be/src/vec/exec/format/table/paimon_reader.cpp
b/be/src/vec/exec/format/table/paimon_reader.cpp
index 4d6cfc96b52..28282a2bf97 100644
--- a/be/src/vec/exec/format/table/paimon_reader.cpp
+++ b/be/src/vec/exec/format/table/paimon_reader.cpp
@@ -70,7 +70,7 @@ PaimonJniReader::PaimonJniReader(const
std::vector<SlotDescriptor*>& file_slot_d
}
Status PaimonJniReader::get_next_block(Block* block, size_t* read_rows, bool*
eof) {
- RETURN_IF_ERROR(_jni_connector->get_nex_block(block, read_rows, eof));
+ RETURN_IF_ERROR(_jni_connector->get_next_block(block, read_rows, eof));
if (*eof) {
RETURN_IF_ERROR(_jni_connector->close());
}
diff --git a/be/src/vec/exec/jni_connector.cpp
b/be/src/vec/exec/jni_connector.cpp
index f0494f931a3..26b66f48aca 100644
--- a/be/src/vec/exec/jni_connector.cpp
+++ b/be/src/vec/exec/jni_connector.cpp
@@ -112,7 +112,7 @@ Status JniConnector::init(
return Status::OK();
}
-Status JniConnector::get_nex_block(Block* block, size_t* read_rows, bool* eof)
{
+Status JniConnector::get_next_block(Block* block, size_t* read_rows, bool*
eof) {
// Call org.apache.doris.common.jni.JniScanner#getNextBatchMeta
// return the address of meta information
JNIEnv* env = nullptr;
diff --git a/be/src/vec/exec/jni_connector.h b/be/src/vec/exec/jni_connector.h
index 194370faf7b..ed282fc0c40 100644
--- a/be/src/vec/exec/jni_connector.h
+++ b/be/src/vec/exec/jni_connector.h
@@ -234,7 +234,7 @@ public:
* | data column start address of the variable
length column-B |
* | ... |
*/
- Status get_nex_block(Block* block, size_t* read_rows, bool* eof);
+ Status get_next_block(Block* block, size_t* read_rows, bool* eof);
/**
* Get performance metrics from java scanner
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
