Do not change formatting when all rows are sampled.

Author: sherfert

cypher-shell/src/main/java/org/neo4j/shell/prettyprint/TableOutputFormatter.java

@@ -54,7 +54,7 @@ private int formatResultAndCountRows(String[] columns,
                                          LinePrinter output) {
 
         List<Record> topRecords = take(records, numSampleRows);
-        int[] columnSizes = calculateColumnSizes(columns, topRecords);
+        int[] columnSizes = calculateColumnSizes(columns, topRecords, records.hasNext());
 
         int totalWidth = 1;
         for (int columnSize : columnSizes) {
@@ -83,14 +83,21 @@ private int formatResultAndCountRows(String[] columns,
         return numberOfRows;
     }
 
-    private int[] calculateColumnSizes(@Nonnull String[] columns, @Nonnull List<Record> data) {
+    /**
+     * Calculate the size of the columns for table formatting
+     * @param columns the column names
+     * @param data (sample) data
+     * @param moreDataAfterSamples if there is more data that should be written into the table after `data`
+     * @return the column sizes
+     */
+    private int[] calculateColumnSizes(@Nonnull String[] columns, @Nonnull List<Record> data, boolean moreDataAfterSamples) {
         int[] columnSizes = new int[columns.length];
         for (int i = 0; i < columns.length; i++) {
             columnSizes[i] = columns[i].length();
         }
         for (Record record : data) {
             for (int i = 0; i < columns.length; i++) {
-                int len = columnLengthForValue(record.get(i));
+                int len = columnLengthForValue(record.get(i), moreDataAfterSamples);
                 if (columnSizes[i] < len) {
                     columnSizes[i] = len;
                 }
@@ -101,9 +108,13 @@ private int[] calculateColumnSizes(@Nonnull String[] columns, @Nonnull List<Reco
 
     /**
      * The length of a column, where Numbers are always getting enough space to fit the highest number possible.
+     *
+     * @param value the value to calculate the length for
+     * @param moreDataAfterSamples if there is more data that should be written into the table after `data`
+     * @return the column size for this value.
      */
-    private int columnLengthForValue(Value value) {
-        if (value instanceof NumberValueAdapter ) {
+    private int columnLengthForValue(Value value, boolean moreDataAfterSamples) {
+        if (value instanceof NumberValueAdapter && moreDataAfterSamples) {
             return 19; // The number of digits of Long.Max
         } else {
             return formatValue(value).length();

cypher-shell/src/test/java/org/neo4j/shell/prettyprint/TableOutputFormatterTest.java

@@ -105,11 +105,11 @@ public void prettyPrintPlanInformationWithNewlines() {
 
         // THEN
         assertThat(actual, startsWith(String.join(NEWLINE,
-                                         "+-----------------------------------------------------------------------------------+",
-                                         "| Plan      | Statement   | Version | Planner | Runtime       | Time                |",
-                                         "+-----------------------------------------------------------------------------------+",
-                                         "| \"EXPLAIN\" | \"READ_ONLY\" | \"3.1\"   | \"COST\"  | \"INTERPRETED\" | 12                  |",
-                                          "+-----------------------------------------------------------------------------------+",
+                                         "+--------------------------------------------------------------------+",
+                                         "| Plan      | Statement   | Version | Planner | Runtime       | Time |",
+                                         "+--------------------------------------------------------------------+",
+                                         "| \"EXPLAIN\" | \"READ_ONLY\" | \"3.1\"   | \"COST\"  | \"INTERPRETED\" | 12   |",
+                                          "+--------------------------------------------------------------------+",
                                          NEWLINE)));
     }
 
@@ -303,19 +303,33 @@ public void basicTable() {
         // WHEN
         String table = formatResult(result);
         // THEN
-        assertThat(table, containsString("| c1  | c2                  |"));
-        assertThat(table, containsString("| \"a\" | 42                  |"));
+        assertThat(table, containsString("| c1  | c2 |"));
+        assertThat(table, containsString("| \"a\" | 42 |"));
     }
 
     @Test
-    public void twoRows() {
+    public void twoRowsWithNumbersAllSampled() {
         // GIVEN
         StatementResult result = mockResult(asList("c1", "c2"), "a", 42, "b", 43);
         // WHEN
         String table = formatResult(result);
         // THEN
-        assertThat(table, containsString("| \"a\" | 42                  |"));
-        assertThat(table, containsString("| \"b\" | 43                  |"));
+        assertThat(table, containsString("| \"a\" | 42 |"));
+        assertThat(table, containsString("| \"b\" | 43 |"));
+    }
+
+    @Test
+    public void fiveRowsWithNumbersNotAllSampled() {
+        // GIVEN
+        StatementResult result = mockResult(asList("c1", "c2"), "a", 42, "b", 43, "c", 44, "d", 45, "e", 46);
+        // WHEN
+        String table = formatResult(result);
+        // THEN
+        assertThat(table, containsString("| \"a\" | 42 |"));
+        assertThat(table, containsString("| \"b\" | 43 |"));
+        assertThat(table, containsString("| \"c\" | 44 |"));
+        assertThat(table, containsString("| \"d\" | 45 |"));
+        assertThat(table, containsString("| \"e\" | 46 |"));
     }
 
     @Test