rust/greptimedb
1
0
Fork 0
mirror of https://github.com/GreptimeTeam/greptimedb.git synced 2026-01-08 06:12:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: further ease the restriction of executing SQLs in new GRPC interface (#797)

Browse Source 
* fix: carry not recordbatch result in FlightData, to allow executing SQLs other than selection in new GRPC interface

* Update src/datanode/src/instance/flight/stream.rs

Co-authored-by: Jiachun Feng <jiachun_feng@proton.me>
This commit is contained in:
LFC
2022-12-28 16:43:21 +08:00
committed by GitHub
parent 76236646ef
commit 04df80e640
22 changed files with 257 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
tests/runner/src/env.rs
View File

@@ -18,8 +18,9 @@ use std::process::Stdio;
use std::time::Duration;
use async_trait::async_trait;
use client::{Client, Database as DB, Error as ClientError, ObjectResult, Select};
use client::{Client, Database as DB, Error as ClientError, ObjectResult};
use common_grpc::flight;
use common_grpc::flight::FlightMessage;
use sqlness::{Database, Environment};
use tokio::process::{Child, Command};
@@ -112,8 +113,7 @@ pub struct GreptimeDB {
#[async_trait]
impl Database for GreptimeDB {
async fn query(&self, query: String) -> Box<dyn Display> {
let sql = Select::Sql(query);
let result = self.db.select(sql).await;
let result = self.db.sql(&query).await;
Box::new(ResultDisplayer { result }) as _
}
}
@@ -130,12 +130,19 @@ impl Display for ResultDisplayer {
write!(f, "{mutate_result:?}")
}
ObjectResult::FlightData(messages) => {
let pretty = flight::flight_messages_to_recordbatches(messages.clone())
.map_err(|e| e.to_string())
.and_then(|x| x.pretty_print().map_err(|e| e.to_string()));
match pretty {
Ok(s) => write!(f, "{s}"),
Err(e) => write!(f, "format result error: {e}"),
if let Some(FlightMessage::AffectedRows(rows)) = messages.get(0) {
write!(f, "Affected Rows: {rows}")
} else {
let pretty = flight::flight_messages_to_recordbatches(messages.clone())
.map_err(|e| e.to_string())
.and_then(|x| x.pretty_print().map_err(|e| e.to_string()));
match pretty {
Ok(s) => write!(f, "{s}"),
Err(e) => write!(
f,
"Failed to convert Flight messages {messages:?} to Recordbatches, error: {e}"
),
}
}
}
},