diff --git a/Makefile.toml b/Makefile.toml index 2055eab88cdc0..ed39ea0fc9425 100644 --- a/Makefile.toml +++ b/Makefile.toml @@ -29,7 +29,6 @@ env_scripts = [ set_env ENABLE_TELEMETRY "false" is_sanitizer_enabled = get_env ENABLE_SANITIZER -is_all_in_one_enabled = get_env ENABLE_ALL_IN_ONE is_hdfs_backend = get_env ENABLE_HDFS is_release = get_env ENABLE_RELEASE_PROFILE is_not_release = not ${is_release} @@ -46,13 +45,8 @@ else set_env RISEDEV_BUILD_TARGET_DIR "" end -if ${is_all_in_one_enabled} - set_env RISEDEV_CARGO_BUILD_CRATE "risingwave_cmd_all" - set_env RISEDEV_CTL_RUN_CMD "-- risectl" -else - set_env RISEDEV_CARGO_BUILD_CRATE "risingwave_cmd" - set_env RISEDEV_CTL_RUN_CMD "--bin risectl --" -end +set_env RISEDEV_CARGO_BUILD_CRATE "risingwave_cmd_all" +set_env RISEDEV_CTL_RUN_CMD "-- risectl" if ${is_hdfs_backend} set_env BUILD_HDFS_BACKEND_CMD "-p risingwave_object_store --features hdfs-backend" @@ -268,31 +262,10 @@ set -e python -mwebbrowser file://$(pwd)/target/doc/index.html ''' -[tasks.link-standalone-binaries] -private = true -category = "RiseDev - Build" -description = "Link standalone cmds to RiseDev bin" -condition = { env_not_set = ["ENABLE_ALL_IN_ONE"] } -script = ''' -#!/usr/bin/env bash -set -e -rm -f "${PREFIX_BIN}/compute-node" -rm -f "${PREFIX_BIN}/meta-node" -rm -f "${PREFIX_BIN}/frontend" -rm -f "${PREFIX_BIN}/compactor" -rm -f "${PREFIX_BIN}/risectl" -ln -s "$(pwd)/target/${RISEDEV_BUILD_TARGET_DIR}${BUILD_MODE_DIR}/compute-node" "${PREFIX_BIN}/compute-node" -ln -s "$(pwd)/target/${RISEDEV_BUILD_TARGET_DIR}${BUILD_MODE_DIR}/meta-node" "${PREFIX_BIN}/meta-node" -ln -s "$(pwd)/target/${RISEDEV_BUILD_TARGET_DIR}${BUILD_MODE_DIR}/frontend" "${PREFIX_BIN}/frontend" -ln -s "$(pwd)/target/${RISEDEV_BUILD_TARGET_DIR}${BUILD_MODE_DIR}/compactor" "${PREFIX_BIN}/compactor" -ln -s "$(pwd)/target/${RISEDEV_BUILD_TARGET_DIR}${BUILD_MODE_DIR}/risectl" "${PREFIX_BIN}/risectl" -''' - [tasks.link-all-in-one-binaries] private = true category = "RiseDev - Build" description = "Link all-in-one cmds to RiseDev bin" -condition = { env_set = ["ENABLE_ALL_IN_ONE"] } script = ''' #!/usr/bin/env bash set -e @@ -339,13 +312,7 @@ script = ''' #!/usr/bin/env bash set -e -binaries=() - -if [[ "$ENABLE_ALL_IN_ONE" == "true" ]]; then - binaries=("risingwave") -else - binaries=("meta-node" "compute-node" "frontend" "compactor") -fi +binaries=("risingwave") set -ex echo -n "${binaries[*]}" | parallel -d ' ' \ @@ -356,7 +323,6 @@ echo -n "${binaries[*]}" | parallel -d ' ' \ private = true category = "RiseDev - Build" description = "Link all binaries to .bin" -condition = { env_set = ["ENABLE_ALL_IN_ONE"] } script = ''' #!/usr/bin/env bash set -e @@ -375,7 +341,6 @@ category = "RiseDev - Build" description = "Copy RisngWave binaries to bin" condition = { env_set = ["ENABLE_BUILD_RUST"] } dependencies = [ - "link-standalone-binaries", "link-all-in-one-binaries", "link-user-bin", "codesign-binaries", diff --git a/backwards-compat-tests/scripts/run_local.sh b/backwards-compat-tests/scripts/run_local.sh index 81545f70b77a8..76b1a4f333458 100755 --- a/backwards-compat-tests/scripts/run_local.sh +++ b/backwards-compat-tests/scripts/run_local.sh @@ -37,9 +37,6 @@ ENABLE_KAFKA=true # Fetch risingwave binary from release. ENABLE_BUILD_RUST=true -# Ensure it will link the all-in-one binary from our release. -ENABLE_ALL_IN_ONE=true - # ENABLE_RELEASE_PROFILE=true EOF } diff --git a/ci/risedev-components.ci.benchmark.env b/ci/risedev-components.ci.benchmark.env index 59136a30477ea..67171fe10bc28 100644 --- a/ci/risedev-components.ci.benchmark.env +++ b/ci/risedev-components.ci.benchmark.env @@ -1,7 +1,6 @@ RISEDEV_CONFIGURED=true ENABLE_MINIO=true ENABLE_ETCD=true -ENABLE_ALL_IN_ONE=true ENABLE_KAFKA=true ENABLE_BUILD_RUST=true ENABLE_RELEASE_PROFILE=true diff --git a/ci/risedev-components.ci.env b/ci/risedev-components.ci.env index 48adc7eb2594a..7157083eb871a 100644 --- a/ci/risedev-components.ci.env +++ b/ci/risedev-components.ci.env @@ -1,4 +1,3 @@ RISEDEV_CONFIGURED=true ENABLE_MINIO=true ENABLE_ETCD=true -ENABLE_ALL_IN_ONE=true diff --git a/ci/risedev-components.ci.source.env b/ci/risedev-components.ci.source.env index ccdd18b7ab9c4..255b873eab94d 100644 --- a/ci/risedev-components.ci.source.env +++ b/ci/risedev-components.ci.source.env @@ -1,6 +1,5 @@ RISEDEV_CONFIGURED=true ENABLE_MINIO=true ENABLE_ETCD=true -ENABLE_ALL_IN_ONE=true ENABLE_KAFKA=true ENABLE_PUBSUB=true diff --git a/ci/scripts/backwards-compat-test.sh b/ci/scripts/backwards-compat-test.sh index 0c013574d4185..c085b7a957f5f 100755 --- a/ci/scripts/backwards-compat-test.sh +++ b/ci/scripts/backwards-compat-test.sh @@ -61,9 +61,6 @@ ENABLE_KAFKA=true # Fetch risingwave binary from release. ENABLE_BUILD_RUST=false -# Ensure it will link the all-in-one binary from our release. -ENABLE_ALL_IN_ONE=true - # Use target/debug for simplicity. ENABLE_RELEASE_PROFILE=false EOF @@ -94,9 +91,6 @@ ENABLE_KAFKA=true # Make sure that it builds ENABLE_BUILD_RUST=true -# Ensure it will link the all-in-one binary from our release. -ENABLE_ALL_IN_ONE=true - # Use target/debug for simplicity. ENABLE_RELEASE_PROFILE=false EOF diff --git a/ci/scripts/gen-flamegraph.sh b/ci/scripts/gen-flamegraph.sh index 11abf2290d6f1..70d9086c36dea 100755 --- a/ci/scripts/gen-flamegraph.sh +++ b/ci/scripts/gen-flamegraph.sh @@ -159,7 +159,6 @@ ENABLE_KAFKA=true ENABLE_COMPUTE_TRACING=true ENABLE_BUILD_RUST=true ENABLE_RELEASE_PROFILE=true -ENABLE_ALL_IN_ONE=true EOF popd } diff --git a/src/cmd/Cargo.toml b/src/cmd/Cargo.toml index de69cc3574509..10a007932dcf9 100644 --- a/src/cmd/Cargo.toml +++ b/src/cmd/Cargo.toml @@ -52,26 +52,6 @@ task_stats_alloc = { path = "../utils/task_stats_alloc" } [lib] test = false -[[bin]] -name = "frontend" -path = "src/bin/frontend_node.rs" -test = false - -[[bin]] -name = "meta-node" -path = "src/bin/meta_node.rs" -test = false - -[[bin]] -name = "compute-node" -path = "src/bin/compute_node.rs" -test = false - -[[bin]] -name = "compactor" -path = "src/bin/compactor.rs" -test = false - [[bin]] name = "risectl" path = "src/bin/ctl.rs" diff --git a/src/cmd/src/bin/compactor.rs b/src/cmd/src/bin/compactor.rs deleted file mode 100644 index 93f1e9c7f8bc8..0000000000000 --- a/src/cmd/src/bin/compactor.rs +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright 2024 RisingWave Labs -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#![cfg_attr(coverage, feature(coverage_attribute))] - -risingwave_cmd::main!(compactor); diff --git a/src/cmd/src/bin/compute_node.rs b/src/cmd/src/bin/compute_node.rs deleted file mode 100644 index 1537a0169c3e4..0000000000000 --- a/src/cmd/src/bin/compute_node.rs +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright 2024 RisingWave Labs -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#![cfg_attr(coverage, feature(coverage_attribute))] - -risingwave_cmd::main!(compute); diff --git a/src/cmd/src/bin/frontend_node.rs b/src/cmd/src/bin/frontend_node.rs deleted file mode 100644 index 20e6f3123e950..0000000000000 --- a/src/cmd/src/bin/frontend_node.rs +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright 2024 RisingWave Labs -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#![cfg_attr(coverage, feature(coverage_attribute))] - -risingwave_cmd::main!(frontend); diff --git a/src/cmd/src/bin/meta_node.rs b/src/cmd/src/bin/meta_node.rs deleted file mode 100644 index bb474d014871e..0000000000000 --- a/src/cmd/src/bin/meta_node.rs +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright 2024 RisingWave Labs -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#![cfg_attr(coverage, feature(coverage_attribute))] - -risingwave_cmd::main!(meta); diff --git a/src/risedevtool/config/src/main.rs b/src/risedevtool/config/src/main.rs index 292c191a8bf84..e8874456bb50b 100644 --- a/src/risedevtool/config/src/main.rs +++ b/src/risedevtool/config/src/main.rs @@ -70,7 +70,6 @@ pub enum Components { BuildConnectorNode, Dashboard, Release, - AllInOne, Sanitizer, DynamicLinking, HummockTrace, @@ -92,7 +91,6 @@ impl Components { Self::Dashboard => "[Build] Dashboard", Self::Tracing => "[Component] Tracing: Grafana Tempo", Self::Release => "[Build] Enable release mode", - Self::AllInOne => "[Build] Enable all-in-one binary", Self::Sanitizer => "[Build] Enable sanitizer", Self::DynamicLinking => "[Build] Enable dynamic linking", Self::HummockTrace => "[Build] Hummock Trace", @@ -148,12 +146,6 @@ you download Grafana Tempo." Self::Release => { " Build RisingWave in release mode" - } - Self::AllInOne => { - " -With this option enabled, RiseDev will help you create -symlinks to `risingwave` all-in-one binary, so as to build -and use `risingwave` in all-in-one mode." } Self::Sanitizer => { " @@ -212,7 +204,6 @@ As a result, RisingWave will dump the core on panics. "ENABLE_COMPUTE_TRACING" => Some(Self::Tracing), "ENABLE_RELEASE_PROFILE" => Some(Self::Release), "ENABLE_DYNAMIC_LINKING" => Some(Self::DynamicLinking), - "ENABLE_ALL_IN_ONE" => Some(Self::AllInOne), "ENABLE_SANITIZER" => Some(Self::Sanitizer), "ENABLE_REDIS" => Some(Self::Redis), "ENABLE_BUILD_RW_CONNECTOR" => Some(Self::BuildConnectorNode), @@ -234,7 +225,6 @@ As a result, RisingWave will dump the core on panics. Self::Dashboard => "ENABLE_BUILD_DASHBOARD", Self::Tracing => "ENABLE_COMPUTE_TRACING", Self::Release => "ENABLE_RELEASE_PROFILE", - Self::AllInOne => "ENABLE_ALL_IN_ONE", Self::Sanitizer => "ENABLE_SANITIZER", Self::BuildConnectorNode => "ENABLE_BUILD_RW_CONNECTOR", Self::DynamicLinking => "ENABLE_DYNAMIC_LINKING", diff --git a/src/risedevtool/src/task/compactor_service.rs b/src/risedevtool/src/task/compactor_service.rs index 393a40d5b1aa5..1a2b24b36bc97 100644 --- a/src/risedevtool/src/task/compactor_service.rs +++ b/src/risedevtool/src/task/compactor_service.rs @@ -34,15 +34,9 @@ impl CompactorService { fn compactor(&self) -> Result { let prefix_bin = env::var("PREFIX_BIN")?; - if let Ok(x) = env::var("ENABLE_ALL_IN_ONE") - && x == "true" - { - Ok(Command::new( - Path::new(&prefix_bin).join("risingwave").join("compactor"), - )) - } else { - Ok(Command::new(Path::new(&prefix_bin).join("compactor"))) - } + Ok(Command::new( + Path::new(&prefix_bin).join("risingwave").join("compactor"), + )) } /// Apply command args according to config diff --git a/src/risedevtool/src/task/compute_node_service.rs b/src/risedevtool/src/task/compute_node_service.rs index b8fc7c1184dfe..3dfba5f3e3e16 100644 --- a/src/risedevtool/src/task/compute_node_service.rs +++ b/src/risedevtool/src/task/compute_node_service.rs @@ -34,17 +34,11 @@ impl ComputeNodeService { fn compute_node(&self) -> Result { let prefix_bin = env::var("PREFIX_BIN")?; - if let Ok(x) = env::var("ENABLE_ALL_IN_ONE") - && x == "true" - { - Ok(Command::new( - Path::new(&prefix_bin) - .join("risingwave") - .join("compute-node"), - )) - } else { - Ok(Command::new(Path::new(&prefix_bin).join("compute-node"))) - } + Ok(Command::new( + Path::new(&prefix_bin) + .join("risingwave") + .join("compute-node"), + )) } /// Apply command args according to config diff --git a/src/risedevtool/src/task/frontend_service.rs b/src/risedevtool/src/task/frontend_service.rs index e37349dafdc1d..2ce67db6b7582 100644 --- a/src/risedevtool/src/task/frontend_service.rs +++ b/src/risedevtool/src/task/frontend_service.rs @@ -35,17 +35,11 @@ impl FrontendService { fn frontend(&self) -> Result { let prefix_bin = env::var("PREFIX_BIN")?; - if let Ok(x) = env::var("ENABLE_ALL_IN_ONE") - && x == "true" - { - Ok(Command::new( - Path::new(&prefix_bin) - .join("risingwave") - .join("frontend-node"), - )) - } else { - Ok(Command::new(Path::new(&prefix_bin).join("frontend"))) - } + Ok(Command::new( + Path::new(&prefix_bin) + .join("risingwave") + .join("frontend-node"), + )) } /// Apply command args according to config diff --git a/src/risedevtool/src/task/meta_node_service.rs b/src/risedevtool/src/task/meta_node_service.rs index 83b55c0d7104f..d88580618763a 100644 --- a/src/risedevtool/src/task/meta_node_service.rs +++ b/src/risedevtool/src/task/meta_node_service.rs @@ -35,15 +35,9 @@ impl MetaNodeService { fn meta_node(&self) -> Result { let prefix_bin = env::var("PREFIX_BIN")?; - if let Ok(x) = env::var("ENABLE_ALL_IN_ONE") - && x == "true" - { - Ok(Command::new( - Path::new(&prefix_bin).join("risingwave").join("meta-node"), - )) - } else { - Ok(Command::new(Path::new(&prefix_bin).join("meta-node"))) - } + Ok(Command::new( + Path::new(&prefix_bin).join("risingwave").join("meta-node"), + )) } /// Apply command args according to config