Skip to content

Commit

Permalink
Merge branch 'main' into xxchan/test
Browse files Browse the repository at this point in the history
  • Loading branch information
xxchan authored Oct 18, 2023
2 parents 4b1367a + 272ce88 commit 20ca939
Show file tree
Hide file tree
Showing 38 changed files with 2,206 additions and 1,493 deletions.
4 changes: 2 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ hashbrown = { version = "0.14.0", features = [
] }
criterion = { version = "0.5", features = ["async_futures"] }
tonic = { package = "madsim-tonic", version = "0.4.0" }
tonic-build = { package = "madsim-tonic-build", version = "0.4.0" }
tonic-build = { package = "madsim-tonic-build", version = "0.4.2" }
prost = { version = "0.12" }
icelake = { git = "https://github.com/icelake-io/icelake", rev = "16dab0e36ab337e58ee8002d828def2d212fa116" }
arrow-array = "47"
Expand Down
1 change: 1 addition & 0 deletions Makefile.toml
Original file line number Diff line number Diff line change
Expand Up @@ -406,6 +406,7 @@ condition = { env_set = [
"ENABLE_BUILD_DASHBOARD",
], files_modified = { input = [
"./dashboard/**/*.js",
"./dashboard/**/*.ts*",
"./dashboard/package.json",
"./dashboard/next.config.js",
], output = [
Expand Down
8 changes: 5 additions & 3 deletions ci/scripts/release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ if [ "${BUILDKITE_SOURCE}" != "schedule" ] && [ "${BUILDKITE_SOURCE}" != "webhoo
fi

echo "--- Install java and maven"
yum install -y java-11-openjdk wget python3 cyrus-sasl-devel
yum install -y java-11-openjdk java-11-openjdk-devel wget python3 cyrus-sasl-devel
pip3 install toml-cli
wget https://ci-deps-dist.s3.amazonaws.com/apache-maven-3.9.3-bin.tar.gz && tar -zxvf apache-maven-3.9.3-bin.tar.gz
export PATH="${REPO_ROOT}/apache-maven-3.9.3/bin:$PATH"
Expand Down Expand Up @@ -64,6 +64,10 @@ elif [[ -n "${BINARY_NAME+x}" ]]; then
aws s3 cp risingwave-${BINARY_NAME}-x86_64-unknown-linux.tar.gz s3://risingwave-nightly-pre-built-binary
fi

echo "--- Build connector node"
cd ${REPO_ROOT}/java && mvn -B package -Dmaven.test.skip=true -Dno-build-rust
cd ${REPO_ROOT} && mv ${REPO_ROOT}/java/connector-node/assembly/target/risingwave-connector-1.0.0.tar.gz risingwave-connector-"${BUILDKITE_TAG}".tar.gz

if [[ -n "${BUILDKITE_TAG}" ]]; then
echo "--- Install gh cli"
yum install -y dnf
Expand All @@ -87,8 +91,6 @@ if [[ -n "${BUILDKITE_TAG}" ]]; then
gh release upload "${BUILDKITE_TAG}" risectl-"${BUILDKITE_TAG}"-x86_64-unknown-linux.tar.gz

echo "--- Release build and upload risingwave connector node jar asset"
cd ${REPO_ROOT}/java && mvn -B package -Dmaven.test.skip=true -Dno-build-rust
cd connector-node/assembly/target && mv risingwave-connector-1.0.0.tar.gz risingwave-connector-"${BUILDKITE_TAG}".tar.gz
gh release upload "${BUILDKITE_TAG}" risingwave-connector-"${BUILDKITE_TAG}".tar.gz
fi

Expand Down
31 changes: 22 additions & 9 deletions dashboard/pages/await_tree.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,22 +36,32 @@ import { getClusterInfoComputeNode } from "./api/cluster"
import useFetch from "./api/fetch"

const SIDEBAR_WIDTH = 200
const ALL_COMPUTE_NODES = ""

export default function AwaitTreeDump() {
const { response: computeNodes } = useFetch(getClusterInfoComputeNode)

const [computeNodeId, setComputeNodeId] = useState<number>()
const [dump, setDump] = useState<string | undefined>("")
const [computeNodeId, setComputeNodeId] = useState<string>()
const [dump, setDump] = useState<string>("")

useEffect(() => {
if (computeNodes && !computeNodeId && computeNodes.length > 0) {
setComputeNodeId(computeNodes[0].id)
if (computeNodes && !computeNodeId) {
setComputeNodeId(ALL_COMPUTE_NODES)
}
}, [computeNodes, computeNodeId])

const dumpTree = async () => {
const title = `Await-Tree Dump of Compute Node ${computeNodeId}:`
setDump(undefined)
if (computeNodeId === undefined) {
return
}

let title
if (computeNodeId === ALL_COMPUTE_NODES) {
title = "Await-Tree Dump of All Compute Nodes:"
} else {
title = `Await-Tree Dump of Compute Node ${computeNodeId}:`
}
setDump("Loading...")

let result

Expand Down Expand Up @@ -92,10 +102,13 @@ export default function AwaitTreeDump() {
<FormLabel>Compute Nodes</FormLabel>
<VStack>
<Select
onChange={(event) =>
setComputeNodeId(parseInt(event.target.value))
}
onChange={(event) => setComputeNodeId(event.target.value)}
>
{computeNodes && (
<option value={ALL_COMPUTE_NODES} key={ALL_COMPUTE_NODES}>
All
</option>
)}
{computeNodes &&
computeNodes.map((n) => (
<option value={n.id} key={n.id}>
Expand Down
5 changes: 5 additions & 0 deletions e2e_test/ddl/alter_rename_relation.slt
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,11 @@ public.mv_on_v1 CREATE MATERIALIZED VIEW mv_on_v1 AS SELECT * FROM v5 AS v1
statement ok
ALTER INDEX idx RENAME TO idx1;

query TT
SHOW CREATE INDEX idx1;
----
public.idx1 CREATE INDEX idx1 ON t2(v1)

statement ok
INSERT INTO t2 VALUES(1,(1,(1,2)));

Expand Down
20 changes: 12 additions & 8 deletions integration_tests/feature-store/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
FROM rust:1.67 as feature-store-server
FROM ubuntu:20.04 AS feature-store-server
ARG BUILD_ARG
ENV DEBIAN_FRONTEND=noninteractive

USER root

Expand All @@ -9,8 +10,11 @@ RUN mkdir -p $WORK_DIR
WORKDIR $WORK_DIR

RUN apt update
RUN apt install -y python3 python3-pip wget ca-certificates
RUN apt install -y postgresql-client
RUN apt install -y lsof curl openssl libssl-dev pkg-config build-essential \
cmake \
python3 python3-pip wget ca-certificates \
postgresql-client \
protobuf-compiler

ADD ./server/model/requirements.txt $WORK_DIR/model-pipreqs.txt
ADD ./generator/requirements.txt $WORK_DIR/generator-pipreqs.txt
Expand All @@ -19,8 +23,8 @@ RUN pip3 install -r $WORK_DIR/model-pipreqs.txt
RUN pip3 install -r $WORK_DIR/generator-pipreqs.txt
RUN pip3 install risingwave

RUN apt install -y lsof curl openssl libssl-dev pkg-config build-essential
RUN apt install -y cmake librdkafka-dev
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --no-modify-path -y
ENV PATH /root/.cargo/bin/:$PATH

# Install .NET 6.0
RUN wget https://packages.microsoft.com/config/debian/11/packages-microsoft-prod.deb -O packages-microsoft-prod.deb
Expand Down Expand Up @@ -49,11 +53,11 @@ ADD ./run.sh $WORK_DIR/run-sh/
ADD ./run-mfa.sh $WORK_DIR/run-sh/

RUN if [ "$BUILD_ARG" = "mfa" ]; then \
cp $WORK_DIR/run-sh/run-mfa.sh $WORK_DIR/run.sh;\
cp $WORK_DIR/run-sh/run-mfa.sh $WORK_DIR/run.sh;\
else \
cp $WORK_DIR/run-sh/run.sh $WORK_DIR/run.sh;\
cp $WORK_DIR/run-sh/run.sh $WORK_DIR/run.sh;\
fi

RUN chmod +x $WORK_DIR/run.sh && rm -rf $WORK_DIR/run-sh

CMD ["sh", "-c", "sleep 10 && ./run.sh"]
CMD ["sh", "-c", "sleep 10 && ./run.sh"]
16 changes: 12 additions & 4 deletions integration_tests/feature-store/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@ When a user needs to make a prediction using these features, they can provide th

1. Build docker. Kafka RisingWave and Feature Store.

```docker compose up --build```
```
docker compose up --build
```


The Feature Store system performs several tasks in sequence:
Expand All @@ -40,7 +42,9 @@ The Feature Store system performs several tasks in sequence:

2. Then we can get the simulation results for Feature store in `.log`.

```cat .log/simulator_log```
```
cat .log/simulator_log
```

# Account change feature store
#### Case Description
Expand All @@ -53,8 +57,12 @@ In this case, we need to calculate the frequency and count of user account chang

1. Build docker. Kafka RisingWave and Feature Store.

```docker compose build --build-arg BUILD_ARG=mfa```
```
docker compose build --build-arg BUILD_ARG=mfa
```

2. Then we can get the simulation results for Feature store in `.log`.

```cat .log/simulator_log```
```
cat .log/simulator_log
```
1 change: 0 additions & 1 deletion integration_tests/feature-store/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ services:
- "./mfa-start.sql:/mfa-start.sql"
- "./mfa-mock.sql:/mfa-mock.sql"
feature-store:
image: rust:1.67
build:
context: .
target: feature-store-server
Expand Down
Loading

0 comments on commit 20ca939

Please sign in to comment.