Skip to content

Commit 1407143

Browse files
authored
Merge branch 'main' into issue-7565
2 parents 22f8e94 + 1580862 commit 1407143

31 files changed

+46
-1228
lines changed

.github/actions/test_sqllogic_cluster_linux/action.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,13 @@ runs:
2323
sha: ${{ github.sha }}
2424
target: ${{ inputs.target }}
2525

26-
- name: Test setup
27-
shell: bash
28-
run: |
29-
bash ./scripts/setup/dev_setup.sh -yd
30-
3126
- name: Run sqllogic Tests with Cluster mode
3227
shell: bash
3328
run: |
34-
bash ./scripts/ci/ci-run-sqllogic-tests-cluster.sh ${{ inputs.dirs }}
29+
docker run --rm --tty --net=host \
30+
--user $(id -u):$(id -g) \
31+
--volume "${PWD}:/workspace" \
32+
--workdir "/workspace" \
33+
datafuselabs/build-tool:sqllogic \
34+
bash ./scripts/ci/ci-run-sqllogic-tests-cluster.sh \
35+
${{ inputs.dirs }}

.github/actions/test_sqllogic_standalone_linux/action.yml

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,13 @@ runs:
2323
sha: ${{ github.sha }}
2424
target: ${{ inputs.target }}
2525

26-
- name: Test setup
27-
shell: bash
28-
run: |
29-
bash ./scripts/setup/dev_setup.sh -yd
30-
3126
- name: Run sqllogic Tests with Standalone mode with embedded meta-store
3227
shell: bash
3328
run: |
34-
bash ./scripts/ci/ci-run-sqllogic-tests.sh ${{ inputs.dirs }}
35-
36-
# - name: Upload failure
37-
# if: failure()
38-
# uses: ./.github/actions/artifact_failure
39-
# with:
40-
# name: test-sqllogic-standalone-linux
29+
docker run --rm --tty --net=host \
30+
--user $(id -u):$(id -g) \
31+
--volume "${PWD}:/workspace" \
32+
--workdir "/workspace" \
33+
datafuselabs/build-tool:sqllogic \
34+
bash ./scripts/ci/ci-run-sqllogic-tests.sh \
35+
${{ inputs.dirs }}

.github/workflows/databend-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ jobs:
203203
run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
204204
- name: Upload to github release
205205
env:
206-
GH_TOKEN: ${{ inputs.github_token }}
206+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
207207
run: |
208208
version=${{ needs.create_release.outputs.version }}
209209
tar -C ./tests/logictest -czvf testsuites-${version}.tar.gz suites

src/query/legacy-parser/src/parser/expr_parser.rs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,6 @@ use sqlparser::tokenizer::Tokenizer;
2222
pub struct ExprParser;
2323

2424
impl ExprParser {
25-
pub fn parse_expr(expr: &str) -> Result<Expr, ParserError> {
26-
let dialect = &MySqlDialect {};
27-
let mut tokenizer = Tokenizer::new(dialect, expr);
28-
let (tokens, position_map) = tokenizer.tokenize()?;
29-
let mut parser = Parser::new(tokens, position_map, dialect);
30-
parser.parse_expr()
31-
}
32-
3325
pub fn parse_exprs(expr: &str) -> Result<Vec<Expr>, ParserError> {
3426
let dialect = &MySqlDialect {};
3527
let mut tokenizer = Tokenizer::new(dialect, expr);

src/query/legacy-parser/src/parser/expression_parser.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,6 @@ use crate::ExprParser;
2121
pub struct ExpressionParser;
2222

2323
impl ExpressionParser {
24-
pub fn parse_expr(expr: &str) -> Result<Expression> {
25-
let expr = ExprParser::parse_expr(expr)?;
26-
let analyzer = ExpressionSyncAnalyzer::create();
27-
analyzer.analyze(&expr)
28-
}
29-
3024
pub fn parse_exprs(expr: &str) -> Result<Vec<Expression>> {
3125
let exprs = ExprParser::parse_exprs(expr)?;
3226
let analyzer = ExpressionSyncAnalyzer::create();

src/query/planners/src/lib.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ mod plan_sink;
8282
mod plan_sort;
8383
mod plan_subqueries_set;
8484
mod plan_table_alter_cluster_key;
85-
mod plan_table_create;
8685
mod plan_table_describe;
8786
mod plan_table_drop;
8887
mod plan_table_drop_cluster_key;
@@ -222,8 +221,6 @@ pub use plan_sink::SINK_SCHEMA;
222221
pub use plan_sort::SortPlan;
223222
pub use plan_subqueries_set::SubQueriesSetPlan;
224223
pub use plan_table_alter_cluster_key::AlterTableClusterKeyPlan;
225-
pub use plan_table_create::CreateTablePlan;
226-
pub use plan_table_create::TableOptions;
227224
pub use plan_table_describe::DescribeTablePlan;
228225
pub use plan_table_drop::DropTablePlan;
229226
pub use plan_table_drop_cluster_key::DropTableClusterKeyPlan;

src/query/planners/src/plan_table_create.rs

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

src/query/service/src/interpreters/interpreter_show_databases.rs

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

src/query/service/src/interpreters/interpreter_show_functions.rs

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

src/query/service/src/interpreters/interpreter_show_metrics.rs

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

0 commit comments

Comments
 (0)