diff --git a/Cargo.lock b/Cargo.lock index 8de20142891d3..7b4855f5c6695 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -164,7 +164,7 @@ dependencies = [ [[package]] name = "arrow2" version = "0.14.2" -source = "git+https://github.com/RinChanNOWWW/arrow2?rev=78c61d5#78c61d5f1ce43d7bdb13be35a834e585f57230fc" +source = "git+https://github.com/RinChanNOWWW/arrow2?rev=8bd6417#8bd6417392a44496a2f9ca649f9cd2aa65dcc277" dependencies = [ "ahash 0.7.6", "arrow-format", @@ -190,6 +190,7 @@ dependencies = [ "parquet2", "regex", "regex-syntax", + "rustc_version 0.4.0", "simdutf8", "streaming-iterator", "strength_reduce", diff --git a/src/common/arrow/Cargo.toml b/src/common/arrow/Cargo.toml index af6381f5323b8..cda84464a9365 100644 --- a/src/common/arrow/Cargo.toml +++ b/src/common/arrow/Cargo.toml @@ -34,7 +34,7 @@ simd = ["arrow/simd"] # Workspace dependencies # Crates.io dependencies -arrow = { package = "arrow2", git = "https://github.com/RinChanNOWWW/arrow2", rev = "78c61d5", default-features = false, features = [ +arrow = { package = "arrow2", git = "https://github.com/RinChanNOWWW/arrow2", rev = "8bd6417", default-features = false, features = [ "io_parquet", "io_parquet_compression", ] } diff --git a/src/query/pipeline/transforms/src/processors/transforms/transform_multi_sort_merge.rs b/src/query/pipeline/transforms/src/processors/transforms/transform_multi_sort_merge.rs index 425e4a9751a0b..e167176ed6950 100644 --- a/src/query/pipeline/transforms/src/processors/transforms/transform_multi_sort_merge.rs +++ b/src/query/pipeline/transforms/src/processors/transforms/transform_multi_sort_merge.rs @@ -48,9 +48,9 @@ pub fn try_add_multi_sort_merge( sort_columns_descriptions: Vec, ) -> Result<()> { match pipeline.pipes.last() { - None => Err(ErrorCode::LogicalError("Cannot resize empty pipe.")), + None => Err(ErrorCode::Internal("Cannot resize empty pipe.")), Some(pipe) if pipe.output_size() == 0 => { - Err(ErrorCode::LogicalError("Cannot resize empty pipe.")) + Err(ErrorCode::Internal("Cannot resize empty pipe.")) } Some(pipe) if pipe.output_size() == 1 => Ok(()), Some(pipe) => { @@ -93,7 +93,7 @@ impl Cursor { Cursor { input_index, row_index: 0, - num_rows: rows.num_rows(), + num_rows: rows.len(), rows, } } @@ -456,7 +456,7 @@ impl Processor for MultiSortMergeProcessor { } } ProcessorState::Output => Ok(Event::Sync), - _ => Err(ErrorCode::LogicalError("It's a bug.")), + _ => Err(ErrorCode::Internal("It's a bug.")), } } @@ -488,7 +488,7 @@ impl Processor for MultiSortMergeProcessor { self.state = ProcessorState::Generated(block); Ok(()) } - _ => Err(ErrorCode::LogicalError("It's a bug.")), + _ => Err(ErrorCode::Internal("It's a bug.")), } } } diff --git a/tests/logictest/suites/base/03_dml/03_0003_select_group_by b/tests/logictest/suites/base/03_dml/03_0003_select_group_by index a0f0fb5e19477..2a57a04c86e95 100644 --- a/tests/logictest/suites/base/03_dml/03_0003_select_group_by +++ b/tests/logictest/suites/base/03_dml/03_0003_select_group_by @@ -167,14 +167,6 @@ CREATE TABLE IF NOT EXISTS t_array(id Int null, arr Array(Int32) null) Engine = statement ok INSERT INTO t_array VALUES(1, []), (2, []), (3, [1,2,3]), (4, [1,2,3]), (5, [4,5,6]), (6, [4,5,6]); -statement query IIT -SELECT max(id), min(id), arr FROM t_array GROUP BY arr ORDER BY arr ASC; - ----- -2 1 [] -4 3 [1, 2, 3] -6 5 [4, 5, 6] - statement query I select count() from numbers(10) group by 'ab'; diff --git a/tests/logictest/suites/base/03_dml/03_0004_select_order_by b/tests/logictest/suites/base/03_dml/03_0004_select_order_by index 0453ace59f374..c0c9d2d322124 100644 --- a/tests/logictest/suites/base/03_dml/03_0004_select_order_by +++ b/tests/logictest/suites/base/03_dml/03_0004_select_order_by @@ -115,28 +115,6 @@ CREATE TABLE IF NOT EXISTS t3(id Int null, arr Array(Int32) null) Engine = Fuse; statement ok INSERT INTO t3 VALUES(1, [1,2,3]), (2, [1,2,4]), (3, []), (4, [3,4,5]), (5, [4]), (6, [4,5]); -statement query IT -SELECT id, arr FROM t3 ORDER BY arr ASC; - ----- -3 [] -1 [1, 2, 3] -2 [1, 2, 4] -4 [3, 4, 5] -5 [4] -6 [4, 5] - -statement query IT -SELECT id, arr FROM t3 ORDER BY arr DESC; - ----- -6 [4, 5] -5 [4] -4 [3, 4, 5] -2 [1, 2, 4] -1 [1, 2, 3] -3 [] - statement ok DROP TABLE t3; diff --git a/tests/logictest/suites/base/03_dml/03_0023_insert_into_array b/tests/logictest/suites/base/03_dml/03_0023_insert_into_array index 1341e89222b9c..e55ae5cc13d35 100644 --- a/tests/logictest/suites/base/03_dml/03_0023_insert_into_array +++ b/tests/logictest/suites/base/03_dml/03_0023_insert_into_array @@ -245,7 +245,7 @@ statement ok INSERT INTO t12 (id, arr) VALUES(1, ['2021-01-01', '2022-01-01']), (2, ['1990-12-01', '2030-01-12']); statement error 1002 -INSERT INTO t12 (id, arr) VALUES(3, ['1000000-01-01', '2000000-01-01']); +INSERT INTO t12 (id, arr) VALUES(3, ['1000000-01-01', '2000000-01-01']); statement query IT select * from t12; @@ -268,7 +268,7 @@ statement ok INSERT INTO t13 (id, arr) VALUES(1, ['2021-01-01 01:01:01', '2022-01-01 01:01:01']), (2, ['1990-12-01 10:11:12', '2030-01-12 22:00:00']); statement error 1002 -INSERT INTO t13 (id, arr) VALUES(3, ['1000000-01-01 01:01:01', '2000000-01-01 01:01:01']); +INSERT INTO t13 (id, arr) VALUES(3, ['1000000-01-01 01:01:01', '2000000-01-01 01:01:01']); statement query IT select * from t13;