-
Notifications
You must be signed in to change notification settings - Fork 741
feat(service/d1): Support d1 for opendal #3248
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.
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
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
6f5533d
feat(service/d1): Support d1 for opendal
ifmagic 0711473
refactor: optimize code
ifmagic f75c7a8
fix: delete extra code
ifmagic bbe1b49
fix: optimize code
ifmagic e8b3575
refactor: errors and get method
ifmagic bd98dea
fix: let clippy http
ifmagic e61c995
fix: let clippy happy
ifmagic File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,331 @@ | ||
| // Licensed to the Apache Software Foundation (ASF) under one | ||
| // or more contributor license agreements. See the NOTICE file | ||
| // distributed with this work for additional information | ||
| // regarding copyright ownership. The ASF licenses this file | ||
| // to you under the Apache License, Version 2.0 (the | ||
| // "License"); you may not use this file except in compliance | ||
| // with the License. You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, | ||
| // software distributed under the License is distributed on an | ||
| // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| // KIND, either express or implied. See the License for the | ||
| // specific language governing permissions and limitations | ||
| // under the License. | ||
|
|
||
| use std::collections::HashMap; | ||
| use std::fmt::Debug; | ||
| use std::fmt::Formatter; | ||
|
|
||
| use async_trait::async_trait; | ||
| use http::header; | ||
| use http::Request; | ||
| use http::StatusCode; | ||
| use serde_json::Value; | ||
|
|
||
| use crate::raw::adapters::kv; | ||
| use crate::raw::*; | ||
| use crate::ErrorKind; | ||
| use crate::*; | ||
|
|
||
| use super::error::parse_error; | ||
| use super::model::D1Response; | ||
|
|
||
| #[doc = include_str!("docs.md")] | ||
| #[derive(Default)] | ||
| pub struct D1Builder { | ||
| token: Option<String>, | ||
| account_id: Option<String>, | ||
| database_id: Option<String>, | ||
|
|
||
| http_client: Option<HttpClient>, | ||
| root: Option<String>, | ||
|
|
||
| table: Option<String>, | ||
| key_field: Option<String>, | ||
| value_field: Option<String>, | ||
| } | ||
|
|
||
| impl Debug for D1Builder { | ||
| fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result { | ||
| let mut ds = f.debug_struct("D1Builder"); | ||
| ds.field("root", &self.root); | ||
| ds.field("table", &self.table); | ||
| ds.field("key_field", &self.key_field); | ||
| ds.field("value_field", &self.value_field); | ||
| ds.finish() | ||
| } | ||
| } | ||
|
|
||
| impl D1Builder { | ||
| /// Set api token for the cloudflare d1 service. | ||
| /// | ||
| /// create a api token from [here](https://dash.cloudflare.com/profile/api-tokens) | ||
| pub fn token(&mut self, token: &str) -> &mut Self { | ||
| if !token.is_empty() { | ||
| self.token = Some(token.to_string()); | ||
| } | ||
| self | ||
| } | ||
|
|
||
| /// Set the account identifier for the cloudflare d1 service. | ||
| /// | ||
| /// get the account identifier from Workers & Pages -> Overview -> Account ID | ||
| /// If not specified, it will return an error when building. | ||
| pub fn account_id(&mut self, account_id: &str) -> &mut Self { | ||
| if !account_id.is_empty() { | ||
| self.account_id = Some(account_id.to_string()); | ||
| } | ||
| self | ||
| } | ||
|
|
||
| /// Set the database identifier for the cloudflare d1 service. | ||
| /// | ||
| /// get the database identifier from Workers & Pages -> D1 -> [Your Database] -> Database ID | ||
| /// If not specified, it will return an error when building. | ||
| pub fn database_id(&mut self, database_id: &str) -> &mut Self { | ||
| if !database_id.is_empty() { | ||
| self.database_id = Some(database_id.to_string()); | ||
| } | ||
| self | ||
| } | ||
|
|
||
| /// set the working directory, all operations will be performed under it. | ||
| /// | ||
| /// default: "/" | ||
| pub fn root(&mut self, root: &str) -> &mut Self { | ||
| if !root.is_empty() { | ||
| self.root = Some(root.to_owned()); | ||
| } | ||
| self | ||
| } | ||
|
|
||
| /// Set the table name of the d1 service to read/write. | ||
| /// | ||
| /// If not specified, it will return an error when building. | ||
| pub fn table(&mut self, table: &str) -> &mut Self { | ||
| if !table.is_empty() { | ||
| self.table = Some(table.to_owned()); | ||
| } | ||
| self | ||
| } | ||
|
|
||
| /// Set the key field name of the d1 service to read/write. | ||
| /// | ||
| /// Default to `key` if not specified. | ||
| pub fn key_field(&mut self, key_field: &str) -> &mut Self { | ||
| if !key_field.is_empty() { | ||
| self.key_field = Some(key_field.to_string()); | ||
| } | ||
| self | ||
| } | ||
|
|
||
| /// Set the value field name of the d1 service to read/write. | ||
| /// | ||
| /// Default to `value` if not specified. | ||
| pub fn value_field(&mut self, value_field: &str) -> &mut Self { | ||
| if !value_field.is_empty() { | ||
| self.value_field = Some(value_field.to_string()); | ||
| } | ||
| self | ||
| } | ||
| } | ||
|
|
||
| impl Builder for D1Builder { | ||
| const SCHEME: Scheme = Scheme::D1; | ||
| type Accessor = D1Backend; | ||
|
|
||
| fn from_map(map: HashMap<String, String>) -> Self { | ||
| let mut builder = D1Builder::default(); | ||
| map.get("token").map(|v| builder.token(v)); | ||
| map.get("account_id").map(|v| builder.account_id(v)); | ||
| map.get("database_id").map(|v| builder.database_id(v)); | ||
|
|
||
| map.get("root").map(|v| builder.root(v)); | ||
| map.get("table").map(|v| builder.table(v)); | ||
| map.get("key_field").map(|v| builder.key_field(v)); | ||
| map.get("value_field").map(|v| builder.value_field(v)); | ||
| builder | ||
| } | ||
|
|
||
| fn build(&mut self) -> Result<Self::Accessor> { | ||
| let mut authorization = None; | ||
| if let Some(token) = &self.token { | ||
| authorization = Some(format_authorization_by_bearer(token)?) | ||
| } | ||
|
|
||
| let Some(account_id) = self.account_id.clone() else { | ||
| return Err(Error::new( | ||
| ErrorKind::ConfigInvalid, | ||
| "account_id is required", | ||
| )); | ||
| }; | ||
|
|
||
| let Some(database_id) = self.database_id.clone() else { | ||
| return Err(Error::new( | ||
| ErrorKind::ConfigInvalid, | ||
| "database_id is required", | ||
| )); | ||
| }; | ||
|
|
||
| let client = if let Some(client) = self.http_client.take() { | ||
| client | ||
| } else { | ||
| HttpClient::new().map_err(|err| { | ||
| err.with_operation("Builder::build") | ||
| .with_context("service", Scheme::D1) | ||
| })? | ||
| }; | ||
|
|
||
| let Some(table) = self.table.clone() else { | ||
| return Err(Error::new(ErrorKind::ConfigInvalid, "table is required")); | ||
| }; | ||
|
|
||
| let key_field = self.key_field.clone().unwrap_or_else(|| "key".to_string()); | ||
|
|
||
| let value_field = self | ||
| .value_field | ||
| .clone() | ||
| .unwrap_or_else(|| "value".to_string()); | ||
|
|
||
| let root = normalize_root( | ||
| self.root | ||
| .clone() | ||
| .unwrap_or_else(|| "/".to_string()) | ||
| .as_str(), | ||
| ); | ||
| Ok(D1Backend::new(Adapter { | ||
| authorization, | ||
| account_id, | ||
| database_id, | ||
| client, | ||
| table, | ||
| key_field, | ||
| value_field, | ||
| }) | ||
| .with_root(&root)) | ||
| } | ||
| } | ||
|
|
||
| pub type D1Backend = kv::Backend<Adapter>; | ||
|
|
||
| #[derive(Clone)] | ||
| pub struct Adapter { | ||
| authorization: Option<String>, | ||
| account_id: String, | ||
| database_id: String, | ||
|
|
||
| client: HttpClient, | ||
| table: String, | ||
| key_field: String, | ||
| value_field: String, | ||
| } | ||
|
|
||
| impl Debug for Adapter { | ||
| fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result { | ||
| let mut ds = f.debug_struct("D1Adapter"); | ||
| ds.field("table", &self.table); | ||
| ds.field("key_field", &self.key_field); | ||
| ds.field("value_field", &self.value_field); | ||
| ds.finish() | ||
| } | ||
| } | ||
|
|
||
| impl Adapter { | ||
| fn create_d1_query_request(&self, sql: &str, params: Vec<Value>) -> Result<Request<AsyncBody>> { | ||
| let p = format!( | ||
| "/accounts/{}/d1/database/{}/query", | ||
| self.account_id, self.database_id | ||
| ); | ||
| let url: String = format!( | ||
| "{}{}", | ||
| "https://api.cloudflare.com/client/v4", | ||
| percent_encode_path(&p) | ||
| ); | ||
|
|
||
| let mut req = Request::post(&url); | ||
| if let Some(auth) = &self.authorization { | ||
| req = req.header(header::AUTHORIZATION, auth); | ||
| } | ||
| req = req.header(header::CONTENT_TYPE, "application/json"); | ||
|
|
||
| let json = serde_json::json!({ | ||
| "sql": sql, | ||
| "params": params, | ||
| }); | ||
|
|
||
| let body = serde_json::to_vec(&json).map_err(new_json_serialize_error)?; | ||
| req.body(AsyncBody::Bytes(body.into())) | ||
| .map_err(new_request_build_error) | ||
| } | ||
| } | ||
|
|
||
| #[async_trait] | ||
| impl kv::Adapter for Adapter { | ||
| fn metadata(&self) -> kv::Metadata { | ||
| kv::Metadata::new( | ||
| Scheme::D1, | ||
| &self.table, | ||
| Capability { | ||
| read: true, | ||
| write: true, | ||
| ..Default::default() | ||
| }, | ||
| ) | ||
| } | ||
|
|
||
| async fn get(&self, path: &str) -> Result<Option<Vec<u8>>> { | ||
| let query = format!( | ||
| "SELECT {} FROM {} WHERE {} = ? LIMIT 1", | ||
| self.value_field, self.table, self.key_field | ||
| ); | ||
| let req = self.create_d1_query_request(&query, vec![path.into()])?; | ||
|
|
||
| let resp = self.client.send(req).await?; | ||
| let status = resp.status(); | ||
| match status { | ||
| StatusCode::OK | StatusCode::PARTIAL_CONTENT => { | ||
| let body = resp.into_body().bytes().await?; | ||
| let d1_response = D1Response::parse(&body)?; | ||
| Ok(d1_response.get_result(&self.value_field)) | ||
| } | ||
| _ => Err(parse_error(resp).await?), | ||
| } | ||
| } | ||
|
|
||
| async fn set(&self, path: &str, value: &[u8]) -> Result<()> { | ||
| let table = &self.table; | ||
| let key_field = &self.key_field; | ||
| let value_field = &self.value_field; | ||
| let query = format!( | ||
| "INSERT INTO {table} ({key_field}, {value_field}) \ | ||
| VALUES (?, ?) \ | ||
| ON CONFLICT ({key_field}) \ | ||
| DO UPDATE SET {value_field} = EXCLUDED.{value_field}", | ||
| ); | ||
|
|
||
| let params = vec![path.into(), value.into()]; | ||
| let req = self.create_d1_query_request(&query, params)?; | ||
|
|
||
| let resp = self.client.send(req).await?; | ||
| let status = resp.status(); | ||
| match status { | ||
| StatusCode::OK | StatusCode::PARTIAL_CONTENT => Ok(()), | ||
| _ => Err(parse_error(resp).await?), | ||
| } | ||
| } | ||
|
|
||
| async fn delete(&self, path: &str) -> Result<()> { | ||
| let query = format!("DELETE FROM {} WHERE {} = ?", self.table, self.key_field); | ||
| let req = self.create_d1_query_request(&query, vec![path.into()])?; | ||
|
|
||
| let resp = self.client.send(req).await?; | ||
| let status = resp.status(); | ||
| match status { | ||
| StatusCode::OK | StatusCode::PARTIAL_CONTENT => Ok(()), | ||
| _ => Err(parse_error(resp).await?), | ||
| } | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.