fix

Signed-off-by: xxchan <xxchan22f@gmail.com>
risingwavelabs · Apr 12, 2024 · b8859ca · b8859ca
1 parent f001e31
commit b8859ca
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 24 deletions.
diff --git a/ci/scripts/e2e-source-test.sh b/ci/scripts/e2e-source-test.sh
@@ -166,8 +166,11 @@ risedev slt './e2e_test/source/basic/alter/kafka_after_new_data.slt'
 
 echo "--- e2e, kafka alter source again"
 ./scripts/source/prepare_data_after_alter.sh 3
-sqllogictest -p 4566 -d dev './e2e_test/source/basic/alter/kafka_after_new_data_2.slt'
+risedev slt './e2e_test/source/basic/alter/kafka_after_new_data_2.slt'
+
+echo "--- e2e, inline test"
+risedev slt './e2e_test/source_inline/**/*.slt'
 
 echo "--- Run CH-benCHmark"
-risedev slt './e2e_test/ch_benchmark/batch/ch_benchmark.slt'
-risedev slt './e2e_test/ch_benchmark/streaming/*.slt'
+./risedev slt -p 4566 -d dev './e2e_test/ch_benchmark/batch/ch_benchmark.slt'
+./risedev slt -p 4566 -d dev './e2e_test/ch_benchmark/streaming/*.slt'
diff --git a/src/cmd_all/scripts/e2e-full-standalone-demo.sh b/src/cmd_all/scripts/e2e-full-standalone-demo.sh
@@ -67,8 +67,8 @@ sleep 15
 # FIXME: Integrate standalone into risedev, so we can reuse risedev-env functionality here.
 cat << EOF > "$RW_PREFIX"/config/risedev-env
 RW_META_ADDR="http://0.0.0.0:5690"
-RW_FRONTEND_LISTEN_ADDRESS="0.0.0.0"
-RW_FRONTEND_PORT="4566"
+RISEDEV_RW_FRONTEND_LISTEN_ADDRESS="0.0.0.0"
+RISEDEV_RW_FRONTEND_PORT="4566"
 EOF
 
 echo "--- Setting up table"

diff --git a/src/risedevtool/src/risedev_env.rs b/src/risedevtool/src/risedev_env.rs
@@ -50,26 +50,30 @@ pub fn generate_risedev_env(services: &Vec<ServiceConfig>) -> String {
                     }
                 }
 
-            // RW_META_ADDR
-            {
-                let meta_node = &c.provide_meta_node.as_ref().unwrap()[0];
-                writeln!(
-                    env,
-                    "RW_META_ADDR=\"http://{}:{}\"",
-                    meta_node.address, meta_node.port
-                )
-                .unwrap();
+                // RW_META_ADDR
+                {
+                    let meta_node = &c.provide_meta_node.as_ref().unwrap()[0];
+                    writeln!(
+                        env,
+                        "RW_META_ADDR=\"http://{}:{}\"",
+                        meta_node.address, meta_node.port
+                    )
+                    .unwrap();
+                }
             }
-            break;
-        }
-    }
-    for item in services {
-        if let ServiceConfig::Frontend(c) = item {
-            let listen_address = &c.listen_address;
-            writeln!(env, "RW_FRONTEND_LISTEN_ADDRESS=\"{listen_address}\"",).unwrap();
-            let port = &c.port;
-            writeln!(env, "RW_FRONTEND_PORT=\"{port}\"",).unwrap();
-            break;
+            ServiceConfig::Frontend(c) => {
+                let listen_address = &c.listen_address;
+                writeln!(env, "RISEDEV_FRONTEND_LISTEN_ADDRESS=\"{listen_address}\"",).unwrap();
+                let port = &c.port;
+                writeln!(env, "RISEDEV_FRONTEND_PORT=\"{port}\"",).unwrap();
+            }
+            ServiceConfig::Kafka(c) => {
+                let brokers = format!("{}:{}", c.address, c.port);
+                writeln!(env, r#"RISEDEV_KAFKA_BOOTSTRAP_SERVERS="{brokers}""#,).unwrap();
+                writeln!(env, r#"RISEDEV_KAFKA_WITH_OPTIONS_COMMON="connector='kafka',properties.bootstrap.server='{brokers}'""#).unwrap();
+                writeln!(env, r#"RPK_BROKERS="{brokers}""#).unwrap();
+            }
+            _ => {}
         }
     }
     env