Improve error message

Author: mtopolnik

core/src/main/java/io/questdb/client/cutlass/qwp/protocol/QwpTableBuffer.java

@@ -169,7 +169,8 @@ public ColumnBuffer getOrCreateColumn(String name, byte type, boolean nullable)
                 columnAccessCursor++;
                 if (candidate.type != type) {
                     throw new LineSenderException(
-                            "Column type mismatch for " + name + ": existing=" + candidate.type + " new=" + type
+                            "Column type mismatch for column '" + name + "': columnType="
+                                    + candidate.type + ", sentType=" + type
                     );
                 }
                 return candidate;
@@ -182,7 +183,8 @@ public ColumnBuffer getOrCreateColumn(String name, byte type, boolean nullable)
             ColumnBuffer existing = columns.get(idx);
             if (existing.type != type) {
                 throw new LineSenderException(
-                        "Column type mismatch for " + name + ": existing=" + existing.type + " new=" + type
+                        "Column type mismatch for column '" + name + "': columnType="
+                                + existing.type + ", sentType=" + type
                 );
             }
             return existing;
@@ -943,6 +945,14 @@ public int[] getArrayShapes() {
             return arrayShapes;
         }
 
+        /**
+         * Returns the off-heap address of the auxiliary data buffer (global symbol IDs).
+         * Returns 0 if no auxiliary data exists.
+         */
+        public long getAuxDataAddress() {
+            return auxBuffer != null ? auxBuffer.pageAddress() : 0;
+        }
+
         /**
          * Returns the total bytes buffered in this column's storage.
          */
@@ -969,14 +979,6 @@ public long getBufferedBytes() {
             return bytes;
         }
 
-        /**
-         * Returns the off-heap address of the auxiliary data buffer (global symbol IDs).
-         * Returns 0 if no auxiliary data exists.
-         */
-        public long getAuxDataAddress() {
-            return auxBuffer != null ? auxBuffer.pageAddress() : 0;
-        }
-
         /**
          * Returns the off-heap address of the column data buffer.
          */

core/src/test/java/io/questdb/client/test/cutlass/qwp/protocol/QwpTableBufferTest.java

@@ -30,12 +30,10 @@
 import io.questdb.client.cutlass.qwp.protocol.QwpTableBuffer;
 import io.questdb.client.std.Decimal128;
 import io.questdb.client.std.Decimal64;
-import static io.questdb.client.test.tools.TestUtils.assertMemoryLeak;
 import org.junit.Test;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static io.questdb.client.test.tools.TestUtils.assertMemoryLeak;
+import static org.junit.Assert.*;
 
 public class QwpTableBufferTest {
 
@@ -420,7 +418,7 @@ public void testGetOrCreateColumnConflictingTypeFastPath() throws Exception {
                     fail("Expected LineSenderException for column type mismatch");
                 } catch (LineSenderException e) {
                     assertEquals(
-                            "Column type mismatch for x: existing=" + QwpConstants.TYPE_LONG + " new=" + QwpConstants.TYPE_DOUBLE,
+                            "Column type mismatch for column 'x': columnType=" + QwpConstants.TYPE_LONG + ", sentType=" + QwpConstants.TYPE_DOUBLE,
                             e.getMessage()
                     );
                 }
@@ -445,7 +443,7 @@ public void testGetOrCreateColumnConflictingTypeSlowPath() throws Exception {
                     fail("Expected LineSenderException for column type mismatch");
                 } catch (LineSenderException e) {
                     assertEquals(
-                            "Column type mismatch for b: existing=" + QwpConstants.TYPE_STRING + " new=" + QwpConstants.TYPE_LONG,
+                            "Column type mismatch for column 'b': columnType=" + QwpConstants.TYPE_STRING + ", sentType=" + QwpConstants.TYPE_LONG,
                             e.getMessage()
                     );
                 }