-
Notifications
You must be signed in to change notification settings - Fork 141
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
Provide hybrid scan setting for consistency requirement #1819
Merged
dai-chen
merged 4 commits into
opensearch-project:feature/flint
from
dai-chen:add-hybrid-scan-mode-rebased
Jul 11, 2023
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
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
126 changes: 126 additions & 0 deletions
126
...src/test/scala/org/opensearch/flint/spark/skipping/FlintSparkSkippingFileIndexSuite.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,126 @@ | ||
| /* | ||
| * Copyright OpenSearch Contributors | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
|
|
||
| package org.opensearch.flint.spark.skipping | ||
|
|
||
| import org.apache.hadoop.fs.{FileStatus, Path} | ||
| import org.mockito.ArgumentMatchers.any | ||
| import org.mockito.Mockito.when | ||
| import org.opensearch.flint.spark.skipping.FlintSparkSkippingIndex.FILE_PATH_COLUMN | ||
| import org.scalatest.matchers.should.Matchers | ||
| import org.scalatestplus.mockito.MockitoSugar.mock | ||
|
|
||
| import org.apache.spark.FlintSuite | ||
| import org.apache.spark.sql.{Column, DataFrame, Row} | ||
| import org.apache.spark.sql.catalyst.InternalRow | ||
| import org.apache.spark.sql.catalyst.expressions.{Literal, Predicate} | ||
| import org.apache.spark.sql.execution.datasources.{FileIndex, PartitionDirectory} | ||
| import org.apache.spark.sql.functions.col | ||
| import org.apache.spark.sql.types._ | ||
|
|
||
| class FlintSparkSkippingFileIndexSuite extends FlintSuite with Matchers { | ||
|
|
||
| /** Test source partition data. */ | ||
| private val partition1 = "partition-1" -> Seq("file-1", "file-2") | ||
| private val partition2 = "partition-2" -> Seq("file-3") | ||
|
|
||
| /** Test index data schema. */ | ||
| private val schema = Map((FILE_PATH_COLUMN, StringType), ("year", IntegerType)) | ||
|
|
||
| test("should keep files returned from index") { | ||
| assertFlintFileIndex() | ||
| .withSourceFiles(Map(partition1)) | ||
| .withIndexData(schema, Seq(Row("file-1", 2023), Row("file-2", 2022))) | ||
| .withIndexFilter(col("year") === 2023) | ||
| .shouldScanSourceFiles(Map("partition-1" -> Seq("file-1"))) | ||
| } | ||
|
|
||
| test("should keep files of multiple partitions returned from index") { | ||
| assertFlintFileIndex() | ||
| .withSourceFiles(Map(partition1, partition2)) | ||
| .withIndexData(schema, Seq(Row("file-1", 2023), Row("file-2", 2022), Row("file-3", 2023))) | ||
| .withIndexFilter(col("year") === 2023) | ||
| .shouldScanSourceFiles(Map("partition-1" -> Seq("file-1"), "partition-2" -> Seq("file-3"))) | ||
| } | ||
|
|
||
| test("should skip unknown source files by default") { | ||
| assertFlintFileIndex() | ||
| .withSourceFiles(Map(partition1)) | ||
| .withIndexData( | ||
| schema, | ||
| Seq(Row("file-1", 2023)) // file-2 is not refreshed to index yet | ||
| ) | ||
| .withIndexFilter(col("year") === 2023) | ||
| .shouldScanSourceFiles(Map("partition-1" -> Seq("file-1"))) | ||
| } | ||
|
|
||
| test("should not skip unknown source files in hybrid-scan mode") { | ||
| withHybridScanEnabled { | ||
| assertFlintFileIndex() | ||
| .withSourceFiles(Map(partition1)) | ||
| .withIndexData( | ||
| schema, | ||
| Seq(Row("file-1", 2023)) // file-2 is not refreshed to index yet | ||
| ) | ||
| .withIndexFilter(col("year") === 2023) | ||
| .shouldScanSourceFiles(Map("partition-1" -> Seq("file-1", "file-2"))) | ||
| } | ||
| } | ||
|
|
||
| test("should not skip unknown source files of multiple partitions in hybrid-scan mode") { | ||
| withHybridScanEnabled { | ||
| assertFlintFileIndex() | ||
| .withSourceFiles(Map(partition1, partition2)) | ||
| .withIndexData( | ||
| schema, | ||
| Seq(Row("file-1", 2023)) // file-2 is not refreshed to index yet | ||
| ) | ||
| .withIndexFilter(col("year") === 2023) | ||
| .shouldScanSourceFiles( | ||
| Map("partition-1" -> Seq("file-1", "file-2"), "partition-2" -> Seq("file-3"))) | ||
| } | ||
| } | ||
|
|
||
| private def assertFlintFileIndex(): AssertionHelper = { | ||
| new AssertionHelper | ||
| } | ||
|
|
||
| private class AssertionHelper { | ||
| private val baseFileIndex = mock[FileIndex] | ||
| private var indexScan: DataFrame = _ | ||
| private var indexFilter: Predicate = _ | ||
|
|
||
| def withSourceFiles(partitions: Map[String, Seq[String]]): AssertionHelper = { | ||
| when(baseFileIndex.listFiles(any(), any())) | ||
| .thenReturn(mockPartitions(partitions)) | ||
| this | ||
| } | ||
|
|
||
| def withIndexData(columns: Map[String, DataType], data: Seq[Row]): AssertionHelper = { | ||
| val schema = StructType(columns.map { case (colName, colType) => | ||
| StructField(colName, colType, nullable = false) | ||
| }.toSeq) | ||
| indexScan = spark.createDataFrame(spark.sparkContext.parallelize(data), schema) | ||
| this | ||
| } | ||
|
|
||
| def withIndexFilter(pred: Column): AssertionHelper = { | ||
| indexFilter = pred.expr.asInstanceOf[Predicate] | ||
| this | ||
| } | ||
|
|
||
| def shouldScanSourceFiles(partitions: Map[String, Seq[String]]): Unit = { | ||
| val fileIndex = FlintSparkSkippingFileIndex(baseFileIndex, indexScan, indexFilter) | ||
| fileIndex.listFiles(Seq.empty, Seq.empty) shouldBe mockPartitions(partitions) | ||
| } | ||
|
|
||
| private def mockPartitions(partitions: Map[String, Seq[String]]): Seq[PartitionDirectory] = { | ||
| partitions.map { case (partitionName, filePaths) => | ||
| val files = filePaths.map(path => new FileStatus(0, false, 0, 0, 0, new Path(path))) | ||
| PartitionDirectory(InternalRow(Literal(partitionName)), files) | ||
| }.toSeq | ||
| } | ||
| } | ||
| } |
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
i assume left join is expensive, is there an magic number to avoid left join, which mean scan without index? if it make sense, we can add an issue to track it at perf test stage.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sure, will cover this in our benchmark after merged. Thanks!