Skip to content

Commit 66fdd1b

Browse files
committed
fix test err
1 parent 71e6f9d commit 66fdd1b

File tree

2 files changed

+30
-22
lines changed

2 files changed

+30
-22
lines changed

src/query/functions-v2/tests/it/scalars/string.rs

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -705,8 +705,16 @@ fn test_insert(file: &mut impl Write) {
705705
DataType::String,
706706
Column::from_data(&["hi", "test", "cc", "q"]),
707707
),
708-
("b", DataType::UInt8, Column::from_data(vec![1, 4, 1, 1])),
709-
("c", DataType::UInt8, Column::from_data(vec![3, 5, 1, 1])),
708+
(
709+
"b",
710+
DataType::Number(NumberDataType::UInt8),
711+
Column::from_data(vec![1, 4, 1, 1]),
712+
),
713+
(
714+
"c",
715+
DataType::Number(NumberDataType::UInt8),
716+
Column::from_data(vec![3, 5, 1, 1]),
717+
),
710718
(
711719
"d",
712720
DataType::String,
@@ -724,12 +732,12 @@ fn test_insert(file: &mut impl Write) {
724732
),
725733
(
726734
"y",
727-
DataType::Nullable(Box::new(DataType::UInt8)),
735+
DataType::Nullable(Box::new(DataType::Number(NumberDataType::UInt8))),
728736
Column::from_data_with_validity(vec![1, 4, 1, 1], vec![true, true, false, true]),
729737
),
730738
(
731739
"z",
732-
DataType::Nullable(Box::new(DataType::UInt8)),
740+
DataType::Nullable(Box::new(DataType::Number(NumberDataType::UInt8))),
733741
Column::from_data_with_validity(vec![3, 5, 1, 1], vec![true, false, true, true]),
734742
),
735743
(

src/query/functions-v2/tests/it/scalars/testdata/string.txt

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2817,15 +2817,15 @@ evaluation:
28172817
| Row 3 | "q" | 1 | 1 | "56" | "56" |
28182818
+--------+-----------------+---------+---------+---------------+---------+
28192819
evaluation (internal):
2820-
+--------+--------------------------------------------------------------------------------------------------------------+
2821-
| Column | Data |
2822-
+--------+--------------------------------------------------------------------------------------------------------------+
2823-
| a | String(StringColumn { data: [104, 105, 116, 101, 115, 116, 99, 99, 113], offsets: [0, 2, 6, 8, 9] }) |
2824-
| b | Int32([1, 4, 1, 1]) |
2825-
| c | Int32([3, 5, 1, 1]) |
2826-
| d | String(StringColumn { data: [120, 120, 122, 99, 49, 50, 53, 54], offsets: [0, 2, 4, 6, 8] }) |
2827-
| Output | String(StringColumn { data: [120, 120, 116, 101, 115, 122, 99, 49, 50, 53, 54], offsets: [0, 2, 7, 9, 11] }) |
2828-
+--------+--------------------------------------------------------------------------------------------------------------+
2820+
+--------+------------------------------------------------------------------------------------------------------+
2821+
| Column | Data |
2822+
+--------+------------------------------------------------------------------------------------------------------+
2823+
| a | StringColumn { data: [104, 105, 116, 101, 115, 116, 99, 99, 113], offsets: [0, 2, 6, 8, 9] } |
2824+
| b | Int32([1, 4, 1, 1]) |
2825+
| c | Int32([3, 5, 1, 1]) |
2826+
| d | StringColumn { data: [120, 120, 122, 99, 49, 50, 53, 54], offsets: [0, 2, 4, 6, 8] } |
2827+
| Output | StringColumn { data: [120, 120, 116, 101, 115, 122, 99, 49, 50, 53, 54], offsets: [0, 2, 7, 9, 11] } |
2828+
+--------+------------------------------------------------------------------------------------------------------+
28292829

28302830

28312831
ast : insert(x, y, z, u)
@@ -2843,14 +2843,14 @@ evaluation:
28432843
| Row 3 | "q" | 1 | 1 | "56" | "56" |
28442844
+--------+--------------------------+------------------+------------------+------------------------+-------------+
28452845
evaluation (internal):
2846-
+--------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
2847-
| Column | Data |
2848-
+--------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
2849-
| x | Nullable(NullableColumn { column: String(StringColumn { data: [104, 105, 116, 101, 115, 116, 99, 99, 113], offsets: [0, 2, 6, 8, 9] }), validity: [0b____1110] }) |
2850-
| y | Nullable(NullableColumn { column: Int32([1, 4, 1, 1]), validity: [0b____1011] }) |
2851-
| z | Nullable(NullableColumn { column: Int32([3, 5, 1, 1]), validity: [0b____1101] }) |
2852-
| u | Nullable(NullableColumn { column: String(StringColumn { data: [120, 120, 122, 99, 49, 50, 53, 54], offsets: [0, 2, 4, 6, 8] }), validity: [0b____1110] }) |
2853-
| Output | Nullable(NullableColumn { column: String(StringColumn { data: [120, 120, 116, 101, 115, 122, 99, 49, 50, 53, 54], offsets: [0, 2, 7, 9, 11] }), validity: [0b____1000] }) |
2854-
+--------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
2846+
+--------+---------------------------------------------------------------------------------------------------------------------------------------------------------+
2847+
| Column | Data |
2848+
+--------+---------------------------------------------------------------------------------------------------------------------------------------------------------+
2849+
| x | NullableColumn { column: StringColumn { data: [104, 105, 116, 101, 115, 116, 99, 99, 113], offsets: [0, 2, 6, 8, 9] }, validity: [0b____1110] } |
2850+
| y | NullableColumn { column: Int32([1, 4, 1, 1]), validity: [0b____1011] } |
2851+
| z | NullableColumn { column: Int32([3, 5, 1, 1]), validity: [0b____1101] } |
2852+
| u | NullableColumn { column: StringColumn { data: [120, 120, 122, 99, 49, 50, 53, 54], offsets: [0, 2, 4, 6, 8] }, validity: [0b____1110] } |
2853+
| Output | NullableColumn { column: StringColumn { data: [120, 120, 116, 101, 115, 122, 99, 49, 50, 53, 54], offsets: [0, 2, 7, 9, 11] }, validity: [0b____1000] } |
2854+
+--------+---------------------------------------------------------------------------------------------------------------------------------------------------------+
28552855

28562856

0 commit comments

Comments
 (0)