Skip to content

[SPARK-10289] [SQL] Fixes JSONRelation refreshing on read path #8460

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
wants to merge 1 commit into from
Closed

[SPARK-10289] [SQL] Fixes JSONRelation refreshing on read path #8460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 31 additions & 2 deletions sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/DataSourceStrategy.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,21 @@

package org.apache.spark.sql.execution.datasources

import org.apache.spark.{Logging, TaskContext}
import org.apache.spark.deploy.SparkHadoopUtil
import org.apache.spark.rdd.{MapPartitionsRDD, RDD, UnionRDD}
import org.apache.spark.sql.catalyst.CatalystTypeConverters.convertToScala
import org.apache.spark.sql.catalyst.{CatalystTypeConverters, InternalRow, expressions}
import org.apache.spark.sql.catalyst.expressions._
import org.apache.spark.sql.catalyst.planning.PhysicalOperation
import org.apache.spark.sql.catalyst.plans.logical
import org.apache.spark.sql.catalyst.plans.logical.LogicalPlan
import org.apache.spark.sql.catalyst.{CatalystTypeConverters, InternalRow, expressions}
import org.apache.spark.sql.execution.datasources.json.JSONRelation
import org.apache.spark.sql.sources._
import org.apache.spark.sql.types.{StringType, StructType}
import org.apache.spark.sql.{SaveMode, Strategy, execution, sources, _}
import org.apache.spark.unsafe.types.UTF8String
import org.apache.spark.util.{SerializableConfiguration, Utils}
import org.apache.spark.{Logging, TaskContext}

/**
* A Strategy for planning scans over data sources defined using the sources API.
Expand Down Expand Up @@ -61,6 +62,20 @@ private[sql] object DataSourceStrategy extends Strategy with Logging {
// Scanning partitioned HadoopFsRelation
case PhysicalOperation(projects, filters, l @ LogicalRelation(t: HadoopFsRelation))
if t.partitionSpec.partitionColumns.nonEmpty =>
// One characteristics of JSONRelation is that, after updating data within the input folder,
// users don't need to refresh the relation manually to read the most recent data. This is
// a feature inherited from the old version of JSONRelation (the one before migrating to
// HadoopFsRelation). However, normal HadoopFsRelations don't share this characteristic.
// Here we specialize JSONRelation to do the refresh manually.
//
// Note that we can't do refreshing in JSONRelation.buildScan, because buildScan is invoked
// for each individual partition.
//
// Please refer to SPARK-10289 and SPARK-9743 for more details.
if (t.isInstanceOf[JSONRelation]) {
t.refresh()
}

val selectedPartitions = prunePartitions(filters, t.partitionSpec).toArray

logInfo {
Expand Down Expand Up @@ -88,6 +103,20 @@ private[sql] object DataSourceStrategy extends Strategy with Logging {

// Scanning non-partitioned HadoopFsRelation
case PhysicalOperation(projects, filters, l @ LogicalRelation(t: HadoopFsRelation)) =>
// One characteristics of JSONRelation is that, after updating data within the input folder,
// users don't need to refresh the relation manually to read the most recent data. This is
// a feature inherited from the old version of JSONRelation (the one before migrating to
// HadoopFsRelation). However, normal HadoopFsRelations don't share this characteristic.
// Here we specialize JSONRelation to do the refresh manually.
//
// Note that we can't do refreshing in JSONRelation.buildScan, because buildScan is invoked
// for each individual partition.
//
// Please refer to SPARK-10289 and SPARK-9743 for more details.
if (t.isInstanceOf[JSONRelation]) {
t.refresh()
}

// See buildPartitionedTableScan for the reason that we need to create a shard
// broadcast HadoopConf.
val sharedHadoopConf = SparkHadoopUtil.get.conf
Expand Down
9 changes: 0 additions & 9 deletions sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/json/JSONRelation.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,15 +111,6 @@ private[sql] class JSONRelation(
jsonSchema
}

override private[sql] def buildScan(
requiredColumns: Array[String],
filters: Array[Filter],
inputPaths: Array[String],
broadcastedConf: Broadcast[SerializableConfiguration]): RDD[Row] = {
refresh()
super.buildScan(requiredColumns, filters, inputPaths, broadcastedConf)
}

override def buildScan(
requiredColumns: Array[String],
filters: Array[Filter],
Expand Down
2 changes: 1 addition & 1 deletion sql/core/src/main/scala/org/apache/spark/sql/sources/interfaces.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -562,7 +562,7 @@ abstract class HadoopFsRelation private[sql](maybePartitionSpec: Option[Partitio
})
}

private[sql] def buildScan(
final private[sql] def buildScan(
Copy link
Contributor Author

@liancheng liancheng Aug 26, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This method was marked as final at the very beginning, and wasn't designed to be overridden by subclasses. The final decorator was removed in #8035 to work around the refreshing issue.

requiredColumns: Array[String],
filters: Array[Filter],
inputPaths: Array[String],
Expand Down