parquet-mr git commit: PARQUET-432: Complete a todo for method ColumnDescriptor.compareTo()

[li...@apache.org]

Repository: parquet-mr
Updated Branches:
  refs/heads/master c38386d6b -> af9fd052d


PARQUET-432: Complete a todo for method ColumnDescriptor.compareTo()

The ticket proposes to consider the case *path.length < o.path.length* in, for method ColumnDescriptor.compareTo().

Author: proflin <pr...@gmail.com>

Closes #314 from proflin/PARQUET-432 and squashes the following commits:

80ba94b [proflin] Addresses PR comments
6ccd00f [proflin] Revert Updates
a4d2a4a [proflin] PARQUET-432: Complete a todo in method ColumnDescriptor.compareTo()
694b76b [proflin] Updates


Project: http://git-wip-us.apache.org/repos/asf/parquet-mr/repo
Commit: http://git-wip-us.apache.org/repos/asf/parquet-mr/commit/af9fd052
Tree: http://git-wip-us.apache.org/repos/asf/parquet-mr/tree/af9fd052
Diff: http://git-wip-us.apache.org/repos/asf/parquet-mr/diff/af9fd052

Branch: refs/heads/master
Commit: af9fd052d1c208f191fbdf85873f965552465598
Parents: c38386d
Author: proflin <pr...@gmail.com>
Authored: Fri Jan 29 11:38:34 2016 -0800
Committer: Cheng Lian <li...@databricks.com>
Committed: Fri Jan 29 11:38:34 2016 -0800

----------------------------------------------------------------------
 .../apache/parquet/column/ColumnDescriptor.java |  6 +--
 .../parquet/column/TestColumnDescriptor.java    | 52 ++++++++++++++++++++
 2 files changed, 55 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/parquet-mr/blob/af9fd052/parquet-column/src/main/java/org/apache/parquet/column/ColumnDescriptor.java
----------------------------------------------------------------------
diff --git a/parquet-column/src/main/java/org/apache/parquet/column/ColumnDescriptor.java b/parquet-column/src/main/java/org/apache/parquet/column/ColumnDescriptor.java
index 8244913..61f13a2 100644
--- a/parquet-column/src/main/java/org/apache/parquet/column/ColumnDescriptor.java
+++ b/parquet-column/src/main/java/org/apache/parquet/column/ColumnDescriptor.java
@@ -117,14 +117,14 @@ public class ColumnDescriptor implements Comparable<ColumnDescriptor> {
 
   @Override
   public int compareTo(ColumnDescriptor o) {
-    // TODO(julien): this will fail if o.path.length < this.path.length
-    for (int i = 0; i < path.length; i++) {
+    int length = path.length < o.path.length ? path.length : o.path.length;
+    for (int i = 0; i < length; i++) {
       int compareTo = path[i].compareTo(o.path[i]);
       if (compareTo != 0) {
         return compareTo;
       }
     }
-    return 0;
+    return path.length - o.path.length;
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/parquet-mr/blob/af9fd052/parquet-column/src/test/java/org/apache/parquet/column/TestColumnDescriptor.java
----------------------------------------------------------------------
diff --git a/parquet-column/src/test/java/org/apache/parquet/column/TestColumnDescriptor.java b/parquet-column/src/test/java/org/apache/parquet/column/TestColumnDescriptor.java
new file mode 100644
index 0000000..33d9cea
--- /dev/null
+++ b/parquet-column/src/test/java/org/apache/parquet/column/TestColumnDescriptor.java
@@ -0,0 +1,52 @@
+/* 
+ * 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.parquet.column;
+
+import org.apache.parquet.schema.PrimitiveType;
+import org.junit.Test;
+
+import static junit.framework.Assert.assertEquals;
+
+public class TestColumnDescriptor {
+
+  private ColumnDescriptor column(String... path) {
+    return new ColumnDescriptor(path, PrimitiveType.PrimitiveTypeName.INT32, 0, 0);
+  }
+
+  @Test
+  public void testComparesTo() throws Exception {
+    assertEquals(column("a").compareTo(column("a")), 0);
+    assertEquals(column("a", "b").compareTo(column("a", "b")), 0);
+
+    assertEquals(column("a").compareTo(column("b")), -1);
+    assertEquals(column("b").compareTo(column("a")), 1);
+    assertEquals(column("a", "a").compareTo(column("a", "b")), -1);
+    assertEquals(column("b", "a").compareTo(column("a", "a")), 1);
+
+    assertEquals(column("a").compareTo(column("a", "b")), -1);
+    assertEquals(column("b").compareTo(column("a", "b")), 1);
+
+    assertEquals(column("a", "b").compareTo(column("a")), 1);
+    assertEquals(column("a", "b").compareTo(column("b")), -1);
+
+    assertEquals(column("").compareTo(column("")), 0);
+    assertEquals(column("").compareTo(column("a")), -1);
+    assertEquals(column("a").compareTo(column("")), 1);
+  }
+}