chaoyli closed pull request #418: Fix compaction and ingestion core
URL: https://github.com/apache/incubator-doris/pull/418
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/be/src/olap/merger.cpp b/be/src/olap/merger.cpp
index 3a84b0b8..dfb425d2 100644
--- a/be/src/olap/merger.cpp
+++ b/be/src/olap/merger.cpp
@@ -106,6 +106,11 @@ OLAPStatus Merger::merge(const vector<ColumnData*>&
olap_data_arr,
++_row_count;
}
+ if (has_error) {
+ LOG(WARNING) << "base compaction failed.";
+ return OLAP_ERR_OTHER_ERROR;
+ }
+
if (OLAP_SUCCESS != writer->finalize()) {
OLAP_LOG_WARNING("fail to finalize writer. [table='%s']",
_table->full_name().c_str());
diff --git a/be/src/olap/push_handler.cpp b/be/src/olap/push_handler.cpp
index a51c7950..9bfaa266 100644
--- a/be/src/olap/push_handler.cpp
+++ b/be/src/olap/push_handler.cpp
@@ -664,6 +664,11 @@ OLAPStatus PushHandler::_convert(
}
}
+ if (res != OLAP_SUCCESS) {
+ LOG(WARNING) << "ingest data failed. res" << res;
+ break;
+ }
+
if (OLAP_SUCCESS != (res = writer->finalize())) {
OLAP_LOG_WARNING("fail to finalize writer. [res=%d]", res);
break;
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@doris.apache.org
For additional commands, e-mail: dev-h...@doris.apache.org
