refactor: make json value use json type (#7248)

Signed-off-by: luofucong <[email protected]>

Author: MichaelScofield

src/api/src/helper.rs

@@ -442,7 +442,9 @@ impl TryFrom<ConcreteDataType> for ColumnDataTypeWrapper {
                             type_ext: Some(TypeExt::JsonType(JsonTypeExtension::JsonBinary.into())),
                         }),
                         JsonFormat::Native(inner) => {
-                            let inner_type = ColumnDataTypeWrapper::try_from(*inner.clone())?;
+                            let inner_type = ColumnDataTypeWrapper::try_from(
+                                ConcreteDataType::from(inner.as_ref()),
+                            )?;
                             Some(ColumnDataTypeExtension {
                                 type_ext: Some(TypeExt::JsonNativeType(Box::new(
                                     JsonNativeTypeExtension {
@@ -1711,33 +1713,33 @@ mod tests {
                             type_ext: Some(TypeExt::StructType(StructTypeExtension {
                                 fields: vec![
                                     v1::StructField {
-                                        name: "id".to_string(),
-                                        datatype: ColumnDataTypeWrapper::int64_datatype()
+                                        name: "address".to_string(),
+                                        datatype: ColumnDataTypeWrapper::string_datatype()
                                             .datatype()
                                             .into(),
                                         datatype_extension: None
                                     },
                                     v1::StructField {
-                                        name: "name".to_string(),
-                                        datatype: ColumnDataTypeWrapper::string_datatype()
+                                        name: "age".to_string(),
+                                        datatype: ColumnDataTypeWrapper::int64_datatype()
                                             .datatype()
                                             .into(),
                                         datatype_extension: None
                                     },
                                     v1::StructField {
-                                        name: "age".to_string(),
-                                        datatype: ColumnDataTypeWrapper::int32_datatype()
+                                        name: "id".to_string(),
+                                        datatype: ColumnDataTypeWrapper::int64_datatype()
                                             .datatype()
                                             .into(),
                                         datatype_extension: None
                                     },
                                     v1::StructField {
-                                        name: "address".to_string(),
+                                        name: "name".to_string(),
                                         datatype: ColumnDataTypeWrapper::string_datatype()
                                             .datatype()
                                             .into(),
                                         datatype_extension: None
-                                    }
+                                    },
                                 ]
                             }))
                         }))

src/datatypes/src/data_type.rs

@@ -33,8 +33,8 @@ use crate::types::{
     BinaryType, BooleanType, DateType, Decimal128Type, DictionaryType, DurationMicrosecondType,
     DurationMillisecondType, DurationNanosecondType, DurationSecondType, DurationType, Float32Type,
     Float64Type, Int8Type, Int16Type, Int32Type, Int64Type, IntervalDayTimeType,
-    IntervalMonthDayNanoType, IntervalType, IntervalYearMonthType, JsonFormat, JsonType, ListType,
-    NullType, StringType, StructType, TimeMillisecondType, TimeType, TimestampMicrosecondType,
+    IntervalMonthDayNanoType, IntervalType, IntervalYearMonthType, JsonType, ListType, NullType,
+    StringType, StructType, TimeMillisecondType, TimeType, TimestampMicrosecondType,
     TimestampMillisecondType, TimestampNanosecondType, TimestampSecondType, TimestampType,
     UInt8Type, UInt16Type, UInt32Type, UInt64Type, VectorType,
 };
@@ -677,7 +677,7 @@ impl ConcreteDataType {
     }
 
     pub fn json_native_datatype(inner_type: ConcreteDataType) -> ConcreteDataType {
-        ConcreteDataType::Json(JsonType::new(JsonFormat::Native(Box::new(inner_type))))
+        ConcreteDataType::Json(JsonType::new_native((&inner_type).into()))
     }
 }