Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[SPARK-48395][PYTHON] Fix StructType.treeString for parameterized types #46711

Closed
wants to merge 2 commits into from

Conversation

zhengruifeng
Copy link
Contributor

What changes were proposed in this pull request?

this PR is a follow up of #46685.

Why are the changes needed?

StructType.treeString uses DataType.typeName to generate the tree string, however, the typeName in python is a class method and can not return the same string for parameterized types.

In [2]: schema = StructType().add("c", CharType(10), True).add("v", VarcharType(10), True).add("d", DecimalType(10, 2), True).add("ym00", YearM
   ...: onthIntervalType(0, 0)).add("ym01", YearMonthIntervalType(0, 1)).add("ym11", YearMonthIntervalType(1, 1))

In [3]: print(schema.treeString())
root
 |-- c: char (nullable = true)
 |-- v: varchar (nullable = true)
 |-- d: decimal (nullable = true)
 |-- ym00: yearmonthinterval (nullable = true)
 |-- ym01: yearmonthinterval (nullable = true)
 |-- ym11: yearmonthinterval (nullable = true)

it should be

In [4]: print(schema.treeString())
root
 |-- c: char(10) (nullable = true)
 |-- v: varchar(10) (nullable = true)
 |-- d: decimal(10,2) (nullable = true)
 |-- ym00: interval year (nullable = true)
 |-- ym01: interval year to month (nullable = true)
 |-- ym11: interval month (nullable = true)

Does this PR introduce any user-facing change?

no, this feature was just added and not release out yet.

How was this patch tested?

added tests

Was this patch authored or co-authored using generative AI tooling?

no

" |-- var: variant (nullable = true)",
"",
],
)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

checked with scala side:

scala> val schema = new StructType().add("n", NullType).add("str", StringType).add("c", CharType(10)).add("v", VarcharType(10)).add("bin", BinaryType).add("bool", BooleanType).add("date", DateType).add("ts", TimestampType).add("ts_ntz", TimestampNTZType).add("dec", DecimalType(10, 2)).add("double", DoubleType).add("float", FloatType).add("long", LongType).add("int", IntegerType).add("short", ShortType).add("byte", ByteType).add("ym_interval_1", YearMonthIntervalType()).add("ym_interval_2", YearMonthIntervalType(YearMonthIntervalType.YEAR)).add("ym_interval_3",YearMonthIntervalType(YearMonthIntervalType.YEAR, YearMonthIntervalType.MONTH)).add("dt_interval_1", DayTimeIntervalType()).add("dt_interval_2", DayTimeIntervalType(DayTimeIntervalType.DAY)).add("dt_interval_3", DayTimeIntervalType(DayTimeIntervalType.HOUR, DayTimeIntervalType.SECOND)).add("cal_interval", CalendarIntervalType).add("var", VariantType)
val schema: org.apache.spark.sql.types.StructType = StructType(StructField(n,NullType,true),StructField(str,StringType,true),StructField(c,CharType(10),true),StructField(v,VarcharType(10),true),StructField(bin,BinaryType,true),StructField(bool,BooleanType,true),StructField(date,DateType,true),StructField(ts,TimestampType,true),StructField(ts_ntz,TimestampNTZType,true),StructField(dec,DecimalType(10,2),true),StructField(double,DoubleType,true),StructField(float,FloatType,true),StructField(long,LongType,true),StructField(int,IntegerType,true),StructField(short,ShortType,true),StructField(byte,ByteType,true),StructField(ym_interval_1,YearMonthIntervalType(0,1),true),StructField(ym_interval_2,YearMonthIntervalType(0,0),true),StructField(ym_interval_3,YearMonthInter...

scala> println(schema.treeString)
root
 |-- n: void (nullable = true)
 |-- str: string (nullable = true)
 |-- c: char(10) (nullable = true)
 |-- v: varchar(10) (nullable = true)
 |-- bin: binary (nullable = true)
 |-- bool: boolean (nullable = true)
 |-- date: date (nullable = true)
 |-- ts: timestamp (nullable = true)
 |-- ts_ntz: timestamp_ntz (nullable = true)
 |-- dec: decimal(10,2) (nullable = true)
 |-- double: double (nullable = true)
 |-- float: float (nullable = true)
 |-- long: long (nullable = true)
 |-- int: integer (nullable = true)
 |-- short: short (nullable = true)
 |-- byte: byte (nullable = true)
 |-- ym_interval_1: interval year to month (nullable = true)
 |-- ym_interval_2: interval year (nullable = true)
 |-- ym_interval_3: interval year to month (nullable = true)
 |-- dt_interval_1: interval day to second (nullable = true)
 |-- dt_interval_2: interval day (nullable = true)
 |-- dt_interval_3: interval hour to second (nullable = true)
 |-- cal_interval: interval (nullable = true)
 |-- var: variant (nullable = true)

@zhengruifeng
Copy link
Contributor Author

merged to master

@zhengruifeng zhengruifeng deleted the tree_string_fix branch May 23, 2024 08:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants