From 20101cdece0943b98140afc67b0fdce0dc9e5cb9 Mon Sep 17 00:00:00 2001 From: xxchan Date: Tue, 17 Oct 2023 13:37:25 +0800 Subject: [PATCH] fix --- integration_tests/feature-store/Dockerfile | 4 ++-- .../feature-store/server/Cargo.lock | 19 ++++++++++++++----- .../feature-store/server/Cargo.toml | 2 +- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/integration_tests/feature-store/Dockerfile b/integration_tests/feature-store/Dockerfile index 6a4cefcfcd95c..592f593875c81 100644 --- a/integration_tests/feature-store/Dockerfile +++ b/integration_tests/feature-store/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:22.04 AS feature-store-server +FROM ubuntu:20.04 AS feature-store-server ARG BUILD_ARG ENV DEBIAN_FRONTEND=noninteractive @@ -11,7 +11,7 @@ WORKDIR $WORK_DIR RUN apt update RUN apt install -y lsof curl openssl libssl-dev pkg-config build-essential \ - cmake librdkafka-dev \ + cmake \ python3 python3-pip wget ca-certificates \ postgresql-client \ protobuf-compiler diff --git a/integration_tests/feature-store/server/Cargo.lock b/integration_tests/feature-store/server/Cargo.lock index 4cbf42aabd6f2..452bbfe3db14d 100644 --- a/integration_tests/feature-store/server/Cargo.lock +++ b/integration_tests/feature-store/server/Cargo.lock @@ -302,6 +302,15 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" +[[package]] +name = "cmake" +version = "0.1.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130" +dependencies = [ + "cc", +] + [[package]] name = "colorchoice" version = "1.0.0" @@ -1455,9 +1464,9 @@ dependencies = [ [[package]] name = "rdkafka" -version = "0.31.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88383df3a85a38adfa2aa447d3ab6eb9cedcb49613adcf18e7e7ebb3b62e9b03" +checksum = "053adfa02fab06e86c01d586cc68aa47ee0ff4489a59469081dc12cbcde578bf" dependencies = [ "futures-channel", "futures-util", @@ -1473,10 +1482,11 @@ dependencies = [ [[package]] name = "rdkafka-sys" -version = "4.4.0+1.9.2" +version = "4.6.0+2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87ac9d87c3aba1748e3112318459f2ac8bff80bfff7359e338e0463549590249" +checksum = "ad63c279fca41a27c231c450a2d2ad18288032e9cbb159ad16c9d96eba35aaaf" dependencies = [ + "cmake", "libc", "libz-sys", "num_enum", @@ -1699,7 +1709,6 @@ dependencies = [ "clap", "prost", "rdkafka", - "rdkafka-sys", "reqwest", "serde_json", "sqlx", diff --git a/integration_tests/feature-store/server/Cargo.toml b/integration_tests/feature-store/server/Cargo.toml index 43b8bb79d314a..ce43a3f8af506 100644 --- a/integration_tests/feature-store/server/Cargo.toml +++ b/integration_tests/feature-store/server/Cargo.toml @@ -13,7 +13,7 @@ sqlx = { version = "0.7", features = ["runtime-tokio-native-tls", "postgres"] } tokio = { version = "1", features = ["full"] } tonic = "0.10.2" reqwest = { version = "0.11", features = ["blocking"] } -rdkafka = { version = "=0.31", features = ["dynamic-linking"] } +rdkafka = { version = "0.34", features = ["cmake-build"] } serde_json = "1.0" prost = "0.12" clap = "4.4.6"