Merge remote-tracking branch 'origin/main' into vi_egress

Author: bluestreak01

core/src/main/java/io/questdb/client/cutlass/qwp/client/QwpColumnWriter.java

@@ -86,7 +86,6 @@ private void encodeColumn(
             case TYPE_GEOHASH:
                 writeGeoHashColumn(dataAddr, valueCount, col.getGeoHashPrecision());
                 break;
-            case TYPE_STRING:
             case TYPE_VARCHAR:
                 writeStringColumn(col, valueCount, stringDataSize);
                 break;

core/src/main/java/io/questdb/client/cutlass/qwp/client/QwpUdpSender.java

@@ -615,7 +615,6 @@ private static long estimateInProgressColumnPayload(InProgressColumnState state)
             case TYPE_DOUBLE_ARRAY:
             case TYPE_LONG_ARRAY:
                 return estimateArrayPayloadBytes(col, state);
-            case TYPE_STRING:
             case TYPE_VARCHAR:
                 return 4L + (col.getStringDataSize() - state.stringDataSizeBefore);
             case TYPE_SYMBOL:
@@ -670,7 +669,6 @@ private static long nonNullablePaddingCost(byte type, int valuesBefore, int miss
                 return (long) missing * 2;
             case TYPE_INT:
             case TYPE_FLOAT:
-            case TYPE_STRING:
             case TYPE_VARCHAR:
                 return (long) missing * 4;
             case TYPE_DOUBLE_ARRAY:
@@ -1046,7 +1044,7 @@ private long estimateBaseForCurrentSchema() {
             estimate += 1;
 
             byte type = def.getTypeCode();
-            if (type == TYPE_STRING || type == TYPE_VARCHAR) {
+            if (type == TYPE_VARCHAR) {
                 estimate += 4;
             } else if (type == TYPE_SYMBOL) {
                 estimate += 1;
@@ -1305,7 +1303,7 @@ private void stageNullArrayColumnValue(CharSequence name, byte type) {
     }
 
     private void stageStringColumnValue(CharSequence name, CharSequence value) {
-        QwpTableBuffer.ColumnBuffer col = acquireColumn(name, TYPE_STRING, true);
+        QwpTableBuffer.ColumnBuffer col = acquireColumn(name, TYPE_VARCHAR, true);
         beginColumnWrite(col, name);
         col.addString(value);
         completeColumnWrite();

core/src/main/java/io/questdb/client/cutlass/qwp/client/QwpWebSocketSender.java

@@ -1015,7 +1015,7 @@ public QwpWebSocketSender stringColumn(CharSequence columnName, CharSequence val
         checkNotClosed();
         checkTableSelected();
         try {
-            QwpTableBuffer.ColumnBuffer col = currentTableBuffer.getOrCreateColumn(columnName, QwpConstants.TYPE_STRING, true);
+            QwpTableBuffer.ColumnBuffer col = currentTableBuffer.getOrCreateColumn(columnName, QwpConstants.TYPE_VARCHAR, true);
             if (col != null) {
                 col.addString(value);
             }

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

@@ -167,10 +167,6 @@ public final class QwpConstants {
      * Column type: SHORT (int16, little-endian).
      */
     public static final byte TYPE_SHORT = 0x03;
-    /**
-     * Column type: STRING (length-prefixed UTF-8).
-     */
-    public static final byte TYPE_STRING = 0x08;
     /**
      * Column type: SYMBOL (dictionary-encoded string).
      */
@@ -282,9 +278,6 @@ public static String getTypeName(byte typeCode) {
             case TYPE_DOUBLE:
                 name = "DOUBLE";
                 break;
-            case TYPE_STRING:
-                name = "STRING";
-                break;
             case TYPE_SYMBOL:
                 name = "SYMBOL";
                 break;

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

@@ -1052,7 +1052,6 @@ public void addNull() {
                     case TYPE_DOUBLE:
                         dataBuffer.putDouble(Double.NaN);
                         break;
-                    case TYPE_STRING:
                     case TYPE_VARCHAR:
                         stringOffsets.putInt(checkedStringOffset(stringData.getAppendOffset()));
                         break;
@@ -1438,7 +1437,6 @@ public void retainTailRow(
             }
 
             switch (type) {
-                case TYPE_STRING:
                 case TYPE_VARCHAR:
                     retainStringValue(valueCountBefore);
                     break;
@@ -1586,7 +1584,6 @@ private void allocateStorage(byte type) {
                 case TYPE_DECIMAL256:
                     dataBuffer = new OffHeapAppendMemory(512);
                     break;
-                case TYPE_STRING:
                 case TYPE_VARCHAR:
                     stringOffsets = new OffHeapAppendMemory(64);
                     try {

core/src/test/java/io/questdb/client/test/cutlass/qwp/client/QwpUdpSenderTest.java

@@ -1101,7 +1101,7 @@ public void testNullableStringPrefixFlushKeepsNullStateWithoutReflection() throw
                 Assert.assertNotNull(tableBuffer);
                 Assert.assertEquals(0, tableBuffer.getRowCount());
 
-                QwpTableBuffer.ColumnBuffer stringColumn = tableBuffer.getExistingColumn("s", TYPE_STRING);
+                QwpTableBuffer.ColumnBuffer stringColumn = tableBuffer.getExistingColumn("s", TYPE_VARCHAR);
                 assertNullableStringNullState(stringColumn);
 
                 QwpTableBuffer.ColumnBuffer longColumn = tableBuffer.getExistingColumn("x", TYPE_LONG);
@@ -2308,7 +2308,6 @@ private ColumnValues decodeColumn(QwpColumnDef def, int rowCount) {
                 case TYPE_LONG_ARRAY:
                     decodeLongArrays(values, nulls, valueCount);
                     break;
-                case TYPE_STRING:
                 case TYPE_VARCHAR:
                     decodeStrings(values, nulls, valueCount);
                     break;