Skip to content
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'upstream/master' into filestreamsource-…
…option
  • Loading branch information
viirya committed Sep 22, 2016
commit 9d16631e87789d5eca4a5737a3d96e15f1623c4b
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ class FileStreamSource(
Map()
}}

private val metadataLog = new HDFSMetadataLog[Array[FileEntry]](sparkSession, metadataPath)

private val metadataLog =
new FileStreamSourceLog(FileStreamSourceLog.VERSION, sparkSession, metadataPath)
private var maxBatchId = metadataLog.getLatest().map(_._1).getOrElse(-1L)

/** Maximum number of new files to be considered in each batch */
Expand Down Expand Up @@ -140,7 +140,8 @@ class FileStreamSource(
userSpecifiedSchema = Some(schema),
className = fileFormatClassName,
options = optionsWithPartitionBasePath)
Dataset.ofRows(sparkSession, LogicalRelation(newDataSource.resolveRelation()))
Dataset.ofRows(sparkSession, LogicalRelation(newDataSource.resolveRelation(
checkFilesExist = false)))
}

/**
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.