4949namespace doris {
5050
5151Status convert_to_arrow_type (const DataTypePtr& origin_type,
52- std::shared_ptr<arrow::DataType>* result,
53- const std::string& timezone ) {
52+ std::shared_ptr<arrow::DataType>* result, const std::string& timezone,
53+ bool datetime_naive ) {
5454 auto type = get_serialized_type (origin_type);
5555 switch (type->get_primitive_type ()) {
5656 case TYPE_NULL :
@@ -97,17 +97,27 @@ Status convert_to_arrow_type(const DataTypePtr& origin_type,
9797 case TYPE_DATEV2 :
9898 *result = std::make_shared<arrow::Date32Type>();
9999 break ;
100- // TODO: maybe need to distinguish TYPE_DATETIME and TYPE_TIMESTAMPTZ
101100 case TYPE_TIMESTAMPTZ :
102- case TYPE_DATETIMEV2 :
101+ case TYPE_DATETIMEV2 : {
102+ arrow::TimeUnit::type time_unit;
103103 if (type->get_scale () > 3 ) {
104- *result = std::make_shared< arrow::TimestampType>(arrow:: TimeUnit::MICRO , timezone) ;
104+ time_unit = arrow::TimeUnit::MICRO ;
105105 } else if (type->get_scale () > 0 ) {
106- *result = std::make_shared< arrow::TimestampType>(arrow:: TimeUnit::MILLI , timezone) ;
106+ time_unit = arrow::TimeUnit::MILLI ;
107107 } else {
108- *result = std::make_shared<arrow::TimestampType>(arrow::TimeUnit::SECOND , timezone);
108+ time_unit = arrow::TimeUnit::SECOND ;
109+ }
110+ // Doris DATETIMEV2 represents a wall-clock value without a timezone. Arrow Flight
111+ // exposes it as a timezone-naive timestamp so clients do not interpret it as an instant.
112+ // This option only changes the DATETIMEV2 output schema. TIMESTAMPTZ remains timezone-aware,
113+ // and Arrow-to-Doris conversions are unaffected.
114+ if (type->get_primitive_type () == TYPE_DATETIMEV2 && datetime_naive) {
115+ *result = std::make_shared<arrow::TimestampType>(time_unit);
116+ } else {
117+ *result = std::make_shared<arrow::TimestampType>(time_unit, timezone);
109118 }
110119 break ;
120+ }
111121 case TYPE_DECIMALV2 :
112122 case TYPE_DECIMAL32 :
113123 case TYPE_DECIMAL64 :
@@ -123,16 +133,19 @@ Status convert_to_arrow_type(const DataTypePtr& origin_type,
123133 case TYPE_ARRAY : {
124134 const auto * type_arr = assert_cast<const DataTypeArray*>(remove_nullable (type).get ());
125135 std::shared_ptr<arrow::DataType> item_type;
126- RETURN_IF_ERROR (convert_to_arrow_type (type_arr->get_nested_type (), &item_type, timezone));
136+ RETURN_IF_ERROR (convert_to_arrow_type (type_arr->get_nested_type (), &item_type, timezone,
137+ datetime_naive));
127138 *result = std::make_shared<arrow::ListType>(item_type);
128139 break ;
129140 }
130141 case TYPE_MAP : {
131142 const auto * type_map = assert_cast<const DataTypeMap*>(remove_nullable (type).get ());
132143 std::shared_ptr<arrow::DataType> key_type;
133144 std::shared_ptr<arrow::DataType> val_type;
134- RETURN_IF_ERROR (convert_to_arrow_type (type_map->get_key_type (), &key_type, timezone));
135- RETURN_IF_ERROR (convert_to_arrow_type (type_map->get_value_type (), &val_type, timezone));
145+ RETURN_IF_ERROR (convert_to_arrow_type (type_map->get_key_type (), &key_type, timezone,
146+ datetime_naive));
147+ RETURN_IF_ERROR (convert_to_arrow_type (type_map->get_value_type (), &val_type, timezone,
148+ datetime_naive));
136149 *result = std::make_shared<arrow::MapType>(key_type, val_type);
137150 break ;
138151 }
@@ -141,8 +154,8 @@ Status convert_to_arrow_type(const DataTypePtr& origin_type,
141154 std::vector<std::shared_ptr<arrow::Field>> fields;
142155 for (size_t i = 0 ; i < type_struct->get_elements ().size (); i++) {
143156 std::shared_ptr<arrow::DataType> field_type;
144- RETURN_IF_ERROR (
145- convert_to_arrow_type (type_struct-> get_element (i), &field_type, timezone));
157+ RETURN_IF_ERROR (convert_to_arrow_type (type_struct-> get_element (i), &field_type,
158+ timezone, datetime_naive ));
146159 fields.push_back (
147160 std::make_shared<arrow::Field>(type_struct->get_element_name (i), field_type,
148161 type_struct->get_element (i)->is_nullable ()));
@@ -206,12 +219,13 @@ Status get_arrow_schema_from_block(const Block& block, std::shared_ptr<arrow::Sc
206219
207220Status get_arrow_schema_from_expr_ctxs (const VExprContextSPtrs& output_vexpr_ctxs,
208221 std::shared_ptr<arrow::Schema>* result,
209- const std::string& timezone) {
222+ const std::string& timezone, bool datetime_naive ) {
210223 std::vector<std::shared_ptr<arrow::Field>> fields;
211224 for (int i = 0 ; i < output_vexpr_ctxs.size (); i++) {
212225 std::shared_ptr<arrow::DataType> arrow_type;
213226 auto root_expr = output_vexpr_ctxs.at (i)->root ();
214- RETURN_IF_ERROR (convert_to_arrow_type (root_expr->data_type (), &arrow_type, timezone));
227+ RETURN_IF_ERROR (convert_to_arrow_type (root_expr->data_type (), &arrow_type, timezone,
228+ datetime_naive));
215229 auto field_name = root_expr->is_slot_ref () && !root_expr->expr_label ().empty ()
216230 ? root_expr->expr_label ()
217231 : fmt::format (" {}_{}" , root_expr->data_type ()->get_name (), i);
0 commit comments