Skip to content

Commit

Permalink
feat: add json datatype for grpc protocol (#4897)
Browse files Browse the repository at this point in the history
* chore: update greptime-proto

* feat: add json datatype for grpc protocol
  • Loading branch information
WenyXu authored Oct 29, 2024
1 parent 702a55a commit 9ded314
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ etcd-client = { version = "0.13" }
fst = "0.4.7"
futures = "0.3"
futures-util = "0.3"
greptime-proto = { git = "https://github.com/GreptimeTeam/greptime-proto.git", rev = "fc45ac4cce7e91c9438c2e5a497a4d99531397f1" }
greptime-proto = { git = "https://github.com/GreptimeTeam/greptime-proto.git", rev = "9faf45e8bd83cba106ddfb09bba85784bf9ade2a" }
humantime = "2.1"
humantime-serde = "1.1"
itertools = "0.10"
Expand Down
5 changes: 5 additions & 0 deletions src/api/src/helper.rs
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ impl From<ColumnDataTypeWrapper> for ConcreteDataType {
ConcreteDataType::binary_datatype()
}
}
ColumnDataType::Json => ConcreteDataType::json_datatype(),
ColumnDataType::String => ConcreteDataType::string_datatype(),
ColumnDataType::Date => ConcreteDataType::date_datatype(),
ColumnDataType::Datetime => ConcreteDataType::datetime_datatype(),
Expand Down Expand Up @@ -417,6 +418,10 @@ pub fn values_with_capacity(datatype: ColumnDataType, capacity: usize) -> Values
decimal128_values: Vec::with_capacity(capacity),
..Default::default()
},
ColumnDataType::Json => Values {
string_values: Vec::with_capacity(capacity),
..Default::default()
},
}
}

Expand Down
1 change: 1 addition & 0 deletions src/operator/src/req_convert/common.rs
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ fn push_column_to_rows(column: Column, rows: &mut [Row]) -> Result<()> {
(Float64, F64Value, f64_values),
(Binary, BinaryValue, binary_values),
(String, StringValue, string_values),
(Json, StringValue, string_values),
(Date, DateValue, date_values),
(Datetime, DatetimeValue, datetime_values),
(
Expand Down

0 comments on commit 9ded314

Please sign in to comment.