diff --git beeline/src/java/org/apache/hive/beeline/TableOutputFormat.java beeline/src/java/org/apache/hive/beeline/TableOutputFormat.java index 2be4678f01a107a4c05766d73b3fa1dd58773100..0e8dffdf7167b4ddc8bf85040d4c67dc42100e6a 100644 --- beeline/src/java/org/apache/hive/beeline/TableOutputFormat.java +++ beeline/src/java/org/apache/hive/beeline/TableOutputFormat.java @@ -66,13 +66,16 @@ public int print(Rows rows) { .truncate(headerCols.getVisibleLength()); } - if (index == 0 || - (beeLine.getOpts().getHeaderInterval() > 0 - && index % beeLine.getOpts().getHeaderInterval() == 0 - && beeLine.getOpts().getShowHeader())) { - printRow(header, true); - printRow(headerCols, false); - printRow(header, true); + if (beeLine.getOpts().getShowHeader()) { + if (index == 0 || + (index - 1 > 0 && ((index - 1) % beeLine.getOpts().getHeaderInterval() == 0)) + ) { + printRow(header, true); + printRow(headerCols, false); + printRow(header, true); + } + } else if (index == 0) { + printRow(header, true); } if (index != 0) { @@ -81,7 +84,7 @@ public int print(Rows rows) { index++; } - if (header != null && beeLine.getOpts().getShowHeader()) { + if (header != null) { printRow(header, true); } @@ -137,4 +140,4 @@ ColorBuffer getOutputString(Rows rows, Rows.Row row, String delim) { } return buf; } -} \ No newline at end of file +}