Index: pom.xml =================================================================== --- pom.xml (revision 1668672) +++ pom.xml (working copy) @@ -100,7 +100,7 @@ 3.4 1.7.5 0.8.0.RELEASE - 1.0.0-incubating + 1.1.0-incubating 3.2.6 3.2.10 3.2.9 Index: ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/TraitsUtil.java =================================================================== --- ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/TraitsUtil.java (revision 1668672) +++ ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/TraitsUtil.java (working copy) @@ -22,7 +22,7 @@ import org.apache.calcite.plan.RelOptCluster; import org.apache.calcite.plan.RelTraitSet; import org.apache.calcite.rel.RelCollation; -import org.apache.calcite.rel.RelCollationImpl; +import org.apache.calcite.rel.RelCollations; import org.apache.hadoop.hive.ql.optimizer.calcite.reloperators.HiveRelNode; public class TraitsUtil { @@ -32,6 +32,6 @@ } public static RelTraitSet getDefaultTraitSet(RelOptCluster cluster) { - return cluster.traitSetOf(HiveRelNode.CONVENTION, RelCollationImpl.EMPTY); + return cluster.traitSetOf(HiveRelNode.CONVENTION, RelCollations.EMPTY); } } Index: ql/src/java/org/apache/hadoop/hive/ql/parse/CalcitePlanner.java =================================================================== --- ql/src/java/org/apache/hadoop/hive/ql/parse/CalcitePlanner.java (revision 1668672) +++ ql/src/java/org/apache/hadoop/hive/ql/parse/CalcitePlanner.java (working copy) @@ -49,6 +49,7 @@ import org.apache.calcite.plan.hep.HepProgramBuilder; import org.apache.calcite.rel.InvalidRelException; import org.apache.calcite.rel.RelCollation; +import org.apache.calcite.rel.RelCollations; import org.apache.calcite.rel.RelCollationImpl; import org.apache.calcite.rel.RelFieldCollation; import org.apache.calcite.rel.RelNode; @@ -707,7 +708,7 @@ List list = Lists.newArrayList(); list.add(HiveDefaultRelMetadataProvider.INSTANCE); RelTraitSet desiredTraits = cluster - .traitSetOf(HiveRelNode.CONVENTION, RelCollationImpl.EMPTY); + .traitSetOf(HiveRelNode.CONVENTION, RelCollations.EMPTY); HepProgram hepPgm = null; HepProgramBuilder hepPgmBldr = new HepProgramBuilder().addMatchOrder(HepMatchOrder.BOTTOM_UP) @@ -2030,7 +2031,7 @@ if (limit != null) { RexNode fetch = cluster.getRexBuilder().makeExactLiteral(BigDecimal.valueOf(limit)); RelTraitSet traitSet = cluster.traitSetOf(HiveRelNode.CONVENTION); - RelCollation canonizedCollation = traitSet.canonize(RelCollationImpl.EMPTY); + RelCollation canonizedCollation = traitSet.canonize(RelCollations.EMPTY); sortRel = new HiveSort(cluster, traitSet, srcRel, canonizedCollation, null, fetch); RowResolver outputRR = new RowResolver();