Github user cloud-fan commented on a diff in the pull request:
https://github.com/apache/spark/pull/21123#discussion_r183589673
--- Diff:
sql/core/src/test/scala/org/apache/spark/sql/sources/v2/FileDataSourceV2Suite.scala
---
@@ -0,0 +1,179 @@
+/*
+ * 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.sql.sources.v2
+
+import java.util.{List => JList, Optional}
+
+import org.apache.spark.sql.{AnalysisException, QueryTest, Row, SaveMode}
+import org.apache.spark.sql.execution.datasources.FileFormat
+import
org.apache.spark.sql.execution.datasources.parquet.{ParquetFileFormat,
ParquetTest}
+import org.apache.spark.sql.execution.datasources.v2.FileDataSourceV2
+import org.apache.spark.sql.internal.SQLConf
+import org.apache.spark.sql.sources.v2.reader.{DataReaderFactory,
DataSourceReader}
+import org.apache.spark.sql.sources.v2.writer.{DataSourceWriter,
DataWriterFactory, WriterCommitMessage}
+import org.apache.spark.sql.test.SharedSQLContext
+import org.apache.spark.sql.types.StructType
+
+class DummyReadOnlyFileDataSourceV2 extends FileDataSourceV2 with
ReadSupport {
+ class DummyFileReader extends DataSourceReader {
+ override def readSchema(): StructType = {
+ throw new AnalysisException("hehe")
+ }
+
+ override def createDataReaderFactories():
JList[DataReaderFactory[Row]] =
+ java.util.Arrays.asList()
+ }
+
+ override def createReader(options: DataSourceOptions): DataSourceReader
= {
+ throw new AnalysisException("Dummy file reader")
+ }
+
+ override def fallBackFileFormat: Class[_ <: FileFormat] =
classOf[ParquetFileFormat]
+
+ override def shortName(): String = "parquet"
+}
+
+class DummyWriteOnlyFileDataSourceV2 extends FileDataSourceV2 with
WriteSupport {
+ override def fallBackFileFormat: Class[_ <: FileFormat] =
classOf[ParquetFileFormat]
+
+ override def shortName(): String = "parquet"
+
+ override def createWriter(
+ jobId: String,
+ schema: StructType,
+ mode: SaveMode,
+ options: DataSourceOptions): Optional[DataSourceWriter] = {
+ throw new AnalysisException("Dummy file writer")
+ }
+}
+
+class SimpleFileDataSourceV2 extends SimpleDataSourceV2 with
FileDataSourceV2 {
+ override def fallBackFileFormat: Class[_ <: FileFormat] =
classOf[ParquetFileFormat]
+
+ override def shortName(): String = "parquet"
+}
+
+class FileDataSourceV2Suite extends QueryTest with ParquetTest with
SharedSQLContext {
+ class DummyFileWriter extends DataSourceWriter {
+ override def createWriterFactory(): DataWriterFactory[Row] = {
+ throw new AnalysisException("hehe")
+ }
+
+ override def commit(messages: Array[WriterCommitMessage]): Unit = {}
+
+ override def abort(messages: Array[WriterCommitMessage]): Unit = {}
+ }
+
+ private val dummyParquetReaderV2 =
classOf[DummyReadOnlyFileDataSourceV2].getName
+ private val dummyParquetWriterV2 =
classOf[DummyWriteOnlyFileDataSourceV2].getName
+ private val simpleFileDataSourceV2 =
classOf[SimpleFileDataSourceV2].getName
+ private val parquetV1 = classOf[ParquetFileFormat].getCanonicalName
+
+ test("Fall back to v1 when writing to file with read only
FileDataSourceV2") {
+ val df = spark.range(1, 10).toDF()
+ withTempPath { file =>
+ val path = file.getCanonicalPath
+ // Writing file should fall back to v1 and succeed.
+ df.write.format(dummyParquetReaderV2).save(path)
+
+ // Validate write result with [[ParquetFileFormat]].
+ checkAnswer(spark.read.format(parquetV1).load(path), df)
+
+ // Dummy File reader should fail as expected.
+ val exception = intercept[AnalysisException] {
+ spark.read.format(dummyParquetReaderV2).load(path)
+ }
+ assert(exception.message.equals("Dummy file reader"))
+ }
+ }
+
+ test("Fall back to v1 when reading file with write only
FileDataSourceV2") {
+ val df = spark.range(1, 10).toDF()
+ withTempPath { file =>
+ val path = file.getCanonicalPath
+
+ // Dummy File writer should fail as expected.
+ val exception = intercept[AnalysisException] {
+ df.write.format(dummyParquetWriterV2).save(path)
+ }
+ assert(exception.message.equals("Dummy file writer"))
+
+ df.write.format(parquetV1).save(path)
+ // Reading file should fall back to v1 and succeed.
+ checkAnswer(spark.read.format(dummyParquetWriterV2).load(path), df)
+ }
+ }
+
+ test("Fall back read path to v1 with configuration
DISABLED_V2_FILE_DATA_SOURCE_READERS") {
+ val df = spark.range(1, 10).toDF()
+ withTempPath { file =>
+ val path = file.getCanonicalPath
+ df.write.format(parquetV1).save(path)
+ withSQLConf(SQLConf.DISABLED_V2_FILE_DATA_SOURCE_READERS.key ->
"foo,parquet,bar") {
+ // Reading file should fall back to v1 and succeed.
+ checkAnswer(spark.read.format(dummyParquetReaderV2).load(path), df)
+ }
+
+ withSQLConf(SQLConf.DISABLED_V2_FILE_DATA_SOURCE_READERS.key ->
"foo,bar") {
+ // Dummy File reader should fail as
DISABLED_V2_FILE_DATA_SOURCE_READERS doesn't include it.
+ val exception = intercept[AnalysisException] {
+ spark.read.format(dummyParquetReaderV2).load(path)
+ }
+ assert(exception.message.equals("Dummy file reader"))
+ }
+ }
+ }
+
+ test("Fall back write path to v1 with configuration
DISABLED_V2_FILE_DATA_SOURCE_READERS") {
+ val df = spark.range(1, 10).toDF()
+ withTempPath { file =>
+ val path = file.getCanonicalPath
+
+ withSQLConf(SQLConf.DISABLED_V2_FILE_DATA_SOURCE_WRITERS.key ->
"foo,bar") {
+ // Dummy File writer should fail as expected.
+ val exception = intercept[AnalysisException] {
+ df.write.format(dummyParquetWriterV2).save(path)
+ }
+ assert(exception.message.equals("Dummy file writer"))
+ }
+
+ withSQLConf(SQLConf.DISABLED_V2_FILE_DATA_SOURCE_WRITERS.key ->
"foo,parquet,bar") {
+ // Writing file should fall back to v1 and succeed.
+ df.write.format(dummyParquetWriterV2).save(path)
+ }
+
+ // Validate write result with [[ParquetFileFormat]].
+ checkAnswer(spark.read.format(parquetV1).load(path), df)
--- End diff --
this check should be put just below
`df.write.format(dummyParquetWriterV2).save(path)`
---
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
