This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch 2.1-tmp
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/2.1-tmp by this push:
new 8fbeda8c069 [Fix](hive-writer) Fix the issue of block was not copied
to do filtering when hive partition writer write block to file. (#32775)
(#33447)
8fbeda8c069 is described below
commit 8fbeda8c069cc603a95924125abd63a03ecbeee9
Author: Qi Chen <kaka11.c...@gmail.com>
AuthorDate: Tue Apr 9 22:23:25 2024 +0800
[Fix](hive-writer) Fix the issue of block was not copied to do filtering
when hive partition writer write block to file. (#32775) (#33447)
backport #32775
---
be/src/vec/sink/writer/vhive_partition_writer.cpp | 2 +-
.../external_table_p0/hive/write/test_hive_write_insert.out | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/be/src/vec/sink/writer/vhive_partition_writer.cpp
b/be/src/vec/sink/writer/vhive_partition_writer.cpp
index fa414848b6b..ca6e76862ba 100644
--- a/be/src/vec/sink/writer/vhive_partition_writer.cpp
+++ b/be/src/vec/sink/writer/vhive_partition_writer.cpp
@@ -247,7 +247,7 @@ Status
VHivePartitionWriter::_projection_and_filter_block(doris::vectorized::Blo
return status;
}
RETURN_IF_ERROR(vectorized::VExprContext::get_output_block_after_execute_exprs(
- _vec_output_expr_ctxs, input_block, output_block));
+ _vec_output_expr_ctxs, input_block, output_block, true));
materialize_block_inplace(*output_block);
if (filter == nullptr) {
diff --git
a/regression-test/data/external_table_p0/hive/write/test_hive_write_insert.out
b/regression-test/data/external_table_p0/hive/write/test_hive_write_insert.out
index 2852d887a9b..7b5c0e7d7bc 100644
---
a/regression-test/data/external_table_p0/hive/write/test_hive_write_insert.out
+++
b/regression-test/data/external_table_p0/hive/write/test_hive_write_insert.out
@@ -58,16 +58,16 @@ true 127 32767 2147483647
9223372036854775807 123.45 123456.789 123456789 1234.5
true 127 32767 2147483647 9223372036854775807 123.45
123456.789 123456789 1234.5678 123456.789012
123456789.012345678901 string_value binary_value 2024-03-20
2024-03-20T12:00 2024-03-20T12:00:00.123457
2024-03-20T12:00:00.123457 char_value1 char_value2 char_value3
varchar_value1 varchar_value2 varchar_value3 {"key1":"value1"}
{"key1":"value1"} {"a":"b"} {1:10} {1:100000000000}
{1.1:10.1} {1.1:10.1} {1:0} {1.1:1.1} {1.23:1.23}
{1.2345:1.2345} {1.23456789:1.23456789} {1.23456789:1.23456789 [...]
-- !q02 --
-false -128 -32768 -2147483648 -9223372036854775808 -123.45
-123456.789 -123456789 -1234.5678 -123456.789012
-123456789.012345678901 string_value binary_value 2024-03-21
2024-03-21T12:00 2024-03-21T12:00:00.123457
2024-03-21T12:00:00.123457 char_value1 char_value2 char_value3
varchar_value1 varchar_value2 varchar_value3 {"key1":"value1"}
{"key1":"value1"} {"x":"y"} {3:20} {3:200000000000}
{3.2:20.2} {3.2:20.2} {0:1} {3.2:2.2} {3.34:2.34}
{2.3456:2.3456} {2.34567890:2.34567890} {2.34567890 [...]
+false -128 -32768 -2147483648 -9223372036854775808 -123.45
-123456.789 -123456789 -1234.5678 -123456.789012
-123456789.012345678901 string_value binary_value 2024-03-21
2024-03-21T12:00 2024-03-21T12:00:00.123457
2024-03-21T12:00:00.123457 char_value1 char_value2 char_value3
varchar_value1 varchar_value2 varchar_value3 {"key1":"value1"}
{"key1":"value1"} {"x":"y"} {2:20} {2:200000000000}
{2.2:20.2} {2.2:20.2} {0:1} {2.2:2.2} {2.34:2.34}
{2.3456:2.3456} {2.34567890:2.34567890} {2.34567890 [...]
false -128 -32768 -2147483648 -9223372036854775808 -123.45
-123456.789 -123456789 -1234.5678 -123456.789012
-123456789.012345678901 string_value binary_value 2024-03-22
2024-03-22T12:00 2024-03-22T12:00:00.123457
2024-03-22T12:00:00.123457 char_value1 char_value2 char_value3
varchar_value1 varchar_value2 varchar_value3 {"key1":"value1"}
{"key1":"value1"} {"x":"y"} {3:20} {3:200000000000}
{3.2:20.2} {3.2:20.2} {0:1} {3.2:2.2} {3.34:2.34}
{2.3456:2.3456} {2.34567890:2.34567890} {2.34567890 [...]
true 127 32767 2147483647 9223372036854775807 123.45
123456.789 123456789 1234.5678 123456.789012
123456789.012345678901 string_value binary_value 2024-03-20
2024-03-20T12:00 2024-03-20T12:00:00.123457
2024-03-20T12:00:00.123457 char_value1 char_value2 char_value3
varchar_value1 varchar_value2 varchar_value3 {"key1":"value1"}
{"key1":"value1"} {"a":"b"} {1:10} {1:100000000000}
{1.1:10.1} {1.1:10.1} {1:0} {1.1:1.1} {1.23:1.23}
{1.2345:1.2345} {1.23456789:1.23456789} {1.23456789:1.23456789 [...]
-true 127 32767 2147483647 9223372036854775807 123.45
123456.789 123456789 1234.5678 123456.789012
123456789.012345678901 string_value binary_value 2024-03-20
2024-03-20T12:00 2024-03-20T12:00:00.123457
2024-03-20T12:00:00.123457 char_value1 char_value2 char_value3
varchar_value1 varchar_value2 varchar_value3 {"key1":"value1"}
{"key1":"value1"} {"x":"y"} {3:20} {3:200000000000}
{3.2:20.2} {3.2:20.2} {0:1} {3.2:2.2} {3.34:2.34}
{2.3456:2.3456} {2.34567890:2.34567890} {2.34567890:2.34567890 [...]
+true 127 32767 2147483647 9223372036854775807 123.45
123456.789 123456789 1234.5678 123456.789012
123456789.012345678901 string_value binary_value 2024-03-20
2024-03-20T12:00 2024-03-20T12:00:00.123457
2024-03-20T12:00:00.123457 char_value1 char_value2 char_value3
varchar_value1 varchar_value2 varchar_value3 {"key1":"value1"}
{"key1":"value1"} {"a":"b"} {1:10} {1:100000000000}
{1.1:10.1} {1.1:10.1} {1:0} {1.1:1.1} {1.23:1.23}
{1.2345:1.2345} {1.23456789:1.23456789} {1.23456789:1.23456789 [...]
-- !q04 --
false -128 -32768 -2147483648 -9223372036854775808 -123.45
-123456.789 -123456789 -1234.5678 -123456.789012
-123456789.012345678901 string_value binary_value 2024-03-22
2024-03-22T12:00 2024-03-22T12:00:00.123457
2024-03-22T12:00:00.123457 char_value1 char_value2 char_value3
varchar_value1 varchar_value2 varchar_value3 {"key1":"value1"}
{"key1":"value1"} {"x":"y"} {3:20} {3:200000000000}
{3.2:20.2} {3.2:20.2} {0:1} {3.2:2.2} {3.34:2.34}
{2.3456:2.3456} {2.34567890:2.34567890} {2.34567890 [...]
false -7 -15 16 -9223372036854775808 -123.45 -123456.789
123456789 -1234.5678 -123456.789012 -123456789.012345678901 str
binary_value 2024-03-25 2024-03-25T12:00
2024-03-25T12:00:00.123457 2024-03-25T12:00:00.123457 char_value11111
char_value22222 char_value33333 varchar_value11111 varchar_value22222
varchar_value33333 {"key7":"value1"} {"key7":"value1"}
{"x":"y"} {3:20} {3:200000000000} {3.2:20.2} {3.2:20.2}
{0:1} {3.2:2.2} {3.34:2.34} {5.3456:2.3456} {5.34567890:2.34567890}
{2.34567890 [...]
true 127 32767 2147483647 9223372036854775807 123.45
123456.789 123456789 1234.5678 123456.789012
123456789.012345678901 string_value binary_value 2024-03-20
2024-03-20T12:00 2024-03-20T12:00:00.123457
2024-03-20T12:00:00.123457 char_value1 char_value2 char_value3
varchar_value1 varchar_value2 varchar_value3 {"key1":"value1"}
{"key1":"value1"} {"a":"b"} {1:10} {1:100000000000}
{1.1:10.1} {1.1:10.1} {1:0} {1.1:1.1} {1.23:1.23}
{1.2345:1.2345} {1.23456789:1.23456789} {1.23456789:1.23456789 [...]
-true 127 32767 2147483647 9223372036854775807 123.45
123456.789 123456789 1234.5678 123456.789012
123456789.012345678901 string_value binary_value 2024-03-20
2024-03-20T12:00 2024-03-20T12:00:00.123457
2024-03-20T12:00:00.123457 char_value1 char_value2 char_value3
varchar_value1 varchar_value2 varchar_value3 {"key1":"value1"}
{"key1":"value1"} {"x":"y"} {3:20} {3:200000000000}
{3.2:20.2} {3.2:20.2} {0:1} {3.2:2.2} {3.34:2.34}
{2.3456:2.3456} {2.34567890:2.34567890} {2.34567890:2.34567890 [...]
+true 127 32767 2147483647 9223372036854775807 123.45
123456.789 123456789 1234.5678 123456.789012
123456789.012345678901 string_value binary_value 2024-03-20
2024-03-20T12:00 2024-03-20T12:00:00.123457
2024-03-20T12:00:00.123457 char_value1 char_value2 char_value3
varchar_value1 varchar_value2 varchar_value3 {"key1":"value1"}
{"key1":"value1"} {"a":"b"} {1:10} {1:100000000000}
{1.1:10.1} {1.1:10.1} {1:0} {1.1:1.1} {1.23:1.23}
{1.2345:1.2345} {1.23456789:1.23456789} {1.23456789:1.23456789 [...]
-- !q01 --
false -128 -32768 -2147483648 -9223372036854775808 -123.45
-123456.789 -123456789 -1234.5678 -123456.789012
-123456789.012345678901 string_value binary_value 2024-03-21
2024-03-21T12:00 2024-03-21T12:00:00.123456
2024-03-21T12:00:00.123456 char_value1 char_value2 char_value3
varchar_value1 varchar_value2 varchar_value3 {"key1":"value1"}
{"key1":"value1"} {"x":"y"} {2:20} {2:200000000000}
{2.2:20.2} {2.2:20.2} {0:1} {2.2:2.2} {2.34:2.34}
{2.3456:2.3456} {2.34567890:2.34567890} {2.34567890 [...]
@@ -141,16 +141,16 @@ true 127 32767 2147483647
9223372036854775807 123.45 123456.789 123456789 1234.5
true 127 32767 2147483647 9223372036854775807 123.45
123456.789 123456789 1234.5678 123456.789012
123456789.012345678901 string_value binary_value 2024-03-20
2024-03-20T12:00 2024-03-20T12:00:00.123457
2024-03-20T12:00:00.123457 char_value1 char_value2 char_value3
varchar_value1 varchar_value2 varchar_value3 {"key1":"value1"}
{"key1":"value1"} {"a":"b"} {1:10} {1:100000000000}
{1.1:10.1} {1.1:10.1} {1:0} {1.1:1.1} {1.23:1.23}
{1.2345:1.2345} {1.23456789:1.23456789} {1.23456789:1.23456789 [...]
-- !q02 --
-false -128 -32768 -2147483648 -9223372036854775808 -123.45
-123456.789 -123456789 -1234.5678 -123456.789012
-123456789.012345678901 string_value binary_value 2024-03-21
2024-03-21T12:00 2024-03-21T12:00:00.123457
2024-03-21T12:00:00.123457 char_value1 char_value2 char_value3
varchar_value1 varchar_value2 varchar_value3 {"key1":"value1"}
{"key1":"value1"} {"x":"y"} {3:20} {3:200000000000}
{3.2:20.2} {3.2:20.2} {0:1} {3.2:2.2} {3.34:2.34}
{2.3456:2.3456} {2.34567890:2.34567890} {2.34567890 [...]
+false -128 -32768 -2147483648 -9223372036854775808 -123.45
-123456.789 -123456789 -1234.5678 -123456.789012
-123456789.012345678901 string_value binary_value 2024-03-21
2024-03-21T12:00 2024-03-21T12:00:00.123457
2024-03-21T12:00:00.123457 char_value1 char_value2 char_value3
varchar_value1 varchar_value2 varchar_value3 {"key1":"value1"}
{"key1":"value1"} {"x":"y"} {2:20} {2:200000000000}
{2.2:20.2} {2.2:20.2} {0:1} {2.2:2.2} {2.34:2.34}
{2.3456:2.3456} {2.34567890:2.34567890} {2.34567890 [...]
false -128 -32768 -2147483648 -9223372036854775808 -123.45
-123456.789 -123456789 -1234.5678 -123456.789012
-123456789.012345678901 string_value binary_value 2024-03-22
2024-03-22T12:00 2024-03-22T12:00:00.123457
2024-03-22T12:00:00.123457 char_value1 char_value2 char_value3
varchar_value1 varchar_value2 varchar_value3 {"key1":"value1"}
{"key1":"value1"} {"x":"y"} {3:20} {3:200000000000}
{3.2:20.2} {3.2:20.2} {0:1} {3.2:2.2} {3.34:2.34}
{2.3456:2.3456} {2.34567890:2.34567890} {2.34567890 [...]
true 127 32767 2147483647 9223372036854775807 123.45
123456.789 123456789 1234.5678 123456.789012
123456789.012345678901 string_value binary_value 2024-03-20
2024-03-20T12:00 2024-03-20T12:00:00.123457
2024-03-20T12:00:00.123457 char_value1 char_value2 char_value3
varchar_value1 varchar_value2 varchar_value3 {"key1":"value1"}
{"key1":"value1"} {"a":"b"} {1:10} {1:100000000000}
{1.1:10.1} {1.1:10.1} {1:0} {1.1:1.1} {1.23:1.23}
{1.2345:1.2345} {1.23456789:1.23456789} {1.23456789:1.23456789 [...]
-true 127 32767 2147483647 9223372036854775807 123.45
123456.789 123456789 1234.5678 123456.789012
123456789.012345678901 string_value binary_value 2024-03-20
2024-03-20T12:00 2024-03-20T12:00:00.123457
2024-03-20T12:00:00.123457 char_value1 char_value2 char_value3
varchar_value1 varchar_value2 varchar_value3 {"key1":"value1"}
{"key1":"value1"} {"x":"y"} {3:20} {3:200000000000}
{3.2:20.2} {3.2:20.2} {0:1} {3.2:2.2} {3.34:2.34}
{2.3456:2.3456} {2.34567890:2.34567890} {2.34567890:2.34567890 [...]
+true 127 32767 2147483647 9223372036854775807 123.45
123456.789 123456789 1234.5678 123456.789012
123456789.012345678901 string_value binary_value 2024-03-20
2024-03-20T12:00 2024-03-20T12:00:00.123457
2024-03-20T12:00:00.123457 char_value1 char_value2 char_value3
varchar_value1 varchar_value2 varchar_value3 {"key1":"value1"}
{"key1":"value1"} {"a":"b"} {1:10} {1:100000000000}
{1.1:10.1} {1.1:10.1} {1:0} {1.1:1.1} {1.23:1.23}
{1.2345:1.2345} {1.23456789:1.23456789} {1.23456789:1.23456789 [...]
-- !q04 --
false -128 -32768 -2147483648 -9223372036854775808 -123.45
-123456.789 -123456789 -1234.5678 -123456.789012
-123456789.012345678901 string_value binary_value 2024-03-22
2024-03-22T12:00 2024-03-22T12:00:00.123457
2024-03-22T12:00:00.123457 char_value1 char_value2 char_value3
varchar_value1 varchar_value2 varchar_value3 {"key1":"value1"}
{"key1":"value1"} {"x":"y"} {3:20} {3:200000000000}
{3.2:20.2} {3.2:20.2} {0:1} {3.2:2.2} {3.34:2.34}
{2.3456:2.3456} {2.34567890:2.34567890} {2.34567890 [...]
false -7 -15 16 -9223372036854775808 -123.45 -123456.789
123456789 -1234.5678 -123456.789012 -123456789.012345678901 str
binary_value 2024-03-25 2024-03-25T12:00
2024-03-25T12:00:00.123457 2024-03-25T12:00:00.123457 char_value11111
char_value22222 char_value33333 varchar_value11111 varchar_value22222
varchar_value33333 {"key7":"value1"} {"key7":"value1"}
{"x":"y"} {3:20} {3:200000000000} {3.2:20.2} {3.2:20.2}
{0:1} {3.2:2.2} {3.34:2.34} {5.3456:2.3456} {5.34567890:2.34567890}
{2.34567890 [...]
true 127 32767 2147483647 9223372036854775807 123.45
123456.789 123456789 1234.5678 123456.789012
123456789.012345678901 string_value binary_value 2024-03-20
2024-03-20T12:00 2024-03-20T12:00:00.123457
2024-03-20T12:00:00.123457 char_value1 char_value2 char_value3
varchar_value1 varchar_value2 varchar_value3 {"key1":"value1"}
{"key1":"value1"} {"a":"b"} {1:10} {1:100000000000}
{1.1:10.1} {1.1:10.1} {1:0} {1.1:1.1} {1.23:1.23}
{1.2345:1.2345} {1.23456789:1.23456789} {1.23456789:1.23456789 [...]
-true 127 32767 2147483647 9223372036854775807 123.45
123456.789 123456789 1234.5678 123456.789012
123456789.012345678901 string_value binary_value 2024-03-20
2024-03-20T12:00 2024-03-20T12:00:00.123457
2024-03-20T12:00:00.123457 char_value1 char_value2 char_value3
varchar_value1 varchar_value2 varchar_value3 {"key1":"value1"}
{"key1":"value1"} {"x":"y"} {3:20} {3:200000000000}
{3.2:20.2} {3.2:20.2} {0:1} {3.2:2.2} {3.34:2.34}
{2.3456:2.3456} {2.34567890:2.34567890} {2.34567890:2.34567890 [...]
+true 127 32767 2147483647 9223372036854775807 123.45
123456.789 123456789 1234.5678 123456.789012
123456789.012345678901 string_value binary_value 2024-03-20
2024-03-20T12:00 2024-03-20T12:00:00.123457
2024-03-20T12:00:00.123457 char_value1 char_value2 char_value3
varchar_value1 varchar_value2 varchar_value3 {"key1":"value1"}
{"key1":"value1"} {"a":"b"} {1:10} {1:100000000000}
{1.1:10.1} {1.1:10.1} {1:0} {1.1:1.1} {1.23:1.23}
{1.2345:1.2345} {1.23456789:1.23456789} {1.23456789:1.23456789 [...]
-- !q01 --
false -128 -32768 -2147483648 -9223372036854775808 -123.45
-123456.789 -123456789 -1234.5678 -123456.789012
-123456789.012345678901 string_value binary_value 2024-03-21
2024-03-21T12:00 2024-03-21T12:00:00.123456
2024-03-21T12:00:00.123456 char_value1 char_value2 char_value3
varchar_value1 varchar_value2 varchar_value3 {"key1":"value1"}
{"key1":"value1"} {"x":"y"} {2:20} {2:200000000000}
{2.2:20.2} {2.2:20.2} {0:1} {2.2:2.2} {2.34:2.34}
{2.3456:2.3456} {2.34567890:2.34567890} {2.34567890 [...]
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
