@@ -212,8 +212,7 @@ TEST_F(ParquetReaderTest, uuid_varbinary) {
212212 RuntimeState runtime_state ((TQueryGlobals ()));
213213 runtime_state.set_desc_tbl (desc_tbl);
214214
215- st = p_reader->init_reader (column_names, nullptr , {}, nullptr , nullptr , nullptr , nullptr ,
216- nullptr );
215+ st = p_reader->init_reader (column_names, {}, nullptr , nullptr , nullptr , nullptr , nullptr );
217216 EXPECT_TRUE (st.ok ()) << st;
218217 std::unordered_map<std::string, std::tuple<std::string, const SlotDescriptor*>>
219218 partition_columns;
@@ -283,8 +282,7 @@ TEST_F(ParquetReaderTest, varbinary_varbinary) {
283282 RuntimeState runtime_state ((TQueryGlobals ()));
284283 runtime_state.set_desc_tbl (desc_tbl);
285284
286- st = p_reader->init_reader (column_names, nullptr , {}, nullptr , nullptr , nullptr , nullptr ,
287- nullptr );
285+ st = p_reader->init_reader (column_names, {}, nullptr , nullptr , nullptr , nullptr , nullptr );
288286 EXPECT_TRUE (st.ok ()) << st;
289287 std::unordered_map<std::string, std::tuple<std::string, const SlotDescriptor*>>
290288 partition_columns;
@@ -356,8 +354,7 @@ TEST_F(ParquetReaderTest, varbinary_string) {
356354 RuntimeState runtime_state ((TQueryGlobals ()));
357355 runtime_state.set_desc_tbl (desc_tbl);
358356
359- st = p_reader->init_reader (column_names, nullptr , {}, nullptr , nullptr , nullptr , nullptr ,
360- nullptr );
357+ st = p_reader->init_reader (column_names, {}, nullptr , nullptr , nullptr , nullptr , nullptr );
361358 EXPECT_TRUE (st.ok ()) << st;
362359 std::unordered_map<std::string, std::tuple<std::string, const SlotDescriptor*>>
363360 partition_columns;
@@ -429,8 +426,7 @@ TEST_F(ParquetReaderTest, varbinary_string2) {
429426 RuntimeState runtime_state ((TQueryGlobals ()));
430427 runtime_state.set_desc_tbl (desc_tbl);
431428
432- st = p_reader->init_reader (column_names, nullptr , {}, nullptr , nullptr , nullptr , nullptr ,
433- nullptr );
429+ st = p_reader->init_reader (column_names, {}, nullptr , nullptr , nullptr , nullptr , nullptr );
434430 EXPECT_TRUE (st.ok ()) << st;
435431 std::unordered_map<std::string, std::tuple<std::string, const SlotDescriptor*>>
436432 partition_columns;
@@ -461,76 +457,5 @@ TEST_F(ParquetReaderTest, varbinary_string2) {
461457 EXPECT_EQ (StringView (string_column->get_data_at (2 )).dump_hex (), " X'00'" );
462458}
463459
464- static ParquetReader* create_parquet_reader (TFileScanRangeParams& scan_params,
465- std::vector<std::string> table_column_names,
466- std::vector<TPrimitiveType::type> types) {
467- TDescriptorTable t_desc_table;
468- TTableDescriptor t_table_desc;
469-
470- create_table_desc (t_desc_table, t_table_desc, table_column_names, types);
471- DescriptorTbl* desc_tbl;
472- ObjectPool obj_pool;
473- static_cast <void >(DescriptorTbl::create (&obj_pool, t_desc_table, &desc_tbl));
474-
475- auto slot_descs = desc_tbl->get_tuple_descriptor (0 )->slots ();
476- auto local_fs = io::global_local_filesystem ();
477- io::FileReaderSPtr reader;
478- static_cast <void >(local_fs->open_file (
479- " ./be/test/exec/test_data/parquet_scanner/type-decoder.parquet" , &reader));
480-
481- cctz::time_zone ctz;
482- TimezoneUtils::find_cctz_time_zone (TimezoneUtils::default_time_zone, ctz);
483- std::vector<std::string> column_names;
484- for (int i = 0 ; i < slot_descs.size (); i++) {
485- column_names.push_back (slot_descs[i]->col_name ());
486- }
487- TFileRangeDesc scan_range;
488- {
489- scan_range.start_offset = 0 ;
490- scan_range.size = 1000 ;
491- }
492- auto p_reader =
493- new ParquetReader (nullptr , scan_params, scan_range, 992 , &ctz, nullptr , nullptr );
494- p_reader->set_file_reader (reader);
495- return p_reader;
496- }
497-
498- TEST_F (ParquetReaderTest, use_column_name) {
499- std::vector<std::string> table_column_names = {" boolean_col" , " tinyint_col" , " smallint_col" ,
500- " int_col" , " bigint_col" , " float_col" ,
501- " double_col" };
502- std::vector<TPrimitiveType::type> table_column_types = {
503- TPrimitiveType::BOOLEAN, TPrimitiveType::TINYINT, TPrimitiveType::SMALLINT,
504- TPrimitiveType::INT, TPrimitiveType::BIGINT, TPrimitiveType::FLOAT,
505- TPrimitiveType::DOUBLE};
506- TFileScanRangeParams scan_params;
507-
508- auto p_reader = create_parquet_reader (scan_params, table_column_names, table_column_types);
509- std::unordered_map<std::string, ColumnValueRangeType> colname_to_value_range;
510- colname_to_value_range.emplace (" boolean_col" , ColumnValueRange<TYPE_BOOLEAN>(" boolean_col" ));
511- colname_to_value_range.emplace (" tinyint_col" , ColumnValueRange<TYPE_TINYINT>(" tinyint_col" ));
512- colname_to_value_range.emplace (" smallint_col" , ColumnValueRange<TYPE_SMALLINT>(" smallint_col" ));
513- colname_to_value_range.emplace (" int_col" , ColumnValueRange<TYPE_INT>(" int_col" ));
514-
515- static_cast <void >(p_reader->init_reader (
516- table_column_names, &colname_to_value_range, {}, nullptr , nullptr , nullptr , nullptr ,
517- nullptr , TableSchemaChangeHelper::ConstNode::get_instance (), false ));
518-
519- std::vector<std::string> read_columns_ans = {" tinyint_col" , " smallint_col" , " int_col" ,
520- " bigint_col" , " boolean_col" , " float_col" ,
521- " double_col" };
522- EXPECT_EQ (p_reader->_read_file_columns , read_columns_ans);
523-
524- std::vector<std::string> miss_columns_ans = {};
525- EXPECT_EQ (p_reader->_missing_cols , miss_columns_ans);
526- std::vector<std::string> colname_to_value_range_names_ans = {" tinyint_col" , " smallint_col" ,
527- " int_col" , " boolean_col" };
528- for (auto col : colname_to_value_range_names_ans) {
529- EXPECT_TRUE (p_reader->_colname_to_value_range ->contains (col));
530- }
531- EXPECT_EQ (p_reader->_colname_to_value_range ->size (), colname_to_value_range_names_ans.size ());
532- delete p_reader;
533- }
534-
535460} // namespace vectorized
536461} // namespace doris
0 commit comments