From 36b1c775e424a7e1c1c4fee215f1672bba45fb0b Mon Sep 17 00:00:00 2001
From: Phillip Cloud <417981+cpcloud@users.noreply.github.com>
Date: Sun, 28 Jan 2024 06:00:01 -0500
Subject: [PATCH 1/2] build(docker): simplify risingwave docker setup

---
 compose.yaml                      | 75 ++++++-------------------------
 docker/risingwave/risingwave.toml |  2 -
 2 files changed, 13 insertions(+), 64 deletions(-)
 delete mode 100644 docker/risingwave/risingwave.toml

diff --git a/compose.yaml b/compose.yaml
index 1a561b895919..e8aca1361556 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -104,9 +104,10 @@ services:
       retries: 20
       test:
         - CMD-SHELL
-        - mc ready data && mc mb --ignore-existing data/trino
+        - mc ready data && mc mb --ignore-existing data/trino data/risingwave
     networks:
       - trino
+      - risingwave
     volumes:
       - $PWD/docker/minio/config.json:/.mc/config.json:ro
 
@@ -537,74 +538,26 @@ services:
     networks:
       - impala
 
-  risingwave-minio:
-    image: "quay.io/minio/minio:latest"
-    command:
-      - server
-      - "--address"
-      - "0.0.0.0:9301"
-      - "--console-address"
-      - "0.0.0.0:9400"
-      - /data
-    expose:
-      - "9301"
-      - "9400"
-    ports:
-      - "9301:9301"
-      - "9400:9400"
-    depends_on: []
-    volumes:
-      - "risingwave-minio:/data"
-    entrypoint: /bin/sh -c "set -e; mkdir -p \"/data/hummock001\"; /usr/bin/docker-entrypoint.sh \"$$0\" \"$$@\" "
-    environment:
-      MINIO_CI_CD: "1"
-      MINIO_ROOT_PASSWORD: hummockadmin
-      MINIO_ROOT_USER: hummockadmin
-      MINIO_DOMAIN: "risingwave-minio"
-    container_name: risingwave-minio
-    healthcheck:
-      test:
-        - CMD-SHELL
-        - bash -c 'printf \"GET / HTTP/1.1\n\n\" > /dev/tcp/127.0.0.1/9301; exit $$?;'
-      interval: 5s
-      timeout: 5s
-      retries: 20
-    restart: always
-    networks:
-      - risingwave
-
   risingwave:
     image: ghcr.io/risingwavelabs/risingwave:nightly-20240122
     command: "standalone --meta-opts=\" \
       --advertise-addr 0.0.0.0:5690 \
       --backend mem \
-      --state-store hummock+minio://hummockadmin:hummockadmin@risingwave-minio:9301/hummock001 \
-      --data-directory hummock_001 \
-      --config-path /risingwave.toml\" \
-      --compute-opts=\" \
-      --config-path /risingwave.toml \
-      --advertise-addr 0.0.0.0:5688 \
-      --role both \" \
-      --frontend-opts=\" \
-      --config-path /risingwave.toml \
-      --listen-addr 0.0.0.0:4566 \
-      --advertise-addr 0.0.0.0:4566 \" \
-      --compactor-opts=\" \
-      --advertise-addr 0.0.0.0:6660 \""
-    expose:
-      - "4566"
+      --state-store hummock+minio://accesskey:secretkey@minio:9000/risingwave \
+      --data-directory hummock_001\" \
+      --compute-opts=\"--advertise-addr 0.0.0.0:5688 --role both\" \
+      --frontend-opts=\"--listen-addr 0.0.0.0:4566 --advertise-addr 0.0.0.0:4566\" \
+      --compactor-opts=\"--advertise-addr 0.0.0.0:6660\""
     ports:
-      - "4566:4566"
+      - 4566:4566
     depends_on:
-      - risingwave-minio
+      minio:
+        condition: service_healthy
     volumes:
-      - "./docker/risingwave/risingwave.toml:/risingwave.toml"
       - risingwave:/data
     environment:
       RUST_BACKTRACE: "1"
-      # If ENABLE_TELEMETRY is not set, telemetry will start by default
-      ENABLE_TELEMETRY: ${ENABLE_TELEMETRY:-true}
-    container_name: risingwave
+      ENABLE_TELEMETRY: "false"
     healthcheck:
       test:
         - CMD-SHELL
@@ -612,10 +565,9 @@ services:
         - bash -c 'printf \"GET / HTTP/1.1\n\n\" > /dev/tcp/127.0.0.1/5688; exit $$?;'
         - bash -c 'printf \"GET / HTTP/1.1\n\n\" > /dev/tcp/127.0.0.1/4566; exit $$?;'
         - bash -c 'printf \"GET / HTTP/1.1\n\n\" > /dev/tcp/127.0.0.1/5690; exit $$?;'
-      interval: 5s
-      timeout: 5s
+      interval: 1s
       retries: 20
-    restart: always
+    restart: on-failure
     networks:
       - risingwave
 
@@ -646,5 +598,4 @@ volumes:
   postgres:
   exasol:
   impala:
-  risingwave-minio:
   risingwave:
diff --git a/docker/risingwave/risingwave.toml b/docker/risingwave/risingwave.toml
deleted file mode 100644
index 43d57926ed16..000000000000
--- a/docker/risingwave/risingwave.toml
+++ /dev/null
@@ -1,2 +0,0 @@
-# RisingWave config file to be mounted into the Docker containers.
-# See https://github.com/risingwavelabs/risingwave/blob/main/src/config/example.toml for example

From 5afce377c4a2c52fb0dc8637936c9966cb3c2e07 Mon Sep 17 00:00:00 2001
From: Phillip Cloud <417981+cpcloud@users.noreply.github.com>
Date: Sun, 28 Jan 2024 14:39:47 -0500
Subject: [PATCH 2/2] test(risingwave): make xfail not strict

---
 ibis/backends/tests/test_json.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ibis/backends/tests/test_json.py b/ibis/backends/tests/test_json.py
index 98c72e6934d5..c52721e2a293 100644
--- a/ibis/backends/tests/test_json.py
+++ b/ibis/backends/tests/test_json.py
@@ -41,8 +41,7 @@
     reason="https://github.com/ibis-project/ibis/pull/6920#discussion_r1373212503",
 )
 @pytest.mark.broken(
-    ["risingwave"],
-    reason="TODO(Kexiang): order mismatch in array",
+    ["risingwave"], reason="TODO(Kexiang): order mismatch in array", strict=False
 )
 def test_json_getitem(json_t, expr_fn, expected):
     expr = expr_fn(json_t)