hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hashut...@apache.org
Subject hive git commit: HIVE-12405 : Comparison bug in HiveSplitGenerator.InputSplitComparator#compare() (Aleksei Statkevich via Gopal V)
Date Thu, 19 Nov 2015 22:16:02 GMT
Repository: hive
Updated Branches:
  refs/heads/master 286d02d7e -> 1f94e88dd


HIVE-12405 : Comparison bug in HiveSplitGenerator.InputSplitComparator#compare() (Aleksei
Statkevich via Gopal V)


Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/1f94e88d
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/1f94e88d
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/1f94e88d

Branch: refs/heads/master
Commit: 1f94e88dd43e6b3cef80ddfecf9d95ed85a471e1
Parents: 286d02d
Author: Aleksei Statkevich <me.aleksei@gmail.com>
Authored: Thu Nov 12 23:17:00 2015 -0800
Committer: Ashutosh Chauhan <hashutosh@apache.org>
Committed: Thu Nov 19 14:15:45 2015 -0800

----------------------------------------------------------------------
 .../hive/ql/exec/tez/HiveSplitGenerator.java    |  4 +-
 .../ql/exec/tez/InputSplitComparatorTest.java   | 39 ++++++++++++++++++++
 2 files changed, 41 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/1f94e88d/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/HiveSplitGenerator.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/HiveSplitGenerator.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/HiveSplitGenerator.java
index c370381..8902acb 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/HiveSplitGenerator.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/HiveSplitGenerator.java
@@ -259,7 +259,7 @@ public class HiveSplitGenerator extends InputInitializer {
   }
 
   // Descending sort based on split size| Followed by file name. Followed by startPosition.
-  private static class InputSplitComparator implements Comparator<InputSplit> {
+  static class InputSplitComparator implements Comparator<InputSplit> {
     @Override
     public int compare(InputSplit o1, InputSplit o2) {
       try {
@@ -278,7 +278,7 @@ public class HiveSplitGenerator extends InputInitializer {
                 // Compare start Position
                 long startPos1 = fs1.getStart();
                 long startPos2 = fs2.getStart();
-                if (startPos1 > startPos1) {
+                if (startPos1 > startPos2) {
                   return 1;
                 } else if (startPos1 < startPos2) {
                   return -1;

http://git-wip-us.apache.org/repos/asf/hive/blob/1f94e88d/ql/src/test/org/apache/hadoop/hive/ql/exec/tez/InputSplitComparatorTest.java
----------------------------------------------------------------------
diff --git a/ql/src/test/org/apache/hadoop/hive/ql/exec/tez/InputSplitComparatorTest.java
b/ql/src/test/org/apache/hadoop/hive/ql/exec/tez/InputSplitComparatorTest.java
new file mode 100644
index 0000000..add65ae
--- /dev/null
+++ b/ql/src/test/org/apache/hadoop/hive/ql/exec/tez/InputSplitComparatorTest.java
@@ -0,0 +1,39 @@
+/**
+ * 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.exec.tez;
+
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.mapred.FileSplit;
+import org.junit.Test;
+
+import static org.apache.hadoop.hive.ql.exec.tez.HiveSplitGenerator.InputSplitComparator;
+import static org.junit.Assert.assertEquals;
+
+public class InputSplitComparatorTest {
+
+  private static final String[] EMPTY = new String[]{};
+
+  @Test
+  public void testCompare1() throws Exception {
+    FileSplit split1 = new FileSplit(new Path("/abc/def"), 2000L, 500L, EMPTY);
+    FileSplit split2 = new FileSplit(new Path("/abc/def"), 1000L, 500L, EMPTY);
+    InputSplitComparator comparator = new InputSplitComparator();
+    assertEquals(1, comparator.compare(split1, split2));
+  }
+}


Mime
View raw message