{"action":"created","comment":{"url":"https://api.github.com/repos/apache/spark/pulls/comments/76096158","id":76096158,"diff_hunk":"@@ -41,36 +40,59 @@ class FileStreamSource(\n     metadataPath: String,\n     options: Map[String, String]) extends Source with Logging {\n \n+  import FileStreamSource._\n+\n+  private val sourceOptions = new FileStreamOptions(options)\n+\n   private val fs = new Path(path).getFileSystem(sparkSession.sessionState.newHadoopConf())\n   private val qualifiedBasePath = fs.makeQualified(new Path(path)) // can contains glob patterns\n-  private val metadataLog = new HDFSMetadataLog[Seq[String]](sparkSession, metadataPath)\n+\n+  private val metadataLog = new HDFSMetadataLog[Seq[FileEntry]](sparkSession, metadataPath)\n+\n   private var maxBatchId = metadataLog.getLatest().map(_._1).getOrElse(-1L)\n \n   /** Maximum number of new files to be considered in each batch */\n-  private val maxFilesPerBatch = getMaxFilesPerBatch()\n+  private val maxFilesPerBatch = sourceOptions.maxFilesPerTrigger\n+\n+  /** A mapping from a file that we have processed to some timestamp it was last modified. */\n+  // Visible for testing.\n+  val seenFiles = new SeenFilesMap(sourceOptions.maxFileAgeMs)","path":"sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/FileStreamSource.scala","position":48,"original_position":48,"commit_id":"6817dec737c4a9e8e4007a92f8f65a1fbc89869e","original_commit_id":"6817dec737c4a9e8e4007a92f8f65a1fbc89869e","user":{"login":"petermaxlee","id":20197098,"avatar_url":"https://avatars.githubusercontent.com/u/20197098?v=3","gravatar_id":"","url":"https://api.github.com/users/petermaxlee","html_url":"https://github.com/petermaxlee","followers_url":"https://api.github.com/users/petermaxlee/followers","following_url":"https://api.github.com/users/petermaxlee/following{/other_user}","gists_url":"https://api.github.com/users/petermaxlee/gists{/gist_id}","starred_url":"https://api.github.com/users/petermaxlee/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/petermaxlee/subscriptions","organizations_url":"https://api.github.com/users/petermaxlee/orgs","repos_url":"https://api.github.com/users/petermaxlee/repos","events_url":"https://api.github.com/users/petermaxlee/events{/privacy}","received_events_url":"https://api.github.com/users/petermaxlee/received_events","type":"User","site_admin":false},"body":"This is actually useful in general for debugging. I'm going to update the comment.\r\n","created_at":"2016-08-24T16:58:39Z","updated_at":"2016-08-24T16:58:39Z","html_url":"https://github.com/apache/spark/pull/14728#discussion_r76096158","pull_request_url":"https://api.github.com/repos/apache/spark/pulls/14728","_links":{"self":{"href":"https://api.github.com/repos/apache/spark/pulls/comments/76096158"},"html":{"href":"https://github.com/apache/spark/pull/14728#discussion_r76096158"},"pull_request":{"href":"https://api.github.com/repos/apache/spark/pulls/14728"}}},"pull_request":{"url":"https://api.github.com/repos/apache/spark/pulls/14728","id":82071017,"html_url":"https://github.com/apache/spark/pull/14728","diff_url":"https://github.com/apache/spark/pull/14728.diff","patch_url":"https://github.com/apache/spark/pull/14728.patch","issue_url":"https://api.github.com/repos/apache/spark/issues/14728","number":14728,"state":"open","locked":false,"title":"[SPARK-17165][SQL] FileStreamSource should not track the list of seen files indefinitely","user":{"login":"petermaxlee","id":20197098,"avatar_url":"https://avatars.githubusercontent.com/u/20197098?v=3","gravatar_id":"","url":"https://api.github.com/users/petermaxlee","html_url":"https://github.com/petermaxlee","followers_url":"https://api.github.com/users/petermaxlee/followers","following_url":"https://api.github.com/users/petermaxlee/following{/other_user}","gists_url":"https://api.github.com/users/petermaxlee/gists{/gist_id}","starred_url":"https://api.github.com/users/petermaxlee/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/petermaxlee/subscriptions","organizations_url":"https://api.github.com/users/petermaxlee/orgs","repos_url":"https://api.github.com/users/petermaxlee/repos","events_url":"https://api.github.com/users/petermaxlee/events{/privacy}","received_events_url":"https://api.github.com/users/petermaxlee/received_events","type":"User","site_admin":false},"body":"## What changes were proposed in this pull request?\r\nBefore this change, FileStreamSource uses an in-memory hash set to track the list of files processed by the engine. The list can grow indefinitely, leading to OOM or overflow of the hash set.\r\n\r\nThis patch introduces a new user-defined option called \"maxFileAge\", default to 24 hours. If a file is older than this age, FileStreamSource will purge it from the in-memory map that was used to track the list of files that have been processed.\r\n\r\n\r\n## How was this patch tested?\r\nAdded unit tests for the underlying utility, and also added an end-to-end test to validate the purge in FileStreamSourceSuite. Also verified the new test cases would fail when the timeout was set to a very large number.\r\n","created_at":"2016-08-20T06:40:13Z","updated_at":"2016-08-24T16:58:39Z","closed_at":null,"merged_at":null,"merge_commit_sha":"c78a6bb8a1244a46115919a34202c50c47b88ea0","assignee":null,"assignees":[],"milestone":null,"commits_url":"https://api.github.com/repos/apache/spark/pulls/14728/commits","review_comments_url":"https://api.github.com/repos/apache/spark/pulls/14728/comments","review_comment_url":"https://api.github.com/repos/apache/spark/pulls/comments{/number}","comments_url":"https://api.github.com/repos/apache/spark/issues/14728/comments","statuses_url":"https://api.github.com/repos/apache/spark/statuses/6817dec737c4a9e8e4007a92f8f65a1fbc89869e","head":{"label":"petermaxlee:SPARK-17165","ref":"SPARK-17165","sha":"6817dec737c4a9e8e4007a92f8f65a1fbc89869e","user":{"login":"petermaxlee","id":20197098,"avatar_url":"https://avatars.githubusercontent.com/u/20197098?v=3","gravatar_id":"","url":"https://api.github.com/users/petermaxlee","html_url":"https://github.com/petermaxlee","followers_url":"https://api.github.com/users/petermaxlee/followers","following_url":"https://api.github.com/users/petermaxlee/following{/other_user}","gists_url":"https://api.github.com/users/petermaxlee/gists{/gist_id}","starred_url":"https://api.github.com/users/petermaxlee/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/petermaxlee/subscriptions","organizations_url":"https://api.github.com/users/petermaxlee/orgs","repos_url":"https://api.github.com/users/petermaxlee/repos","events_url":"https://api.github.com/users/petermaxlee/events{/privacy}","received_events_url":"https://api.github.com/users/petermaxlee/received_events","type":"User","site_admin":false},"repo":{"id":62184923,"name":"spark","full_name":"petermaxlee/spark","owner":{"login":"petermaxlee","id":20197098,"avatar_url":"https://avatars.githubusercontent.com/u/20197098?v=3","gravatar_id":"","url":"https://api.github.com/users/petermaxlee","html_url":"https://github.com/petermaxlee","followers_url":"https://api.github.com/users/petermaxlee/followers","following_url":"https://api.github.com/users/petermaxlee/following{/other_user}","gists_url":"https://api.github.com/users/petermaxlee/gists{/gist_id}","starred_url":"https://api.github.com/users/petermaxlee/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/petermaxlee/subscriptions","organizations_url":"https://api.github.com/users/petermaxlee/orgs","repos_url":"https://api.github.com/users/petermaxlee/repos","events_url":"https://api.github.com/users/petermaxlee/events{/privacy}","received_events_url":"https://api.github.com/users/petermaxlee/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/petermaxlee/spark","description":"Mirror of Apache Spark","fork":true,"url":"https://api.github.com/repos/petermaxlee/spark","forks_url":"https://api.github.com/repos/petermaxlee/spark/forks","keys_url":"https://api.github.com/repos/petermaxlee/spark/keys{/key_id}","collaborators_url":"https://api.github.com/repos/petermaxlee/spark/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/petermaxlee/spark/teams","hooks_url":"https://api.github.com/repos/petermaxlee/spark/hooks","issue_events_url":"https://api.github.com/repos/petermaxlee/spark/issues/events{/number}","events_url":"https://api.github.com/repos/petermaxlee/spark/events","assignees_url":"https://api.github.com/repos/petermaxlee/spark/assignees{/user}","branches_url":"https://api.github.com/repos/petermaxlee/spark/branches{/branch}","tags_url":"https://api.github.com/repos/petermaxlee/spark/tags","blobs_url":"https://api.github.com/repos/petermaxlee/spark/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/petermaxlee/spark/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/petermaxlee/spark/git/refs{/sha}","trees_url":"https://api.github.com/repos/petermaxlee/spark/git/trees{/sha}","statuses_url":"https://api.github.com/repos/petermaxlee/spark/statuses/{sha}","languages_url":"https://api.github.com/repos/petermaxlee/spark/languages","stargazers_url":"https://api.github.com/repos/petermaxlee/spark/stargazers","contributors_url":"https://api.github.com/repos/petermaxlee/spark/contributors","subscribers_url":"https://api.github.com/repos/petermaxlee/spark/subscribers","subscription_url":"https://api.github.com/repos/petermaxlee/spark/subscription","commits_url":"https://api.github.com/repos/petermaxlee/spark/commits{/sha}","git_commits_url":"https://api.github.com/repos/petermaxlee/spark/git/commits{/sha}","comments_url":"https://api.github.com/repos/petermaxlee/spark/comments{/number}","issue_comment_url":"https://api.github.com/repos/petermaxlee/spark/issues/comments{/number}","contents_url":"https://api.github.com/repos/petermaxlee/spark/contents/{+path}","compare_url":"https://api.github.com/repos/petermaxlee/spark/compare/{base}...{head}","merges_url":"https://api.github.com/repos/petermaxlee/spark/merges","archive_url":"https://api.github.com/repos/petermaxlee/spark/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/petermaxlee/spark/downloads","issues_url":"https://api.github.com/repos/petermaxlee/spark/issues{/number}","pulls_url":"https://api.github.com/repos/petermaxlee/spark/pulls{/number}","milestones_url":"https://api.github.com/repos/petermaxlee/spark/milestones{/number}","notifications_url":"https://api.github.com/repos/petermaxlee/spark/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/petermaxlee/spark/labels{/name}","releases_url":"https://api.github.com/repos/petermaxlee/spark/releases{/id}","deployments_url":"https://api.github.com/repos/petermaxlee/spark/deployments","created_at":"2016-06-29T01:13:31Z","updated_at":"2016-06-29T01:13:54Z","pushed_at":"2016-08-24T06:42:29Z","git_url":"git://github.com/petermaxlee/spark.git","ssh_url":"git@github.com:petermaxlee/spark.git","clone_url":"https://github.com/petermaxlee/spark.git","svn_url":"https://github.com/petermaxlee/spark","homepage":null,"size":176917,"stargazers_count":0,"watchers_count":0,"language":"Scala","has_issues":false,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"apache:master","ref":"master","sha":"45d40d9f66c666eec6df926db23937589d67225d","user":{"login":"apache","id":47359,"avatar_url":"https://avatars.githubusercontent.com/u/47359?v=3","gravatar_id":"","url":"https://api.github.com/users/apache","html_url":"https://github.com/apache","followers_url":"https://api.github.com/users/apache/followers","following_url":"https://api.github.com/users/apache/following{/other_user}","gists_url":"https://api.github.com/users/apache/gists{/gist_id}","starred_url":"https://api.github.com/users/apache/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/apache/subscriptions","organizations_url":"https://api.github.com/users/apache/orgs","repos_url":"https://api.github.com/users/apache/repos","events_url":"https://api.github.com/users/apache/events{/privacy}","received_events_url":"https://api.github.com/users/apache/received_events","type":"Organization","site_admin":false},"repo":{"id":17165658,"name":"spark","full_name":"apache/spark","owner":{"login":"apache","id":47359,"avatar_url":"https://avatars.githubusercontent.com/u/47359?v=3","gravatar_id":"","url":"https://api.github.com/users/apache","html_url":"https://github.com/apache","followers_url":"https://api.github.com/users/apache/followers","following_url":"https://api.github.com/users/apache/following{/other_user}","gists_url":"https://api.github.com/users/apache/gists{/gist_id}","starred_url":"https://api.github.com/users/apache/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/apache/subscriptions","organizations_url":"https://api.github.com/users/apache/orgs","repos_url":"https://api.github.com/users/apache/repos","events_url":"https://api.github.com/users/apache/events{/privacy}","received_events_url":"https://api.github.com/users/apache/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/apache/spark","description":"Mirror of Apache Spark","fork":false,"url":"https://api.github.com/repos/apache/spark","forks_url":"https://api.github.com/repos/apache/spark/forks","keys_url":"https://api.github.com/repos/apache/spark/keys{/key_id}","collaborators_url":"https://api.github.com/repos/apache/spark/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/apache/spark/teams","hooks_url":"https://api.github.com/repos/apache/spark/hooks","issue_events_url":"https://api.github.com/repos/apache/spark/issues/events{/number}","events_url":"https://api.github.com/repos/apache/spark/events","assignees_url":"https://api.github.com/repos/apache/spark/assignees{/user}","branches_url":"https://api.github.com/repos/apache/spark/branches{/branch}","tags_url":"https://api.github.com/repos/apache/spark/tags","blobs_url":"https://api.github.com/repos/apache/spark/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/apache/spark/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/apache/spark/git/refs{/sha}","trees_url":"https://api.github.com/repos/apache/spark/git/trees{/sha}","statuses_url":"https://api.github.com/repos/apache/spark/statuses/{sha}","languages_url":"https://api.github.com/repos/apache/spark/languages","stargazers_url":"https://api.github.com/repos/apache/spark/stargazers","contributors_url":"https://api.github.com/repos/apache/spark/contributors","subscribers_url":"https://api.github.com/repos/apache/spark/subscribers","subscription_url":"https://api.github.com/repos/apache/spark/subscription","commits_url":"https://api.github.com/repos/apache/spark/commits{/sha}","git_commits_url":"https://api.github.com/repos/apache/spark/git/commits{/sha}","comments_url":"https://api.github.com/repos/apache/spark/comments{/number}","issue_comment_url":"https://api.github.com/repos/apache/spark/issues/comments{/number}","contents_url":"https://api.github.com/repos/apache/spark/contents/{+path}","compare_url":"https://api.github.com/repos/apache/spark/compare/{base}...{head}","merges_url":"https://api.github.com/repos/apache/spark/merges","archive_url":"https://api.github.com/repos/apache/spark/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/apache/spark/downloads","issues_url":"https://api.github.com/repos/apache/spark/issues{/number}","pulls_url":"https://api.github.com/repos/apache/spark/pulls{/number}","milestones_url":"https://api.github.com/repos/apache/spark/milestones{/number}","notifications_url":"https://api.github.com/repos/apache/spark/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/apache/spark/labels{/name}","releases_url":"https://api.github.com/repos/apache/spark/releases{/id}","deployments_url":"https://api.github.com/repos/apache/spark/deployments","created_at":"2014-02-25T08:00:08Z","updated_at":"2016-08-24T13:55:08Z","pushed_at":"2016-08-24T16:48:36Z","git_url":"git://github.com/apache/spark.git","ssh_url":"git@github.com:apache/spark.git","clone_url":"https://github.com/apache/spark.git","svn_url":"https://github.com/apache/spark","homepage":null,"size":512233,"stargazers_count":9762,"watchers_count":9762,"language":"Scala","has_issues":false,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":9108,"mirror_url":"git://git.apache.org/spark.git","open_issues_count":480,"forks":9108,"open_issues":480,"watchers":9762,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/apache/spark/pulls/14728"},"html":{"href":"https://github.com/apache/spark/pull/14728"},"issue":{"href":"https://api.github.com/repos/apache/spark/issues/14728"},"comments":{"href":"https://api.github.com/repos/apache/spark/issues/14728/comments"},"review_comments":{"href":"https://api.github.com/repos/apache/spark/pulls/14728/comments"},"review_comment":{"href":"https://api.github.com/repos/apache/spark/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/apache/spark/pulls/14728/commits"},"statuses":{"href":"https://api.github.com/repos/apache/spark/statuses/6817dec737c4a9e8e4007a92f8f65a1fbc89869e"}}}}
{"actor":{"display_login":"petermaxlee"}}