Fix map and array type rendering

gerashegalov · Apr 29, 2015 · 8a97b14 · 8a97b14
1 parent e33549d
commit 8a97b14
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/presto-main/src/main/java/com/facebook/presto/type/ArrayType.java b/presto-main/src/main/java/com/facebook/presto/type/ArrayType.java
@@ -176,4 +176,10 @@ public List<Type> getTypeParameters()
  {
  return ImmutableList.of(getElementType());
  }
+
+ @Override
+ public String getDisplayName()
+ {
+ return "array<" + elementType.getDisplayName() + ">";
+ }
 }
diff --git a/presto-main/src/main/java/com/facebook/presto/type/MapType.java b/presto-main/src/main/java/com/facebook/presto/type/MapType.java
@@ -29,9 +29,9 @@
 import java.util.Map;
 
 import static com.facebook.presto.type.TypeUtils.appendToBlockBuilder;
-import static com.facebook.presto.type.TypeUtils.hashPosition;
 import static com.facebook.presto.type.TypeUtils.buildStructuralSlice;
 import static com.facebook.presto.type.TypeUtils.checkElementNotNull;
+import static com.facebook.presto.type.TypeUtils.hashPosition;
 import static com.facebook.presto.type.TypeUtils.parameterizedTypeName;
 import static com.facebook.presto.type.TypeUtils.readStructuralBlock;
 import static com.google.common.base.Preconditions.checkArgument;
@@ -217,4 +217,10 @@ public List<Type> getTypeParameters()
  {
  return ImmutableList.of(getKeyType(), getValueType());
  }
+
+ @Override
+ public String getDisplayName()
+ {
+ return "map<" + keyType.getDisplayName() + ", " + valueType.getDisplayName() + ">";
+ }
 }
diff --git a/presto-main/src/main/java/com/facebook/presto/type/RowType.java b/presto-main/src/main/java/com/facebook/presto/type/RowType.java
@@ -67,17 +67,17 @@ public RowType(List<Type> fieldTypes, Optional<List<String>> fieldNames)
  public String getDisplayName()
  {
  // Convert to standard sql name
- List<String> fields = new ArrayList<>();
- for (int i = 0; i < this.fields.size(); i++) {
- RowField field = this.fields.get(i);
+ List<String> fieldDisplayNames = new ArrayList<>();
+ for (RowField field : fields) {
+ String typeDisplayName = field.getType().getDisplayName();
  if (field.getName().isPresent()) {
- fields.add(field.getName() + " " + field.getType().getDisplayName());
+ fieldDisplayNames.add(field.getName().get() + " " + typeDisplayName);
  }
  else {
- fields.add(field.getType().getDisplayName());
+ fieldDisplayNames.add(typeDisplayName);
  }
  }
- return "ROW(" + Joiner.on(", ").join(fields) + ")";
+ return "row(" + Joiner.on(", ").join(fieldDisplayNames) + ")";
  }
 
  @Override