You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by na...@apache.org on 2014/12/19 02:28:58 UTC

svn commit: r1646606 [1/11] - in /hive/trunk: common/src/java/org/apache/hive/common/util/ ql/src/java/org/apache/hadoop/hive/ql/exec/ ql/src/java/org/apache/hadoop/hive/ql/plan/ ql/src/test/results/clientpositive/ ql/src/test/results/clientpositive/tez/

Author: navis
Date: Fri Dec 19 01:28:56 2014
New Revision: 1646606

URL: http://svn.apache.org/r1646606
Log:
HIVE-7024 : Escape control characters for explain result (Navis reviewed by Sergey Shelukhin)

Modified:
    hive/trunk/common/src/java/org/apache/hive/common/util/HiveStringUtils.java
    hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/ExplainTask.java
    hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/PartitionDesc.java
    hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/TableDesc.java
    hive/trunk/ql/src/test/results/clientpositive/alter_partition_coltype.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_join_reordering_values.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_1.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_11.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_12.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_2.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_3.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_4.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_5.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_7.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_8.q.out
    hive/trunk/ql/src/test/results/clientpositive/binary_output_format.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucket1.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucket2.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucket3.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucket4.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucket5.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucket_map_join_1.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucket_map_join_2.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucketcontext_1.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucketcontext_2.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucketcontext_3.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucketcontext_4.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucketcontext_5.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucketcontext_6.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucketcontext_7.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucketcontext_8.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin1.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin10.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin11.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin12.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin13.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin2.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin3.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin4.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin5.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin7.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin8.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin9.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin_negative.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin_negative2.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin_negative3.q.out
    hive/trunk/ql/src/test/results/clientpositive/columnstats_partlvl.q.out
    hive/trunk/ql/src/test/results/clientpositive/columnstats_tbllvl.q.out
    hive/trunk/ql/src/test/results/clientpositive/constantPropagateForSubQuery.q.out
    hive/trunk/ql/src/test/results/clientpositive/ctas.q.out
    hive/trunk/ql/src/test/results/clientpositive/ctas_hadoop20.q.out
    hive/trunk/ql/src/test/results/clientpositive/disable_merge_for_bucketing.q.out
    hive/trunk/ql/src/test/results/clientpositive/display_colstats_tbllvl.q.out
    hive/trunk/ql/src/test/results/clientpositive/extrapolate_part_stats_full.q.out
    hive/trunk/ql/src/test/results/clientpositive/extrapolate_part_stats_partial.q.out
    hive/trunk/ql/src/test/results/clientpositive/filter_join_breaktask.q.out
    hive/trunk/ql/src/test/results/clientpositive/groupby_map_ppr.q.out
    hive/trunk/ql/src/test/results/clientpositive/groupby_map_ppr_multi_distinct.q.out
    hive/trunk/ql/src/test/results/clientpositive/groupby_ppr.q.out
    hive/trunk/ql/src/test/results/clientpositive/groupby_ppr_multi_distinct.q.out
    hive/trunk/ql/src/test/results/clientpositive/groupby_sort_1.q.out
    hive/trunk/ql/src/test/results/clientpositive/groupby_sort_1_23.q.out
    hive/trunk/ql/src/test/results/clientpositive/groupby_sort_6.q.out
    hive/trunk/ql/src/test/results/clientpositive/groupby_sort_skew_1.q.out
    hive/trunk/ql/src/test/results/clientpositive/groupby_sort_skew_1_23.q.out
    hive/trunk/ql/src/test/results/clientpositive/input23.q.out
    hive/trunk/ql/src/test/results/clientpositive/input42.q.out
    hive/trunk/ql/src/test/results/clientpositive/input_part1.q.out
    hive/trunk/ql/src/test/results/clientpositive/input_part2.q.out
    hive/trunk/ql/src/test/results/clientpositive/input_part7.q.out
    hive/trunk/ql/src/test/results/clientpositive/input_part9.q.out
    hive/trunk/ql/src/test/results/clientpositive/join17.q.out
    hive/trunk/ql/src/test/results/clientpositive/join26.q.out
    hive/trunk/ql/src/test/results/clientpositive/join32.q.out
    hive/trunk/ql/src/test/results/clientpositive/join32_lessSize.q.out
    hive/trunk/ql/src/test/results/clientpositive/join33.q.out
    hive/trunk/ql/src/test/results/clientpositive/join34.q.out
    hive/trunk/ql/src/test/results/clientpositive/join35.q.out
    hive/trunk/ql/src/test/results/clientpositive/join9.q.out
    hive/trunk/ql/src/test/results/clientpositive/join_filters_overlap.q.out
    hive/trunk/ql/src/test/results/clientpositive/join_map_ppr.q.out
    hive/trunk/ql/src/test/results/clientpositive/list_bucket_dml_1.q.out
    hive/trunk/ql/src/test/results/clientpositive/list_bucket_dml_10.q.out
    hive/trunk/ql/src/test/results/clientpositive/list_bucket_dml_11.q.out
    hive/trunk/ql/src/test/results/clientpositive/list_bucket_dml_12.q.out
    hive/trunk/ql/src/test/results/clientpositive/list_bucket_dml_13.q.out
    hive/trunk/ql/src/test/results/clientpositive/list_bucket_dml_14.q.out
    hive/trunk/ql/src/test/results/clientpositive/list_bucket_dml_2.q.out
    hive/trunk/ql/src/test/results/clientpositive/list_bucket_dml_3.q.out
    hive/trunk/ql/src/test/results/clientpositive/list_bucket_dml_4.q.out
    hive/trunk/ql/src/test/results/clientpositive/list_bucket_dml_5.q.out
    hive/trunk/ql/src/test/results/clientpositive/list_bucket_dml_6.q.out
    hive/trunk/ql/src/test/results/clientpositive/list_bucket_dml_7.q.out
    hive/trunk/ql/src/test/results/clientpositive/list_bucket_dml_8.q.out
    hive/trunk/ql/src/test/results/clientpositive/list_bucket_dml_9.q.out
    hive/trunk/ql/src/test/results/clientpositive/list_bucket_query_multiskew_1.q.out
    hive/trunk/ql/src/test/results/clientpositive/list_bucket_query_multiskew_2.q.out
    hive/trunk/ql/src/test/results/clientpositive/list_bucket_query_multiskew_3.q.out
    hive/trunk/ql/src/test/results/clientpositive/list_bucket_query_oneskew_2.q.out
    hive/trunk/ql/src/test/results/clientpositive/list_bucket_query_oneskew_3.q.out
    hive/trunk/ql/src/test/results/clientpositive/load_dyn_part8.q.out
    hive/trunk/ql/src/test/results/clientpositive/louter_join_ppr.q.out
    hive/trunk/ql/src/test/results/clientpositive/mapjoin_mapjoin.q.out
    hive/trunk/ql/src/test/results/clientpositive/merge3.q.out
    hive/trunk/ql/src/test/results/clientpositive/metadataonly1.q.out
    hive/trunk/ql/src/test/results/clientpositive/optimize_nullscan.q.out
    hive/trunk/ql/src/test/results/clientpositive/outer_join_ppr.q.out
    hive/trunk/ql/src/test/results/clientpositive/pcr.q.out
    hive/trunk/ql/src/test/results/clientpositive/ppd_join_filter.q.out
    hive/trunk/ql/src/test/results/clientpositive/ppd_union_view.q.out
    hive/trunk/ql/src/test/results/clientpositive/ppd_vc.q.out
    hive/trunk/ql/src/test/results/clientpositive/ppr_allchildsarenull.q.out
    hive/trunk/ql/src/test/results/clientpositive/push_or.q.out
    hive/trunk/ql/src/test/results/clientpositive/rand_partitionpruner1.q.out
    hive/trunk/ql/src/test/results/clientpositive/rand_partitionpruner2.q.out
    hive/trunk/ql/src/test/results/clientpositive/rand_partitionpruner3.q.out
    hive/trunk/ql/src/test/results/clientpositive/reduce_deduplicate.q.out
    hive/trunk/ql/src/test/results/clientpositive/regexp_extract.q.out
    hive/trunk/ql/src/test/results/clientpositive/router_join_ppr.q.out
    hive/trunk/ql/src/test/results/clientpositive/sample1.q.out
    hive/trunk/ql/src/test/results/clientpositive/sample10.q.out
    hive/trunk/ql/src/test/results/clientpositive/sample2.q.out
    hive/trunk/ql/src/test/results/clientpositive/sample4.q.out
    hive/trunk/ql/src/test/results/clientpositive/sample5.q.out
    hive/trunk/ql/src/test/results/clientpositive/sample6.q.out
    hive/trunk/ql/src/test/results/clientpositive/sample7.q.out
    hive/trunk/ql/src/test/results/clientpositive/sample8.q.out
    hive/trunk/ql/src/test/results/clientpositive/sample9.q.out
    hive/trunk/ql/src/test/results/clientpositive/serde_user_properties.q.out
    hive/trunk/ql/src/test/results/clientpositive/smb_mapjoin_11.q.out
    hive/trunk/ql/src/test/results/clientpositive/smb_mapjoin_12.q.out
    hive/trunk/ql/src/test/results/clientpositive/smb_mapjoin_13.q.out
    hive/trunk/ql/src/test/results/clientpositive/smb_mapjoin_15.q.out
    hive/trunk/ql/src/test/results/clientpositive/sort_merge_join_desc_5.q.out
    hive/trunk/ql/src/test/results/clientpositive/sort_merge_join_desc_6.q.out
    hive/trunk/ql/src/test/results/clientpositive/sort_merge_join_desc_7.q.out
    hive/trunk/ql/src/test/results/clientpositive/stats0.q.out
    hive/trunk/ql/src/test/results/clientpositive/stats11.q.out
    hive/trunk/ql/src/test/results/clientpositive/stats12.q.out
    hive/trunk/ql/src/test/results/clientpositive/stats13.q.out
    hive/trunk/ql/src/test/results/clientpositive/temp_table_display_colstats_tbllvl.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_1.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_11.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_12.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_2.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_3.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_4.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_5.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_7.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_8.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/bucket2.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/bucket3.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/bucket4.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/ctas.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/disable_merge_for_bucketing.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/filter_join_breaktask.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/mapjoin_mapjoin.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/metadataonly1.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/optimize_nullscan.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/sample1.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/transform_ppr1.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/transform_ppr2.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/vectorized_ptf.q.out
    hive/trunk/ql/src/test/results/clientpositive/transform_ppr1.q.out
    hive/trunk/ql/src/test/results/clientpositive/transform_ppr2.q.out
    hive/trunk/ql/src/test/results/clientpositive/truncate_column_list_bucket.q.out
    hive/trunk/ql/src/test/results/clientpositive/udf_explode.q.out
    hive/trunk/ql/src/test/results/clientpositive/udtf_explode.q.out
    hive/trunk/ql/src/test/results/clientpositive/union22.q.out
    hive/trunk/ql/src/test/results/clientpositive/union24.q.out
    hive/trunk/ql/src/test/results/clientpositive/union_ppr.q.out
    hive/trunk/ql/src/test/results/clientpositive/vectorized_ptf.q.out

Modified: hive/trunk/common/src/java/org/apache/hive/common/util/HiveStringUtils.java
URL: http://svn.apache.org/viewvc/hive/trunk/common/src/java/org/apache/hive/common/util/HiveStringUtils.java?rev=1646606&r1=1646605&r2=1646606&view=diff
==============================================================================
--- hive/trunk/common/src/java/org/apache/hive/common/util/HiveStringUtils.java (original)
+++ hive/trunk/common/src/java/org/apache/hive/common/util/HiveStringUtils.java Fri Dec 19 01:28:56 2014
@@ -36,6 +36,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.HashMap;
 import java.util.Locale;
+import java.util.Properties;
 import java.util.StringTokenizer;
 
 import com.google.common.collect.Interner;
@@ -886,4 +887,46 @@ public class HiveStringUtils {
   public static String normalizeIdentifier(String identifier) {
 	  return identifier.trim().toLowerCase();
 	}
+
+  public static Map getPropertiesExplain(Properties properties) {
+    if (properties != null) {
+      String value = properties.getProperty("columns.comments");
+      if (value != null) {
+        // should copy properties first
+        Map clone = new HashMap(properties);
+        clone.put("columns.comments", quoteComments(value));
+        return clone;
+      }
+    }
+    return properties;
+  }
+
+  public static String quoteComments(String value) {
+    char[] chars = value.toCharArray();
+    if (!commentProvided(chars)) {
+      return null;
+    }
+    StringBuilder builder = new StringBuilder();
+    int prev = 0;
+    for (int i = 0; i < chars.length; i++) {
+      if (chars[i] == 0x00) {
+        if (builder.length() > 0) {
+          builder.append(',');
+        }
+        builder.append('\'').append(chars, prev, i - prev).append('\'');
+        prev = i + 1;
+      }
+    }
+    builder.append(",\'").append(chars, prev, chars.length - prev).append('\'');
+    return builder.toString();
+  }
+
+  public static boolean commentProvided(char[] chars) {
+    for (char achar : chars) {
+      if (achar != 0x00) {
+        return true;
+      }
+    }
+    return false;
+  }
 }

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/ExplainTask.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/ExplainTask.java?rev=1646606&r1=1646605&r2=1646606&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/ExplainTask.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/ExplainTask.java Fri Dec 19 01:28:56 2014
@@ -386,7 +386,8 @@ public class ExplainTask extends Task<Ex
       // Print the key
       if (out != null) {
         out.print(indentString(indent));
-        out.printf("%s ", ent.getKey().toString());
+        out.print(ent.getKey());
+        out.print(" ");
       }
 
       // Print the value
@@ -625,7 +626,8 @@ public class ExplainTask extends Task<Ex
           if (isPrintable(val)) {
             if (out != null && shouldPrint(xpl_note, val)) {
               if (!skipHeader) {
-                out.printf("%s ", header);
+                out.print(header);
+                out.print(" ");
               }
               out.println(val);
             }
@@ -752,7 +754,9 @@ public class ExplainTask extends Task<Ex
 
     if (out != null) {
       out.print(indentString(indent));
-      out.printf("Stage: %s\n", task.getId());
+      out.print("Stage: ");
+      out.print(task.getId());
+      out.print("\n");
     }
 
     // Start by getting the work part of the task and call the output plan for
@@ -778,7 +782,7 @@ public class ExplainTask extends Task<Ex
     JSONObject json = jsonOutput ? new JSONObject() : null;
     if (out != null) {
       out.print(indentString(indent));
-      out.printf("%s", task.getId());
+      out.print(task.getId());
     }
 
     if ((task.getParentTasks() == null || task.getParentTasks().isEmpty())) {
@@ -845,7 +849,9 @@ public class ExplainTask extends Task<Ex
     }
     if (taskType) {
       if (out != null) {
-        out.printf(" [%s]", task.getType());
+        out.print(" [");
+        out.print(task.getType());
+        out.print("]");
       }
       if (jsonOutput) {
         json.put("TASK TYPE", task.getType().name());

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/PartitionDesc.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/PartitionDesc.java?rev=1646606&r1=1646605&r2=1646606&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/PartitionDesc.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/PartitionDesc.java Fri Dec 19 01:28:56 2014
@@ -24,6 +24,7 @@ import com.google.common.collect.Interne
 import java.io.Serializable;
 import java.util.Enumeration;
 import java.util.LinkedHashMap;
+import java.util.Map;
 import java.util.Properties;
 
 import org.apache.hadoop.conf.Configuration;
@@ -40,6 +41,7 @@ import org.apache.hadoop.hive.serde2.Ser
 import org.apache.hadoop.mapred.InputFormat;
 import org.apache.hadoop.mapred.OutputFormat;
 import org.apache.hadoop.util.ReflectionUtils;
+import org.apache.hive.common.util.HiveStringUtils;
 
 /**
  * PartitionDesc.
@@ -167,7 +169,6 @@ public class PartitionDesc implements Se
     }
   }
 
-  @Explain(displayName = "properties", normalExplain = false)
   public Properties getProperties() {
     if (properties == null && tableDesc != null) {
       return tableDesc.getProperties();
@@ -175,6 +176,11 @@ public class PartitionDesc implements Se
     return properties;
   }
 
+  @Explain(displayName = "properties", normalExplain = false)
+  public Map getPropertiesExplain() {
+    return HiveStringUtils.getPropertiesExplain(getProperties());
+  }
+
   public void setProperties(final Properties properties) {
     this.properties = properties;
     for (Enumeration<?> keys =  properties.propertyNames(); keys.hasMoreElements();) {

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/TableDesc.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/TableDesc.java?rev=1646606&r1=1646605&r2=1646606&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/TableDesc.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/TableDesc.java Fri Dec 19 01:28:56 2014
@@ -33,6 +33,7 @@ import org.apache.hadoop.hive.serde2.Des
 import org.apache.hadoop.hive.serde2.SerDeUtils;
 import org.apache.hadoop.mapred.InputFormat;
 import org.apache.hadoop.mapred.OutputFormat;
+import org.apache.hive.common.util.HiveStringUtils;
 
 /**
  * TableDesc.
@@ -102,11 +103,15 @@ public class TableDesc implements Serial
         .getOutputFormatSubstitute(outputFileFormatClass);
   }
 
-  @Explain(displayName = "properties", normalExplain = false)
   public Properties getProperties() {
     return properties;
   }
 
+  @Explain(displayName = "properties", normalExplain = false)
+  public Map getPropertiesExplain() {
+    return HiveStringUtils.getPropertiesExplain(getProperties());
+  }
+
   public void setProperties(final Properties properties) {
     this.properties = properties;
   }

Modified: hive/trunk/ql/src/test/results/clientpositive/alter_partition_coltype.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/alter_partition_coltype.q.out?rev=1646606&r1=1646605&r2=1646606&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/alter_partition_coltype.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/alter_partition_coltype.q.out Fri Dec 19 01:28:56 2014
@@ -151,7 +151,7 @@ STAGE PLANS:
               COLUMN_STATS_ACCURATE true
               bucket_count -1
               columns key,value
-              columns.comments 
+              columns.comments 
               columns.types string:string
 #### A masked pattern was here ####
               name default.alter_coltype
@@ -172,7 +172,7 @@ STAGE PLANS:
               properties:
                 bucket_count -1
                 columns key,value
-                columns.comments 
+                columns.comments 
                 columns.types string:string
 #### A masked pattern was here ####
                 name default.alter_coltype
@@ -197,7 +197,7 @@ STAGE PLANS:
               COLUMN_STATS_ACCURATE true
               bucket_count -1
               columns key,value
-              columns.comments 
+              columns.comments 
               columns.types string:string
 #### A masked pattern was here ####
               name default.alter_coltype
@@ -218,7 +218,7 @@ STAGE PLANS:
               properties:
                 bucket_count -1
                 columns key,value
-                columns.comments 
+                columns.comments 
                 columns.types string:string
 #### A masked pattern was here ####
                 name default.alter_coltype
@@ -380,7 +380,7 @@ STAGE PLANS:
               COLUMN_STATS_ACCURATE true
               bucket_count -1
               columns key,value
-              columns.comments 
+              columns.comments 
               columns.types string:string
 #### A masked pattern was here ####
               name default.alter_coltype
@@ -401,7 +401,7 @@ STAGE PLANS:
               properties:
                 bucket_count -1
                 columns key,value
-                columns.comments 
+                columns.comments 
                 columns.types string:string
 #### A masked pattern was here ####
                 name default.alter_coltype
@@ -541,7 +541,7 @@ STAGE PLANS:
               COLUMN_STATS_ACCURATE true
               bucket_count -1
               columns key,value
-              columns.comments 
+              columns.comments 
               columns.types string:string
 #### A masked pattern was here ####
               name default.alter_coltype
@@ -562,7 +562,7 @@ STAGE PLANS:
               properties:
                 bucket_count -1
                 columns key,value
-                columns.comments 
+                columns.comments 
                 columns.types string:string
 #### A masked pattern was here ####
                 name default.alter_coltype
@@ -733,7 +733,7 @@ STAGE PLANS:
               COLUMN_STATS_ACCURATE true
               bucket_count -1
               columns key,value
-              columns.comments 
+              columns.comments 
               columns.types string:string
 #### A masked pattern was here ####
               name default.alter_coltype
@@ -754,7 +754,7 @@ STAGE PLANS:
               properties:
                 bucket_count -1
                 columns key,value
-                columns.comments 
+                columns.comments 
                 columns.types string:string
 #### A masked pattern was here ####
                 name default.alter_coltype
@@ -777,7 +777,7 @@ STAGE PLANS:
               COLUMN_STATS_ACCURATE true
               bucket_count -1
               columns key,value
-              columns.comments 
+              columns.comments 
               columns.types string:string
 #### A masked pattern was here ####
               name default.alter_coltype
@@ -798,7 +798,7 @@ STAGE PLANS:
               properties:
                 bucket_count -1
                 columns key,value
-                columns.comments 
+                columns.comments 
                 columns.types string:string
 #### A masked pattern was here ####
                 name default.alter_coltype

Modified: hive/trunk/ql/src/test/results/clientpositive/auto_join_reordering_values.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/auto_join_reordering_values.q.out?rev=1646606&r1=1646605&r2=1646606&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/auto_join_reordering_values.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/auto_join_reordering_values.q.out Fri Dec 19 01:28:56 2014
@@ -221,7 +221,7 @@ STAGE PLANS:
               COLUMN_STATS_ACCURATE true
               bucket_count -1
               columns dealid,date,time,cityid,userid
-              columns.comments 
+              columns.comments 
               columns.types int:string:string:int:int
 #### A masked pattern was here ####
               name default.orderpayment_small
@@ -241,7 +241,7 @@ STAGE PLANS:
                 COLUMN_STATS_ACCURATE true
                 bucket_count -1
                 columns dealid,date,time,cityid,userid
-                columns.comments 
+                columns.comments 
                 columns.types int:string:string:int:int
 #### A masked pattern was here ####
                 name default.orderpayment_small
@@ -346,7 +346,7 @@ STAGE PLANS:
               COLUMN_STATS_ACCURATE true
               bucket_count -1
               columns dealid,date,time,cityid,userid
-              columns.comments 
+              columns.comments 
               columns.types int:string:string:int:int
 #### A masked pattern was here ####
               name default.orderpayment_small
@@ -366,7 +366,7 @@ STAGE PLANS:
                 COLUMN_STATS_ACCURATE true
                 bucket_count -1
                 columns dealid,date,time,cityid,userid
-                columns.comments 
+                columns.comments 
                 columns.types int:string:string:int:int
 #### A masked pattern was here ####
                 name default.orderpayment_small
@@ -472,7 +472,7 @@ STAGE PLANS:
               COLUMN_STATS_ACCURATE true
               bucket_count -1
               columns dealid,date,time,cityid,userid
-              columns.comments 
+              columns.comments 
               columns.types int:string:string:int:int
 #### A masked pattern was here ####
               name default.orderpayment_small
@@ -492,7 +492,7 @@ STAGE PLANS:
                 COLUMN_STATS_ACCURATE true
                 bucket_count -1
                 columns dealid,date,time,cityid,userid
-                columns.comments 
+                columns.comments 
                 columns.types int:string:string:int:int
 #### A masked pattern was here ####
                 name default.orderpayment_small

Modified: hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_1.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_1.q.out?rev=1646606&r1=1646605&r2=1646606&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_1.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_1.q.out Fri Dec 19 01:28:56 2014
@@ -188,7 +188,7 @@ STAGE PLANS:
               bucket_count 4
               bucket_field_name key
               columns key,value
-              columns.comments 
+              columns.comments 
               columns.types string:string
 #### A masked pattern was here ####
               name default.bucket_big
@@ -211,7 +211,7 @@ STAGE PLANS:
                 bucket_count 4
                 bucket_field_name key
                 columns key,value
-                columns.comments 
+                columns.comments 
                 columns.types string:string
 #### A masked pattern was here ####
                 name default.bucket_big
@@ -236,7 +236,7 @@ STAGE PLANS:
               bucket_count 4
               bucket_field_name key
               columns key,value
-              columns.comments 
+              columns.comments 
               columns.types string:string
 #### A masked pattern was here ####
               name default.bucket_big
@@ -259,7 +259,7 @@ STAGE PLANS:
                 bucket_count 4
                 bucket_field_name key
                 columns key,value
-                columns.comments 
+                columns.comments 
                 columns.types string:string
 #### A masked pattern was here ####
                 name default.bucket_big
@@ -411,7 +411,7 @@ STAGE PLANS:
               bucket_count 4
               bucket_field_name key
               columns key,value
-              columns.comments 
+              columns.comments 
               columns.types string:string
 #### A masked pattern was here ####
               name default.bucket_big
@@ -434,7 +434,7 @@ STAGE PLANS:
                 bucket_count 4
                 bucket_field_name key
                 columns key,value
-                columns.comments 
+                columns.comments 
                 columns.types string:string
 #### A masked pattern was here ####
                 name default.bucket_big
@@ -459,7 +459,7 @@ STAGE PLANS:
               bucket_count 4
               bucket_field_name key
               columns key,value
-              columns.comments 
+              columns.comments 
               columns.types string:string
 #### A masked pattern was here ####
               name default.bucket_big
@@ -482,7 +482,7 @@ STAGE PLANS:
                 bucket_count 4
                 bucket_field_name key
                 columns key,value
-                columns.comments 
+                columns.comments 
                 columns.types string:string
 #### A masked pattern was here ####
                 name default.bucket_big
@@ -617,7 +617,7 @@ STAGE PLANS:
                     bucket_count 2
                     bucket_field_name key
                     columns key,value
-                    columns.comments 
+                    columns.comments 
                     columns.types string:string
 #### A masked pattern was here ####
                     name default.bucket_small
@@ -640,7 +640,7 @@ STAGE PLANS:
                       bucket_count 2
                       bucket_field_name key
                       columns key,value
-                      columns.comments 
+                      columns.comments 
                       columns.types string:string
 #### A masked pattern was here ####
                       name default.bucket_small
@@ -709,7 +709,7 @@ STAGE PLANS:
               bucket_count 4
               bucket_field_name key
               columns key,value
-              columns.comments 
+              columns.comments 
               columns.types string:string
 #### A masked pattern was here ####
               name default.bucket_big
@@ -732,7 +732,7 @@ STAGE PLANS:
                 bucket_count 4
                 bucket_field_name key
                 columns key,value
-                columns.comments 
+                columns.comments 
                 columns.types string:string
 #### A masked pattern was here ####
                 name default.bucket_big
@@ -757,7 +757,7 @@ STAGE PLANS:
               bucket_count 4
               bucket_field_name key
               columns key,value
-              columns.comments 
+              columns.comments 
               columns.types string:string
 #### A masked pattern was here ####
               name default.bucket_big
@@ -780,7 +780,7 @@ STAGE PLANS:
                 bucket_count 4
                 bucket_field_name key
                 columns key,value
-                columns.comments 
+                columns.comments 
                 columns.types string:string
 #### A masked pattern was here ####
                 name default.bucket_big
@@ -804,7 +804,7 @@ STAGE PLANS:
               bucket_count 2
               bucket_field_name key
               columns key,value
-              columns.comments 
+              columns.comments 
               columns.types string:string
 #### A masked pattern was here ####
               name default.bucket_small
@@ -827,7 +827,7 @@ STAGE PLANS:
                 bucket_count 2
                 bucket_field_name key
                 columns key,value
-                columns.comments 
+                columns.comments 
                 columns.types string:string
 #### A masked pattern was here ####
                 name default.bucket_small
@@ -891,7 +891,7 @@ STAGE PLANS:
                     bucket_count 4
                     bucket_field_name key
                     columns key,value
-                    columns.comments 
+                    columns.comments 
                     columns.types string:string
 #### A masked pattern was here ####
                     name default.bucket_big
@@ -914,7 +914,7 @@ STAGE PLANS:
                       bucket_count 4
                       bucket_field_name key
                       columns key,value
-                      columns.comments 
+                      columns.comments 
                       columns.types string:string
 #### A masked pattern was here ####
                       name default.bucket_big
@@ -938,7 +938,7 @@ STAGE PLANS:
                     bucket_count 4
                     bucket_field_name key
                     columns key,value
-                    columns.comments 
+                    columns.comments 
                     columns.types string:string
 #### A masked pattern was here ####
                     name default.bucket_big
@@ -961,7 +961,7 @@ STAGE PLANS:
                       bucket_count 4
                       bucket_field_name key
                       columns key,value
-                      columns.comments 
+                      columns.comments 
                       columns.types string:string
 #### A masked pattern was here ####
                       name default.bucket_big
@@ -1030,7 +1030,7 @@ STAGE PLANS:
               bucket_count 4
               bucket_field_name key
               columns key,value
-              columns.comments 
+              columns.comments 
               columns.types string:string
 #### A masked pattern was here ####
               name default.bucket_big
@@ -1053,7 +1053,7 @@ STAGE PLANS:
                 bucket_count 4
                 bucket_field_name key
                 columns key,value
-                columns.comments 
+                columns.comments 
                 columns.types string:string
 #### A masked pattern was here ####
                 name default.bucket_big
@@ -1078,7 +1078,7 @@ STAGE PLANS:
               bucket_count 4
               bucket_field_name key
               columns key,value
-              columns.comments 
+              columns.comments 
               columns.types string:string
 #### A masked pattern was here ####
               name default.bucket_big
@@ -1101,7 +1101,7 @@ STAGE PLANS:
                 bucket_count 4
                 bucket_field_name key
                 columns key,value
-                columns.comments 
+                columns.comments 
                 columns.types string:string
 #### A masked pattern was here ####
                 name default.bucket_big
@@ -1125,7 +1125,7 @@ STAGE PLANS:
               bucket_count 2
               bucket_field_name key
               columns key,value
-              columns.comments 
+              columns.comments 
               columns.types string:string
 #### A masked pattern was here ####
               name default.bucket_small
@@ -1148,7 +1148,7 @@ STAGE PLANS:
                 bucket_count 2
                 bucket_field_name key
                 columns key,value
-                columns.comments 
+                columns.comments 
                 columns.types string:string
 #### A masked pattern was here ####
                 name default.bucket_small
@@ -1235,7 +1235,7 @@ STAGE PLANS:
               bucket_count 4
               bucket_field_name key
               columns key,value
-              columns.comments 
+              columns.comments 
               columns.types string:string
 #### A masked pattern was here ####
               name default.bucket_big
@@ -1258,7 +1258,7 @@ STAGE PLANS:
                 bucket_count 4
                 bucket_field_name key
                 columns key,value
-                columns.comments 
+                columns.comments 
                 columns.types string:string
 #### A masked pattern was here ####
                 name default.bucket_big
@@ -1283,7 +1283,7 @@ STAGE PLANS:
               bucket_count 4
               bucket_field_name key
               columns key,value
-              columns.comments 
+              columns.comments 
               columns.types string:string
 #### A masked pattern was here ####
               name default.bucket_big
@@ -1306,7 +1306,7 @@ STAGE PLANS:
                 bucket_count 4
                 bucket_field_name key
                 columns key,value
-                columns.comments 
+                columns.comments 
                 columns.types string:string
 #### A masked pattern was here ####
                 name default.bucket_big

Modified: hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_11.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_11.q.out?rev=1646606&r1=1646605&r2=1646606&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_11.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_11.q.out Fri Dec 19 01:28:56 2014
@@ -161,7 +161,7 @@ STAGE PLANS:
                     bucket_count 2
                     bucket_field_name key
                     columns key,value
-                    columns.comments 
+                    columns.comments 
                     columns.types string:string
 #### A masked pattern was here ####
                     name default.bucket_small
@@ -183,7 +183,7 @@ STAGE PLANS:
                       bucket_count 2
                       bucket_field_name key
                       columns key,value
-                      columns.comments 
+                      columns.comments 
                       columns.types string:string
 #### A masked pattern was here ####
                       name default.bucket_small
@@ -259,7 +259,7 @@ STAGE PLANS:
               bucket_count 4
               bucket_field_name key
               columns key,value
-              columns.comments 
+              columns.comments 
               columns.types string:string
 #### A masked pattern was here ####
               name default.bucket_big
@@ -281,7 +281,7 @@ STAGE PLANS:
                 bucket_count 4
                 bucket_field_name key
                 columns key,value
-                columns.comments 
+                columns.comments 
                 columns.types string:string
 #### A masked pattern was here ####
                 name default.bucket_big
@@ -306,7 +306,7 @@ STAGE PLANS:
               bucket_count 4
               bucket_field_name key
               columns key,value
-              columns.comments 
+              columns.comments 
               columns.types string:string
 #### A masked pattern was here ####
               name default.bucket_big
@@ -328,7 +328,7 @@ STAGE PLANS:
                 bucket_count 4
                 bucket_field_name key
                 columns key,value
-                columns.comments 
+                columns.comments 
                 columns.types string:string
 #### A masked pattern was here ####
                 name default.bucket_big
@@ -353,7 +353,7 @@ STAGE PLANS:
               bucket_count 2
               bucket_field_name key
               columns key,value
-              columns.comments 
+              columns.comments 
               columns.types string:string
 #### A masked pattern was here ####
               name default.bucket_small
@@ -375,7 +375,7 @@ STAGE PLANS:
                 bucket_count 2
                 bucket_field_name key
                 columns key,value
-                columns.comments 
+                columns.comments 
                 columns.types string:string
 #### A masked pattern was here ####
                 name default.bucket_small
@@ -515,7 +515,7 @@ STAGE PLANS:
                     bucket_count 2
                     bucket_field_name key
                     columns key,value
-                    columns.comments 
+                    columns.comments 
                     columns.types string:string
 #### A masked pattern was here ####
                     name default.bucket_small
@@ -537,7 +537,7 @@ STAGE PLANS:
                       bucket_count 2
                       bucket_field_name key
                       columns key,value
-                      columns.comments 
+                      columns.comments 
                       columns.types string:string
 #### A masked pattern was here ####
                       name default.bucket_small
@@ -613,7 +613,7 @@ STAGE PLANS:
               bucket_count 4
               bucket_field_name key
               columns key,value
-              columns.comments 
+              columns.comments 
               columns.types string:string
 #### A masked pattern was here ####
               name default.bucket_big
@@ -635,7 +635,7 @@ STAGE PLANS:
                 bucket_count 4
                 bucket_field_name key
                 columns key,value
-                columns.comments 
+                columns.comments 
                 columns.types string:string
 #### A masked pattern was here ####
                 name default.bucket_big
@@ -660,7 +660,7 @@ STAGE PLANS:
               bucket_count 4
               bucket_field_name key
               columns key,value
-              columns.comments 
+              columns.comments 
               columns.types string:string
 #### A masked pattern was here ####
               name default.bucket_big
@@ -682,7 +682,7 @@ STAGE PLANS:
                 bucket_count 4
                 bucket_field_name key
                 columns key,value
-                columns.comments 
+                columns.comments 
                 columns.types string:string
 #### A masked pattern was here ####
                 name default.bucket_big
@@ -707,7 +707,7 @@ STAGE PLANS:
               bucket_count 2
               bucket_field_name key
               columns key,value
-              columns.comments 
+              columns.comments 
               columns.types string:string
 #### A masked pattern was here ####
               name default.bucket_small
@@ -729,7 +729,7 @@ STAGE PLANS:
                 bucket_count 2
                 bucket_field_name key
                 columns key,value
-                columns.comments 
+                columns.comments 
                 columns.types string:string
 #### A masked pattern was here ####
                 name default.bucket_small
@@ -867,7 +867,7 @@ STAGE PLANS:
                     bucket_count 2
                     bucket_field_name key
                     columns key,value
-                    columns.comments 
+                    columns.comments 
                     columns.types string:string
 #### A masked pattern was here ####
                     name default.bucket_small
@@ -889,7 +889,7 @@ STAGE PLANS:
                       bucket_count 2
                       bucket_field_name key
                       columns key,value
-                      columns.comments 
+                      columns.comments 
                       columns.types string:string
 #### A masked pattern was here ####
                       name default.bucket_small
@@ -973,7 +973,7 @@ STAGE PLANS:
               bucket_count 4
               bucket_field_name key
               columns key,value
-              columns.comments 
+              columns.comments 
               columns.types string:string
 #### A masked pattern was here ####
               name default.bucket_big
@@ -995,7 +995,7 @@ STAGE PLANS:
                 bucket_count 4
                 bucket_field_name key
                 columns key,value
-                columns.comments 
+                columns.comments 
                 columns.types string:string
 #### A masked pattern was here ####
                 name default.bucket_big
@@ -1020,7 +1020,7 @@ STAGE PLANS:
               bucket_count 4
               bucket_field_name key
               columns key,value
-              columns.comments 
+              columns.comments 
               columns.types string:string
 #### A masked pattern was here ####
               name default.bucket_big
@@ -1042,7 +1042,7 @@ STAGE PLANS:
                 bucket_count 4
                 bucket_field_name key
                 columns key,value
-                columns.comments 
+                columns.comments 
                 columns.types string:string
 #### A masked pattern was here ####
                 name default.bucket_big
@@ -1195,7 +1195,7 @@ STAGE PLANS:
                     bucket_count 2
                     bucket_field_name key
                     columns key,value
-                    columns.comments 
+                    columns.comments 
                     columns.types string:string
 #### A masked pattern was here ####
                     name default.bucket_small
@@ -1217,7 +1217,7 @@ STAGE PLANS:
                       bucket_count 2
                       bucket_field_name key
                       columns key,value
-                      columns.comments 
+                      columns.comments 
                       columns.types string:string
 #### A masked pattern was here ####
                       name default.bucket_small
@@ -1244,7 +1244,7 @@ STAGE PLANS:
                     bucket_count 4
                     bucket_field_name key
                     columns key,value
-                    columns.comments 
+                    columns.comments 
                     columns.types string:string
 #### A masked pattern was here ####
                     name default.bucket_big
@@ -1266,7 +1266,7 @@ STAGE PLANS:
                       bucket_count 4
                       bucket_field_name key
                       columns key,value
-                      columns.comments 
+                      columns.comments 
                       columns.types string:string
 #### A masked pattern was here ####
                       name default.bucket_big
@@ -1289,7 +1289,7 @@ STAGE PLANS:
                     bucket_count 4
                     bucket_field_name key
                     columns key,value
-                    columns.comments 
+                    columns.comments 
                     columns.types string:string
 #### A masked pattern was here ####
                     name default.bucket_big
@@ -1311,7 +1311,7 @@ STAGE PLANS:
                       bucket_count 4
                       bucket_field_name key
                       columns key,value
-                      columns.comments 
+                      columns.comments 
                       columns.types string:string
 #### A masked pattern was here ####
                       name default.bucket_big
@@ -1414,7 +1414,7 @@ STAGE PLANS:
               bucket_count 4
               bucket_field_name key
               columns key,value
-              columns.comments 
+              columns.comments 
               columns.types string:string
 #### A masked pattern was here ####
               name default.bucket_big
@@ -1436,7 +1436,7 @@ STAGE PLANS:
                 bucket_count 4
                 bucket_field_name key
                 columns key,value
-                columns.comments 
+                columns.comments 
                 columns.types string:string
 #### A masked pattern was here ####
                 name default.bucket_big
@@ -1461,7 +1461,7 @@ STAGE PLANS:
               bucket_count 4
               bucket_field_name key
               columns key,value
-              columns.comments 
+              columns.comments 
               columns.types string:string
 #### A masked pattern was here ####
               name default.bucket_big
@@ -1483,7 +1483,7 @@ STAGE PLANS:
                 bucket_count 4
                 bucket_field_name key
                 columns key,value
-                columns.comments 
+                columns.comments 
                 columns.types string:string
 #### A masked pattern was here ####
                 name default.bucket_big

Modified: hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_12.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_12.q.out?rev=1646606&r1=1646605&r2=1646606&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_12.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_12.q.out Fri Dec 19 01:28:56 2014
@@ -227,7 +227,7 @@ STAGE PLANS:
                     bucket_count 2
                     bucket_field_name key
                     columns key,value
-                    columns.comments 
+                    columns.comments 
                     columns.types string:string
 #### A masked pattern was here ####
                     name default.bucket_small
@@ -250,7 +250,7 @@ STAGE PLANS:
                       bucket_count 2
                       bucket_field_name key
                       columns key,value
-                      columns.comments 
+                      columns.comments 
                       columns.types string:string
 #### A masked pattern was here ####
                       name default.bucket_small
@@ -278,7 +278,7 @@ STAGE PLANS:
                     bucket_count 4
                     bucket_field_name key
                     columns key,value
-                    columns.comments 
+                    columns.comments 
                     columns.types string:string
 #### A masked pattern was here ####
                     name default.bucket_big
@@ -301,7 +301,7 @@ STAGE PLANS:
                       bucket_count 4
                       bucket_field_name key
                       columns key,value
-                      columns.comments 
+                      columns.comments 
                       columns.types string:string
 #### A masked pattern was here ####
                       name default.bucket_big
@@ -325,7 +325,7 @@ STAGE PLANS:
                     bucket_count 4
                     bucket_field_name key
                     columns key,value
-                    columns.comments 
+                    columns.comments 
                     columns.types string:string
 #### A masked pattern was here ####
                     name default.bucket_big
@@ -348,7 +348,7 @@ STAGE PLANS:
                       bucket_count 4
                       bucket_field_name key
                       columns key,value
-                      columns.comments 
+                      columns.comments 
                       columns.types string:string
 #### A masked pattern was here ####
                       name default.bucket_big
@@ -376,7 +376,7 @@ STAGE PLANS:
                     bucket_count 3
                     bucket_field_name key
                     columns key,value
-                    columns.comments 
+                    columns.comments 
                     columns.types string:string
 #### A masked pattern was here ####
                     name default.bucket_medium
@@ -399,7 +399,7 @@ STAGE PLANS:
                       bucket_count 3
                       bucket_field_name key
                       columns key,value
-                      columns.comments 
+                      columns.comments 
                       columns.types string:string
 #### A masked pattern was here ####
                       name default.bucket_medium
@@ -516,7 +516,7 @@ STAGE PLANS:
               bucket_count 4
               bucket_field_name key
               columns key,value
-              columns.comments 
+              columns.comments 
               columns.types string:string
 #### A masked pattern was here ####
               name default.bucket_big
@@ -539,7 +539,7 @@ STAGE PLANS:
                 bucket_count 4
                 bucket_field_name key
                 columns key,value
-                columns.comments 
+                columns.comments 
                 columns.types string:string
 #### A masked pattern was here ####
                 name default.bucket_big
@@ -564,7 +564,7 @@ STAGE PLANS:
               bucket_count 4
               bucket_field_name key
               columns key,value
-              columns.comments 
+              columns.comments 
               columns.types string:string
 #### A masked pattern was here ####
               name default.bucket_big
@@ -587,7 +587,7 @@ STAGE PLANS:
                 bucket_count 4
                 bucket_field_name key
                 columns key,value
-                columns.comments 
+                columns.comments 
                 columns.types string:string
 #### A masked pattern was here ####
                 name default.bucket_big
@@ -612,7 +612,7 @@ STAGE PLANS:
               bucket_count 3
               bucket_field_name key
               columns key,value
-              columns.comments 
+              columns.comments 
               columns.types string:string
 #### A masked pattern was here ####
               name default.bucket_medium
@@ -635,7 +635,7 @@ STAGE PLANS:
                 bucket_count 3
                 bucket_field_name key
                 columns key,value
-                columns.comments 
+                columns.comments 
                 columns.types string:string
 #### A masked pattern was here ####
                 name default.bucket_medium
@@ -660,7 +660,7 @@ STAGE PLANS:
               bucket_count 2
               bucket_field_name key
               columns key,value
-              columns.comments 
+              columns.comments 
               columns.types string:string
 #### A masked pattern was here ####
               name default.bucket_small
@@ -683,7 +683,7 @@ STAGE PLANS:
                 bucket_count 2
                 bucket_field_name key
                 columns key,value
-                columns.comments 
+                columns.comments 
                 columns.types string:string
 #### A masked pattern was here ####
                 name default.bucket_small

Modified: hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_2.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_2.q.out?rev=1646606&r1=1646605&r2=1646606&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_2.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_2.q.out Fri Dec 19 01:28:56 2014
@@ -168,7 +168,7 @@ STAGE PLANS:
               bucket_count 2
               bucket_field_name key
               columns key,value
-              columns.comments 
+              columns.comments 
               columns.types string:string
 #### A masked pattern was here ####
               name default.bucket_big
@@ -191,7 +191,7 @@ STAGE PLANS:
                 bucket_count 2
                 bucket_field_name key
                 columns key,value
-                columns.comments 
+                columns.comments 
                 columns.types string:string
 #### A masked pattern was here ####
                 name default.bucket_big
@@ -216,7 +216,7 @@ STAGE PLANS:
               bucket_count 2
               bucket_field_name key
               columns key,value
-              columns.comments 
+              columns.comments 
               columns.types string:string
 #### A masked pattern was here ####
               name default.bucket_big
@@ -239,7 +239,7 @@ STAGE PLANS:
                 bucket_count 2
                 bucket_field_name key
                 columns key,value
-                columns.comments 
+                columns.comments 
                 columns.types string:string
 #### A masked pattern was here ####
                 name default.bucket_big
@@ -376,7 +376,7 @@ STAGE PLANS:
                     bucket_count 4
                     bucket_field_name key
                     columns key,value
-                    columns.comments 
+                    columns.comments 
                     columns.types string:string
 #### A masked pattern was here ####
                     name default.bucket_small
@@ -399,7 +399,7 @@ STAGE PLANS:
                       bucket_count 4
                       bucket_field_name key
                       columns key,value
-                      columns.comments 
+                      columns.comments 
                       columns.types string:string
 #### A masked pattern was here ####
                       name default.bucket_small
@@ -468,7 +468,7 @@ STAGE PLANS:
               bucket_count 2
               bucket_field_name key
               columns key,value
-              columns.comments 
+              columns.comments 
               columns.types string:string
 #### A masked pattern was here ####
               name default.bucket_big
@@ -491,7 +491,7 @@ STAGE PLANS:
                 bucket_count 2
                 bucket_field_name key
                 columns key,value
-                columns.comments 
+                columns.comments 
                 columns.types string:string
 #### A masked pattern was here ####
                 name default.bucket_big
@@ -516,7 +516,7 @@ STAGE PLANS:
               bucket_count 2
               bucket_field_name key
               columns key,value
-              columns.comments 
+              columns.comments 
               columns.types string:string
 #### A masked pattern was here ####
               name default.bucket_big
@@ -539,7 +539,7 @@ STAGE PLANS:
                 bucket_count 2
                 bucket_field_name key
                 columns key,value
-                columns.comments 
+                columns.comments 
                 columns.types string:string
 #### A masked pattern was here ####
                 name default.bucket_big
@@ -563,7 +563,7 @@ STAGE PLANS:
               bucket_count 4
               bucket_field_name key
               columns key,value
-              columns.comments 
+              columns.comments 
               columns.types string:string
 #### A masked pattern was here ####
               name default.bucket_small
@@ -586,7 +586,7 @@ STAGE PLANS:
                 bucket_count 4
                 bucket_field_name key
                 columns key,value
-                columns.comments 
+                columns.comments 
                 columns.types string:string
 #### A masked pattern was here ####
                 name default.bucket_small
@@ -650,7 +650,7 @@ STAGE PLANS:
                     bucket_count 2
                     bucket_field_name key
                     columns key,value
-                    columns.comments 
+                    columns.comments 
                     columns.types string:string
 #### A masked pattern was here ####
                     name default.bucket_big
@@ -673,7 +673,7 @@ STAGE PLANS:
                       bucket_count 2
                       bucket_field_name key
                       columns key,value
-                      columns.comments 
+                      columns.comments 
                       columns.types string:string
 #### A masked pattern was here ####
                       name default.bucket_big
@@ -697,7 +697,7 @@ STAGE PLANS:
                     bucket_count 2
                     bucket_field_name key
                     columns key,value
-                    columns.comments 
+                    columns.comments 
                     columns.types string:string
 #### A masked pattern was here ####
                     name default.bucket_big
@@ -720,7 +720,7 @@ STAGE PLANS:
                       bucket_count 2
                       bucket_field_name key
                       columns key,value
-                      columns.comments 
+                      columns.comments 
                       columns.types string:string
 #### A masked pattern was here ####
                       name default.bucket_big
@@ -789,7 +789,7 @@ STAGE PLANS:
               bucket_count 2
               bucket_field_name key
               columns key,value
-              columns.comments 
+              columns.comments 
               columns.types string:string
 #### A masked pattern was here ####
               name default.bucket_big
@@ -812,7 +812,7 @@ STAGE PLANS:
                 bucket_count 2
                 bucket_field_name key
                 columns key,value
-                columns.comments 
+                columns.comments 
                 columns.types string:string
 #### A masked pattern was here ####
                 name default.bucket_big
@@ -837,7 +837,7 @@ STAGE PLANS:
               bucket_count 2
               bucket_field_name key
               columns key,value
-              columns.comments 
+              columns.comments 
               columns.types string:string
 #### A masked pattern was here ####
               name default.bucket_big
@@ -860,7 +860,7 @@ STAGE PLANS:
                 bucket_count 2
                 bucket_field_name key
                 columns key,value
-                columns.comments 
+                columns.comments 
                 columns.types string:string
 #### A masked pattern was here ####
                 name default.bucket_big
@@ -884,7 +884,7 @@ STAGE PLANS:
               bucket_count 4
               bucket_field_name key
               columns key,value
-              columns.comments 
+              columns.comments 
               columns.types string:string
 #### A masked pattern was here ####
               name default.bucket_small
@@ -907,7 +907,7 @@ STAGE PLANS:
                 bucket_count 4
                 bucket_field_name key
                 columns key,value
-                columns.comments 
+                columns.comments 
                 columns.types string:string
 #### A masked pattern was here ####
                 name default.bucket_small
@@ -994,7 +994,7 @@ STAGE PLANS:
               bucket_count 2
               bucket_field_name key
               columns key,value
-              columns.comments 
+              columns.comments 
               columns.types string:string
 #### A masked pattern was here ####
               name default.bucket_big
@@ -1017,7 +1017,7 @@ STAGE PLANS:
                 bucket_count 2
                 bucket_field_name key
                 columns key,value
-                columns.comments 
+                columns.comments 
                 columns.types string:string
 #### A masked pattern was here ####
                 name default.bucket_big
@@ -1042,7 +1042,7 @@ STAGE PLANS:
               bucket_count 2
               bucket_field_name key
               columns key,value
-              columns.comments 
+              columns.comments 
               columns.types string:string
 #### A masked pattern was here ####
               name default.bucket_big
@@ -1065,7 +1065,7 @@ STAGE PLANS:
                 bucket_count 2
                 bucket_field_name key
                 columns key,value
-                columns.comments 
+                columns.comments 
                 columns.types string:string
 #### A masked pattern was here ####
                 name default.bucket_big

Modified: hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_3.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_3.q.out?rev=1646606&r1=1646605&r2=1646606&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_3.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_3.q.out Fri Dec 19 01:28:56 2014
@@ -168,7 +168,7 @@ STAGE PLANS:
               bucket_count 4
               bucket_field_name key
               columns key,value
-              columns.comments 
+              columns.comments 
               columns.types string:string
 #### A masked pattern was here ####
               name default.bucket_big
@@ -191,7 +191,7 @@ STAGE PLANS:
                 bucket_count 4
                 bucket_field_name key
                 columns key,value
-                columns.comments 
+                columns.comments 
                 columns.types string:string
 #### A masked pattern was here ####
                 name default.bucket_big
@@ -342,7 +342,7 @@ STAGE PLANS:
               bucket_count 4
               bucket_field_name key
               columns key,value
-              columns.comments 
+              columns.comments 
               columns.types string:string
 #### A masked pattern was here ####
               name default.bucket_big
@@ -365,7 +365,7 @@ STAGE PLANS:
                 bucket_count 4
                 bucket_field_name key
                 columns key,value
-                columns.comments 
+                columns.comments 
                 columns.types string:string
 #### A masked pattern was here ####
                 name default.bucket_big
@@ -499,7 +499,7 @@ STAGE PLANS:
                     bucket_count 2
                     bucket_field_name key
                     columns key,value
-                    columns.comments 
+                    columns.comments 
                     columns.types string:string
 #### A masked pattern was here ####
                     name default.bucket_small
@@ -522,7 +522,7 @@ STAGE PLANS:
                       bucket_count 2
                       bucket_field_name key
                       columns key,value
-                      columns.comments 
+                      columns.comments 
                       columns.types string:string
 #### A masked pattern was here ####
                       name default.bucket_small
@@ -545,7 +545,7 @@ STAGE PLANS:
                     bucket_count 2
                     bucket_field_name key
                     columns key,value
-                    columns.comments 
+                    columns.comments 
                     columns.types string:string
 #### A masked pattern was here ####
                     name default.bucket_small
@@ -568,7 +568,7 @@ STAGE PLANS:
                       bucket_count 2
                       bucket_field_name key
                       columns key,value
-                      columns.comments 
+                      columns.comments 
                       columns.types string:string
 #### A masked pattern was here ####
                       name default.bucket_small
@@ -637,7 +637,7 @@ STAGE PLANS:
               bucket_count 4
               bucket_field_name key
               columns key,value
-              columns.comments 
+              columns.comments 
               columns.types string:string
 #### A masked pattern was here ####
               name default.bucket_big
@@ -660,7 +660,7 @@ STAGE PLANS:
                 bucket_count 4
                 bucket_field_name key
                 columns key,value
-                columns.comments 
+                columns.comments 
                 columns.types string:string
 #### A masked pattern was here ####
                 name default.bucket_big
@@ -684,7 +684,7 @@ STAGE PLANS:
               bucket_count 2
               bucket_field_name key
               columns key,value
-              columns.comments 
+              columns.comments 
               columns.types string:string
 #### A masked pattern was here ####
               name default.bucket_small
@@ -707,7 +707,7 @@ STAGE PLANS:
                 bucket_count 2
                 bucket_field_name key
                 columns key,value
-                columns.comments 
+                columns.comments 
                 columns.types string:string
 #### A masked pattern was here ####
                 name default.bucket_small
@@ -731,7 +731,7 @@ STAGE PLANS:
               bucket_count 2
               bucket_field_name key
               columns key,value
-              columns.comments 
+              columns.comments 
               columns.types string:string
 #### A masked pattern was here ####
               name default.bucket_small
@@ -754,7 +754,7 @@ STAGE PLANS:
                 bucket_count 2
                 bucket_field_name key
                 columns key,value
-                columns.comments 
+                columns.comments 
                 columns.types string:string
 #### A masked pattern was here ####
                 name default.bucket_small
@@ -817,7 +817,7 @@ STAGE PLANS:
                     bucket_count 4
                     bucket_field_name key
                     columns key,value
-                    columns.comments 
+                    columns.comments 
                     columns.types string:string
 #### A masked pattern was here ####
                     name default.bucket_big
@@ -840,7 +840,7 @@ STAGE PLANS:
                       bucket_count 4
                       bucket_field_name key
                       columns key,value
-                      columns.comments 
+                      columns.comments 
                       columns.types string:string
 #### A masked pattern was here ####
                       name default.bucket_big
@@ -909,7 +909,7 @@ STAGE PLANS:
               bucket_count 4
               bucket_field_name key
               columns key,value
-              columns.comments 
+              columns.comments 
               columns.types string:string
 #### A masked pattern was here ####
               name default.bucket_big
@@ -932,7 +932,7 @@ STAGE PLANS:
                 bucket_count 4
                 bucket_field_name key
                 columns key,value
-                columns.comments 
+                columns.comments 
                 columns.types string:string
 #### A masked pattern was here ####
                 name default.bucket_big
@@ -956,7 +956,7 @@ STAGE PLANS:
               bucket_count 2
               bucket_field_name key
               columns key,value
-              columns.comments 
+              columns.comments 
               columns.types string:string
 #### A masked pattern was here ####
               name default.bucket_small
@@ -979,7 +979,7 @@ STAGE PLANS:
                 bucket_count 2
                 bucket_field_name key
                 columns key,value
-                columns.comments 
+                columns.comments 
                 columns.types string:string
 #### A masked pattern was here ####
                 name default.bucket_small
@@ -1003,7 +1003,7 @@ STAGE PLANS:
               bucket_count 2
               bucket_field_name key
               columns key,value
-              columns.comments 
+              columns.comments 
               columns.types string:string
 #### A masked pattern was here ####
               name default.bucket_small
@@ -1026,7 +1026,7 @@ STAGE PLANS:
                 bucket_count 2
                 bucket_field_name key
                 columns key,value
-                columns.comments 
+                columns.comments 
                 columns.types string:string
 #### A masked pattern was here ####
                 name default.bucket_small
@@ -1114,7 +1114,7 @@ STAGE PLANS:
               bucket_count 4
               bucket_field_name key
               columns key,value
-              columns.comments 
+              columns.comments 
               columns.types string:string
 #### A masked pattern was here ####
               name default.bucket_big
@@ -1137,7 +1137,7 @@ STAGE PLANS:
                 bucket_count 4
                 bucket_field_name key
                 columns key,value
-                columns.comments 
+                columns.comments 
                 columns.types string:string
 #### A masked pattern was here ####
                 name default.bucket_big

Modified: hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_4.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_4.q.out?rev=1646606&r1=1646605&r2=1646606&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_4.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_4.q.out Fri Dec 19 01:28:56 2014
@@ -184,7 +184,7 @@ STAGE PLANS:
               bucket_count 2
               bucket_field_name key
               columns key,value
-              columns.comments 
+              columns.comments 
               columns.types string:string
 #### A masked pattern was here ####
               name default.bucket_big
@@ -207,7 +207,7 @@ STAGE PLANS:
                 bucket_count 2
                 bucket_field_name key
                 columns key,value
-                columns.comments 
+                columns.comments 
                 columns.types string:string
 #### A masked pattern was here ####
                 name default.bucket_big
@@ -358,7 +358,7 @@ STAGE PLANS:
               bucket_count 2
               bucket_field_name key
               columns key,value
-              columns.comments 
+              columns.comments 
               columns.types string:string
 #### A masked pattern was here ####
               name default.bucket_big
@@ -381,7 +381,7 @@ STAGE PLANS:
                 bucket_count 2
                 bucket_field_name key
                 columns key,value
-                columns.comments 
+                columns.comments 
                 columns.types string:string
 #### A masked pattern was here ####
                 name default.bucket_big
@@ -515,7 +515,7 @@ STAGE PLANS:
                     bucket_count 4
                     bucket_field_name key
                     columns key,value
-                    columns.comments 
+                    columns.comments 
                     columns.types string:string
 #### A masked pattern was here ####
                     name default.bucket_small
@@ -538,7 +538,7 @@ STAGE PLANS:
                       bucket_count 4
                       bucket_field_name key
                       columns key,value
-                      columns.comments 
+                      columns.comments 
                       columns.types string:string
 #### A masked pattern was here ####
                       name default.bucket_small
@@ -561,7 +561,7 @@ STAGE PLANS:
                     bucket_count 4
                     bucket_field_name key
                     columns key,value
-                    columns.comments 
+                    columns.comments 
                     columns.types string:string
 #### A masked pattern was here ####
                     name default.bucket_small
@@ -584,7 +584,7 @@ STAGE PLANS:
                       bucket_count 4
                       bucket_field_name key
                       columns key,value
-                      columns.comments 
+                      columns.comments 
                       columns.types string:string
 #### A masked pattern was here ####
                       name default.bucket_small
@@ -653,7 +653,7 @@ STAGE PLANS:
               bucket_count 2
               bucket_field_name key
               columns key,value
-              columns.comments 
+              columns.comments 
               columns.types string:string
 #### A masked pattern was here ####
               name default.bucket_big
@@ -676,7 +676,7 @@ STAGE PLANS:
                 bucket_count 2
                 bucket_field_name key
                 columns key,value
-                columns.comments 
+                columns.comments 
                 columns.types string:string
 #### A masked pattern was here ####
                 name default.bucket_big
@@ -700,7 +700,7 @@ STAGE PLANS:
               bucket_count 4
               bucket_field_name key
               columns key,value
-              columns.comments 
+              columns.comments 
               columns.types string:string
 #### A masked pattern was here ####
               name default.bucket_small
@@ -723,7 +723,7 @@ STAGE PLANS:
                 bucket_count 4
                 bucket_field_name key
                 columns key,value
-                columns.comments 
+                columns.comments 
                 columns.types string:string
 #### A masked pattern was here ####
                 name default.bucket_small
@@ -747,7 +747,7 @@ STAGE PLANS:
               bucket_count 4
               bucket_field_name key
               columns key,value
-              columns.comments 
+              columns.comments 
               columns.types string:string
 #### A masked pattern was here ####
               name default.bucket_small
@@ -770,7 +770,7 @@ STAGE PLANS:
                 bucket_count 4
                 bucket_field_name key
                 columns key,value
-                columns.comments 
+                columns.comments 
                 columns.types string:string
 #### A masked pattern was here ####
                 name default.bucket_small
@@ -833,7 +833,7 @@ STAGE PLANS:
                     bucket_count 2
                     bucket_field_name key
                     columns key,value
-                    columns.comments 
+                    columns.comments 
                     columns.types string:string
 #### A masked pattern was here ####
                     name default.bucket_big
@@ -856,7 +856,7 @@ STAGE PLANS:
                       bucket_count 2
                       bucket_field_name key
                       columns key,value
-                      columns.comments 
+                      columns.comments 
                       columns.types string:string
 #### A masked pattern was here ####
                       name default.bucket_big
@@ -925,7 +925,7 @@ STAGE PLANS:
               bucket_count 2
               bucket_field_name key
               columns key,value
-              columns.comments 
+              columns.comments 
               columns.types string:string
 #### A masked pattern was here ####
               name default.bucket_big
@@ -948,7 +948,7 @@ STAGE PLANS:
                 bucket_count 2
                 bucket_field_name key
                 columns key,value
-                columns.comments 
+                columns.comments 
                 columns.types string:string
 #### A masked pattern was here ####
                 name default.bucket_big
@@ -972,7 +972,7 @@ STAGE PLANS:
               bucket_count 4
               bucket_field_name key
               columns key,value
-              columns.comments 
+              columns.comments 
               columns.types string:string
 #### A masked pattern was here ####
               name default.bucket_small
@@ -995,7 +995,7 @@ STAGE PLANS:
                 bucket_count 4
                 bucket_field_name key
                 columns key,value
-                columns.comments 
+                columns.comments 
                 columns.types string:string
 #### A masked pattern was here ####
                 name default.bucket_small
@@ -1019,7 +1019,7 @@ STAGE PLANS:
               bucket_count 4
               bucket_field_name key
               columns key,value
-              columns.comments 
+              columns.comments 
               columns.types string:string
 #### A masked pattern was here ####
               name default.bucket_small
@@ -1042,7 +1042,7 @@ STAGE PLANS:
                 bucket_count 4
                 bucket_field_name key
                 columns key,value
-                columns.comments 
+                columns.comments 
                 columns.types string:string
 #### A masked pattern was here ####
                 name default.bucket_small
@@ -1130,7 +1130,7 @@ STAGE PLANS:
               bucket_count 2
               bucket_field_name key
               columns key,value
-              columns.comments 
+              columns.comments 
               columns.types string:string
 #### A masked pattern was here ####
               name default.bucket_big
@@ -1153,7 +1153,7 @@ STAGE PLANS:
                 bucket_count 2
                 bucket_field_name key
                 columns key,value
-                columns.comments 
+                columns.comments 
                 columns.types string:string
 #### A masked pattern was here ####
                 name default.bucket_big

Modified: hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_5.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_5.q.out?rev=1646606&r1=1646605&r2=1646606&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_5.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_5.q.out Fri Dec 19 01:28:56 2014
@@ -148,7 +148,7 @@ STAGE PLANS:
               bucket_count 2
               bucket_field_name key
               columns key,value
-              columns.comments 
+              columns.comments 
               columns.types string:string
 #### A masked pattern was here ####
               name default.bucket_big
@@ -168,7 +168,7 @@ STAGE PLANS:
                 bucket_count 2
                 bucket_field_name key
                 columns key,value
-                columns.comments 
+                columns.comments 
                 columns.types string:string
 #### A masked pattern was here ####
                 name default.bucket_big
@@ -312,7 +312,7 @@ STAGE PLANS:
               bucket_count 2
               bucket_field_name key
               columns key,value
-              columns.comments 
+              columns.comments 
               columns.types string:string
 #### A masked pattern was here ####
               name default.bucket_big
@@ -332,7 +332,7 @@ STAGE PLANS:
                 bucket_count 2
                 bucket_field_name key
                 columns key,value
-                columns.comments 
+                columns.comments 
                 columns.types string:string
 #### A masked pattern was here ####
                 name default.bucket_big
@@ -504,7 +504,7 @@ STAGE PLANS:
               bucket_count 2
               bucket_field_name key
               columns key,value
-              columns.comments 
+              columns.comments 
               columns.types string:string
 #### A masked pattern was here ####
               name default.bucket_big
@@ -524,7 +524,7 @@ STAGE PLANS:
                 bucket_count 2
                 bucket_field_name key
                 columns key,value
-                columns.comments 
+                columns.comments 
                 columns.types string:string
 #### A masked pattern was here ####
                 name default.bucket_big
@@ -545,7 +545,7 @@ STAGE PLANS:
               bucket_count 4
               bucket_field_name key
               columns key,value
-              columns.comments 
+              columns.comments 
               columns.types string:string
 #### A masked pattern was here ####
               name default.bucket_small
@@ -562,7 +562,7 @@ STAGE PLANS:
                 bucket_count 4
                 bucket_field_name key
                 columns key,value
-                columns.comments 
+                columns.comments 
                 columns.types string:string
 #### A masked pattern was here ####
                 name default.bucket_small
@@ -668,7 +668,7 @@ STAGE PLANS:
               bucket_count 2
               bucket_field_name key
               columns key,value
-              columns.comments 
+              columns.comments 
               columns.types string:string
 #### A masked pattern was here ####
               name default.bucket_big
@@ -688,7 +688,7 @@ STAGE PLANS:
                 bucket_count 2
                 bucket_field_name key
                 columns key,value
-                columns.comments 
+                columns.comments 
                 columns.types string:string
 #### A masked pattern was here ####
                 name default.bucket_big
@@ -709,7 +709,7 @@ STAGE PLANS:
               bucket_count 4
               bucket_field_name key
               columns key,value
-              columns.comments 
+              columns.comments 
               columns.types string:string
 #### A masked pattern was here ####
               name default.bucket_small
@@ -726,7 +726,7 @@ STAGE PLANS:
                 bucket_count 4
                 bucket_field_name key
                 columns key,value
-                columns.comments 
+                columns.comments 
                 columns.types string:string
 #### A masked pattern was here ####
                 name default.bucket_small
@@ -812,7 +812,7 @@ STAGE PLANS:
               bucket_count 2
               bucket_field_name key
               columns key,value
-              columns.comments 
+              columns.comments 
               columns.types string:string
 #### A masked pattern was here ####
               name default.bucket_big
@@ -832,7 +832,7 @@ STAGE PLANS:
                 bucket_count 2
                 bucket_field_name key
                 columns key,value
-                columns.comments 
+                columns.comments 
                 columns.types string:string
 #### A masked pattern was here ####
                 name default.bucket_big