-
Notifications
You must be signed in to change notification settings - Fork 466
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[GLUTEN-8872][CH][Part-2] Support Delta Deletion Vectors read for CH …
…backend Part-2: Support reading deletion vectors bitmap when queryring
- Loading branch information
Showing
26 changed files
with
670 additions
and
85 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
184 changes: 184 additions & 0 deletions
184
...a-32/test/scala/org/apache/spark/gluten/delta/GlutenDeltaParquetDeletionVectorSuite.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,184 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.apache.spark.gluten.delta | ||
|
|
||
| import org.apache.gluten.execution.{FileSourceScanExecTransformer, GlutenClickHouseTPCHAbstractSuite} | ||
|
|
||
| import org.apache.spark.SparkConf | ||
| import org.apache.spark.sql.delta.files.TahoeFileIndex | ||
| import org.apache.spark.sql.execution.adaptive.AdaptiveSparkPlanHelper | ||
|
|
||
| // Some sqls' line length exceeds 100 | ||
| // scalastyle:off line.size.limit | ||
|
|
||
| class GlutenDeltaParquetDeletionVectorSuite | ||
| extends GlutenClickHouseTPCHAbstractSuite | ||
| with AdaptiveSparkPlanHelper { | ||
|
|
||
| override protected val needCopyParquetToTablePath = true | ||
|
|
||
| override protected val tablesPath: String = basePath + "/tpch-data" | ||
| override protected val tpchQueries: String = rootPath + "queries/tpch-queries-ch" | ||
| override protected val queriesResults: String = rootPath + "mergetree-queries-output" | ||
|
|
||
| // import org.apache.gluten.backendsapi.clickhouse.CHConfig._ | ||
|
|
||
| /** Run Gluten + ClickHouse Backend with SortShuffleManager */ | ||
| override protected def sparkConf: SparkConf = { | ||
| super.sparkConf | ||
| .set("spark.shuffle.manager", "org.apache.spark.shuffle.sort.ColumnarShuffleManager") | ||
| .set("spark.io.compression.codec", "LZ4") | ||
| .set("spark.sql.shuffle.partitions", "5") | ||
| .set("spark.sql.autoBroadcastJoinThreshold", "10MB") | ||
| .set("spark.sql.adaptive.enabled", "true") | ||
| .set("spark.sql.files.maxPartitionBytes", "20000000") | ||
| .set("spark.sql.storeAssignmentPolicy", "legacy") | ||
| // .setCHConfig("use_local_format", true) | ||
| .set("spark.databricks.delta.retentionDurationCheck.enabled", "false") | ||
| } | ||
|
|
||
| override protected def createTPCHNotNullTables(): Unit = { | ||
| createNotNullTPCHTablesInParquet(tablesPath) | ||
| } | ||
|
|
||
| private val q1SchemaString: String = | ||
| s""" l_orderkey bigint, | ||
| | l_partkey bigint, | ||
| | l_suppkey bigint, | ||
| | l_linenumber bigint, | ||
| | l_quantity double, | ||
| | l_extendedprice double, | ||
| | l_discount double, | ||
| | l_tax double, | ||
| | l_returnflag string, | ||
| | l_linestatus string, | ||
| | l_shipdate date, | ||
| | l_commitdate date, | ||
| | l_receiptdate date, | ||
| | l_shipinstruct string, | ||
| | l_shipmode string, | ||
| | l_comment string""".stripMargin | ||
|
|
||
| test("test parquet table delete with the delta DV") { | ||
| spark.sql(s""" | ||
| |set spark.gluten.enabled=false; | ||
| |""".stripMargin) | ||
| spark.sql(s""" | ||
| |DROP TABLE IF EXISTS lineitem_delta_parquet_delete_dv; | ||
| |""".stripMargin) | ||
|
|
||
| spark.sql(s""" | ||
| |CREATE TABLE IF NOT EXISTS lineitem_delta_parquet_delete_dv | ||
| |($q1SchemaString) | ||
| |USING delta | ||
| |TBLPROPERTIES (delta.enableDeletionVectors='true') | ||
| |LOCATION '$basePath/lineitem_delta_parquet_delete_dv' | ||
| |""".stripMargin) | ||
|
|
||
| spark.sql(s""" | ||
| | insert into table lineitem_delta_parquet_delete_dv | ||
| | select /*+ REPARTITION(6) */ * from lineitem | ||
| |""".stripMargin) | ||
|
|
||
| val df1 = spark.sql(s""" | ||
| | delete from lineitem_delta_parquet_delete_dv | ||
| | where mod(l_orderkey, 3) = 1 and l_orderkey < 100 | ||
| |""".stripMargin) | ||
| spark.sql(s""" | ||
| |set spark.gluten.enabled=true; | ||
| |""".stripMargin) | ||
|
|
||
| val df = spark.sql(s""" | ||
| | select sum(l_linenumber) from lineitem_delta_parquet_delete_dv | ||
| |""".stripMargin) | ||
| val result = df.collect() | ||
| assert( | ||
| result.apply(0).get(0) === 1802335 | ||
| ) | ||
| val scanExec = collect(df.queryExecution.executedPlan) { | ||
| case f: FileSourceScanExecTransformer => f | ||
| } | ||
| val parquetScan = scanExec.head | ||
| val fileIndex = parquetScan.relation.location.asInstanceOf[TahoeFileIndex] | ||
| val addFiles = fileIndex.matchingFiles(Nil, Nil) | ||
| assert(addFiles.size === 6) | ||
|
|
||
| spark.sql(s""" | ||
| |set spark.gluten.enabled=false; | ||
| |""".stripMargin) | ||
| spark.sql(s""" | ||
| | delete from lineitem_delta_parquet_delete_dv where mod(l_orderkey, 3) = 2 | ||
| |""".stripMargin) | ||
| spark.sql(s""" | ||
| |set spark.gluten.enabled=true; | ||
| |""".stripMargin) | ||
|
|
||
| val df3 = spark.sql(s""" | ||
| | select sum(l_linenumber) from lineitem_delta_parquet_delete_dv | ||
| |""".stripMargin) | ||
| assert( | ||
| df3.collect().apply(0).get(0) === 1200560 | ||
| ) | ||
| } | ||
|
|
||
| test("test parquet partition table delete with the delta DV") { | ||
| withSQLConf(("spark.sql.sources.partitionOverwriteMode", "dynamic")) { | ||
| spark.sql(s""" | ||
| |set spark.gluten.enabled=false; | ||
| |""".stripMargin) | ||
| spark.sql(s""" | ||
| |DROP TABLE IF EXISTS lineitem_delta_partition_parquet_delete_dv; | ||
| |""".stripMargin) | ||
|
|
||
| spark.sql(s""" | ||
| |CREATE TABLE IF NOT EXISTS lineitem_delta_partition_parquet_delete_dv | ||
| |($q1SchemaString) | ||
| |USING delta | ||
| |PARTITIONED BY (l_returnflag) | ||
| |TBLPROPERTIES (delta.enableDeletionVectors='true') | ||
| |LOCATION '$basePath/lineitem_delta_partition_parquet_delete_dv' | ||
| |""".stripMargin) | ||
|
|
||
| spark.sql(s""" | ||
| | insert into table lineitem_delta_partition_parquet_delete_dv | ||
| | select /*+ REPARTITION(6) */ * from lineitem | ||
| |""".stripMargin) | ||
|
|
||
| val df1 = spark.sql(s""" | ||
| | delete from lineitem_delta_partition_parquet_delete_dv | ||
| | where mod(l_orderkey, 3) = 1 | ||
| |""".stripMargin) | ||
| spark.sql(s""" | ||
| |set spark.gluten.enabled=true; | ||
| |""".stripMargin) | ||
|
|
||
| val df = | ||
| spark.sql(s""" | ||
| | select sum(l_linenumber) from lineitem_delta_partition_parquet_delete_dv | ||
| |""".stripMargin) | ||
| val result = df.collect() | ||
| assert( | ||
| result.apply(0).get(0) === 1201486 | ||
| ) | ||
| val scanExec = collect(df.queryExecution.executedPlan) { | ||
| case f: FileSourceScanExecTransformer => f | ||
| } | ||
| assert(scanExec.nonEmpty) | ||
| } | ||
| } | ||
| } | ||
| // scalastyle:off line.size.limit |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.