update files

Signed-off-by: tqqq <dirtysalt1987@gmail.com>

Author: dirtysalt

be/src/connector/hive_connector.cpp

@@ -430,14 +430,13 @@ void HiveDataSource::_init_tuples_and_slots(RuntimeState* state) {
             _scanner_params.partition_index_in_chunk.push_back(i);
             _scanner_params._partition_index_in_hdfs_partition_columns.push_back(
                     _hive_table->get_partition_col_index(slots[i]));
-            _scanner_params._partition_index_in_hdfs_partition_columns.push_back(
-                    _hive_table->get_partition_col_index(slots[i]));
         } else if (int32_t index = scan_range_indicate_const_column_index(slots[i]->id()); index >= 0) {
             _scanner_params.partition_slots.push_back(slots[i]);
             _scanner_params.partition_index_in_chunk.push_back(i);
             _scanner_params._partition_index_in_hdfs_partition_columns.push_back(index);
         } else if (int32_t extended_col_index = extended_column_index(slots[i]->id()); extended_col_index >= 0) {
             _scanner_params.extended_col_slots.push_back(slots[i]);
+            _scanner_params.extended_col_index_in_chunk.push_back(i);
             _scanner_params.index_in_extended_columns.push_back(extended_col_index);
         } else {
             _scanner_params.materialize_slots.push_back(slots[i]);

be/src/exec/hdfs_scanner/hdfs_scanner.cpp

@@ -526,7 +526,7 @@ Status HdfsScanner::reinterpret_status(const Status& st) {
 
 void HdfsScanner::update_counter() {
     HdfsScannerProfile* profile = &_scanner_params.profile;
-    if (profile == nullptr) return;
+    if (profile->runtime_profile == nullptr) return;
 
     update_hdfs_counter(profile);
 

be/test/exec/hdfs_scanner/hdfs_scanner_test.cpp

@@ -327,10 +327,12 @@ TEST_F(HdfsScannerTest, TestFillNotExistedColumnWithDefaultValue) {
                         {"c2", TypeDescriptor::from_logical_type(LogicalType::TYPE_INT)},
                         {""}};
     auto* tuple_desc = _create_tuple_desc(descs);
+    HdfsScannerParams scanner_params;
     HdfsScannerContext ctx;
+    ctx.params = &scanner_params;
     ctx.not_existed_slots.push_back(tuple_desc->slots()[0]);
     ctx.not_existed_slots.push_back(tuple_desc->slots()[1]);
-    ctx.params->materialize_slot_default_values.emplace(tuple_desc->slots()[0]->id(), "42");
+    scanner_params.materialize_slot_default_values.emplace(tuple_desc->slots()[0]->id(), "42");
 
     ChunkPtr chunk = RuntimeChunkHelper::new_chunk(*tuple_desc, 0);
     ASSERT_OK(ctx.append_or_update_not_existed_columns_to_chunk(&chunk, 1));
@@ -342,9 +344,11 @@ TEST_F(HdfsScannerTest, TestFillNotExistedColumnWithDefaultValue) {
 TEST_F(HdfsScannerTest, TestFillNotExistedColumnWithEmptyDefaultNullable) {
     SlotDesc descs[] = {{"c1", TypeDescriptor::from_logical_type(LogicalType::TYPE_VARCHAR)}, {""}};
     auto* tuple_desc = _create_tuple_desc(descs);
+    HdfsScannerParams scanner_params;
     HdfsScannerContext ctx;
+    ctx.params = &scanner_params;
     ctx.not_existed_slots.push_back(tuple_desc->slots()[0]);
-    ctx.params->materialize_slot_default_values.emplace(tuple_desc->slots()[0]->id(), "");
+    scanner_params.materialize_slot_default_values.emplace(tuple_desc->slots()[0]->id(), "");
 
     ChunkPtr chunk = RuntimeChunkHelper::new_chunk(*tuple_desc, 0);
     ASSERT_OK(ctx.append_or_update_not_existed_columns_to_chunk(&chunk, 1));
@@ -356,9 +360,11 @@ TEST_F(HdfsScannerTest, TestFillNotExistedColumnWithEmptyDefaultNullable) {
 TEST_F(HdfsScannerTest, TestFillNotExistedColumnWithEmptyDefaultNonNullable) {
     SlotDesc descs[] = {{"c1", TypeDescriptor::from_logical_type(LogicalType::TYPE_VARCHAR)}, {""}};
     auto* tuple_desc = _create_tuple_desc_with_nullable(descs, false);
+    HdfsScannerParams scanner_params;
     HdfsScannerContext ctx;
+    ctx.params = &scanner_params;
     ctx.not_existed_slots.push_back(tuple_desc->slots()[0]);
-    ctx.params->materialize_slot_default_values.emplace(tuple_desc->slots()[0]->id(), "");
+    scanner_params.materialize_slot_default_values.emplace(tuple_desc->slots()[0]->id(), "");
 
     ChunkPtr chunk = RuntimeChunkHelper::new_chunk(*tuple_desc, 0);
     ASSERT_OK(ctx.append_or_update_not_existed_columns_to_chunk(&chunk, 1));
@@ -369,9 +375,11 @@ TEST_F(HdfsScannerTest, TestFillNotExistedColumnWithEmptyDefaultNonNullable) {
 TEST_F(HdfsScannerTest, TestFillNotExistedColumnWithEmptyDefaultNonString) {
     SlotDesc descs[] = {{"c1", TypeDescriptor::from_logical_type(LogicalType::TYPE_INT)}, {""}};
     auto* tuple_desc = _create_tuple_desc(descs);
+    HdfsScannerParams scanner_params;
     HdfsScannerContext ctx;
+    ctx.params = &scanner_params;
     ctx.not_existed_slots.push_back(tuple_desc->slots()[0]);
-    ctx.params->materialize_slot_default_values.emplace(tuple_desc->slots()[0]->id(), "");
+    scanner_params.materialize_slot_default_values.emplace(tuple_desc->slots()[0]->id(), "");
 
     ChunkPtr chunk = RuntimeChunkHelper::new_chunk(*tuple_desc, 0);
     auto status = ctx.append_or_update_not_existed_columns_to_chunk(&chunk, 1);