Skip to content

Commit 1cc158a

Browse files
authored
Merge branch 'main' into dev/xinli/select-list-stage
2 parents d1e71ec + 9e554b4 commit 1cc158a

File tree

102 files changed

+2590
-1145
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+2590
-1145
lines changed

Cargo.lock

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/doc/13-sql-reference/20-system-tables/system-configs.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,6 @@ mysql> SELECT * FROM system.configs;
4343
| query | management_mode | false | |
4444
| query | jwt_key_file | | |
4545
| query | jwt_key_files | | |
46-
| query | async_insert_max_data_size | 10000 | |
47-
| query | async_insert_busy_timeout | 200 | |
48-
| query | async_insert_stale_timeout | 0 | |
4946
| query | users | | |
5047
| query | share_endpoint_address | | |
5148
| query | share_endpoint_auth_token_file | | |

docs/doc/90-contributing/01-rfcs/20220602-async-insert.md

Lines changed: 0 additions & 139 deletions
This file was deleted.

src/binaries/opensharing/main.rs

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,27 @@ use poem::EndpointExt;
1818
use poem::Route;
1919
use poem::Server;
2020
use sharing_endpoint::configs::Config;
21-
use sharing_endpoint::handlers::presign_files;
21+
use sharing_endpoint::handlers::share_table_meta;
22+
use sharing_endpoint::handlers::share_table_presign_files;
2223
use sharing_endpoint::middlewares::SharingAuth;
2324
use sharing_endpoint::services::SharingServices;
25+
2426
#[tokio::main]
2527
async fn main() -> Result<(), std::io::Error> {
2628
let config = Config::load().expect("cfgs");
2729
SharingServices::init(config.clone())
2830
.await
2931
.expect("failed to init sharing service");
3032
let app = Route::new()
33+
// handler for share table presign
3134
.at(
3235
"/tenant/:tenant_id/:share_name/table/:table_name/presign",
33-
poem::post(presign_files),
36+
poem::post(share_table_presign_files),
37+
)
38+
// handler for accessing share table meta
39+
.at(
40+
"/tenant/:tenant_id/:share_name/meta",
41+
poem::post(share_table_meta),
3442
)
3543
.with(SharingAuth);
3644

src/common/exception/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ codespan-reporting = { git = "https://github.com/brendanzab/codespan", rev = "c8
2222

2323
anyhow = { workspace = true }
2424
bincode = { version = "2.0.0-rc.1", features = ["serde", "std", "alloc"] }
25+
http = "0.2"
2526
opendal = { workspace = true }
2627
paste = "1.0.9"
2728
prost = { workspace = true }

src/common/exception/src/exception_code.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@ build_exceptions! {
137137
DropColumnEmptyError(1109),
138138
// create table or alter table add column with internal column name
139139
TableWithInternalColumnName(1110),
140+
EmptyShareEndpointConfig(1111),
140141

141142
// Data Related Errors
142143

src/common/exception/src/exception_into.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,12 @@ impl From<opendal::Error> for ErrorCode {
175175
}
176176
}
177177

178+
impl From<http::Error> for ErrorCode {
179+
fn from(error: http::Error) -> Self {
180+
ErrorCode::from_std_error(error)
181+
}
182+
}
183+
178184
impl From<std::io::Error> for ErrorCode {
179185
fn from(error: std::io::Error) -> Self {
180186
use std::io::ErrorKind;

src/meta/api/src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,4 +62,5 @@ pub use util::txn_cond_seq;
6262
pub use util::txn_op_del;
6363
pub use util::txn_op_put;
6464
pub use util::txn_op_put_with_expire;
65+
pub use util::DEFAULT_MGET_SIZE;
6566
pub use util::TXN_MAX_RETRY_TIMES;

0 commit comments

Comments
 (0)