Skip to content

Commit

Permalink
Merge branch 'main' into wrj/bitmap-usize
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] authored Dec 23, 2022
2 parents 8046eaa + 3e3e4d2 commit 418d885
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 47 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
![RisingWave Logo](./docs/images/logo-title.svg)

[![Slack](https://badgen.net/badge/Slack/Join%20RisingWave/0abd59?icon=slack)](https://join.slack.com/t/risingwave-community/shared_invite/zt-120rft0mr-d8uGk3d~NZiZAQWPnElOfw)
[![Build status](https://badge.buildkite.com/9394d2bca0f87e2e97aa78b25f765c92d4207c0b65e7f6648f.svg)](https://buildkite.com/singularity-data/main)
[![Build status](https://badge.buildkite.com/9394d2bca0f87e2e97aa78b25f765c92d4207c0b65e7f6648f.svg)](https://buildkite.com/risingwavelabs/main)
[![codecov](https://codecov.io/gh/risingwavelabs/risingwave/branch/main/graph/badge.svg?token=EB44K9K38B)](https://codecov.io/gh/risingwavelabs/risingwave)

**RisingWave is now ready for production! Curious about the use cases? More details coming soon!**
Expand All @@ -22,9 +22,9 @@ There are two ways to install RisingWave: use a pre-built package or compile fro

```shell
# Download the pre-built binary
wget https://github.com/risingwavelabs/risingwave/releases/download/v0.1.13/risingwave-v0.1.13-x86_64-unknown-linux.tar.gz
wget https://github.com/risingwavelabs/risingwave/releases/download/v0.1.14/risingwave-v0.1.14-x86_64-unknown-linux.tar.gz
# Unzip the binary
tar xvf risingwave-v0.1.13-x86_64-unknown-linux.tar.gz
tar xvf risingwave-v0.1.14-x86_64-unknown-linux.tar.gz
# Start RisingWave in single-binary playground mode
./risingwave playground
```
Expand All @@ -33,7 +33,7 @@ tar xvf risingwave-v0.1.13-x86_64-unknown-linux.tar.gz

```shell
# Start RisingWave in single-binary playground mode
docker run -it --pull=always -p 4566:4566 -p 5691:5691 ghcr.io/risingwavelabs/risingwave:v0.1.13 playground
docker run -it --pull=always -p 4566:4566 -p 5691:5691 ghcr.io/risingwavelabs/risingwave:v0.1.14 playground
```

**Compile from Source with [RiseDev](docs/developer-guide.md#set-up-the-development-environment) (Linux and macOS)**
Expand Down
43 changes: 2 additions & 41 deletions ci/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ services:
- POSTGRES_PASSWORD=postgres
- POSTGRES_INITDB_ARGS=--encoding=UTF-8 --lc-collate=C --lc-ctype=C
ports:
- '5432:5432'
- 5432
healthcheck:
test: [ "CMD-SHELL", "pg_isready -U postgres" ]
interval: 5s
Expand All @@ -18,7 +18,7 @@ services:
mysql:
image: mysql:8.0
ports:
- "3306:3306"
- 3306
environment:
- MYSQL_ROOT_PASSWORD=123456
- MYSQL_USER=mysqluser
Expand All @@ -29,38 +29,6 @@ services:
timeout: 5s
retries: 5

zookeeper:
image: confluentinc/cp-zookeeper
ports:
- "2181:2181"
environment:
ZOOKEEPER_CLIENT_PORT: 2181
ZOOKEEPER_TICK_TIME: 2000
ZOOKEEPER_SYNC_LIMIT: 2

kafka:
image: confluentinc/cp-kafka
ports:
- 29092:29092
depends_on:
- zookeeper
environment:
KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
KAFKA_LISTENERS: INTERNAL://0.0.0.0:9092,OUTSIDE://0.0.0.0:29092
KAFKA_ADVERTISED_LISTENERS: INTERNAL://kafka:9092,OUTSIDE://${HOST_IP}:29092
KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: INTERNAL:PLAINTEXT,OUTSIDE:PLAINTEXT
KAFKA_INTER_BROKER_LISTENER_NAME: INTERNAL
healthcheck:
test: nc -z ${HOST_IP} 29092 || exit -1
interval: 5s
timeout: 10s
retries: 5

pubsub-emu:
image: thekevjames/gcloud-pubsub-emulator:latest
ports:
- "5980:8681"

source-test-env:
image: public.ecr.aws/x5u3w5h6/rw-build-env:v20221212
depends_on:
Expand Down Expand Up @@ -90,13 +58,6 @@ services:
volumes:
- ..:/risingwave

benchmark-env:
image: public.ecr.aws/x5u3w5h6/rw-build-env:v20221212
depends_on:
- kafka
volumes:
- ..:/risingwave

release-env:
image: quay.io/pypa/manylinux2014_x86_64
working_dir: /mnt
Expand Down
6 changes: 5 additions & 1 deletion ci/scripts/run-e2e-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ if [[ "$RUN_META_BACKUP" -eq "1" ]]; then
BACKUP_TEST_RW_ALL_IN_ONE="target/debug/risingwave" \
RW_HUMMOCK_URL="hummock+minio://hummockadmin:hummockadmin@127.0.0.1:9301/hummock001" \
RW_META_ADDR="http://127.0.0.1:5690" \
RUST_LOG="info,risingwave_stream=info,risingwave_batch=info,risingwave_storage=info" \
bash "${test_root}/run_all.sh"
echo "--- Kill cluster"
cargo make kill
Expand All @@ -91,6 +92,7 @@ fi
if [[ "$RUN_DELETE_RANGE" -eq "1" ]]; then
echo "--- e2e, ci-delete-range-test"
cargo make clean-data
RUST_LOG="info,risingwave_stream=info,risingwave_batch=info,risingwave_storage=info" \
cargo make ci-start ci-delete-range-test
buildkite-agent artifact download delete-range-test-"$profile" target/debug/
mv target/debug/delete-range-test-"$profile" target/debug/delete-range-test
Expand All @@ -105,6 +107,7 @@ fi

if [[ "$RUN_COMPACTION" -eq "1" ]]; then
echo "--- e2e, ci-compaction-test, nexmark_q7"
RUST_LOG="info,risingwave_stream=info,risingwave_batch=info,risingwave_storage=info" \
cargo make ci-start ci-compaction-test
# Please make sure the regression is expected before increasing the timeout.
sqllogictest -p 4566 -d dev './e2e_test/compaction/ingest_rows.slt'
Expand Down Expand Up @@ -134,7 +137,8 @@ if [[ "$RUN_COMPACTION" -eq "1" ]]; then
chmod +x ./target/debug/compaction-test
# Use the config of ci-compaction-test for replay.
config_path=".risingwave/config/risingwave.toml"
RUST_LOG="info,risingwave_stream=info,risingwave_batch=info,risingwave_storage=info" ./target/debug/compaction-test --ci-mode true --state-store hummock+minio://hummockadmin:hummockadmin@127.0.0.1:9301/hummock001 --config-path "${config_path}"
RUST_LOG="info,risingwave_stream=info,risingwave_batch=info,risingwave_storage=info" \
./target/debug/compaction-test --ci-mode true --state-store hummock+minio://hummockadmin:hummockadmin@127.0.0.1:9301/hummock001 --config-path "${config_path}"

echo "--- Kill cluster"
cargo make ci-kill
Expand Down
10 changes: 10 additions & 0 deletions e2e_test/batch/basic/func.slt.part
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,16 @@ select nullif(1,2);
----
1

query I
select mod(5,2);
----
1

query I
select mod(7.7,2.2);
----
1.1

query IIIII
select coalesce(1,2), coalesce(null,2), coalesce(null), coalesce(null,null), coalesce(null,2,3);
----
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/planner_test/tests/testdata/subquery.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@
└─LogicalApply { type: LeftOuter, on: true, correlated_id: 1, max_one_row: true }
├─LogicalFilter { predicate: In(pg_class.relkind, 'r':Varchar, 'p':Varchar, 'v':Varchar, 'm':Varchar, 'S':Varchar, 'f':Varchar, '':Varchar) AND (pg_namespace.nspname <> 'pg_catalog':Varchar) AND IsNull(RegexpMatch(pg_namespace.nspname, '^pg_toast':Varchar)) AND (pg_namespace.nspname <> 'information_schema':Varchar) }
| └─LogicalJoin { type: LeftOuter, on: (pg_namespace.oid = pg_class.relnamespace), output: all }
| ├─LogicalScan { table: pg_class, columns: [pg_class.oid, pg_class.relname, pg_class.relnamespace, pg_class.relowner, pg_class.relkind] }
| ├─LogicalScan { table: pg_class, columns: [pg_class.oid, pg_class.relname, pg_class.relnamespace, pg_class.relowner, pg_class.relkind, pg_class.relam, pg_class.reltablespace] }
| └─LogicalScan { table: pg_namespace, columns: [pg_namespace.oid, pg_namespace.nspname, pg_namespace.nspowner, pg_namespace.nspacl] }
└─LogicalProject { exprs: [pg_user.name] }
└─LogicalFilter { predicate: (CorrelatedInputRef { index: 3, correlated_id: 1 } = pg_user.usesysid) }
Expand Down
1 change: 1 addition & 0 deletions src/frontend/src/binder/expr/function.rs
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ impl Binder {
"ceil" => ExprType::Ceil,
"floor" => ExprType::Floor,
"abs" => ExprType::Abs,
"mod" => ExprType::Modulus,
// temporal/chrono
"to_timestamp" => ExprType::ToTimestamp,
"date_trunc" => ExprType::DateTrunc,
Expand Down

0 comments on commit 418d885

Please sign in to comment.