Skip to content

[SPARK-14874][SQL][Streaming] Remove the obsolete Batch representation #12638

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
lw-lin wants to merge 4 commits into from
+4 −30
Closed

[SPARK-14874][SQL][Streaming] Remove the obsolete Batch representation #12638

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c79cba9
remove the useless Batch class
lw-lin Apr 23, 2016
60aaf97
revert renaming
lw-lin Apr 26, 2016
14e6900
revert renaming
lw-lin Apr 26, 2016
653fa52
Merge remote-tracking branch 'refs/remotes/origin/master' into remove…
lw-lin Apr 27, 2016
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
26 changes: 0 additions & 26 deletions sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/Batch.scala
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/FileStreamSource.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ class FileStreamSource(
}

/**
* Returns the next batch of data that is available after `start`, if any is available.
* Returns the data that is between the offsets (`start`, `end`].
Copy link
Contributor Author

@lw-lin lw-lin Apr 27, 2016

Choose a reason for hiding this comment

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

This doc should be updated, following Source.getBatch()'s doc change from Returns the next batch of data that is available after start, if any is available. to Returns the data that is between the offsets (start, end].

*/
override def getBatch(start: Option[Offset], end: Offset): DataFrame = {
val startId = start.map(_.asInstanceOf[LongOffset].offset).getOrElse(-1L)
Expand Down
2 changes: 1 addition & 1 deletion sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/Sink.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import org.apache.spark.sql.DataFrame
trait Sink {

/**
* Adds a batch of data to this sink. The data for a given `batchId` is deterministic and if
* Adds a batch of data to this sink. The data for a given `batchId` is deterministic and if
* this method is called more than once with the same batchId (which will happen in the case of
* failures), then `data` should only be added once.
*/
Expand Down
2 changes: 1 addition & 1 deletion sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/Source.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ trait Source {
def getOffset: Option[Offset]

/**
* Returns the data that is between the offsets (`start`, `end`]. When `start` is `None` then
* Returns the data that is between the offsets (`start`, `end`]. When `start` is `None` then
* the batch should begin with the first available record. This method must always return the
* same data for a particular `start` and `end` pair.
*/
Expand Down
2 changes: 1 addition & 1 deletion sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/memory.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ case class MemoryStream[A : Encoder](id: Int, sqlContext: SQLContext)
}

/**
* Returns the next batch of data that is available after `start`, if any is available.
* Returns the data that is between the offsets (`start`, `end`].
*/
override def getBatch(start: Option[Offset], end: Offset): DataFrame = {
val startOrdinal =
Expand Down