Skip to content

SKIPME sync with csd-1.5 #119

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

Merged
markhamstra merged 4 commits into from
Nov 5, 2015
Merged

SKIPME sync with csd-1.5 #119

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
12dd4c6
Add logic to get the size estimation from Hadoop filesystem.
Oct 30, 2015
648a0d5
Add logic to read partition number from spark context local property.
Nov 3, 2015
c2efd24
Use the "raw" not ("preprocessed") table name in MetastoreRelation
mbautin Nov 3, 2015
1510006
Add debug message.
Nov 4, 2015
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
Use the "raw" not ("preprocessed") table name in MetastoreRelation
  • Loading branch information
@mbautin @markhamstra
mbautin authored and markhamstra committed Nov 4, 2015
commit c2efd24bf6ca2e8325c8388ac34057760af2b082
8 changes: 4 additions & 4 deletions sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveMetastoreCatalog.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,12 +409,12 @@ private[hive] class HiveMetastoreCatalog(val client: ClientInterface, hive: Hive
val databaseName = tableIdent.lift(tableIdent.size - 2).getOrElse(
client.currentDatabase)
val rawTableName = tableIdent.last
val tblName = tableNamePreprocessor(rawTableName)
val table = client.getTable(databaseName, tblName).withTableName(rawTableName)
val tblNameInMetastore = tableNamePreprocessor(rawTableName)
val table = client.getTable(databaseName, tblNameInMetastore).withTableName(rawTableName)

if (table.properties.get("spark.sql.sources.provider").isDefined) {
val dataSourceTable =
cachedDataSourceTables(QualifiedTableName(databaseName, tblName).toLowerCase)
cachedDataSourceTables(QualifiedTableName(databaseName, tblNameInMetastore).toLowerCase)
// Then, if alias is specified, wrap the table with a Subquery using the alias.
// Otherwise, wrap the table with a Subquery using the table name.
val withAlias =
Expand All @@ -431,7 +431,7 @@ private[hive] class HiveMetastoreCatalog(val client: ClientInterface, hive: Hive
case Some(aliasText) => Subquery(aliasText, HiveQl.createPlan(viewText))
}
} else {
MetastoreRelation(databaseName, tblName, alias)(table)(hive)
MetastoreRelation(databaseName, rawTableName, alias)(table)(hive)
}
}

Expand Down