Skip to content

[SPARK-19763][SQL]qualified external datasource table location stored in catalog #17095

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
windpiger wants to merge 8 commits into from
Closed

[SPARK-19763][SQL]qualified external datasource table location stored in catalog #17095

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
570ce24
[SPARK-19763][SQL]qualified external datasource table location stored…
windpiger Feb 28, 2017
55c525e
fix test failed
windpiger Feb 28, 2017
18ec570
fix test failed
windpiger Feb 28, 2017
22bef8b
modify test case
windpiger Feb 28, 2017
7e08045
merge with master
windpiger Mar 2, 2017
9932b03
fix test failed
windpiger Mar 2, 2017
0919fea
merge with master
windpiger Mar 9, 2017
c7e837c
remove useless import
windpiger Mar 9, 2017
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
Prev Previous commit
Next Next commit
modify test case
  • Loading branch information
@windpiger
windpiger committed Feb 28, 2017
commit 22bef8be2f242cf54edb06ffad9fd447fb29d1db
5 changes: 4 additions & 1 deletion sql/core/src/test/scala/org/apache/spark/sql/internal/CatalogSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ package org.apache.spark.sql.internal
import java.io.File
import java.net.URI

import org.apache.hadoop.fs.Path
import org.scalatest.BeforeAndAfterEach

import org.apache.spark.SparkFunSuite
Expand Down Expand Up @@ -459,7 +460,9 @@ class CatalogSuite
options = Map("path" -> dir.getAbsolutePath))
val table = spark.sessionState.catalog.getTableMetadata(TableIdentifier("t"))
assert(table.tableType == CatalogTableType.EXTERNAL)
assert(table.storage.locationUri.get == s"file:${dir.getAbsolutePath}")
val dirPath = new Path(dir.getAbsolutePath)
val fs = dirPath.getFileSystem(spark.sessionState.newHadoopConf())
assert(new Path(table.storage.locationUri.get) == fs.makeQualified(dirPath))

Seq((1)).toDF("i").write.insertInto("t")
assert(dir.exists() && dir.listFiles().nonEmpty)
Expand Down
6 changes: 4 additions & 2 deletions sql/core/src/test/scala/org/apache/spark/sql/sources/PathOptionSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,15 +85,17 @@ class PathOptionSuite extends DataSourceTest with SharedSQLContext {
test("path option also exist for write path") {
withTable("src") {
withTempPath { p =>
val path = new Path(p.getAbsolutePath).toString
val path = new Path(p.getAbsolutePath)
sql(
s"""
|CREATE TABLE src
|USING ${classOf[TestOptionsSource].getCanonicalName}
|OPTIONS (PATH '$path')
|AS SELECT 1
""".stripMargin)
assert(spark.table("src").schema.head.metadata.getString("path") == s"file:$path")
val fs = path.getFileSystem(spark.sessionState.newHadoopConf())
assert(new Path(spark.table("src").schema.head.metadata.getString("path")) ==
fs.makeQualified(path))
}
}

Expand Down
6 changes: 5 additions & 1 deletion sql/hive/src/test/scala/org/apache/spark/sql/hive/HiveMetastoreCatalogSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@

package org.apache.spark.sql.hive

import org.apache.hadoop.fs.Path

import org.apache.spark.sql.{QueryTest, Row, SaveMode}
import org.apache.spark.sql.catalyst.TableIdentifier
import org.apache.spark.sql.catalyst.catalog.CatalogTableType
Expand Down Expand Up @@ -140,7 +142,9 @@ class DataSourceWithHiveMetastoreCatalogSuite
assert(hiveTable.storage.serde === Some(serde))

assert(hiveTable.tableType === CatalogTableType.EXTERNAL)
assert(hiveTable.storage.locationUri === Some(s"file:${path.toString}"))
val dirPath = new Path(dir.getAbsolutePath)
val fs = dirPath.getFileSystem(spark.sessionState.newHadoopConf())
assert(hiveTable.storage.locationUri === Some(fs.makeQualified(dirPath).toString))

val columns = hiveTable.schema
assert(columns.map(_.name) === Seq("d1", "d2"))
Expand Down