Skip to content

Commit 2e0db34

Browse files
committed
Remove TYPE_STRING, it's a synonym for TYPE_VARCHAR
1 parent 269824f commit 2e0db34

9 files changed

Lines changed: 137 additions & 165 deletions

File tree

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ private void encodeColumn(
8686
case TYPE_GEOHASH:
8787
writeGeoHashColumn(dataAddr, valueCount, col.getGeoHashPrecision());
8888
break;
89-
case TYPE_STRING:
9089
case TYPE_VARCHAR:
9190
writeStringColumn(col, valueCount, stringDataSize);
9291
break;

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -615,7 +615,6 @@ private static long estimateInProgressColumnPayload(InProgressColumnState state)
615615
case TYPE_DOUBLE_ARRAY:
616616
case TYPE_LONG_ARRAY:
617617
return estimateArrayPayloadBytes(col, state);
618-
case TYPE_STRING:
619618
case TYPE_VARCHAR:
620619
return 4L + (col.getStringDataSize() - state.stringDataSizeBefore);
621620
case TYPE_SYMBOL:
@@ -670,7 +669,6 @@ private static long nonNullablePaddingCost(byte type, int valuesBefore, int miss
670669
return (long) missing * 2;
671670
case TYPE_INT:
672671
case TYPE_FLOAT:
673-
case TYPE_STRING:
674672
case TYPE_VARCHAR:
675673
return (long) missing * 4;
676674
case TYPE_DOUBLE_ARRAY:
@@ -1046,7 +1044,7 @@ private long estimateBaseForCurrentSchema() {
10461044
estimate += 1;
10471045

10481046
byte type = def.getTypeCode();
1049-
if (type == TYPE_STRING || type == TYPE_VARCHAR) {
1047+
if (type == TYPE_VARCHAR) {
10501048
estimate += 4;
10511049
} else if (type == TYPE_SYMBOL) {
10521050
estimate += 1;

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -140,10 +140,6 @@ public final class QwpConstants {
140140
* Column type: SHORT (int16, little-endian).
141141
*/
142142
public static final byte TYPE_SHORT = 0x03;
143-
/**
144-
* Column type: STRING (length-prefixed UTF-8).
145-
*/
146-
public static final byte TYPE_STRING = 0x08;
147143
/**
148144
* Column type: SYMBOL (dictionary-encoded string).
149145
*/
@@ -257,9 +253,6 @@ public static String getTypeName(byte typeCode) {
257253
case TYPE_DOUBLE:
258254
name = "DOUBLE";
259255
break;
260-
case TYPE_STRING:
261-
name = "STRING";
262-
break;
263256
case TYPE_SYMBOL:
264257
name = "SYMBOL";
265258
break;

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1052,7 +1052,6 @@ public void addNull() {
10521052
case TYPE_DOUBLE:
10531053
dataBuffer.putDouble(Double.NaN);
10541054
break;
1055-
case TYPE_STRING:
10561055
case TYPE_VARCHAR:
10571056
stringOffsets.putInt(checkedStringOffset(stringData.getAppendOffset()));
10581057
break;
@@ -1438,7 +1437,6 @@ public void retainTailRow(
14381437
}
14391438

14401439
switch (type) {
1441-
case TYPE_STRING:
14421440
case TYPE_VARCHAR:
14431441
retainStringValue(valueCountBefore);
14441442
break;
@@ -1586,7 +1584,6 @@ private void allocateStorage(byte type) {
15861584
case TYPE_DECIMAL256:
15871585
dataBuffer = new OffHeapAppendMemory(512);
15881586
break;
1589-
case TYPE_STRING:
15901587
case TYPE_VARCHAR:
15911588
stringOffsets = new OffHeapAppendMemory(64);
15921589
try {

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2308,7 +2308,6 @@ private ColumnValues decodeColumn(QwpColumnDef def, int rowCount) {
23082308
case TYPE_LONG_ARRAY:
23092309
decodeLongArrays(values, nulls, valueCount);
23102310
break;
2311-
case TYPE_STRING:
23122311
case TYPE_VARCHAR:
23132312
decodeStrings(values, nulls, valueCount);
23142313
break;

0 commit comments

Comments
 (0)