Skip to content

Commit 380a969

Browse files
committed
merge with main
1 parent 21f06dd commit 380a969

29 files changed

+2274
-47
lines changed

.circleci/continue_config.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -281,6 +281,7 @@ workflows:
281281
matrix:
282282
parameters:
283283
engine:
284+
- doris
284285
- duckdb
285286
- postgres
286287
- mysql

.circleci/wait-for-db.sh

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,34 @@ clickhouse_ready() {
3434
probe_port 8123
3535
}
3636

37+
doris_ready() {
38+
probe_port 9030
39+
40+
echo "Checking for 3 alive Doris backends..."
41+
sleep 15
42+
43+
while true; do
44+
echo "Checking Doris backends..."
45+
ALIVE_BACKENDS=$(docker exec -i doris-fe-01 mysql -h127.0.0.1 -P9030 -uroot -e "show backends \G" | grep -c "^ *Alive: true$")
46+
47+
# fallback value if failed to get number
48+
if ! [[ "$ALIVE_BACKENDS" =~ ^[0-9]+$ ]]; then
49+
echo "WARN: Unable to parse number of alive backends, got: '$ALIVE_BACKENDS'"
50+
ALIVE_BACKENDS=0
51+
fi
52+
53+
echo "Found $ALIVE_BACKENDS alive backends"
54+
55+
if [ "$ALIVE_BACKENDS" -ge 3 ]; then
56+
echo "Doris has 3 or more alive backends"
57+
break
58+
fi
59+
60+
echo "Waiting for more backends to become alive..."
61+
sleep 5
62+
done
63+
}
64+
3765
postgres_ready() {
3866
probe_port 5432
3967
}

.readthedocs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ build:
66
python: "3.10"
77
jobs:
88
pre_build:
9-
- pip install -e ".[athena,azuresql,bigframes,bigquery,clickhouse,databricks,dbt,dlt,gcppostgres,github,llm,mssql,mysql,mwaa,postgres,redshift,slack,snowflake,trino,web,risingwave]"
9+
- pip install -e ".[athena,azuresql,bigframes,bigquery,clickhouse,databricks,dbt,dlt,doris,gcppostgres,github,llm,mssql,mysql,mwaa,postgres,redshift,slack,snowflake,trino,web,risingwave]"
1010
- make api-docs
1111

1212
mkdocs:

Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,9 @@ trino-test: engine-trino-up
149149
risingwave-test: engine-risingwave-up
150150
pytest -n auto -m "risingwave" --retries 3 --junitxml=test-results/junit-risingwave.xml
151151

152+
doris-test: engine-doris-up
153+
pytest -n auto -m "doris" --retries 3 --junitxml=test-results/junit-doris.xml
154+
152155
#################
153156
# Cloud Engines #
154157
#################

docs/concepts/models/overview.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,7 @@ This table lists each engine's support for `TABLE` and `VIEW` object comments:
181181
| BigQuery | Y | Y |
182182
| ClickHouse | Y | Y |
183183
| Databricks | Y | Y |
184+
| Doris | Y | Y |
184185
| DuckDB <=0.9 | N | N |
185186
| DuckDB >=0.10 | Y | Y |
186187
| MySQL | Y | Y |

docs/guides/configuration.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -908,6 +908,7 @@ These pages describe the connection configuration options for each execution eng
908908
* [Athena](../integrations/engines/athena.md)
909909
* [BigQuery](../integrations/engines/bigquery.md)
910910
* [Databricks](../integrations/engines/databricks.md)
911+
* [Doris](../integrations/engines/doris.md)
911912
* [DuckDB](../integrations/engines/duckdb.md)
912913
* [MotherDuck](../integrations/engines/motherduck.md)
913914
* [MySQL](../integrations/engines/mysql.md)
@@ -949,6 +950,7 @@ Unsupported state engines, even for development:
949950
* [ClickHouse](../integrations/engines/clickhouse.md)
950951
* [Spark](../integrations/engines/spark.md)
951952
* [Trino](../integrations/engines/trino.md)
953+
* [Doris](../integrations/engines/doris.md)
952954

953955
This example gateway configuration uses Snowflake for the data warehouse connection and Postgres for the state backend connection:
954956

docs/guides/connections.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ default_gateway: local_db
8181

8282
* [BigQuery](../integrations/engines/bigquery.md)
8383
* [Databricks](../integrations/engines/databricks.md)
84+
* [Doris](../integrations/engines/doris.md)
8485
* [DuckDB](../integrations/engines/duckdb.md)
8586
* [MotherDuck](../integrations/engines/motherduck.md)
8687
* [MySQL](../integrations/engines/mysql.md)

docs/installation.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ Other extras are required to use specific SQL engines, like Bigquery or Postgres
5454
| Bigquery | `pip install "sqlmesh[bigquery]"` |
5555
| ClickHouse | `pip install "sqlmesh[clickhouse]"` |
5656
| Databricks | `pip install "sqlmesh[databricks]"` |
57+
| Doris | `pip install "sqlmesh[doris]"` |
5758
| GCP Postgres | `pip install "sqlmesh[gcppostgres]"` |
5859
| MS SQL Server | `pip install "sqlmesh[mssql]"` |
5960
| MySQL | `pip install "sqlmesh[mysql]"` |

0 commit comments

Comments
 (0)