Repository: carbondata Updated Branches: refs/heads/branch-1.3 a416fa691 -> bb35c255e
[HOTFIX] Fixed compilation issue Project: http://git-wip-us.apache.org/repos/asf/carbondata/repo Commit: http://git-wip-us.apache.org/repos/asf/carbondata/commit/bb35c255 Tree: http://git-wip-us.apache.org/repos/asf/carbondata/tree/bb35c255 Diff: http://git-wip-us.apache.org/repos/asf/carbondata/diff/bb35c255 Branch: refs/heads/branch-1.3 Commit: bb35c255eb7660c4de514df6a8c306c568b4d8b6 Parents: a416fa6 Author: kumarvishal09 <kumarvishal1...@gmail.com> Authored: Fri Apr 20 18:40:51 2018 +0530 Committer: kumarvishal09 <kumarvishal1...@gmail.com> Committed: Fri Apr 20 18:40:51 2018 +0530 ---------------------------------------------------------------------- .../org/apache/spark/sql/optimizer/CarbonFilters.scala | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/carbondata/blob/bb35c255/integration/spark2/src/main/scala/org/apache/spark/sql/optimizer/CarbonFilters.scala ---------------------------------------------------------------------- diff --git a/integration/spark2/src/main/scala/org/apache/spark/sql/optimizer/CarbonFilters.scala b/integration/spark2/src/main/scala/org/apache/spark/sql/optimizer/CarbonFilters.scala index e5eb53c..d96b8b4 100644 --- a/integration/spark2/src/main/scala/org/apache/spark/sql/optimizer/CarbonFilters.scala +++ b/integration/spark2/src/main/scala/org/apache/spark/sql/optimizer/CarbonFilters.scala @@ -442,17 +442,23 @@ object CarbonFilters { tableIdentifier) } + def getPartitions(partitionFilters: Seq[Expression], + session: SparkSession, + identifier: TableIdentifier): Option[Seq[PartitionSpec]] = { + val table = CarbonEnv.getCarbonTable(identifier)(session) + getPartitions(partitionFilters, session, table) + } + /** * Fetches partition information from hive * @param partitionFilters * @param sparkSession - * @param identifier * @return */ def getPartitions(partitionFilters: Seq[Expression], sparkSession: SparkSession, - identifier: TableIdentifier): Option[Seq[PartitionSpec]] = { - val table = CarbonEnv.getCarbonTable(identifier)(sparkSession) + table: CarbonTable): Option[Seq[PartitionSpec]] = { + val identifier = TableIdentifier(table.getTableName, Some(table.getDatabaseName)) // first try to read partitions in case if the trigger comes from the aggregation table load. val partitionsForAggTable = getPartitionsForAggTable(sparkSession, table) if (partitionsForAggTable.isDefined) {
