mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-01-23 10:27:34 -06:00
Code Issues Packages Projects Releases 123 Wiki Activity

merge perf squash quiets errcode

Browse Source
This commit is contained in:
Max Hoffman
2023-02-28 11:27:59 -08:00
parent 6771f82c56
commit 1fef8a5496
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/merge-perf.yaml vendored
View File

@@ -69,7 +69,7 @@ jobs:
./${{ env.SCRIPT_DIR}}/setup.sh $TMPDIR $DATADIR
cd $TMPDIR
latency=$(python3 -c "import time, subprocess; start = time.time(); res=subprocess.run(['dolt', 'merge', '--no-edit', 'main'], capture_output=True); output = res.stdout + res.stderr if res.returncode != 0 else time.time() -start; print(output); exit(res.returncode)")
latency=$(python3 -c "import time, subprocess; start = time.time(); res=subprocess.run(['dolt', 'merge', '--squash', 'main'], capture_output=True); output = res.stdout + res.stderr if res.returncode != 0 else time.time() -start; print(output); exit(res.returncode)")
conflicts=$(dolt sql -r csv -q "select count(*) from dolt_conflicts_table0;" | tail -1)