Skip to content

Commit a68bbba

Browse files
authored
Fixed release.py issue and updated a doc (#402)
1 parent 3ca209a commit a68bbba

File tree

2 files changed

+50
-20
lines changed

2 files changed

+50
-20
lines changed

docs/GettingStarted.md

Lines changed: 41 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ installed. For Windows, you must have Docker Desktop installed. See
2222
[Deephaven's Quick Start Guide](https://deephaven.io/core/docs/tutorials/quickstart/) for Docker version requirements
2323
and setup tips.
2424

25-
For Benchmark setup, the following docker-compose.yml file is useful.
26-
````
25+
For Benchmark setup, the following `docker-compose.yml` file is useful.
26+
```
2727
services:
2828
deephaven:
2929
image: ghcr.io/deephaven/server:edge
@@ -39,8 +39,8 @@ services:
3939
- redpanda
4040
- start
4141
- --smp 2
42-
- --memory 2G
4342
- --reserve-memory 0M
43+
- --memory=1G
4444
- --overprovisioned
4545
- --node-id 0
4646
- --check=false
@@ -50,13 +50,49 @@ services:
5050
- PLAINTEXT://redpanda:29092,OUTSIDE://localhost:9092
5151
- --pandaproxy-addr 0.0.0.0:8082
5252
- --advertise-pandaproxy-addr redpanda:8082
53-
image: docker.redpanda.com/vectorized/redpanda:v23.2.22
53+
image: redpandadata/redpanda:v24.1.2
5454
ports:
5555
- 8081:8081
5656
- 8082:8082
5757
- 9092:9092
5858
- 29092:29092
59-
````
59+
60+
minio-server:
61+
image: minio/minio:RELEASE.2024-07-04T14-25-45Z
62+
command: server /minio --console-address ":9001"
63+
hostname: minio
64+
environment:
65+
MINIO_DOMAIN: minio
66+
networks:
67+
default:
68+
aliases:
69+
- data.minio
70+
expose:
71+
- "9000"
72+
- "9001"
73+
ports:
74+
- 9000:9000
75+
- 9001:9001
76+
healthcheck:
77+
test: ["CMD", "mc", "ready", "local"]
78+
interval: 5s
79+
timeout: 5s
80+
retries: 5
81+
volumes:
82+
- ./minio:/minio
83+
84+
minio-bucket:
85+
image: minio/mc
86+
depends_on:
87+
- minio-server
88+
entrypoint: >
89+
/bin/sh -c "
90+
/usr/bin/mc alias set endpoint http://minio:9000 minioadmin minioadmin;
91+
/usr/bin/mc mb endpoint/data;
92+
/usr/bin/mc anonymous set public endpoint/data;
93+
exit 0;
94+
"
95+
```
6096

6197
## Building/Running Tests Outside of the IDE
6298

src/main/resources/io/deephaven/benchmark/run/profile/queries/release.py

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,20 @@
1-
# Copyright (c) 2023-2024 Deephaven Data Labs and Patent Pending
1+
# Copyright (c) 2022-2025 Deephaven Data Labs and Patent Pending
22
#
33
# Supporting Deephaven queries to use the benchmark_snippet to investigate changes between releases
44
# - Generate tables for best and wost static rates between the latest release and previous
55
# - Generate table using same benchmarks as standard summmary SVG for comparison to previous releases
6-
# Requirements: Deephaven 0.23.0 or greater
6+
# Requirements: Deephaven 0.32.0 or greater
77

88
from urllib.request import urlopen; import os
99

1010
root = 'file:///nfs' if os.path.exists('/nfs/deephaven-benchmark') else 'https://storage.googleapis.com'
1111
with urlopen(root + '/deephaven-benchmark/benchmark_tables.dh.py') as r:
1212
benchmark_storage_uri_arg = root + '/deephaven-benchmark'
13-
benchmark_category_arg = 'release' # release | nightly
14-
benchmark_max_sets_arg = 5
13+
benchmark_category_arg = 'release'
14+
benchmark_max_sets_arg = 4
1515
benchmark_actor_filter_arg = 'deephaven'
16-
benchmark_set_filter_arg = '[0-9]{2}[.][0-9]{3}[.][0-9]{2}'
1716
exec(r.read().decode(), globals(), locals())
1817

19-
# Replace any characters that are illegal in DH column names
20-
def column_name(name):
21-
name = name.replace('/','__')
22-
return re.sub('[^A-Za-z0-9_$]', '_', name)
23-
2418
# Return a table containing only non-obsolete benchmarks having at least two of the most recent versions
2519
# Candidate for pulling up into deephaven_tables.py
2620
def latest_comparable_benchmarks(filter_table):
@@ -44,13 +38,13 @@ def latest_comparable_benchmarks(filter_table):
4438
vers_tbl = newest_benchmarks.view(["deephaven_version"])
4539

4640
from deephaven import numpy as dhnp
47-
vers = dhnp.to_numpy(newest_benchmarks.view(["deephaven_version"]).first_by())
48-
print("Vers: ", vers)
41+
vers = dhnp.to_numpy(newest_benchmarks.select_distinct(["deephaven_version"]))
4942
versLen = len(vers)
50-
vers = [normalize_name(ver) for ver in vers]
43+
vers = [normalize_name('V_' + ver[0]) for ver in vers]
44+
print("Vers: ", vers)
5145

5246
past_static_rates = newest_benchmarks.where(['benchmark_name.endsWith(`-Static`)']) \
53-
.group_by(['benchmark_name','origin','set_id']) \
47+
.sort_descending(['set_id']).group_by(['benchmark_name','origin']) \
5448
.update(['Change=gain(op_rate[1], op_rate[0])']) \
5549
.update([(vers[i] + "=op_rate[" + str(i) + "]") for i in range(versLen)]) \
5650
.view(['Static_Benchmark=benchmark_name.replace(` -Static`,``)',
@@ -74,5 +68,5 @@ def latest_comparable_benchmarks(filter_table):
7468
("Static_Benchmark='" + name + "'") for name in summary_bechmark_names
7569
])
7670

77-
parquet_benchmarks = past_static_rates.where(["Static_Benchmark.startsWith(`Parquet`)"]).sort(['Change'])
71+
parquet_benchmarks = past_static_rates.where(["Static_Benchmark.contains(`Parquet`)"]).sort(['Change'])
7872

0 commit comments

Comments
 (0)