Merge branch 'main' of ssh://github.com/risingwavelabs/risingwave int…

…o cajan93/mem-relative

.typos.toml

@@ -25,6 +25,7 @@ extend-exclude = [
     "src/sqlparser/tests/testdata/",
     "src/frontend/planner_test/tests/testdata",
     "src/tests/sqlsmith/tests/freeze",
+    "src/license/src/manager.rs",
     "Cargo.lock",
     "**/Cargo.toml",
     "**/go.mod",

Cargo.toml

@@ -25,6 +25,7 @@ members = [
     "src/frontend/planner_test",
     "src/java_binding",
     "src/jni_core",
+    "src/license",
     "src/meta",
     "src/meta/dashboard",
     "src/meta/model_v2",
@@ -138,6 +139,10 @@ arrow-array-iceberg = { package = "arrow-array", version = "52" }
 arrow-schema-iceberg = { package = "arrow-schema", version = "52" }
 arrow-buffer-iceberg = { package = "arrow-buffer", version = "52" }
 arrow-cast-iceberg = { package = "arrow-cast", version = "52" }
+# TODO
+# After apache/iceberg-rust#411 is merged, we move to the upstream version.
+iceberg = { git = "https://github.com/risingwavelabs/iceberg-rust.git", rev = "0c6e133e6f4655ff9ce4ad57b577dc7f692dd902" }
+iceberg-catalog-rest = { git = "https://github.com/risingwavelabs/iceberg-rust.git", rev = "0c6e133e6f4655ff9ce4ad57b577dc7f692dd902" }
 arrow-array = "50"
 arrow-arith = "50"
 arrow-cast = "50"
@@ -213,6 +218,7 @@ risingwave_frontend = { path = "./src/frontend" }
 risingwave_hummock_sdk = { path = "./src/storage/hummock_sdk" }
 risingwave_hummock_test = { path = "./src/storage/hummock_test" }
 risingwave_hummock_trace = { path = "./src/storage/hummock_trace" }
+risingwave_license = { path = "./src/license" }
 risingwave_mem_table_spill_test = { path = "./src/stream/spill_test" }
 risingwave_meta = { path = "./src/meta" }
 risingwave_meta_dashboard = { path = "./src/meta/dashboard" }

docker/docker-compose-distributed-etcd.yml

@@ -20,7 +20,7 @@ services:
     expose:
       - "6660"
       - "1260"
-    ports: []
+    ports: [ ]
     depends_on:
       - meta-node-0
       # - minio-0
@@ -62,7 +62,7 @@ services:
     expose:
       - "5688"
       - "1222"
-    ports: []
+    ports: [ ]
     depends_on:
       - meta-node-0
       # - minio-0
@@ -120,10 +120,10 @@ services:
     ports:
       - "2388:2388"
       - "2389:2389"
-    depends_on: []
+    depends_on: [ ]
     volumes:
       - "etcd-0:/etcd-data"
-    environment: {}
+    environment: { }
     container_name: etcd-0
     healthcheck:
       test:
@@ -179,19 +179,19 @@ services:
           memory: 1G
   grafana-0:
     image: "grafana/grafana-oss:latest"
-    command: []
+    command: [ ]
     expose:
       - "3001"
     ports:
       - "3001:3001"
-    depends_on: []
+    depends_on: [ ]
     volumes:
       - "grafana-0:/var/lib/grafana"
       - "./grafana.ini:/etc/grafana/grafana.ini"
       - "./grafana-risedev-datasource.yml:/etc/grafana/provisioning/datasources/grafana-risedev-datasource.yml"
       - "./grafana-risedev-dashboard.yml:/etc/grafana/provisioning/dashboards/grafana-risedev-dashboard.yml"
       - "./dashboards:/dashboards"
-    environment: {}
+    environment: { }
     container_name: grafana-0
     healthcheck:
       test:
@@ -240,6 +240,7 @@ services:
       RUST_BACKTRACE: "1"
       # If ENABLE_TELEMETRY is not set, telemetry will start by default
       ENABLE_TELEMETRY: ${ENABLE_TELEMETRY:-true}
+      RW_TELEMETRY_TYPE: ${RW_TELEMETRY_TYPE:-"docker-compose"}
     container_name: meta-node-0
     healthcheck:
       test:
@@ -270,7 +271,7 @@ services:
     ports:
       - "9301:9301"
       - "9400:9400"
-    depends_on: []
+    depends_on: [ ]
     volumes:
       - "minio-0:/data"
     entrypoint: "
@@ -313,11 +314,11 @@ services:
       - "9500"
     ports:
       - "9500:9500"
-    depends_on: []
+    depends_on: [ ]
     volumes:
       - "prometheus-0:/prometheus"
       - "./prometheus.yaml:/etc/prometheus/prometheus.yml"
-    environment: {}
+    environment: { }
     container_name: prometheus-0
     healthcheck:
       test:
@@ -355,10 +356,10 @@ services:
       - "9092:9092"
       - "9644:9644"
       - "8081:8081"
-    depends_on: []
+    depends_on: [ ]
     volumes:
       - "message_queue:/var/lib/redpanda/data"
-    environment: {}
+    environment: { }
     container_name: message_queue
     healthcheck:
       test: curl -f localhost:9644/v1/status/ready