[SPARK-26327][SQL][BACKPORT-2.2] Bug fix for FileSourceScanExec metrics update

[xuanyuanking]

What changes were proposed in this pull request?

Backport #23277 to branch 2.2 without the metrics renaming.

How was this patch tested?

New test case in SQLMetricsSuite.

[SparkQA]

Test build #100036 has finished for PR 23300 at commit 6c442d1.

• This patch fails to build.
• This patch merges cleanly.
• This patch adds no public classes.

[dongjoon-hyun]

@xuanyuanking .
It seems to fail to build.

[error] /home/jenkins/workspace/SparkPullRequestBuilder/sql/core/src/test/scala/org/apache/spark/sql/execution/metric/SQLMetricsSuite.scala:447: package org.apache.spark.sql.test is not a value
[error]   test("SPARK-26327: FileSourceScanExec metrics") {
[error]   ^
[error] /home/jenkins/workspace/SparkPullRequestBuilder/sql/core/src/test/scala/org/apache/spark/sql/execution/metric/SQLMetricsSuite.scala:448: not found: value withTable
[error]     withTable("testDataForScan") {
[error]     ^
[error] /home/jenkins/workspace/SparkPullRequestBuilder/sql/core/src/test/scala/org/apache/spark/sql/execution/metric/SQLMetricsSuite.scala:449: not found: value spark
[error]       spark.range(10).selectExpr("id", "id % 3 as p")
[error]       ^
[error] /home/jenkins/workspace/SparkPullRequestBuilder/sql/core/src/test/scala/org/apache/spark/sql/execution/metric/SQLMetricsSuite.scala:452: not found: value spark
[error]       val df = spark.sql(
[error]                ^
[error] /home/jenkins/workspace/SparkPullRequestBuilder/sql/core/src/test/scala/org/apache/spark/sql/execution/metric/SQLMetricsSuite.scala:454: not found: value testSparkPlanMetrics
[error]       testSparkPlanMetrics(df, 1, Map(
[error]       ^

[xuanyuanking]

Yea UT cherry-pick in a wrong place, sorry for this, fix in this commit.

[SparkQA]

Test build #100060 has finished for PR 23300 at commit 7239aac.

• This patch fails SparkR unit tests.
• This patch merges cleanly.
• This patch adds no public classes.

[dongjoon-hyun]

Retest this please.

[SparkQA]

Test build #100097 has finished for PR 23300 at commit 7239aac.

• This patch passes all tests.
• This patch merges cleanly.
• This patch adds no public classes.

[dongjoon-hyun]

+1, LGTM. Merged to branch-2.2.
Thanks.

[xuanyuanking]

Thanks Dongjoon.