Skip to content

Commit cab3485

Browse files
authored
Merge branch 'main' into add-mini-ontime
2 parents 8b771a2 + c5e83da commit cab3485

File tree

10 files changed

+26
-24
lines changed

10 files changed

+26
-24
lines changed

docs/doc/02-cloud/index.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,11 @@ To log in to your account, go to https://app.databend.com.
2121

2222
### Warehouses
2323

24-
Virtual warehouses can be automatically suspended in case of no activities for a specific period.
24+
Serverless warehouses can be automatically suspended in case of no activities for a specific period.
2525

2626
<img src="/img/cloud/databend_cloud_warehouse.png"/>
2727

28+
2829
### Databases
2930

3031
This page shows a list of your databases:
@@ -48,6 +49,8 @@ Worksheets is a powerful SQL editor where you can run SQL queries. For example,
4849
### Connect to a Serverless Warehouse on Databend Cloud
4950

5051
Databend Cloud provides a connection string for your applications to connect to it:
52+
<img src="/img/cloud/databend_cloud_warehouse_detail.png"/>
53+
<img src="/img/cloud/databend_cloud_warehouse_connect.png"/>
5154

5255
```shell
5356
https://<tenant>--<warehouse>.ch.aws-us-east-2.default.databend.com/
60.3 KB
Loading
144 KB
Loading
147 KB
Loading

query/tests/it/catalogs/database_catalog.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ use crate::tests::create_catalog;
3434
#[tokio::test(flavor = "multi_thread", worker_threads = 1)]
3535
async fn test_catalogs_get_database() -> Result<()> {
3636
let tenant = "test";
37-
let catalog = create_catalog()?;
37+
let catalog = create_catalog().await?;
3838

3939
// get system database
4040
let database = catalog.get_database(tenant, "system").await?;
@@ -61,7 +61,7 @@ async fn test_catalogs_get_database() -> Result<()> {
6161
#[tokio::test(flavor = "multi_thread", worker_threads = 1)]
6262
async fn test_catalogs_database() -> Result<()> {
6363
let tenant = "admin";
64-
let catalog = create_catalog()?;
64+
let catalog = create_catalog().await?;
6565

6666
let db_list = catalog.list_databases(tenant).await?;
6767
let db_count = db_list.len();
@@ -153,7 +153,7 @@ async fn test_catalogs_database() -> Result<()> {
153153
#[tokio::test(flavor = "multi_thread", worker_threads = 1)]
154154
async fn test_catalogs_table() -> Result<()> {
155155
let tenant = "test";
156-
let catalog = create_catalog()?;
156+
let catalog = create_catalog().await?;
157157

158158
// Check system/default.
159159
{

query/tests/it/catalogs/immutable_catalogs.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ async fn test_immutable_catalogs_database() -> Result<()> {
9595
#[tokio::test(flavor = "multi_thread", worker_threads = 1)]
9696
async fn test_immutable_catalogs_table() -> Result<()> {
9797
let tenant = "test";
98-
let catalog = create_catalog()?;
98+
let catalog = create_catalog().await?;
9999

100100
let db_list_1 = catalog.list_tables(tenant, "system").await?;
101101
assert!(!db_list_1.is_empty());

query/tests/it/storages/memory.rs

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,17 +34,18 @@ async fn test_memorytable() -> Result<()> {
3434
DataField::new("a", u32::to_data_type()),
3535
DataField::new("b", u64::to_data_type()),
3636
]);
37-
let table = MemoryTable::try_create(crate::tests::create_storage_context()?, TableInfo {
38-
desc: "'default'.'a'".into(),
39-
name: "a".into(),
40-
ident: Default::default(),
41-
meta: TableMeta {
42-
schema: schema.clone(),
43-
engine: "Memory".to_string(),
44-
options: TableOptions::default(),
45-
..Default::default()
46-
},
47-
})?;
37+
let table =
38+
MemoryTable::try_create(crate::tests::create_storage_context().await?, TableInfo {
39+
desc: "'default'.'a'".into(),
40+
name: "a".into(),
41+
ident: Default::default(),
42+
meta: TableMeta {
43+
schema: schema.clone(),
44+
engine: "Memory".to_string(),
45+
options: TableOptions::default(),
46+
..Default::default()
47+
},
48+
})?;
4849

4950
// append data.
5051
{

query/tests/it/storages/null.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ async fn test_null_table() -> Result<()> {
3131
DataField::new("a", u64::to_data_type()),
3232
DataField::new("b", u64::to_data_type()),
3333
]);
34-
let table = NullTable::try_create(crate::tests::create_storage_context()?, TableInfo {
34+
let table = NullTable::try_create(crate::tests::create_storage_context().await?, TableInfo {
3535
desc: "'default'.'a'".into(),
3636
name: "a".into(),
3737
ident: Default::default(),

query/tests/it/tests/catalog.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@
1515
use common_exception::Result;
1616
use databend_query::catalogs::DatabaseCatalog;
1717

18-
pub fn create_catalog() -> Result<DatabaseCatalog> {
19-
futures::executor::block_on(async move {
20-
let conf = crate::tests::ConfigBuilder::create().config();
21-
DatabaseCatalog::try_create_with_config(conf).await
22-
})
18+
pub async fn create_catalog() -> Result<DatabaseCatalog> {
19+
let conf = crate::tests::ConfigBuilder::create().config();
20+
DatabaseCatalog::try_create_with_config(conf).await
2321
}

query/tests/it/tests/context.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@ pub async fn create_query_context_with_config(
9292
Ok(context)
9393
}
9494

95-
pub fn create_storage_context() -> Result<StorageContext> {
96-
let meta_embedded = futures::executor::block_on(MetaEmbedded::new_temp()).unwrap();
95+
pub async fn create_storage_context() -> Result<StorageContext> {
96+
let meta_embedded = MetaEmbedded::new_temp().await.unwrap();
9797

9898
Ok(StorageContext {
9999
meta: Arc::new(meta_embedded),

0 commit comments

Comments
 (0)