Skip to content

feat: Nested Type String Support Double Quoting #732

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

Merged
sundy-li merged 5 commits into from
Dec 29, 2025
Merged

feat: Nested Type String Support Double Quoting #732

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6fb176d
feat: Nested Type String Support Double Quoting
b41sh Dec 26, 2025
4e5abab
fix
b41sh Dec 26, 2025
ec516f1
fix
b41sh Dec 26, 2025
936afbc
fix arrow decoder
b41sh Dec 26, 2025
befb5de
fix
b41sh Dec 26, 2025
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
6 changes: 3 additions & 3 deletions cli/tests/00-base.result
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ Asia/Shanghai
1 1.00
2 2.00
2
[1,2,3] NULL (1,'ab')
NULL {'k1':'v1','k2':'v2'} (2,NULL)
[1,2,3] NULL "(1,""ab"")"
NULL "{""k1"":""v1"",""k2"":""v2""}" (2,NULL)
1 NULL 1 ab
NULL v1 2 NULL
{'k1':'v1','k2':'v2'} [6162,78797A] ('[1,2]','2024-04-10')
"{""k1"":""v1"",""k2"":""v2""}" [6162,78797A] "([1,2],""2024-04-10"")"
bye
2 changes: 1 addition & 1 deletion sql/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@ memchr = "2.7"
roaring = { version = "0.10.12", features = ["serde"] }
jiff = { workspace = true }
serde = { version = "1.0", default-features = false, features = ["derive"] }
serde_json = { version = "1.0", default-features = false, features = ["std"] }
serde_json = { version = "1.0", default-features = false, features = ["std", "raw_value"] }
url = { version = "2.5", default-features = false }
25 changes: 15 additions & 10 deletions sql/src/value/format/display.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,32 +64,37 @@ impl Value {
}
Value::Number(n) => write!(f, "{n}"),
Value::Binary(s) => write!(f, "{}", hex::encode_upper(s)),
Value::String(s)
| Value::Bitmap(s)
| Value::Variant(s)
| Value::Interval(s)
| Value::Geometry(s)
| Value::Geography(s) => {
Value::String(s) | Value::Bitmap(s) | Value::Interval(s) => {
if raw {
write!(f, "{s}")
} else {
write!(f, "'{s}'")
write!(f, "\"{s}\"")
}
}
Value::Variant(s) => {
write!(f, "{s}")
}
Value::Geometry(s) | Value::Geography(s) => {
if raw || s.starts_with('{') {
write!(f, "{s}")
} else {
write!(f, "\"{s}\"")
}
}
Value::Timestamp(dt) => {
let formatted = dt.strftime(TIMESTAMP_FORMAT);
if raw {
write!(f, "{formatted}")
} else {
write!(f, "'{formatted}'")
write!(f, "\"{formatted}\"")
}
}
Value::TimestampTz(dt) => {
let formatted = dt.strftime(TIMESTAMP_TIMEZONE_FORMAT);
if raw {
write!(f, "{formatted}")
} else {
write!(f, "'{formatted}'")
write!(f, "\"{formatted}\"")
}
}
Value::Date(i) => {
Expand All @@ -98,7 +103,7 @@ impl Value {
if raw {
write!(f, "{d}")
} else {
write!(f, "'{d}'")
write!(f, "\"{d}\"")
}
}
Value::Array(vals) => {
Expand Down
25 changes: 15 additions & 10 deletions sql/src/value/format/result_encode.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,14 +81,19 @@ impl Value {
}
},
Value::Binary(s) => bytes.extend_from_slice(hex::encode_upper(s).as_bytes()),
Value::String(s)
| Value::Bitmap(s)
| Value::Variant(s)
| Value::Interval(s)
| Value::Geometry(s)
| Value::Geography(s) => {
Value::String(s) | Value::Bitmap(s) | Value::Interval(s) => {
Self::write_string(bytes, s, raw);
}
Value::Variant(s) => {
bytes.extend_from_slice(s.as_bytes());
}
Value::Geometry(s) | Value::Geography(s) => {
if s.starts_with('{') {
bytes.extend_from_slice(s.as_bytes());
} else {
Self::write_string(bytes, s, raw);
}
}
Value::Timestamp(dt) => {
let s = dt.strftime(TIMESTAMP_FORMAT).to_string();
Self::write_string(bytes, &s, raw);
Expand Down Expand Up @@ -150,9 +155,9 @@ impl Value {

fn write_string(bytes: &mut Vec<u8>, string: &String, raw: bool) {
if !raw {
bytes.push(b'\'');
write_quoted_string_min_escape(string.as_bytes(), bytes, b'\'');
bytes.push(b'\'');
bytes.push(b'"');
write_quoted_string_min_escape(string.as_bytes(), bytes, b'"');
bytes.push(b'"');
} else {
bytes.extend_from_slice(string.as_bytes());
}
Expand Down Expand Up @@ -202,7 +207,7 @@ fn write_quoted_string_min_escape(bytes: &[u8], buf: &mut Vec<u8>, quote: u8) {
if start < i {
buf.extend_from_slice(&bytes[start..i]);
}
buf.push(quote);
buf.push(b'\\');
buf.push(quote);
start = i + 1;
}
Expand Down
59 changes: 48 additions & 11 deletions sql/src/value/string_decoder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ use databend_client::schema::{DataType, DecimalDataType, DecimalSize, NumberData
use ethnum::i256;
use hex;
use jiff::{civil::DateTime as JiffDateTime, tz::TimeZone, Zoned};
use serde::Deserialize;
use serde_json::{value::RawValue, Deserializer};
use std::io::{BufRead, Cursor};
use std::str::FromStr;

Expand Down Expand Up @@ -281,7 +283,9 @@ impl ValueDecoder {

fn read_string<R: AsRef<[u8]>>(&self, reader: &mut Cursor<R>) -> Result<Value> {
let mut buf = Vec::new();
reader.read_quoted_text(&mut buf, b'\'')?;
if reader.read_quoted_text(&mut buf, b'"').is_err() {
reader.read_quoted_text(&mut buf, b'\'')?;
}
Ok(Value::String(unsafe { String::from_utf8_unchecked(buf) }))
}

Expand All @@ -295,54 +299,78 @@ impl ValueDecoder {

fn read_date<R: AsRef<[u8]>>(&self, reader: &mut Cursor<R>) -> Result<Value> {
let mut buf = Vec::new();
reader.read_quoted_text(&mut buf, b'\'')?;
if reader.read_quoted_text(&mut buf, b'"').is_err() {
reader.read_quoted_text(&mut buf, b'\'')?;
}
let v = unsafe { std::str::from_utf8_unchecked(&buf) };
let days = NaiveDate::parse_from_str(v, "%Y-%m-%d")?.num_days_from_ce() - DAYS_FROM_CE;
Ok(Value::Date(days))
}

fn read_timestamp<R: AsRef<[u8]>>(&self, reader: &mut Cursor<R>) -> Result<Value> {
let mut buf = Vec::new();
reader.read_quoted_text(&mut buf, b'\'')?;
if reader.read_quoted_text(&mut buf, b'"').is_err() {
reader.read_quoted_text(&mut buf, b'\'')?;
}
let v = unsafe { std::str::from_utf8_unchecked(&buf) };
parse_timestamp(v, &self.timezone)
}

fn read_timestamp_tz<R: AsRef<[u8]>>(&self, reader: &mut Cursor<R>) -> Result<Value> {
let mut buf = Vec::new();
reader.read_quoted_text(&mut buf, b'\'')?;
if reader.read_quoted_text(&mut buf, b'"').is_err() {
reader.read_quoted_text(&mut buf, b'\'')?;
}
let v = unsafe { std::str::from_utf8_unchecked(&buf) };
let t = Zoned::strptime(TIMESTAMP_TIMEZONE_FORMAT, v)?;
Ok(Value::TimestampTz(t))
}

fn read_interval<R: AsRef<[u8]>>(&self, reader: &mut Cursor<R>) -> Result<Value> {
let mut buf = Vec::new();
reader.read_quoted_text(&mut buf, b'\'')?;
if reader.read_quoted_text(&mut buf, b'"').is_err() {
reader.read_quoted_text(&mut buf, b'\'')?;
}
Ok(Value::Interval(unsafe { String::from_utf8_unchecked(buf) }))
}

fn read_bitmap<R: AsRef<[u8]>>(&self, reader: &mut Cursor<R>) -> Result<Value> {
let mut buf = Vec::new();
reader.read_quoted_text(&mut buf, b'\'')?;
if reader.read_quoted_text(&mut buf, b'"').is_err() {
reader.read_quoted_text(&mut buf, b'\'')?;
}
Ok(Value::Bitmap(unsafe { String::from_utf8_unchecked(buf) }))
}

fn read_variant<R: AsRef<[u8]>>(&self, reader: &mut Cursor<R>) -> Result<Value> {
let mut buf = Vec::new();
reader.read_quoted_text(&mut buf, b'\'')?;
Ok(Value::Variant(unsafe { String::from_utf8_unchecked(buf) }))
if let Ok(val) = self.read_json(reader) {
Ok(Value::Variant(val))
} else {
let mut buf = Vec::new();
reader.read_quoted_text(&mut buf, b'\'')?;
Ok(Value::Variant(unsafe { String::from_utf8_unchecked(buf) }))
}
}

fn read_geometry<R: AsRef<[u8]>>(&self, reader: &mut Cursor<R>) -> Result<Value> {
let mut buf = Vec::new();
reader.read_quoted_text(&mut buf, b'\'')?;
if reader.read_quoted_text(&mut buf, b'"').is_err() {
if let Ok(val) = self.read_json(reader) {
return Ok(Value::Variant(val));
}
reader.read_quoted_text(&mut buf, b'\'')?;
}
Ok(Value::Geometry(unsafe { String::from_utf8_unchecked(buf) }))
}

fn read_geography<R: AsRef<[u8]>>(&self, reader: &mut Cursor<R>) -> Result<Value> {
let mut buf = Vec::new();
reader.read_quoted_text(&mut buf, b'\'')?;
if reader.read_quoted_text(&mut buf, b'"').is_err() {
if let Ok(val) = self.read_json(reader) {
return Ok(Value::Variant(val));
}
reader.read_quoted_text(&mut buf, b'\'')?;
}
Ok(Value::Geography(unsafe {
String::from_utf8_unchecked(buf)
}))
Expand Down Expand Up @@ -457,6 +485,15 @@ impl ValueDecoder {
reader.must_ignore_byte(b')')?;
Ok(Value::Tuple(vals))
}

fn read_json<R: AsRef<[u8]>>(&self, reader: &mut Cursor<R>) -> Result<String> {
let start = reader.position() as usize;
let data = reader.get_ref().as_ref();
let mut deserializer = Deserializer::from_slice(&data[start..]);
let raw: Box<RawValue> = Box::<RawValue>::deserialize(&mut deserializer)?;
reader.set_position((start + raw.get().len()) as u64);
Ok(raw.to_string())
}
}

fn parse_timestamp(ts_string: &str, tz: &TimeZone) -> Result<Value> {
Expand Down
Loading