Skip to content

[SPARK-29448][SQL] Support the INTERVAL type by Parquet datasource #26102

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.

Sign up for GitHub

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

Closed
MaxGekk wants to merge 19 commits into from
Closed

[SPARK-29448][SQL] Support the INTERVAL type by Parquet datasource #26102

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
1c64fb1
Support the interval type in schemas
MaxGekk Oct 10, 2019
0769585
Support the interval type in ColumnarBatchRow
MaxGekk Oct 10, 2019
cfcecf1
Fix imports
MaxGekk Oct 10, 2019
c7889ed
Support writing and reading intervals
MaxGekk Oct 12, 2019
4563a4e
Remove unused variable
MaxGekk Oct 12, 2019
83b4bf2
Fix coding style
MaxGekk Oct 12, 2019
81ef7be
Exclude parquet from checking
MaxGekk Oct 12, 2019
de0872e
Exclude parquet from checks of unsupported interval
MaxGekk Oct 12, 2019
281f62b
Combine AtomicType and CalendarIntervalType in supportDataType()
MaxGekk Oct 14, 2019
232b1fb
Replace timestampBuffer and intervalBuffer by reusableBuffer
MaxGekk Oct 14, 2019
3f6ad61
Move unsupported type check to checkUnsupportedTypes()
MaxGekk Oct 14, 2019
c260622
Add more tests to ParquetQuerySuite
MaxGekk Oct 14, 2019
8fd037b
Merge remote-tracking branch 'origin/master' into parquet-interval
MaxGekk Oct 25, 2019
032a2ea
CalendarInterval.fromString -> IntervalUtils.fromString
MaxGekk Oct 25, 2019
6834f1e
Merge remote-tracking branch 'remotes/origin/master' into parquet-int…
MaxGekk Nov 1, 2019
712378c
Rebase on new field - days
MaxGekk Nov 1, 2019
cf8023a
Add one more test
MaxGekk Nov 1, 2019
8fa4a0d
Merge remote-tracking branch 'remotes/origin/master' into parquet-int…
MaxGekk Dec 10, 2019
9041110
Rebase on the master
MaxGekk Dec 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Rebase on the master
  • Loading branch information
@MaxGekk
MaxGekk committed Dec 10, 2019
commit 904111049f95d066dd53bc208d253454add85b17
3 changes: 2 additions & 1 deletion ...c/main/scala/org/apache/spark/sql/execution/datasources/parquet/ParquetRowConverter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import org.apache.spark.internal.Logging
import org.apache.spark.sql.catalyst.InternalRow
import org.apache.spark.sql.catalyst.expressions._
import org.apache.spark.sql.catalyst.util.{ArrayBasedMapData, DateTimeUtils, GenericArrayData}
import org.apache.spark.sql.catalyst.util.DateTimeConstants.MICROS_PER_MILLIS
import org.apache.spark.sql.catalyst.util.DateTimeUtils.SQLTimestamp
import org.apache.spark.sql.types._
import org.apache.spark.unsafe.types.{CalendarInterval, UTF8String}
Expand Down Expand Up @@ -333,7 +334,7 @@ private[parquet] class ParquetRowConverter(
s"but got a ${value.length()}-byte array.")

val buf = value.toByteBuffer.order(ByteOrder.LITTLE_ENDIAN)
val microseconds = buf.getInt * DateTimeUtils.MICROS_PER_MILLIS
val microseconds = buf.getInt * MICROS_PER_MILLIS
val days = buf.getInt
val months = buf.getInt
updater.set(new CalendarInterval(months, days, microseconds))
Expand Down
3 changes: 2 additions & 1 deletion ...c/main/scala/org/apache/spark/sql/execution/datasources/parquet/ParquetWriteSupport.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import org.apache.spark.internal.Logging
import org.apache.spark.sql.SPARK_VERSION_METADATA_KEY
import org.apache.spark.sql.catalyst.InternalRow
import org.apache.spark.sql.catalyst.expressions.SpecializedGetters
import org.apache.spark.sql.catalyst.util.DateTimeConstants.MICROS_PER_MILLIS
import org.apache.spark.sql.catalyst.util.DateTimeUtils
import org.apache.spark.sql.internal.SQLConf
import org.apache.spark.sql.types._
Expand Down Expand Up @@ -213,7 +214,7 @@ class ParquetWriteSupport extends WriteSupport[InternalRow] with Logging {
val interval = row.getInterval(ordinal)
val buf = ByteBuffer.wrap(reusableBuffer)
buf.order(ByteOrder.LITTLE_ENDIAN)
.putInt((interval.milliseconds()).toInt)
.putInt(Math.toIntExact(interval.microseconds / MICROS_PER_MILLIS))
.putInt(interval.days)
.putInt(interval.months)
recordConsumer.addBinary(Binary.fromReusedByteArray(reusableBuffer))
Expand Down
3 changes: 2 additions & 1 deletion ...re/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/ParquetIOSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -751,7 +751,8 @@ class ParquetIOSuite extends QueryTest with ParquetTest with SharedSparkSession
Decimal("1234.23456"),
DateTimeUtils.fromJavaDate(java.sql.Date.valueOf("2015-01-01")),
DateTimeUtils.fromJavaTimestamp(java.sql.Timestamp.valueOf("2015-01-01 23:50:59.123")),
IntervalUtils.fromString("interval 1 month 2 microsecond"))
IntervalUtils.safeStringToInterval(
UTF8String.fromString("interval 1 month 2 microsecond")))

dataTypes.zip(constantValues).foreach { case (dt, v) =>
val schema = StructType(StructField("pcol", dt) :: Nil)
Expand Down