miklosgergely commented on a change in pull request #1756: URL: https://github.com/apache/hive/pull/1756#discussion_r550923625
########## File path: ql/src/java/org/apache/hadoop/hive/ql/ddl/table/info/desc/formatter/TextDescTableFormatter.java ########## @@ -0,0 +1,575 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hadoop.hive.ql.ddl.table.info.desc.formatter; + +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections4.MapUtils; +import org.apache.commons.text.StringEscapeUtils; +import org.apache.hadoop.hive.common.StatsSetupConst; +import org.apache.hadoop.hive.conf.HiveConf; +import org.apache.hadoop.hive.conf.HiveConf.ConfVars; +import org.apache.hadoop.hive.metastore.TableType; +import org.apache.hadoop.hive.metastore.api.ColumnStatisticsObj; +import org.apache.hadoop.hive.metastore.api.FieldSchema; +import org.apache.hadoop.hive.metastore.api.StorageDescriptor; +import org.apache.hadoop.hive.ql.ddl.ShowUtils; +import org.apache.hadoop.hive.ql.ddl.ShowUtils.TextMetaDataTable; +import org.apache.hadoop.hive.ql.ddl.table.info.desc.DescTableDesc; +import org.apache.hadoop.hive.ql.exec.Utilities; +import org.apache.hadoop.hive.ql.metadata.CheckConstraint; +import org.apache.hadoop.hive.ql.metadata.CheckConstraint.CheckConstraintCol; +import org.apache.hadoop.hive.ql.metadata.DefaultConstraint; +import org.apache.hadoop.hive.ql.metadata.DefaultConstraint.DefaultConstraintCol; +import org.apache.hadoop.hive.ql.metadata.ForeignKeyInfo; +import org.apache.hadoop.hive.ql.metadata.HiveException; +import org.apache.hadoop.hive.ql.metadata.NotNullConstraint; +import org.apache.hadoop.hive.ql.metadata.Partition; +import org.apache.hadoop.hive.ql.metadata.PrimaryKeyInfo; +import org.apache.hadoop.hive.ql.metadata.Table; +import org.apache.hadoop.hive.ql.metadata.UniqueConstraint; +import org.apache.hadoop.hive.ql.metadata.ForeignKeyInfo.ForeignKeyCol; +import org.apache.hadoop.hive.ql.metadata.UniqueConstraint.UniqueConstraintCol; +import org.apache.hadoop.hive.ql.plan.PlanUtils; +import org.apache.hadoop.hive.ql.session.SessionState; +import org.apache.hive.common.util.HiveStringUtils; + +import java.io.DataOutputStream; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.TreeMap; +import java.util.Map.Entry; + +import static org.apache.hadoop.hive.ql.ddl.ShowUtils.ALIGNMENT; +import static org.apache.hadoop.hive.ql.ddl.ShowUtils.DEFAULT_STRINGBUILDER_SIZE; +import static org.apache.hadoop.hive.ql.ddl.ShowUtils.FIELD_DELIM; +import static org.apache.hadoop.hive.ql.ddl.ShowUtils.LINE_DELIM; +import static org.apache.hadoop.hive.ql.ddl.ShowUtils.formatOutput; + +/** + * Formats DESC TABLE results to text format. + */ +class TextDescTableFormatter extends DescTableFormatter { + @Override + public void describeTable(HiveConf conf, DataOutputStream out, String columnPath, String tableName, Table table, + Partition partition, List<FieldSchema> columns, boolean isFormatted, boolean isExtended, boolean isOutputPadded, + List<ColumnStatisticsObj> columnStats) throws HiveException { + try { + addStatsData(out, columnPath, columns, isFormatted, columnStats, isOutputPadded); + addPartitionData(out, conf, columnPath, table, isFormatted, isOutputPadded); + + if (columnPath == null) { + if (isFormatted) { + addFormattedTableData(out, table, partition, isOutputPadded); + } + + if (isExtended) { + out.write(Utilities.newLineCode); + addExtendedTableData(out, table, partition); + addExtendedConstraintData(out, table); + addExtendedStorageData(out, table); + } + } + } catch (IOException e) { + throw new HiveException(e); + } + } + + private void addStatsData(DataOutputStream out, String columnPath, List<FieldSchema> columns, boolean isFormatted, + List<ColumnStatisticsObj> columnStats, boolean isOutputPadded) throws IOException { + String statsData = ""; + + TextMetaDataTable metaDataTable = new TextMetaDataTable(); + boolean needColStats = isFormatted && columnPath != null; + if (needColStats) { + metaDataTable.addRow(DescTableDesc.COLUMN_STATISTICS_HEADERS.toArray(new String[]{})); + } else if (isFormatted && !SessionState.get().isHiveServerQuery()) { + statsData += "# "; + metaDataTable.addRow(DescTableDesc.SCHEMA.split("#")[0].split(",")); + } + for (FieldSchema column : columns) { + metaDataTable.addRow(ShowUtils.extractColumnValues(column, needColStats, + getColumnStatisticsObject(column.getName(), column.getType(), columnStats))); + } + if (needColStats) { + metaDataTable.transpose(); + } + statsData += metaDataTable.renderTable(isOutputPadded); + out.write(statsData.getBytes("UTF-8")); + } + + private ColumnStatisticsObj getColumnStatisticsObject(String columnName, String columnType, + List<ColumnStatisticsObj> columnStats) { + if (CollectionUtils.isNotEmpty(columnStats)) { + for (ColumnStatisticsObj columnStat : columnStats) { + if (columnStat.getColName().equalsIgnoreCase(columnName) && + columnStat.getColType().equalsIgnoreCase(columnType)) { + return columnStat; + } + } + } + return null; + } + + private void addPartitionData(DataOutputStream out, HiveConf conf, String columnPath, Table table, + boolean isFormatted, boolean isOutputPadded) throws IOException { + String partitionData = ""; + if (columnPath == null) { + List<FieldSchema> partitionColumns = table.isPartitioned() ? table.getPartCols() : null; + if (CollectionUtils.isNotEmpty(partitionColumns) && + conf.getBoolVar(ConfVars.HIVE_DISPLAY_PARTITION_COLUMNS_SEPARATELY)) { + TextMetaDataTable metaDataTable = new TextMetaDataTable(); + partitionData += LINE_DELIM + "# Partition Information" + LINE_DELIM + "# "; + metaDataTable.addRow(DescTableDesc.SCHEMA.split("#")[0].split(",")); + for (FieldSchema partitionColumn : partitionColumns) { + metaDataTable.addRow(ShowUtils.extractColumnValues(partitionColumn, false, null)); + } + partitionData += metaDataTable.renderTable(isOutputPadded); + } + } else { + String statsState = table.getParameters().get(StatsSetupConst.COLUMN_STATS_ACCURATE); + if (table.getParameters() != null && statsState != null) { + StringBuilder stringBuilder = new StringBuilder(); + formatOutput(StatsSetupConst.COLUMN_STATS_ACCURATE, + isFormatted ? StringEscapeUtils.escapeJava(statsState) : HiveStringUtils.escapeJava(statsState), + stringBuilder, isOutputPadded); + partitionData += stringBuilder.toString(); + } + } + out.write(partitionData.getBytes("UTF-8")); + } + + private void addFormattedTableData(DataOutputStream out, Table table, Partition partition, boolean isOutputPadded) + throws IOException, UnsupportedEncodingException { + String formattedTableInfo = null; + if (partition != null) { + formattedTableInfo = getPartitionInformation(partition); + } else { + formattedTableInfo = getTableInformation(table, isOutputPadded); + } + + if (table.getTableConstraintsInfo().isTableConstraintsInfoNotEmpty()) { + formattedTableInfo += getConstraintsInformation(table); + } + out.write(formattedTableInfo.getBytes("UTF-8")); Review comment: Fixed. ########## File path: ql/src/java/org/apache/hadoop/hive/ql/ddl/table/info/desc/formatter/TextDescTableFormatter.java ########## @@ -0,0 +1,575 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hadoop.hive.ql.ddl.table.info.desc.formatter; + +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections4.MapUtils; +import org.apache.commons.text.StringEscapeUtils; +import org.apache.hadoop.hive.common.StatsSetupConst; +import org.apache.hadoop.hive.conf.HiveConf; +import org.apache.hadoop.hive.conf.HiveConf.ConfVars; +import org.apache.hadoop.hive.metastore.TableType; +import org.apache.hadoop.hive.metastore.api.ColumnStatisticsObj; +import org.apache.hadoop.hive.metastore.api.FieldSchema; +import org.apache.hadoop.hive.metastore.api.StorageDescriptor; +import org.apache.hadoop.hive.ql.ddl.ShowUtils; +import org.apache.hadoop.hive.ql.ddl.ShowUtils.TextMetaDataTable; +import org.apache.hadoop.hive.ql.ddl.table.info.desc.DescTableDesc; +import org.apache.hadoop.hive.ql.exec.Utilities; +import org.apache.hadoop.hive.ql.metadata.CheckConstraint; +import org.apache.hadoop.hive.ql.metadata.CheckConstraint.CheckConstraintCol; +import org.apache.hadoop.hive.ql.metadata.DefaultConstraint; +import org.apache.hadoop.hive.ql.metadata.DefaultConstraint.DefaultConstraintCol; +import org.apache.hadoop.hive.ql.metadata.ForeignKeyInfo; +import org.apache.hadoop.hive.ql.metadata.HiveException; +import org.apache.hadoop.hive.ql.metadata.NotNullConstraint; +import org.apache.hadoop.hive.ql.metadata.Partition; +import org.apache.hadoop.hive.ql.metadata.PrimaryKeyInfo; +import org.apache.hadoop.hive.ql.metadata.Table; +import org.apache.hadoop.hive.ql.metadata.UniqueConstraint; +import org.apache.hadoop.hive.ql.metadata.ForeignKeyInfo.ForeignKeyCol; +import org.apache.hadoop.hive.ql.metadata.UniqueConstraint.UniqueConstraintCol; +import org.apache.hadoop.hive.ql.plan.PlanUtils; +import org.apache.hadoop.hive.ql.session.SessionState; +import org.apache.hive.common.util.HiveStringUtils; + +import java.io.DataOutputStream; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.TreeMap; +import java.util.Map.Entry; + +import static org.apache.hadoop.hive.ql.ddl.ShowUtils.ALIGNMENT; +import static org.apache.hadoop.hive.ql.ddl.ShowUtils.DEFAULT_STRINGBUILDER_SIZE; +import static org.apache.hadoop.hive.ql.ddl.ShowUtils.FIELD_DELIM; +import static org.apache.hadoop.hive.ql.ddl.ShowUtils.LINE_DELIM; +import static org.apache.hadoop.hive.ql.ddl.ShowUtils.formatOutput; + +/** + * Formats DESC TABLE results to text format. + */ +class TextDescTableFormatter extends DescTableFormatter { + @Override + public void describeTable(HiveConf conf, DataOutputStream out, String columnPath, String tableName, Table table, + Partition partition, List<FieldSchema> columns, boolean isFormatted, boolean isExtended, boolean isOutputPadded, + List<ColumnStatisticsObj> columnStats) throws HiveException { + try { + addStatsData(out, columnPath, columns, isFormatted, columnStats, isOutputPadded); + addPartitionData(out, conf, columnPath, table, isFormatted, isOutputPadded); + + if (columnPath == null) { + if (isFormatted) { + addFormattedTableData(out, table, partition, isOutputPadded); + } + + if (isExtended) { + out.write(Utilities.newLineCode); + addExtendedTableData(out, table, partition); + addExtendedConstraintData(out, table); + addExtendedStorageData(out, table); + } + } + } catch (IOException e) { + throw new HiveException(e); + } + } + + private void addStatsData(DataOutputStream out, String columnPath, List<FieldSchema> columns, boolean isFormatted, + List<ColumnStatisticsObj> columnStats, boolean isOutputPadded) throws IOException { + String statsData = ""; + + TextMetaDataTable metaDataTable = new TextMetaDataTable(); + boolean needColStats = isFormatted && columnPath != null; + if (needColStats) { + metaDataTable.addRow(DescTableDesc.COLUMN_STATISTICS_HEADERS.toArray(new String[]{})); + } else if (isFormatted && !SessionState.get().isHiveServerQuery()) { + statsData += "# "; + metaDataTable.addRow(DescTableDesc.SCHEMA.split("#")[0].split(",")); + } + for (FieldSchema column : columns) { + metaDataTable.addRow(ShowUtils.extractColumnValues(column, needColStats, + getColumnStatisticsObject(column.getName(), column.getType(), columnStats))); + } + if (needColStats) { + metaDataTable.transpose(); + } + statsData += metaDataTable.renderTable(isOutputPadded); + out.write(statsData.getBytes("UTF-8")); + } + + private ColumnStatisticsObj getColumnStatisticsObject(String columnName, String columnType, + List<ColumnStatisticsObj> columnStats) { + if (CollectionUtils.isNotEmpty(columnStats)) { + for (ColumnStatisticsObj columnStat : columnStats) { + if (columnStat.getColName().equalsIgnoreCase(columnName) && + columnStat.getColType().equalsIgnoreCase(columnType)) { + return columnStat; + } + } + } + return null; + } + + private void addPartitionData(DataOutputStream out, HiveConf conf, String columnPath, Table table, + boolean isFormatted, boolean isOutputPadded) throws IOException { + String partitionData = ""; + if (columnPath == null) { + List<FieldSchema> partitionColumns = table.isPartitioned() ? table.getPartCols() : null; + if (CollectionUtils.isNotEmpty(partitionColumns) && + conf.getBoolVar(ConfVars.HIVE_DISPLAY_PARTITION_COLUMNS_SEPARATELY)) { + TextMetaDataTable metaDataTable = new TextMetaDataTable(); + partitionData += LINE_DELIM + "# Partition Information" + LINE_DELIM + "# "; + metaDataTable.addRow(DescTableDesc.SCHEMA.split("#")[0].split(",")); + for (FieldSchema partitionColumn : partitionColumns) { + metaDataTable.addRow(ShowUtils.extractColumnValues(partitionColumn, false, null)); + } + partitionData += metaDataTable.renderTable(isOutputPadded); + } + } else { + String statsState = table.getParameters().get(StatsSetupConst.COLUMN_STATS_ACCURATE); + if (table.getParameters() != null && statsState != null) { + StringBuilder stringBuilder = new StringBuilder(); + formatOutput(StatsSetupConst.COLUMN_STATS_ACCURATE, + isFormatted ? StringEscapeUtils.escapeJava(statsState) : HiveStringUtils.escapeJava(statsState), + stringBuilder, isOutputPadded); + partitionData += stringBuilder.toString(); + } + } + out.write(partitionData.getBytes("UTF-8")); Review comment: Fixed. ########## File path: ql/src/java/org/apache/hadoop/hive/ql/ddl/table/info/desc/formatter/TextDescTableFormatter.java ########## @@ -0,0 +1,575 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hadoop.hive.ql.ddl.table.info.desc.formatter; + +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections4.MapUtils; +import org.apache.commons.text.StringEscapeUtils; +import org.apache.hadoop.hive.common.StatsSetupConst; +import org.apache.hadoop.hive.conf.HiveConf; +import org.apache.hadoop.hive.conf.HiveConf.ConfVars; +import org.apache.hadoop.hive.metastore.TableType; +import org.apache.hadoop.hive.metastore.api.ColumnStatisticsObj; +import org.apache.hadoop.hive.metastore.api.FieldSchema; +import org.apache.hadoop.hive.metastore.api.StorageDescriptor; +import org.apache.hadoop.hive.ql.ddl.ShowUtils; +import org.apache.hadoop.hive.ql.ddl.ShowUtils.TextMetaDataTable; +import org.apache.hadoop.hive.ql.ddl.table.info.desc.DescTableDesc; +import org.apache.hadoop.hive.ql.exec.Utilities; +import org.apache.hadoop.hive.ql.metadata.CheckConstraint; +import org.apache.hadoop.hive.ql.metadata.CheckConstraint.CheckConstraintCol; +import org.apache.hadoop.hive.ql.metadata.DefaultConstraint; +import org.apache.hadoop.hive.ql.metadata.DefaultConstraint.DefaultConstraintCol; +import org.apache.hadoop.hive.ql.metadata.ForeignKeyInfo; +import org.apache.hadoop.hive.ql.metadata.HiveException; +import org.apache.hadoop.hive.ql.metadata.NotNullConstraint; +import org.apache.hadoop.hive.ql.metadata.Partition; +import org.apache.hadoop.hive.ql.metadata.PrimaryKeyInfo; +import org.apache.hadoop.hive.ql.metadata.Table; +import org.apache.hadoop.hive.ql.metadata.UniqueConstraint; +import org.apache.hadoop.hive.ql.metadata.ForeignKeyInfo.ForeignKeyCol; +import org.apache.hadoop.hive.ql.metadata.UniqueConstraint.UniqueConstraintCol; +import org.apache.hadoop.hive.ql.plan.PlanUtils; +import org.apache.hadoop.hive.ql.session.SessionState; +import org.apache.hive.common.util.HiveStringUtils; + +import java.io.DataOutputStream; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.TreeMap; +import java.util.Map.Entry; + +import static org.apache.hadoop.hive.ql.ddl.ShowUtils.ALIGNMENT; +import static org.apache.hadoop.hive.ql.ddl.ShowUtils.DEFAULT_STRINGBUILDER_SIZE; +import static org.apache.hadoop.hive.ql.ddl.ShowUtils.FIELD_DELIM; +import static org.apache.hadoop.hive.ql.ddl.ShowUtils.LINE_DELIM; +import static org.apache.hadoop.hive.ql.ddl.ShowUtils.formatOutput; + +/** + * Formats DESC TABLE results to text format. + */ +class TextDescTableFormatter extends DescTableFormatter { + @Override + public void describeTable(HiveConf conf, DataOutputStream out, String columnPath, String tableName, Table table, + Partition partition, List<FieldSchema> columns, boolean isFormatted, boolean isExtended, boolean isOutputPadded, + List<ColumnStatisticsObj> columnStats) throws HiveException { + try { + addStatsData(out, columnPath, columns, isFormatted, columnStats, isOutputPadded); + addPartitionData(out, conf, columnPath, table, isFormatted, isOutputPadded); + + if (columnPath == null) { + if (isFormatted) { + addFormattedTableData(out, table, partition, isOutputPadded); + } + + if (isExtended) { + out.write(Utilities.newLineCode); + addExtendedTableData(out, table, partition); + addExtendedConstraintData(out, table); + addExtendedStorageData(out, table); + } + } + } catch (IOException e) { + throw new HiveException(e); + } + } + + private void addStatsData(DataOutputStream out, String columnPath, List<FieldSchema> columns, boolean isFormatted, + List<ColumnStatisticsObj> columnStats, boolean isOutputPadded) throws IOException { + String statsData = ""; + + TextMetaDataTable metaDataTable = new TextMetaDataTable(); + boolean needColStats = isFormatted && columnPath != null; + if (needColStats) { + metaDataTable.addRow(DescTableDesc.COLUMN_STATISTICS_HEADERS.toArray(new String[]{})); + } else if (isFormatted && !SessionState.get().isHiveServerQuery()) { + statsData += "# "; + metaDataTable.addRow(DescTableDesc.SCHEMA.split("#")[0].split(",")); + } + for (FieldSchema column : columns) { + metaDataTable.addRow(ShowUtils.extractColumnValues(column, needColStats, + getColumnStatisticsObject(column.getName(), column.getType(), columnStats))); + } + if (needColStats) { + metaDataTable.transpose(); + } + statsData += metaDataTable.renderTable(isOutputPadded); + out.write(statsData.getBytes("UTF-8")); Review comment: Fixed. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
