You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@spark.apache.org by GitBox <gi...@apache.org> on 2020/11/18 21:14:47 UTC
[GitHub] [spark] HeartSaVioR commented on a change in pull request #30411: [SPARK-31962][SQL] Provide modifiedAfter and modifiedBefore options when filtering from a batch-based file data source
HeartSaVioR commented on a change in pull request #30411:
URL: https://github.com/apache/spark/pull/30411#discussion_r526424771
##########
File path: sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/PathFilterSuite.scala
##########
@@ -0,0 +1,307 @@
+/*
+ * 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.execution.datasources
+
+import java.io.File
+import java.time.{LocalDateTime, ZoneId, ZoneOffset}
+import java.time.format.DateTimeFormatter
+
+import scala.util.Random
+
+import org.apache.spark.sql.{AnalysisException, QueryTest, Row}
+import org.apache.spark.sql.catalyst.util.{stringToFile, DateTimeUtils}
+import org.apache.spark.sql.test.SharedSparkSession
+import org.apache.spark.sql.types.{StringType, StructField, StructType}
+
+class PathFilterSuite extends QueryTest with SharedSparkSession {
+ import testImplicits._
+
+ test("SPARK-31962: modifiedBefore specified" +
+ " and sharing same timestamp with file last modified time.") {
+ withTempDir { dir =>
+ val curTime = LocalDateTime.now(ZoneOffset.UTC)
+ executeTest(dir, Seq(curTime), 0, modifiedBefore = Some(formatTime(curTime)))
+ }
+ }
+
+ test("SPARK-31962: modifiedAfter specified" +
+ " and sharing same timestamp with file last modified time.") {
+ withTempDir { dir =>
+ val curTime = LocalDateTime.now(ZoneOffset.UTC)
+ executeTest(dir, Seq(curTime), 0, modifiedAfter = Some(formatTime(curTime)))
+ }
+ }
+
+ test("SPARK-31962: modifiedBefore and modifiedAfter option" +
+ " share same timestamp with file last modified time.") {
+ withTempDir { dir =>
+ val curTime = LocalDateTime.now(ZoneOffset.UTC)
+ val formattedTime = formatTime(curTime)
+ executeTest(dir, Seq(curTime), 0, modifiedBefore = Some(formattedTime),
+ modifiedAfter = Some(formattedTime))
+ }
+ }
+
+ test("SPARK-31962: modifiedBefore and modifiedAfter option" +
+ " share same timestamp with earlier file last modified time.") {
+ withTempDir { dir =>
+ val curTime = LocalDateTime.now(ZoneOffset.UTC)
+ val fileTime = curTime.minusDays(3)
+ val formattedTime = formatTime(curTime)
+ executeTest(dir, Seq(fileTime), 0, modifiedBefore = Some(formattedTime),
+ modifiedAfter = Some(formattedTime))
+ }
+ }
+
+ test("SPARK-31962: modifiedBefore and modifiedAfter option" +
+ " share same timestamp with later file last modified time.") {
+ withTempDir { dir =>
+ val curTime = LocalDateTime.now(ZoneOffset.UTC)
+ val formattedTime = formatTime(curTime)
+ executeTest(dir, Seq(curTime), 0, modifiedBefore = Some(formattedTime),
+ modifiedAfter = Some(formattedTime))
+ }
+ }
+
+ test("SPARK-31962: when modifiedAfter specified with a past date") {
+ withTempDir { dir =>
+ val curTime = LocalDateTime.now(ZoneOffset.UTC)
+ val pastTime = curTime.minusYears(1)
+ val formattedTime = formatTime(pastTime)
+ executeTest(dir, Seq(curTime), 1, modifiedAfter = Some(formattedTime))
+ }
+ }
+
+ test("SPARK-31962: when modifiedBefore specified with a future date") {
+ withTempDir { dir =>
+ val curTime = LocalDateTime.now(ZoneOffset.UTC)
+ val futureTime = curTime.plusYears(1)
+ val formattedTime = formatTime(futureTime)
+ executeTest(dir, Seq(curTime), 1, modifiedBefore = Some(formattedTime))
+ }
+ }
+
+ test("SPARK-31962: with modifiedBefore option provided using a past date") {
+ withTempDir { dir =>
+ val curTime = LocalDateTime.now(ZoneOffset.UTC)
+ val pastTime = curTime.minusYears(1)
+ val formattedTime = formatTime(pastTime)
+ executeTest(dir, Seq(curTime), 0, modifiedBefore = Some(formattedTime))
+ }
+ }
+
+ test("SPARK-31962: modifiedAfter specified with a past date, multiple files, one valid") {
+ withTempDir { dir =>
+ val fileTime1 = LocalDateTime.now(ZoneOffset.UTC)
+ val fileTime2 = LocalDateTime.ofEpochSecond(0, 0, ZoneOffset.UTC)
+ val pastTime = fileTime1.minusYears(1)
+ val formattedTime = formatTime(pastTime)
+ executeTest(dir, Seq(fileTime1, fileTime2), 1, modifiedAfter = Some(formattedTime))
+ }
+ }
+
+ test("SPARK-31962: modifiedAfter specified with a past date, multiple files, both valid") {
+ withTempDir { dir =>
+ val curTime = LocalDateTime.now(ZoneOffset.UTC)
+ val pastTime = curTime.minusYears(1)
+ val formattedTime = formatTime(pastTime)
+ executeTest(dir, Seq(curTime, curTime), 2, modifiedAfter = Some(formattedTime))
+ }
+ }
+
+ test("SPARK-31962: modifiedAfter specified with a past date, multiple files, none valid") {
+ withTempDir { dir =>
+ val fileTime = LocalDateTime.ofEpochSecond(0, 0, ZoneOffset.UTC)
+ val pastTime = LocalDateTime.now(ZoneOffset.UTC).minusYears(1)
+ val formattedTime = formatTime(pastTime)
+ executeTest(dir, Seq(fileTime, fileTime), 0, modifiedAfter = Some(formattedTime))
+ }
+ }
+
+ test("SPARK-31962: modifiedBefore specified with a future date, multiple files, both valid") {
+ withTempDir { dir =>
+ val fileTime = LocalDateTime.ofEpochSecond(0, 0, ZoneOffset.UTC)
+ val futureTime = LocalDateTime.now(ZoneOffset.UTC).plusYears(1)
+ val formattedTime = formatTime(futureTime)
+ executeTest(dir, Seq(fileTime, fileTime), 2, modifiedBefore = Some(formattedTime))
+ }
+ }
+
+ test("SPARK-31962: modifiedBefore specified with a future date, multiple files, one valid") {
+ withTempDir { dir =>
+ val curTime = LocalDateTime.now(ZoneOffset.UTC)
+ val fileTime1 = LocalDateTime.ofEpochSecond(0, 0, ZoneOffset.UTC)
+ val fileTime2 = curTime.plusDays(3)
+ val formattedTime = formatTime(curTime)
+ executeTest(dir, Seq(fileTime1, fileTime2), 1, modifiedBefore = Some(formattedTime))
+ }
+ }
+
+ test("SPARK-31962: modifiedBefore specified with a future date, multiple files, none valid") {
+ withTempDir { dir =>
+ val fileTime = LocalDateTime.now(ZoneOffset.UTC).minusDays(1)
+ val formattedTime = formatTime(fileTime)
+ executeTest(dir, Seq(fileTime, fileTime), 0, modifiedBefore = Some(formattedTime))
+ }
+ }
+
+ test("SPARK-31962: modifiedBefore/modifiedAfter is specified with an invalid date") {
+ executeTestWithBadOption(
+ Map("modifiedBefore" -> "2024-05+1 01:00:00"),
+ Seq("The timestamp provided", "modifiedbefore", "2024-05+1 01:00:00"))
+
+ executeTestWithBadOption(
+ Map("modifiedAfter" -> "2024-05+1 01:00:00"),
+ Seq("The timestamp provided", "modifiedafter", "2024-05+1 01:00:00"))
+ }
+
+ test("SPARK-31962: modifiedBefore/modifiedAfter - empty option") {
+ executeTestWithBadOption(
+ Map("modifiedBefore" -> ""),
+ Seq("The timestamp provided", "modifiedbefore"))
+
+ executeTestWithBadOption(
+ Map("modifiedAfter" -> ""),
+ Seq("The timestamp provided", "modifiedafter"))
+ }
+
+ test("SPARK-31962: modifiedBefore/modifiedAfter filter takes into account local timezone " +
+ "when specified as an option.") {
+ Seq("modifiedbefore", "modifiedafter").foreach { filterName =>
+ // CET = UTC + 1 hour, HST = UTC - 10 hours
+ Seq("CET", "HST").foreach { tzId =>
+ testModifiedDateFilterWithTimezone(tzId, filterName)
+ }
+ }
+ }
+
+ test("Option pathGlobFilter: filter files correctly") {
Review comment:
Note to reviewers: two tests were moved from FileBasedDataSourceSuite as this PR adds the specific suite for filtering option.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org