Skip to content

Commit f510d21

Browse files
Ngone51HyukjinKwon
Ngone51
authored and
HyukjinKwon
committed
[SPARK-32466][FOLLOW-UP][TEST][SQL] Regenerate the golden explain file for PlanStabilitySuite
### What changes were proposed in this pull request? This PR regenerates the golden explain file based on the fix: #29537 ### Why are the changes needed? Eliminates the personal related information (e.g., local directories) in the explain plan. ### Does this PR introduce _any_ user-facing change? No. ### How was this patch tested? Checked manually. Closes #29546 from Ngone51/follow-up-gen-golden-file. Authored-by: yi.wu <[email protected]> Signed-off-by: HyukjinKwon <[email protected]>
1 parent b07e742 commit f510d21

File tree

310 files changed

+2065
-2065
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

310 files changed

+2065
-2065
lines changed

‎sql/core/src/test/resources/tpcds-plan-stability/approved-plans-modified/q10.sf100/explain.txt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ TakeOrderedAndProject (52)
5656
(1) Scan parquet default.customer
5757
Output [3]: [c_customer_sk#1, c_current_cdemo_sk#2, c_current_addr_sk#3]
5858
Batched: true
59-
Location: InMemoryFileIndex [file:/Users/yi.wu/IdeaProjects/spark/sql/core/spark-warehouse/org.apache.spark.sql.TPCDSModifiedPlanStabilityWithStatsSuite/customer]
59+
Location [not included in comparison]/{warehouse_dir}/customer]
6060
PushedFilters: [IsNotNull(c_customer_sk), IsNotNull(c_current_addr_sk), IsNotNull(c_current_cdemo_sk)]
6161
ReadSchema: struct<c_customer_sk:int,c_current_cdemo_sk:int,c_current_addr_sk:int>
6262

@@ -78,7 +78,7 @@ Arguments: [c_customer_sk#1 ASC NULLS FIRST], false, 0
7878
(6) Scan parquet default.web_sales
7979
Output [2]: [ws_sold_date_sk#5, ws_bill_customer_sk#6]
8080
Batched: true
81-
Location: InMemoryFileIndex [file:/Users/yi.wu/IdeaProjects/spark/sql/core/spark-warehouse/org.apache.spark.sql.TPCDSModifiedPlanStabilityWithStatsSuite/web_sales]
81+
Location [not included in comparison]/{warehouse_dir}/web_sales]
8282
PushedFilters: [IsNotNull(ws_sold_date_sk), IsNotNull(ws_bill_customer_sk)]
8383
ReadSchema: struct<ws_sold_date_sk:int,ws_bill_customer_sk:int>
8484

@@ -92,7 +92,7 @@ Condition : (isnotnull(ws_sold_date_sk#5) AND isnotnull(ws_bill_customer_sk#6))
9292
(9) Scan parquet default.date_dim
9393
Output [3]: [d_date_sk#7, d_year#8, d_moy#9]
9494
Batched: true
95-
Location: InMemoryFileIndex [file:/Users/yi.wu/IdeaProjects/spark/sql/core/spark-warehouse/org.apache.spark.sql.TPCDSModifiedPlanStabilityWithStatsSuite/date_dim]
95+
Location [not included in comparison]/{warehouse_dir}/date_dim]
9696
PushedFilters: [IsNotNull(d_moy), IsNotNull(d_year), EqualTo(d_year,2002), GreaterThanOrEqual(d_moy,4), LessThanOrEqual(d_moy,7), IsNotNull(d_date_sk)]
9797
ReadSchema: struct<d_date_sk:int,d_year:int,d_moy:int>
9898

@@ -123,7 +123,7 @@ Input [3]: [ws_sold_date_sk#5, ws_bill_customer_sk#6, d_date_sk#7]
123123
(16) Scan parquet default.catalog_sales
124124
Output [2]: [cs_sold_date_sk#12, cs_ship_customer_sk#13]
125125
Batched: true
126-
Location: InMemoryFileIndex [file:/Users/yi.wu/IdeaProjects/spark/sql/core/spark-warehouse/org.apache.spark.sql.TPCDSModifiedPlanStabilityWithStatsSuite/catalog_sales]
126+
Location [not included in comparison]/{warehouse_dir}/catalog_sales]
127127
PushedFilters: [IsNotNull(cs_sold_date_sk), IsNotNull(cs_ship_customer_sk)]
128128
ReadSchema: struct<cs_sold_date_sk:int,cs_ship_customer_sk:int>
129129

@@ -164,7 +164,7 @@ Join condition: None
164164
(26) Scan parquet default.store_sales
165165
Output [2]: [ss_sold_date_sk#16, ss_customer_sk#17]
166166
Batched: true
167-
Location: InMemoryFileIndex [file:/Users/yi.wu/IdeaProjects/spark/sql/core/spark-warehouse/org.apache.spark.sql.TPCDSModifiedPlanStabilityWithStatsSuite/store_sales]
167+
Location [not included in comparison]/{warehouse_dir}/store_sales]
168168
PushedFilters: [IsNotNull(ss_sold_date_sk), IsNotNull(ss_customer_sk)]
169169
ReadSchema: struct<ss_sold_date_sk:int,ss_customer_sk:int>
170170

@@ -207,7 +207,7 @@ Input [3]: [c_customer_sk#1, c_current_cdemo_sk#2, c_current_addr_sk#3]
207207
(36) Scan parquet default.customer_address
208208
Output [2]: [ca_address_sk#20, ca_county#21]
209209
Batched: true
210-
Location: InMemoryFileIndex [file:/Users/yi.wu/IdeaProjects/spark/sql/core/spark-warehouse/org.apache.spark.sql.TPCDSModifiedPlanStabilityWithStatsSuite/customer_address]
210+
Location [not included in comparison]/{warehouse_dir}/customer_address]
211211
PushedFilters: [In(ca_county, [Walker County,Richland County,Gaines County,Douglas County,Dona Ana County]), IsNotNull(ca_address_sk)]
212212
ReadSchema: struct<ca_address_sk:int,ca_county:string>
213213

@@ -242,7 +242,7 @@ Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint))
242242
(44) Scan parquet default.customer_demographics
243243
Output [9]: [cd_demo_sk#24, cd_gender#25, cd_marital_status#26, cd_education_status#27, cd_purchase_estimate#28, cd_credit_rating#29, cd_dep_count#30, cd_dep_employed_count#31, cd_dep_college_count#32]
244244
Batched: true
245-
Location: InMemoryFileIndex [file:/Users/yi.wu/IdeaProjects/spark/sql/core/spark-warehouse/org.apache.spark.sql.TPCDSModifiedPlanStabilityWithStatsSuite/customer_demographics]
245+
Location [not included in comparison]/{warehouse_dir}/customer_demographics]
246246
PushedFilters: [IsNotNull(cd_demo_sk)]
247247
ReadSchema: struct<cd_demo_sk:int,cd_gender:string,cd_marital_status:string,cd_education_status:string,cd_purchase_estimate:int,cd_credit_rating:string,cd_dep_count:int,cd_dep_employed_count:int,cd_dep_college_count:int>
248248

‎sql/core/src/test/resources/tpcds-plan-stability/approved-plans-modified/q10/explain.txt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ TakeOrderedAndProject (48)
5252
(1) Scan parquet default.customer
5353
Output [3]: [c_customer_sk#1, c_current_cdemo_sk#2, c_current_addr_sk#3]
5454
Batched: true
55-
Location: InMemoryFileIndex [file:/Users/yi.wu/IdeaProjects/spark/sql/core/spark-warehouse/org.apache.spark.sql.TPCDSModifiedPlanStabilitySuite/customer]
55+
Location [not included in comparison]/{warehouse_dir}/customer]
5656
PushedFilters: [IsNotNull(c_customer_sk), IsNotNull(c_current_addr_sk), IsNotNull(c_current_cdemo_sk)]
5757
ReadSchema: struct<c_customer_sk:int,c_current_cdemo_sk:int,c_current_addr_sk:int>
5858

@@ -66,7 +66,7 @@ Condition : ((isnotnull(c_customer_sk#1) AND isnotnull(c_current_addr_sk#3)) AND
6666
(4) Scan parquet default.web_sales
6767
Output [2]: [ws_sold_date_sk#4, ws_bill_customer_sk#5]
6868
Batched: true
69-
Location: InMemoryFileIndex [file:/Users/yi.wu/IdeaProjects/spark/sql/core/spark-warehouse/org.apache.spark.sql.TPCDSModifiedPlanStabilitySuite/web_sales]
69+
Location [not included in comparison]/{warehouse_dir}/web_sales]
7070
PushedFilters: [IsNotNull(ws_sold_date_sk), IsNotNull(ws_bill_customer_sk)]
7171
ReadSchema: struct<ws_sold_date_sk:int,ws_bill_customer_sk:int>
7272

@@ -80,7 +80,7 @@ Condition : (isnotnull(ws_sold_date_sk#4) AND isnotnull(ws_bill_customer_sk#5))
8080
(7) Scan parquet default.date_dim
8181
Output [3]: [d_date_sk#6, d_year#7, d_moy#8]
8282
Batched: true
83-
Location: InMemoryFileIndex [file:/Users/yi.wu/IdeaProjects/spark/sql/core/spark-warehouse/org.apache.spark.sql.TPCDSModifiedPlanStabilitySuite/date_dim]
83+
Location [not included in comparison]/{warehouse_dir}/date_dim]
8484
PushedFilters: [IsNotNull(d_year), IsNotNull(d_moy), EqualTo(d_year,2002), GreaterThanOrEqual(d_moy,4), LessThanOrEqual(d_moy,7), IsNotNull(d_date_sk)]
8585
ReadSchema: struct<d_date_sk:int,d_year:int,d_moy:int>
8686

@@ -111,7 +111,7 @@ Input [3]: [ws_sold_date_sk#4, ws_bill_customer_sk#5, d_date_sk#6]
111111
(14) Scan parquet default.catalog_sales
112112
Output [2]: [cs_sold_date_sk#11, cs_ship_customer_sk#12]
113113
Batched: true
114-
Location: InMemoryFileIndex [file:/Users/yi.wu/IdeaProjects/spark/sql/core/spark-warehouse/org.apache.spark.sql.TPCDSModifiedPlanStabilitySuite/catalog_sales]
114+
Location [not included in comparison]/{warehouse_dir}/catalog_sales]
115115
PushedFilters: [IsNotNull(cs_sold_date_sk), IsNotNull(cs_ship_customer_sk)]
116116
ReadSchema: struct<cs_sold_date_sk:int,cs_ship_customer_sk:int>
117117

@@ -148,7 +148,7 @@ Join condition: None
148148
(23) Scan parquet default.store_sales
149149
Output [2]: [ss_sold_date_sk#15, ss_customer_sk#16]
150150
Batched: true
151-
Location: InMemoryFileIndex [file:/Users/yi.wu/IdeaProjects/spark/sql/core/spark-warehouse/org.apache.spark.sql.TPCDSModifiedPlanStabilitySuite/store_sales]
151+
Location [not included in comparison]/{warehouse_dir}/store_sales]
152152
PushedFilters: [IsNotNull(ss_sold_date_sk), IsNotNull(ss_customer_sk)]
153153
ReadSchema: struct<ss_sold_date_sk:int,ss_customer_sk:int>
154154

@@ -187,7 +187,7 @@ Input [3]: [c_customer_sk#1, c_current_cdemo_sk#2, c_current_addr_sk#3]
187187
(32) Scan parquet default.customer_address
188188
Output [2]: [ca_address_sk#19, ca_county#20]
189189
Batched: true
190-
Location: InMemoryFileIndex [file:/Users/yi.wu/IdeaProjects/spark/sql/core/spark-warehouse/org.apache.spark.sql.TPCDSModifiedPlanStabilitySuite/customer_address]
190+
Location [not included in comparison]/{warehouse_dir}/customer_address]
191191
PushedFilters: [In(ca_county, [Walker County,Richland County,Gaines County,Douglas County,Dona Ana County]), IsNotNull(ca_address_sk)]
192192
ReadSchema: struct<ca_address_sk:int,ca_county:string>
193193

@@ -218,7 +218,7 @@ Input [3]: [c_current_cdemo_sk#2, c_current_addr_sk#3, ca_address_sk#19]
218218
(39) Scan parquet default.customer_demographics
219219
Output [9]: [cd_demo_sk#22, cd_gender#23, cd_marital_status#24, cd_education_status#25, cd_purchase_estimate#26, cd_credit_rating#27, cd_dep_count#28, cd_dep_employed_count#29, cd_dep_college_count#30]
220220
Batched: true
221-
Location: InMemoryFileIndex [file:/Users/yi.wu/IdeaProjects/spark/sql/core/spark-warehouse/org.apache.spark.sql.TPCDSModifiedPlanStabilitySuite/customer_demographics]
221+
Location [not included in comparison]/{warehouse_dir}/customer_demographics]
222222
PushedFilters: [IsNotNull(cd_demo_sk)]
223223
ReadSchema: struct<cd_demo_sk:int,cd_gender:string,cd_marital_status:string,cd_education_status:string,cd_purchase_estimate:int,cd_credit_rating:string,cd_dep_count:int,cd_dep_employed_count:int,cd_dep_college_count:int>
224224

‎sql/core/src/test/resources/tpcds-plan-stability/approved-plans-modified/q19.sf100/explain.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ TakeOrderedAndProject (39)
4343
(1) Scan parquet default.date_dim
4444
Output [3]: [d_date_sk#1, d_year#2, d_moy#3]
4545
Batched: true
46-
Location: InMemoryFileIndex [file:/Users/yi.wu/IdeaProjects/spark/sql/core/spark-warehouse/org.apache.spark.sql.TPCDSModifiedPlanStabilityWithStatsSuite/date_dim]
46+
Location [not included in comparison]/{warehouse_dir}/date_dim]
4747
PushedFilters: [IsNotNull(d_moy), IsNotNull(d_year), EqualTo(d_moy,11), EqualTo(d_year,1999), GreaterThanOrEqual(d_date_sk,2451484), LessThanOrEqual(d_date_sk,2451513), IsNotNull(d_date_sk)]
4848
ReadSchema: struct<d_date_sk:int,d_year:int,d_moy:int>
4949

@@ -65,7 +65,7 @@ Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint))
6565
(6) Scan parquet default.store_sales
6666
Output [5]: [ss_sold_date_sk#5, ss_item_sk#6, ss_customer_sk#7, ss_store_sk#8, ss_ext_sales_price#9]
6767
Batched: true
68-
Location: InMemoryFileIndex [file:/Users/yi.wu/IdeaProjects/spark/sql/core/spark-warehouse/org.apache.spark.sql.TPCDSModifiedPlanStabilityWithStatsSuite/store_sales]
68+
Location [not included in comparison]/{warehouse_dir}/store_sales]
6969
PushedFilters: [IsNotNull(ss_sold_date_sk), GreaterThanOrEqual(ss_sold_date_sk,2451484), LessThanOrEqual(ss_sold_date_sk,2451513), IsNotNull(ss_item_sk), IsNotNull(ss_customer_sk), IsNotNull(ss_store_sk)]
7070
ReadSchema: struct<ss_sold_date_sk:int,ss_item_sk:int,ss_customer_sk:int,ss_store_sk:int,ss_ext_sales_price:decimal(7,2)>
7171

@@ -92,7 +92,7 @@ Arguments: HashedRelationBroadcastMode(List(cast(input[1, int, true] as bigint))
9292
(12) Scan parquet default.customer
9393
Output [2]: [c_customer_sk#11, c_current_addr_sk#12]
9494
Batched: true
95-
Location: InMemoryFileIndex [file:/Users/yi.wu/IdeaProjects/spark/sql/core/spark-warehouse/org.apache.spark.sql.TPCDSModifiedPlanStabilityWithStatsSuite/customer]
95+
Location [not included in comparison]/{warehouse_dir}/customer]
9696
PushedFilters: [IsNotNull(c_customer_sk), IsNotNull(c_current_addr_sk)]
9797
ReadSchema: struct<c_customer_sk:int,c_current_addr_sk:int>
9898

@@ -115,7 +115,7 @@ Input [6]: [ss_item_sk#6, ss_customer_sk#7, ss_store_sk#8, ss_ext_sales_price#9,
115115
(17) Scan parquet default.store
116116
Output [2]: [s_store_sk#13, s_zip#14]
117117
Batched: true
118-
Location: InMemoryFileIndex [file:/Users/yi.wu/IdeaProjects/spark/sql/core/spark-warehouse/org.apache.spark.sql.TPCDSModifiedPlanStabilityWithStatsSuite/store]
118+
Location [not included in comparison]/{warehouse_dir}/store]
119119
PushedFilters: [IsNotNull(s_zip), IsNotNull(s_store_sk)]
120120
ReadSchema: struct<s_store_sk:int,s_zip:string>
121121

@@ -146,7 +146,7 @@ Arguments: HashedRelationBroadcastMode(List(cast(input[2, int, true] as bigint))
146146
(24) Scan parquet default.customer_address
147147
Output [2]: [ca_address_sk#17, ca_zip#18]
148148
Batched: true
149-
Location: InMemoryFileIndex [file:/Users/yi.wu/IdeaProjects/spark/sql/core/spark-warehouse/org.apache.spark.sql.TPCDSModifiedPlanStabilityWithStatsSuite/customer_address]
149+
Location [not included in comparison]/{warehouse_dir}/customer_address]
150150
PushedFilters: [IsNotNull(ca_address_sk), IsNotNull(ca_zip)]
151151
ReadSchema: struct<ca_address_sk:int,ca_zip:string>
152152

@@ -169,7 +169,7 @@ Input [6]: [ss_item_sk#6, ss_ext_sales_price#9, c_current_addr_sk#12, s_zip#14,
169169
(29) Scan parquet default.item
170170
Output [6]: [i_item_sk#19, i_brand_id#20, i_brand#21, i_manufact_id#22, i_manufact#23, i_manager_id#24]
171171
Batched: true
172-
Location: InMemoryFileIndex [file:/Users/yi.wu/IdeaProjects/spark/sql/core/spark-warehouse/org.apache.spark.sql.TPCDSModifiedPlanStabilityWithStatsSuite/item]
172+
Location [not included in comparison]/{warehouse_dir}/item]
173173
PushedFilters: [IsNotNull(i_manager_id), EqualTo(i_manager_id,7), IsNotNull(i_item_sk)]
174174
ReadSchema: struct<i_item_sk:int,i_brand_id:int,i_brand:string,i_manufact_id:int,i_manufact:string,i_manager_id:int>
175175

‎sql/core/src/test/resources/tpcds-plan-stability/approved-plans-modified/q19/explain.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ TakeOrderedAndProject (39)
4343
(1) Scan parquet default.date_dim
4444
Output [3]: [d_date_sk#1, d_year#2, d_moy#3]
4545
Batched: true
46-
Location: InMemoryFileIndex [file:/Users/yi.wu/IdeaProjects/spark/sql/core/spark-warehouse/org.apache.spark.sql.TPCDSModifiedPlanStabilitySuite/date_dim]
46+
Location [not included in comparison]/{warehouse_dir}/date_dim]
4747
PushedFilters: [IsNotNull(d_moy), IsNotNull(d_year), EqualTo(d_moy,11), EqualTo(d_year,1999), GreaterThanOrEqual(d_date_sk,2451484), LessThanOrEqual(d_date_sk,2451513), IsNotNull(d_date_sk)]
4848
ReadSchema: struct<d_date_sk:int,d_year:int,d_moy:int>
4949

@@ -61,7 +61,7 @@ Input [3]: [d_date_sk#1, d_year#2, d_moy#3]
6161
(5) Scan parquet default.store_sales
6262
Output [5]: [ss_sold_date_sk#4, ss_item_sk#5, ss_customer_sk#6, ss_store_sk#7, ss_ext_sales_price#8]
6363
Batched: true
64-
Location: InMemoryFileIndex [file:/Users/yi.wu/IdeaProjects/spark/sql/core/spark-warehouse/org.apache.spark.sql.TPCDSModifiedPlanStabilitySuite/store_sales]
64+
Location [not included in comparison]/{warehouse_dir}/store_sales]
6565
PushedFilters: [IsNotNull(ss_sold_date_sk), GreaterThanOrEqual(ss_sold_date_sk,2451484), LessThanOrEqual(ss_sold_date_sk,2451513), IsNotNull(ss_item_sk), IsNotNull(ss_customer_sk), IsNotNull(ss_store_sk)]
6666
ReadSchema: struct<ss_sold_date_sk:int,ss_item_sk:int,ss_customer_sk:int,ss_store_sk:int,ss_ext_sales_price:decimal(7,2)>
6767

@@ -88,7 +88,7 @@ Input [6]: [d_date_sk#1, ss_sold_date_sk#4, ss_item_sk#5, ss_customer_sk#6, ss_s
8888
(11) Scan parquet default.item
8989
Output [6]: [i_item_sk#10, i_brand_id#11, i_brand#12, i_manufact_id#13, i_manufact#14, i_manager_id#15]
9090
Batched: true
91-
Location: InMemoryFileIndex [file:/Users/yi.wu/IdeaProjects/spark/sql/core/spark-warehouse/org.apache.spark.sql.TPCDSModifiedPlanStabilitySuite/item]
91+
Location [not included in comparison]/{warehouse_dir}/item]
9292
PushedFilters: [IsNotNull(i_manager_id), EqualTo(i_manager_id,7), IsNotNull(i_item_sk)]
9393
ReadSchema: struct<i_item_sk:int,i_brand_id:int,i_brand:string,i_manufact_id:int,i_manufact:string,i_manager_id:int>
9494

@@ -119,7 +119,7 @@ Input [9]: [ss_item_sk#5, ss_customer_sk#6, ss_store_sk#7, ss_ext_sales_price#8,
119119
(18) Scan parquet default.customer
120120
Output [2]: [c_customer_sk#17, c_current_addr_sk#18]
121121
Batched: true
122-
Location: InMemoryFileIndex [file:/Users/yi.wu/IdeaProjects/spark/sql/core/spark-warehouse/org.apache.spark.sql.TPCDSModifiedPlanStabilitySuite/customer]
122+
Location [not included in comparison]/{warehouse_dir}/customer]
123123
PushedFilters: [IsNotNull(c_customer_sk), IsNotNull(c_current_addr_sk)]
124124
ReadSchema: struct<c_customer_sk:int,c_current_addr_sk:int>
125125

@@ -146,7 +146,7 @@ Input [9]: [ss_customer_sk#6, ss_store_sk#7, ss_ext_sales_price#8, i_brand_id#11
146146
(24) Scan parquet default.customer_address
147147
Output [2]: [ca_address_sk#20, ca_zip#21]
148148
Batched: true
149-
Location: InMemoryFileIndex [file:/Users/yi.wu/IdeaProjects/spark/sql/core/spark-warehouse/org.apache.spark.sql.TPCDSModifiedPlanStabilitySuite/customer_address]
149+
Location [not included in comparison]/{warehouse_dir}/customer_address]
150150
PushedFilters: [IsNotNull(ca_address_sk), IsNotNull(ca_zip)]
151151
ReadSchema: struct<ca_address_sk:int,ca_zip:string>
152152

@@ -173,7 +173,7 @@ Input [9]: [ss_store_sk#7, ss_ext_sales_price#8, i_brand_id#11, i_brand#12, i_ma
173173
(30) Scan parquet default.store
174174
Output [2]: [s_store_sk#23, s_zip#24]
175175
Batched: true
176-
Location: InMemoryFileIndex [file:/Users/yi.wu/IdeaProjects/spark/sql/core/spark-warehouse/org.apache.spark.sql.TPCDSModifiedPlanStabilitySuite/store]
176+
Location [not included in comparison]/{warehouse_dir}/store]
177177
PushedFilters: [IsNotNull(s_zip), IsNotNull(s_store_sk)]
178178
ReadSchema: struct<s_store_sk:int,s_zip:string>
179179

0 commit comments

Comments
 (0)