Only push predicates into partitioned table scans.

marmbrus · Jan 28, 2014 · c263c84 · c263c84
1 parent ab77882
commit c263c84
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/main/scala/catalyst/execution/hiveOperators.scala b/src/main/scala/catalyst/execution/hiveOperators.scala
@@ -36,6 +36,9 @@ case class HiveTableScan(
     partitionPruningPred: Option[Expression])
   extends LeafNode {
 
+  require(partitionPruningPred.isEmpty || relation.hiveQlTable.isPartitioned,
+    "Partition pruning predicates only supported for partitioned tables.")
+
   // Bind all partition key attribute references in the partition pruning predicate for later
   // evaluation.
   private val boundPruningPred = partitionPruningPred.map { pred =>

diff --git a/src/main/scala/catalyst/execution/planningStrategies.scala b/src/main/scala/catalyst/execution/planningStrategies.scala
@@ -48,7 +48,9 @@ trait PlanningStrategies {
    */
   object PartitionPrunings extends Strategy {
     def apply(plan: LogicalPlan): Seq[SharkPlan] = plan match {
-      case p @ FilteredOperation(predicates, relation: MetastoreRelation) =>
+      case p @ FilteredOperation(predicates, relation: MetastoreRelation)
+          if relation.hiveQlTable.isPartitioned =>
+
         val partitionKeyIds = relation.partitionKeys.map(_.id).toSet
 
         // Filter out all predicates that only deal with partition keys