mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-04-22 19:43:51 -05:00
Code Issues Packages Projects Releases 156 Wiki Activity
15,325 Commits 288 Branches 627 Tags
fea7fa876c387af7b6ac196ff1794ccb613aff44
Commit Graph

9226 Commits

Author SHA1 Message Date
James Cor fea7fa876c more refactoring 2022-09-28 11:39:14 -07:00
James Cor da8246b942 copy pasta and refacta 2022-09-28 11:35:09 -07:00
James Cor d0546ffcdf feedbacK 2022-09-28 11:23:28 -07:00
James Cor b683820fc6 it now do the thing 2022-09-27 23:31:13 -07:00
James Cor 413ca59ec6 some changes, need to fix prolly conflicts to not remerge 2022-09-27 17:15:39 -07:00
JCOR11599 9760bd26e1 [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2022-09-27 22:20:47 +00:00
James Cor 8ff785a3e3 i wonder what this will break 2022-09-27 15:19:19 -07:00
James Cor 6d51206676 more tests, and small keyless fix 2022-09-27 11:29:20 -07:00
James Cor 400999e064 Merge branch 'james/conflicts' of https://github.com/dolthub/dolt into james/conflicts 2022-09-27 00:59:36 -07:00
James Cor bf1de09adf rename to prolly 2022-09-27 00:59:28 -07:00
JCOR11599 3d2ea83dc9 [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2022-09-27 07:23:52 +00:00
James Cor 26d0bc6dd1 working for noms, new format tomorrow :)))))) 2022-09-27 00:21:58 -07:00
James Cor a0f1d6fe32 i forget 2022-09-26 21:06:53 -07:00
JCOR11599 84526cdf65 [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2022-09-26 23:06:20 +00:00
James Cor f1204c3814 keyless conflicts figured out probably, but i have denv anyway 2022-09-26 16:03:04 -07:00
James Cor 76d9eec826 Merge branch 'main' into james/conflicts 2022-09-26 10:03:11 -07:00
jennifersp 691997b87a support dolt_diff_summary_table_function (#4363) 2022-09-26 09:48:58 -07:00
James Cor c05244936a Merge pull request #4399 from dolthub/james/bindvars 
adding prepared tests for dolt stored procedures
 2022-09-23 12:35:41 -07:00
Aaron Son e01f7aa7d7 Merge pull request #4394 from dolthub/aaron/sql-variables-cluster-role-and-epoch 
sql-server: Implement dolt_cluster_role, dolt_cluster_role_epoch variables, dolt_assume_cluster_role procedure.
 2022-09-23 11:44:55 -07:00
James Cor ae89e8e08d i am good at counting 2022-09-23 10:26:23 -07:00
James Cor 1688eca1cc this number is right 2022-09-23 10:19:34 -07:00
James Cor 089b552799 updating prepareds count 2022-09-23 10:14:44 -07:00
James Cor b9feb14941 adding test 2022-09-22 16:35:42 -07:00
James Cor 74472cc162 Merge pull request #4397 from dolthub/james/geom 
print spatial types as hex in shells only
 2022-09-22 16:24:15 -07:00
Dustin Brown 3c937aefb2 [ga-bump-dep] Bump dependency in Dolt by JCOR11599 (#4398) 
Co-authored-by: JCOR11599 <jcor@ucsd.edu>
 2022-09-22 16:19:24 -07:00
James Cor ba4f8c6e33 simpler 2022-09-22 14:58:08 -07:00
James Cor e034896202 print spatial types as hex in shells only 2022-09-22 14:35:07 -07:00
reltuk 9611b480e8 [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2022-09-22 18:57:38 +00:00
Aaron Son 09bed9471d sql-server: Add dolt_assume_cluster_role procedure. 
Currently implements rules around epoch changes and updates the persisted and
global session variables.
 2022-09-22 11:53:15 -07:00
Aaron Son 13e8cab325 sql-server: Add read-only handling for cluster role and role_epoch system variables. 2022-09-22 10:04:32 -07:00
Zach Musgrave aa521524a2 Merge pull request #4389 from dolthub/zachmu/dolt-commit-race 
Fix race for concurrent dolt_commit calls
 2022-09-22 09:23:50 -07:00
Zach Musgrave 8f88f5ee0f Update go/store/datas/database_common.go 
Co-authored-by: Aaron Son <aaron@dolthub.com>
 2022-09-22 09:20:59 -07:00
reltuk 1bb903650d [ga-bump-dep] Bump dependency in Dolt by reltuk 2022-09-22 00:16:27 +00:00
Aaron Son 2a56d984c5 Merge pull request #4387 from dolthub/aaron/remotestorage-remotesrv-support-repo-path 
remotestorage,remotesrv: Be less restrictive in repository paths for remotesapi repos that are not served through dolthub.
 2022-09-21 16:41:30 -07:00
Aaron Son cf1cabe199 go/libraries/doltcore/remotesrv: http.go: Small comment for magic constant 33. 2022-09-21 16:41:13 -07:00
Aaron Son 7bca0b572f Merge pull request #4379 from dolthub/aaron/doltdb-commit_hooks-push-logic-cleanup 
[no-release-notes] go/libraries/doltcore/doltdb: Cleanup commit_hooks pull chunks duplication.
 2022-09-21 16:37:32 -07:00
Aaron Son 9ce8016719 Merge pull request #4383 from dolthub/aaron/sql-server-read-repica-force-pull-setting 
go/libraries/doltcore/sqle: ReadReplicaDatabase: Add variable for force pulling remote branches.
 2022-09-21 16:37:20 -07:00
Aaron Son a70051068d Merge pull request #4386 from dolthub/aaron/sql-server-yaml-parse-and-validate-cluster-config 
go/cmd/dolt/commands/sqlserver: yaml_config.go: Parse and validate cluster: config.
 2022-09-21 16:37:07 -07:00
Zach Musgrave df0ea99b25 Small refactoring to reduce env dependency 2022-09-21 15:50:04 -07:00
Zach Musgrave cdf477fa72 Upgrade vitess 2022-09-21 15:45:52 -07:00
Zach Musgrave 01d8eac77c Clarified the contract of NewPendingCommit. The first parent (current head commit) is now always filled in automatically at commit time at the datas.Database layer 2022-09-21 15:41:32 -07:00
James Cor 3c5180bfde idk how I missed this 2022-09-21 14:13:59 -07:00
James Cor 23b5bdcf80 Merge branch 'main' into james/conflicts 2022-09-21 14:04:08 -07:00
James Cor 4c48785026 compile error from nothing?????? 2022-09-21 14:00:14 -07:00
James Cor e00840459c ? 2022-09-21 13:51:49 -07:00
James Cor d8fc123c9f ok now it's really working 2022-09-21 13:39:16 -07:00
Aaron Son 91a09258ec go: remotesrv: Use RepoPath when it is provided. 2022-09-21 11:55:58 -07:00
Dhruv Sringari 8c8f27d2ad Implement merge stats for the new format (#4384) 
* Add prolly.MergeMapsWithStats

* don't use a callback to update merge stats

* thread merge stats through doltcore/merge
 2022-09-21 10:55:49 -07:00
Aaron Son 73f922493e go/libraries/doltcore/remotestorage: Be more permissive in allowed path, only pass repo_path in requests if repo_id cannot be constructed. 2022-09-21 10:26:21 -07:00
James Cor 2b9ccf677f seems to be working 2022-09-21 10:12:35 -07:00