Skip to content

Commit

Permalink
Merge branch 'main' into bz/project-eli-adj-update
Browse files Browse the repository at this point in the history
  • Loading branch information
BugenZhao authored Jun 3, 2024
2 parents 4b26019 + e888f44 commit 32e6b76
Show file tree
Hide file tree
Showing 107 changed files with 2,967 additions and 2,682 deletions.
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -78,4 +78,6 @@ simulation-it-test.tar.zst
# spark binary
e2e_test/iceberg/spark-*-bin*

**/poetry.lock
**/poetry.lock

*.slt.temp
4 changes: 3 additions & 1 deletion .typos.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@ inout = "inout" # This is a SQL keyword!
numer = "numer" # numerator
nd = "nd" # N-dimentional / 2nd
steam = "stream" # You played with Steam games too much.
ser = "ser" # Serialization
# Some weird short variable names
ot = "ot"
bui = "bui" # BackwardUserIterator
bui = "bui" # BackwardUserIterator
mosquitto = "mosquitto" # This is a MQTT broker.
abd = "abd"
iy = "iy"
Expand All @@ -21,6 +22,7 @@ extend-exclude = [
"e2e_test",
"**/*.svg",
"scripts",
"src/sqlparser/tests/testdata/",
"src/frontend/planner_test/tests/testdata",
"src/tests/sqlsmith/tests/freeze",
"Cargo.lock",
Expand Down
150 changes: 101 additions & 49 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ license = "Apache-2.0"
repository = "https://github.com/risingwavelabs/risingwave"

[workspace.dependencies]
foyer = { version = "0.8.6", features = ["nightly"] }
foyer = { version = "0.9.1", features = ["nightly"] }
auto_enums = { version = "0.8", features = ["futures03", "tokio1"] }
await-tree = "0.2.1"
aws-config = { version = "1", default-features = false, features = [
Expand Down
4 changes: 3 additions & 1 deletion ci/scripts/e2e-source-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ buildkite-agent artifact download risingwave-connector.tar.gz ./
mkdir ./connector-node
tar xf ./risingwave-connector.tar.gz -C ./connector-node

echo "--- Install dependencies"
python3 -m pip install --break-system-packages requests protobuf fastavro confluent_kafka jsonschema

echo "--- e2e, inline test"
RUST_LOG="debug,risingwave_stream=info,risingwave_batch=info,risingwave_storage=info" \
risedev ci-start ci-inline-source-test
Expand Down Expand Up @@ -136,7 +139,6 @@ echo "--- e2e, ci-1cn-1fe, protobuf schema registry"
export RISINGWAVE_CI=true
RUST_LOG="info,risingwave_stream=info,risingwave_batch=info,risingwave_storage=info" \
risedev ci-start ci-1cn-1fe
python3 -m pip install --break-system-packages requests protobuf confluent-kafka
python3 e2e_test/schema_registry/pb.py "message_queue:29092" "http://schemaregistry:8082" "sr_pb_test" 20 user
echo "make sure google/protobuf/source_context.proto is NOT in schema registry"
curl --silent 'http://schemaregistry:8082/subjects'; echo
Expand Down
2 changes: 1 addition & 1 deletion docker/dashboards/risingwave-dev-dashboard.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docker/dashboards/risingwave-user-dashboard.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions e2e_test/error_ui/extended/main.slt
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ selet 1;
db error: ERROR: Failed to prepare the statement

Caused by:
sql parser error: expected an SQL statement, found: selet at line 1, column 1
sql parser error: expected statement, found: selet
LINE 1: selet 1;
^
^


query error
Expand Down
4 changes: 2 additions & 2 deletions e2e_test/error_ui/simple/main.slt
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ selet 1;
db error: ERROR: Failed to run the query

Caused by:
sql parser error: expected an SQL statement, found: selet at line 1, column 1
sql parser error: expected statement, found: selet
LINE 1: selet 1;
^
^


statement error
Expand Down
Loading

0 comments on commit 32e6b76

Please sign in to comment.