diff --git a/hcatalog/core/.gitignore b/hcatalog/core/.gitignore index 0a7a9c5..3b2ad03 100644 --- a/hcatalog/core/.gitignore +++ b/hcatalog/core/.gitignore @@ -1 +1,2 @@ mapred +/bin/ diff --git a/hcatalog/webhcat/svr/.gitignore b/hcatalog/webhcat/svr/.gitignore index 916e17c..3285bd9 100644 --- a/hcatalog/webhcat/svr/.gitignore +++ b/hcatalog/webhcat/svr/.gitignore @@ -1 +1,2 @@ dependency-reduced-pom.xml +/bin/ diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/cost/HiveCost.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/cost/HiveCost.java index 0755943..6a58ba1 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/cost/HiveCost.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/cost/HiveCost.java @@ -114,8 +114,9 @@ public boolean equals(RelOptCost other) { } public boolean isEqWithEpsilon(RelOptCost other) { - return (this == other) || (Math.abs((this.cpu + this.io) - - (other.getCpu() + other.getIo())) < RelOptUtil.EPSILON); + return (this == other) + || ((Math.abs((this.cpu + this.io) - (other.getCpu() + other.getIo())) < RelOptUtil.EPSILON) && (Math + .abs((this.rowCount - other.getRows())) < RelOptUtil.EPSILON)); } public RelOptCost minus(RelOptCost other) {