rust/greptimedb
1
0
Fork 0
mirror of https://github.com/GreptimeTeam/greptimedb.git synced 2026-10-13 07:22:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(query): adapt MergeScan JSON extension helpers

Browse Source 
Use the JSON2 extension API introduced by the replayed #8745 patch.

Signed-off-by: discord9 <discord9@163.com>
(cherry picked from commit 6690189d6a07d0bdc03566fed5f2a06306df5cff)
This commit is contained in:
discord9
2026-08-20 14:45:10 +08:00
parent 6e5cd114b3
commit e897a65e16
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/query/src/dist_plan/merge_scan.rs
+10 -3
View File
@@ -46,7 +46,10 @@ use datafusion_common::{Column as ColumnExpr, DataFusionError, Result};
use datafusion_expr::{Expr, Extension, LogicalPlan, UserDefinedLogicalNodeCore};
use datafusion_physical_expr::expressions::Column;
use datafusion_physical_expr::{Distribution, EquivalenceProperties, PhysicalSortExpr};
use datatypes::extension::json::is_json_extension_type;
use datatypes::extension::json::{
Json2ExtensionType, is_any_json_extension_type, is_json2_extension_type,
is_legacy_json2_extension_type,
};
use futures_util::StreamExt;
use greptime_proto::v1::region::RegionRequestHeader;
use meter_core::data::ReadItem;
@@ -110,7 +113,7 @@ fn merge_scan_schema_error_count_for_test() -> u64 {
/// Returns true when the field is a JSON column, identified either by its
/// Arrow extension type or by its `greptime:type=Json` marker.
fn is_json_field(field: &Field) -> bool {
is_json_extension_type(field)
is_any_json_extension_type(field)
|| field
.metadata()
.get(datatypes::schema::TYPE_KEY)
@@ -848,11 +851,15 @@ fn maybe_amend_json2_field(schema: &ArrowSchema) -> ArrowSchemaRef {
let schema = schema.clone();
let mut new_fields = Vec::with_capacity(schema.fields().len());
for field in schema.fields().iter() {
let new_field = if is_json_extension_type(field)
let new_field = if is_json2_extension_type(field)
&& matches!(field.data_type(), DataType::Struct(fields) if fields.is_empty())
{
let is_legacy_json2 = is_legacy_json2_extension_type(field);
let mut new_field = field.as_ref().clone();
new_field.set_data_type(DataType::Binary);
if is_legacy_json2 {
new_field = new_field.with_extension_type(Json2ExtensionType::default());
}
Arc::new(new_field)
} else {
field.clone()