mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-04-21 11:29:51 -05:00
Code Issues Packages Projects Releases 156 Wiki Activity

Make num_data_conflicts nil when schema conflicts

Browse Source
This commit is contained in:
Taylor Bantle
2025-05-20 11:22:45 -07:00
parent f0748011e8
commit 431a1daba7
5 changed files with 62 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/merge-perf.yaml
+1 -1
View File
@@ -77,7 +77,7 @@ jobs:
TMPDIR=$gw/tmp
./${{ env.SCRIPT_DIR}}/setup.sh $TMPDIR $DATADIR
# small python script times merge, we suppres errcodes but print error messages
# small python script times merge, we suppress errcodes but print error messages
cd $TMPDIR
python3 -c "import time, subprocess, sys; start = time.time(); res=subprocess.run(['dolt', 'merge', '--squash', 'main'], capture_output=True); err = res.stdout + res.stderr if res.returncode != 0 else ''; latency = time.time() -start; print(latency); sys.stderr.write(str(err))" 1> lat.log 2>err.log
latency=$(cat lat.log)