Skip to content

Q
Questdb

jobily / Questdb
11 个月 前同步成功

通知 1
Star 0
Fork 0
Q
Questdb

体验新版 GitCode，发现更多精彩内容 >>

未验证 提交 762a0d77 编写于 作者: A Andrey Pechkurov 提交者： GitHub
浏览文件
操作

fix(ilp): boolean to number conversion for TCP (#1418) 

Boolean to number conversion was only supported for long fields in ILP over TCP. This commit extends the conversion to support other numeric types: byte, short, int, float, double.

Also fixes Boolean format (single byte) being used when writing converted Boolean values on disk.

Important note: this is a potentially breaking change.
上级 e12b1654
显示空白变更内容
内联 并排
Showing with 85 addition and 22 deletion
core/src/main/java/io/questdb/cairo/ColumnType.java
浏览文件 @ 762a0d77
......@@ -162,10 +162,6 @@ public final class ColumnType {
return columnType == ColumnType.INT;
}
public static boolean isLong(int columnType) {
return columnType == ColumnType.LONG;
}
public static boolean isNull(int columnType) {
return columnType == NULL;
}
......
core/src/main/java/io/questdb/cutlass/line/tcp/LineTcpMeasurementScheduler.java
浏览文件 @ 762a0d77
......@@ -823,9 +823,36 @@ class LineTcpMeasurementScheduler implements Closeable {
byte b = Unsafe.getUnsafe().getByte(bufPos);
bufPos += Byte.BYTES;
final int colType = writer.getMetadata().getColumnType(colIndex);
if (ColumnType.isBoolean(colType) || ColumnType.isLong(colType)) {
switch (ColumnType.tagOf(colType)) {
case ColumnType.BOOLEAN:
row.putBool(colIndex, b == 1);
} else {
break;
case ColumnType.BYTE:
row.putByte(colIndex, b);
break;
case ColumnType.SHORT:
row.putShort(colIndex, b);
break;
case ColumnType.INT:
row.putInt(colIndex, b);
break;
case ColumnType.LONG:
row.putLong(colIndex, b);
break;
case ColumnType.FLOAT:
row.putFloat(colIndex, b);
break;
case ColumnType.DOUBLE:
row.putDouble(colIndex, b);
break;
default:
throw CairoException.instance(0)
.put("cast error for line protocol boolean [columnIndex=").put(colIndex)
.put(", columnType=").put(ColumnType.nameOf(colType))
......
core/src/test/java/io/questdb/cutlass/line/tcp/LineTcpInsertOtherTypesTest.java
浏览文件 @ 762a0d77
......@@ -186,7 +186,9 @@ public class LineTcpInsertOtherTypesTest extends BaseLineTcpContextTest {
"2147483647\t1970-01-01T00:00:07.000000Z\n" +
"-2147483647\t1970-01-01T00:00:08.000000Z\n" +
"NaN\t1970-01-01T00:00:11.000000Z\n" +
"NaN\t1970-01-01T00:00:19.000000Z\n",
"1\t1970-01-01T00:00:14.000000Z\n" +
"0\t1970-01-01T00:00:15.000000Z\n" +
"NaN\t1970-01-01T00:00:21.000000Z\n",
new CharSequence[]{
"0i", // valid
"100i", // valid
......@@ -198,9 +200,11 @@ public class LineTcpInsertOtherTypesTest extends BaseLineTcpContextTest {
"-2147483647i", // valid
"0", // discarded bad type double
"100", // discarded bad type double
"-2147483648i", // discarded out of range
"-2147483648i", // valid NaN same as null
"-2147483648", // discarded out of range
"null", // discarded bad type symbol
"true", // valid, true casts down to 1
"false", // valid, true casts down to 0
"-0", // discarded bad type double
"-100", // discarded bad type double
"2147483647", // discarded bad type double
......@@ -223,7 +227,9 @@ public class LineTcpInsertOtherTypesTest extends BaseLineTcpContextTest {
"2147483647\t1970-01-01T00:00:07.000000Z\n" +
"-2147483647\t1970-01-01T00:00:08.000000Z\n" +
"-2147483648\t1970-01-01T00:00:11.000000Z\n" +
"NaN\t1970-01-01T00:00:19.000000Z\n",
"NaN\t1970-01-01T00:00:19.000000Z\n" +
"1\t1970-01-01T00:00:21.000000Z\n" +
"0\t1970-01-01T00:00:22.000000Z\n",
new CharSequence[]{
"0i", // valid
"100i", // valid
......@@ -245,6 +251,8 @@ public class LineTcpInsertOtherTypesTest extends BaseLineTcpContextTest {
"NaN", // discarded bad type symbol
"", // valid null
"0t", // discarded bad type timestamp
"true", // valid, true casts down to 1
"false", // valid, true casts down to 0
});
}
......@@ -259,7 +267,9 @@ public class LineTcpInsertOtherTypesTest extends BaseLineTcpContextTest {
"32767\t1970-01-01T00:00:05.000000Z\n" +
"-32767\t1970-01-01T00:00:06.000000Z\n" +
"0\t1970-01-01T00:00:08.000000Z\n" +
"0\t1970-01-01T00:00:19.000000Z\n",
"0\t1970-01-01T00:00:19.000000Z\n" +
"1\t1970-01-01T00:00:21.000000Z\n" +
"0\t1970-01-01T00:00:22.000000Z\n",
new CharSequence[]{
"0i", // valid
"100i", // valid
......@@ -281,6 +291,8 @@ public class LineTcpInsertOtherTypesTest extends BaseLineTcpContextTest {
"NaN", // discarded bad type symbol
"", // valid null
"0t", // discarded bad type timestamp
"true", // valid, true casts down to 1
"false", // valid, true casts down to 0
});
}
......@@ -295,7 +307,9 @@ public class LineTcpInsertOtherTypesTest extends BaseLineTcpContextTest {
"-32767\t1970-01-01T00:00:06.000000Z\n" +
"-2147483648\t1970-01-01T00:00:08.000000Z\n" +
"2147483648\t1970-01-01T00:00:09.000000Z\n" +
"NaN\t1970-01-01T00:00:15.000000Z\n",
"NaN\t1970-01-01T00:00:15.000000Z\n" +
"1\t1970-01-01T00:00:17.000000Z\n" +
"0\t1970-01-01T00:00:18.000000Z\n",
new CharSequence[]{
"0i", // valid, taken as long, no way to make a short
"100i", // valid
......@@ -313,6 +327,8 @@ public class LineTcpInsertOtherTypesTest extends BaseLineTcpContextTest {
"NaN", // discarded bad type symbol
"", // valid null
"0t", // discarded bad type timestamp
"true", // valid, true casts down to 1
"false", // valid, true casts down to 0
});
}
......@@ -326,7 +342,9 @@ public class LineTcpInsertOtherTypesTest extends BaseLineTcpContextTest {
"-100\t1970-01-01T00:00:04.000000Z\n" +
"127\t1970-01-01T00:00:05.000000Z\n" +
"-128\t1970-01-01T00:00:06.000000Z\n" +
"0\t1970-01-01T00:00:14.000000Z\n",
"0\t1970-01-01T00:00:14.000000Z\n" +
"1\t1970-01-01T00:00:16.000000Z\n" +
"0\t1970-01-01T00:00:17.000000Z\n",
new CharSequence[]{
"0i", // valid
"100i", // valid
......@@ -343,6 +361,8 @@ public class LineTcpInsertOtherTypesTest extends BaseLineTcpContextTest {
"NaN", // discarded bad type symbol
"", // valid null
"0t", // discarded bad type timestamp
"true", // valid, true casts down to 1
"false", // valid, true casts down to 0
});
}
......@@ -356,7 +376,9 @@ public class LineTcpInsertOtherTypesTest extends BaseLineTcpContextTest {
"127\t1970-01-01T00:00:05.000000Z\n" +
"-2147483648\t1970-01-01T00:00:06.000000Z\n" +
"-127\t1970-01-01T00:00:07.000000Z\n" +
"NaN\t1970-01-01T00:00:13.000000Z\n",
"NaN\t1970-01-01T00:00:13.000000Z\n" +
"1\t1970-01-01T00:00:15.000000Z\n" +
"0\t1970-01-01T00:00:16.000000Z\n",
new CharSequence[]{
"0i", // valid, taken as long, no way to make a short
"100i", // valid
......@@ -372,6 +394,8 @@ public class LineTcpInsertOtherTypesTest extends BaseLineTcpContextTest {
"NaN", // discarded bad type symbol
"", // valid null
"0t", // discarded bad type timestamp
"true", // valid, true casts down to 1
"false", // valid, true casts down to 0
});
}
......@@ -641,7 +665,9 @@ public class LineTcpInsertOtherTypesTest extends BaseLineTcpContextTest {
"123.0\t1970-01-01T00:00:16.000000Z\n" +
"-123.0\t1970-01-01T00:00:17.000000Z\n" +
"NaN\t1970-01-01T00:00:18.000000Z\n" +
"NaN\t1970-01-01T00:00:19.000000Z\n",
"NaN\t1970-01-01T00:00:19.000000Z\n" +
"1.0\t1970-01-01T00:00:21.000000Z\n" +
"0.0\t1970-01-01T00:00:22.000000Z\n",
new CharSequence[]{
"1.6x", // discarded bad type symbol
"1.7976931348623157E308", // valid
......@@ -663,6 +689,8 @@ public class LineTcpInsertOtherTypesTest extends BaseLineTcpContextTest {
"NaN", // valid null
"", // valid null
"0t", // discarded bad type timestamp
"true", // valid, true casts down to 1.0
"false", // valid, true casts down to 0.0
});
}
......@@ -685,7 +713,9 @@ public class LineTcpInsertOtherTypesTest extends BaseLineTcpContextTest {
"123.0\t1970-01-01T00:00:16.000000Z\n" +
"-123.0\t1970-01-01T00:00:17.000000Z\n" +
"NaN\t1970-01-01T00:00:18.000000Z\n" +
"NaN\t1970-01-01T00:00:19.000000Z\n",
"NaN\t1970-01-01T00:00:19.000000Z\n" +
"1.0\t1970-01-01T00:00:21.000000Z\n" +
"0.0\t1970-01-01T00:00:22.000000Z\n",
new CharSequence[]{
"1.7976931348623156E308", // valid
"0.425667788123", // valid
......@@ -707,6 +737,8 @@ public class LineTcpInsertOtherTypesTest extends BaseLineTcpContextTest {
"NaN", // valid null
"", // valid null
"0t", // discarded bad type timestamp
"true", // valid, true casts down to 1.0
"false", // valid, true casts down to 0.0
});
}
......@@ -729,7 +761,9 @@ public class LineTcpInsertOtherTypesTest extends BaseLineTcpContextTest {
"-123.0000\t1970-01-01T00:00:14.000000Z\n" +
"NaN\t1970-01-01T00:00:15.000000Z\n" +
"NaN\t1970-01-01T00:00:16.000000Z\n" +
"NaN\t1970-01-01T00:00:17.000000Z\n",
"NaN\t1970-01-01T00:00:17.000000Z\n" +
"1.0000\t1970-01-01T00:00:20.000000Z\n" +
"0.0000\t1970-01-01T00:00:21.000000Z\n",
new CharSequence[]{
"0.425667788123", // valid
"3.14159265358979323846", // valid
......@@ -750,6 +784,8 @@ public class LineTcpInsertOtherTypesTest extends BaseLineTcpContextTest {
"NaN", // valid null
"1.6x", // discarded bad type symbol
"0t", // discarded bad type timestamp
"true", // valid, true casts down to 1.0
"false", // valid, true casts down to 0.0
});
}
......@@ -770,7 +806,9 @@ public class LineTcpInsertOtherTypesTest extends BaseLineTcpContextTest {
"123.0\t1970-01-01T00:00:13.000000Z\n" +
"-123.0\t1970-01-01T00:00:14.000000Z\n" +
"NaN\t1970-01-01T00:00:15.000000Z\n" +
"NaN\t1970-01-01T00:00:16.000000Z\n",
"NaN\t1970-01-01T00:00:16.000000Z\n" +
"1.0\t1970-01-01T00:00:19.000000Z\n" +
"0.0\t1970-01-01T00:00:20.000000Z\n",
new CharSequence[]{
"0.425667788123", // valid, but interpreted as double, cannot make float columns
"3.14159265358979323846", // valid
......@@ -790,6 +828,8 @@ public class LineTcpInsertOtherTypesTest extends BaseLineTcpContextTest {
"", // valid null
"1.6x", // discarded bad type symbol
"0t", // discarded bad type timestamp
"true", // valid, true casts down to 1.0
"false", // valid, true casts down to 0.0
});
}
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或