You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by mo...@apache.org on 2022/10/04 13:26:05 UTC
[doris] branch master updated: [fix](parquet) fix parquet write setting property is not effective (#12912)
This is an automated email from the ASF dual-hosted git repository.
morningman 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 3f47f67b16 [fix](parquet) fix parquet write setting property is not effective (#12912)
3f47f67b16 is described below
commit 3f47f67b1607f9f206714a30bc0039193f8e02d9
Author: zhangstar333 <87...@users.noreply.github.com>
AuthorDate: Tue Oct 4 21:25:57 2022 +0800
[fix](parquet) fix parquet write setting property is not effective (#12912)
---
be/src/runtime/file_result_writer.cpp | 2 +-
be/src/vec/runtime/vfile_result_writer.cpp | 2 +-
fe/fe-core/src/main/java/org/apache/doris/analysis/OutFileClause.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/be/src/runtime/file_result_writer.cpp b/be/src/runtime/file_result_writer.cpp
index 6a341e85a3..f6c8ff8fce 100644
--- a/be/src/runtime/file_result_writer.cpp
+++ b/be/src/runtime/file_result_writer.cpp
@@ -231,6 +231,7 @@ Status FileResultWriter::append_row_batch(const RowBatch* batch) {
Status FileResultWriter::_write_parquet_file(const RowBatch& batch) {
RETURN_IF_ERROR(_parquet_writer->write(batch));
// split file if exceed limit
+ _current_written_bytes = _parquet_writer->written_len();
return _create_new_file_if_exceed_size();
}
@@ -407,7 +408,6 @@ Status FileResultWriter::_create_new_file_if_exceed_size() {
Status FileResultWriter::_close_file_writer(bool done, bool only_close) {
if (_parquet_writer != nullptr) {
_parquet_writer->close();
- _current_written_bytes = _parquet_writer->written_len();
COUNTER_UPDATE(_written_data_bytes, _current_written_bytes);
delete _parquet_writer;
_parquet_writer = nullptr;
diff --git a/be/src/vec/runtime/vfile_result_writer.cpp b/be/src/vec/runtime/vfile_result_writer.cpp
index 883ba51c5a..4ae0e79dab 100644
--- a/be/src/vec/runtime/vfile_result_writer.cpp
+++ b/be/src/vec/runtime/vfile_result_writer.cpp
@@ -210,6 +210,7 @@ Status VFileResultWriter::append_block(Block& block) {
Status VFileResultWriter::_write_parquet_file(const Block& block) {
RETURN_IF_ERROR(_vparquet_writer->write(block));
// split file if exceed limit
+ _current_written_bytes = _vparquet_writer->written_len();
return _create_new_file_if_exceed_size();
}
@@ -416,7 +417,6 @@ Status VFileResultWriter::_create_new_file_if_exceed_size() {
Status VFileResultWriter::_close_file_writer(bool done) {
if (_vparquet_writer) {
_vparquet_writer->close();
- _current_written_bytes = _vparquet_writer->written_len();
COUNTER_UPDATE(_written_data_bytes, _current_written_bytes);
_vparquet_writer.reset(nullptr);
} else if (_file_writer_impl) {
diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/OutFileClause.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/OutFileClause.java
index fdb88b1ed4..d51e3e3b6f 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/analysis/OutFileClause.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/OutFileClause.java
@@ -144,7 +144,7 @@ public class OutFileClause {
private static final String PARQUET_COMPRESSION = "compression";
private TParquetCompressionType parquetCompressionType = TParquetCompressionType.UNCOMPRESSED;
private static final String PARQUET_DISABLE_DICTIONARY = "disable_dictionary";
- private boolean parquetDisableDictionary = true;
+ private boolean parquetDisableDictionary = false;
private static final String PARQUET_VERSION = "version";
private static TParquetVersion parquetVersion = TParquetVersion.PARQUET_1_0;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org