svn commit: r1530144 - in /hive/trunk/ql/src: java/org/apache/hadoop/hive/ql/plan/ConditionalResolverCommonJoin.java test/org/apache/hadoop/hive/ql/plan/TestConditionalResolverCommonJoin.java

[ha...@apache.org]

Author: hashutosh
Date: Tue Oct  8 03:48:48 2013
New Revision: 1530144

URL: http://svn.apache.org/r1530144
Log:
HIVE-5418 : Integer overflow bug in ConditionalResolverCommonJoin.AliasFileSizePair (Steven Wong via Ashutosh Chauhan)

Added:
    hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/plan/TestConditionalResolverCommonJoin.java
Modified:
    hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ConditionalResolverCommonJoin.java

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ConditionalResolverCommonJoin.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ConditionalResolverCommonJoin.java?rev=1530144&r1=1530143&r2=1530144&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ConditionalResolverCommonJoin.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ConditionalResolverCommonJoin.java Tue Oct  8 03:48:48 2013
@@ -135,7 +135,7 @@ public class ConditionalResolverCommonJo
     return resTsks;
   }
 
-  class AliasFileSizePair implements Comparable<AliasFileSizePair> {
+  static class AliasFileSizePair implements Comparable<AliasFileSizePair> {
     String alias;
     long size;
     AliasFileSizePair(String alias, long size) {
@@ -148,7 +148,7 @@ public class ConditionalResolverCommonJo
       if (o == null) {
         return 1;
       }
-      return (int)(size - o.size);
+      return (size < o.size) ? -1 : ((size > o.size) ? 1 : 0);
     }
   }
 

Added: hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/plan/TestConditionalResolverCommonJoin.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/plan/TestConditionalResolverCommonJoin.java?rev=1530144&view=auto
==============================================================================
--- hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/plan/TestConditionalResolverCommonJoin.java (added)
+++ hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/plan/TestConditionalResolverCommonJoin.java Tue Oct  8 03:48:48 2013
@@ -0,0 +1,35 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.hive.ql.plan;
+
+import junit.framework.TestCase;
+
+import org.apache.hadoop.hive.ql.plan.ConditionalResolverCommonJoin.AliasFileSizePair;
+
+public class TestConditionalResolverCommonJoin extends TestCase {
+
+    public void testAliasFileSizePairCompareTo() {
+        AliasFileSizePair big = new AliasFileSizePair("big", 389560034778L);
+        AliasFileSizePair small = new AliasFileSizePair("small", 1647L);
+
+        assertEquals(0, big.compareTo(big));
+        assertEquals(1, big.compareTo(small));
+        assertEquals(-1, small.compareTo(big));
+    }
+}