Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: json type support #52

Merged
merged 1 commit into from
Nov 4, 2024
Merged

feat: json type support #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ingester-protocol/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<artifactId>ingester-protocol</artifactId>

<properties>
<greptimedb.proto.version>0.7.0</greptimedb.proto.version>
<greptimedb.proto.version>0.9.0</greptimedb.proto.version>
</properties>

<dependencies>
Expand Down
3 changes: 3 additions & 0 deletions ingester-protocol/src/main/java/io/greptime/models/DataType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ public enum DataType {
IntervalDayTime,
IntervalMonthDayNano,
Decimal128,
Json,
;

public boolean isTimestamp() {
Expand Down Expand Up @@ -115,6 +116,8 @@ public Common.ColumnDataType toProtoValue() {
return Common.ColumnDataType.INTERVAL_MONTH_DAY_NANO;
case Decimal128:
return Common.ColumnDataType.DECIMAL128;
case Json:
return Common.ColumnDataType.JSON;
default:
return null;
}
Expand Down
1 change: 1 addition & 0 deletions ingester-protocol/src/main/java/io/greptime/models/RowHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ public static void addValue(
valueBuilder.setBinaryValue(UnsafeByteOperations.unsafeWrap((byte[]) value));
break;
case STRING:
case JSON:
valueBuilder.setStringValue((String) value);
break;
case DATE:
Expand Down
7 changes: 4 additions & 3 deletions ingester-protocol/src/test/java/io/greptime/WriteClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,14 +96,15 @@ public void testWriteSuccess() throws ExecutionException, InterruptedException {
.addField("field24", DataType.IntervalDayTime)
.addField("field25", DataType.IntervalMonthDayNano)
.addField("field26", DataType.Decimal128)
.addField("field27", DataType.Json)
.build();
Table table = Table.from(schema);
long ts = System.currentTimeMillis();

// spotless:off
Object[] row1 = new Object[]{"tag1", ts, 1, 2, 3, 4L, 5, 6, 7, 8L, 0.9F, 0.10D, true, new byte[0], 13L, 14L, 15L, 16L, 17L, 18L, 19L, 20L, 21L, 22L, 23, 24L, new IntervalMonthDayNano(1, 2, 3), BigDecimal.valueOf(123.456)};
Object[] row2 = new Object[]{"tag2", ts, 1, 2, 3, 4L, 5, 6, 7, 8L, 0.9F, 0.10D, true, new byte[0], 13L, 14L, 15L, 16L, 17L, 18L, 19L, 20L, 21L, 22L, 23, 24L, new IntervalMonthDayNano(4, 5, 6), BigDecimal.valueOf(123.456)};
Object[] row3 = new Object[]{"tag3", ts, 1, 2, 3, 4L, 5, 6, 7, 8L, 0.9F, 0.10D, true, new byte[0], 13L, 14L, 15L, 16L, 17L, 18L, 19L, 20L, 21L, 22L, 23, 24L, new IntervalMonthDayNano(7, 8, 9), BigDecimal.valueOf(123.456)};
Object[] row1 = new Object[]{"tag1", ts, 1, 2, 3, 4L, 5, 6, 7, 8L, 0.9F, 0.10D, true, new byte[0], 13L, 14L, 15L, 16L, 17L, 18L, 19L, 20L, 21L, 22L, 23, 24L, new IntervalMonthDayNano(1, 2, 3), BigDecimal.valueOf(123.456), "{\"a\": 1}"};
Object[] row2 = new Object[]{"tag2", ts, 1, 2, 3, 4L, 5, 6, 7, 8L, 0.9F, 0.10D, true, new byte[0], 13L, 14L, 15L, 16L, 17L, 18L, 19L, 20L, 21L, 22L, 23, 24L, new IntervalMonthDayNano(4, 5, 6), BigDecimal.valueOf(123.456), "{\"b\": 2}"};
Object[] row3 = new Object[]{"tag3", ts, 1, 2, 3, 4L, 5, 6, 7, 8L, 0.9F, 0.10D, true, new byte[0], 13L, 14L, 15L, 16L, 17L, 18L, 19L, 20L, 21L, 22L, 23, 24L, new IntervalMonthDayNano(7, 8, 9), BigDecimal.valueOf(123.456), "{\"c\": 3}"};
// spotless:on

table.addRow(row1);
Expand Down