Commit Graph

19317 Commits

Author SHA1 Message Date
Jason Fulghum b7e079108d missing import 2023-05-22 09:19:25 -07:00
Jason Fulghum ab80db31f6 dep updates 2023-05-22 09:19:09 -07:00
Jason Fulghum 100da53873 Revert "Breaking the direct package dependency from dsess to merge"
This reverts commit 9c65e422cf.
2023-05-22 09:13:01 -07:00
Jason Fulghum 9064f45a5e Merge branch 'main' into fulghum/schema-merge 2023-05-22 09:12:55 -07:00
Nick Tobey a4a97d27fc Merge pull request #5943 from dolthub/nicktobey/detached_head
Don't panic when in detached head state.
2023-05-18 16:43:53 -07:00
Tim Sehn 3d424e144c Merge pull request #5985 from dolthub/tim/more-load-data-tests
`LOAD DATA` bats tests improvements
2023-05-18 15:20:34 -07:00
Tim Sehn 3b43b06cef Remove extraneous spaces 2023-05-18 13:24:42 -07:00
Tim Sehn bdff9be723 More thorough load data bats tests 2023-05-18 13:15:22 -07:00
Tim Sehn 4be9963b63 More load data tests 2023-05-18 12:42:43 -07:00
Tim Sehn ce0d917c64 Load data testing progress 2023-05-18 12:08:23 -07:00
Tim Sehn fcb5455fd0 Stubs and a couple bats tests for load data bats tests improvements 2023-05-18 11:11:31 -07:00
Maximilian Hoffman f4f4c200be [no-release-notes] fix GMS bump (#5979) 2023-05-18 09:02:05 -07:00
Jason Fulghum 9c65e422cf Breaking the direct package dependency from dsess to merge 2023-05-17 14:44:28 -07:00
Nick Tobey 6af53091ee Merge branch 'main' of github.com:dolthub/dolt into nicktobey/detached_head 2023-05-17 11:18:12 -07:00
Nick Tobey 9226024961 Add clarifying TODO to GetWorkingSet. 2023-05-17 11:14:37 -07:00
Aaron Son 8e7dafa27d Merge pull request #5940 from dolthub/aaron/block-on-cluster-replication
go: sqle: cluster: Implement dolt_cluster_ack_writes_timeout_secs, a way to block COMMIT ack until the commit is replicated to cluster standbys.
2023-05-17 06:11:06 -07:00
James Cor b0bdef9f21 Merge pull request #5971 from dolthub/JCOR11599-2405a8d8
[auto-bump] [no-release-notes] dependency by JCOR11599
2023-05-16 22:46:08 -07:00
JCOR11599 621104344f [ga-bump-dep] Bump dependency in Dolt by JCOR11599 2023-05-17 04:30:35 +00:00
Aaron Son 6ea915ca4d Merge remote-tracking branch 'origin/main' into aaron/block-on-cluster-replication 2023-05-16 16:57:09 -07:00
Aaron Son af184681a4 Merge pull request #5949 from dolthub/aaron/cluster-replication-heartbeats
go: sqle: cluster: commithook: Periodically heartbeat to a standby when we are primary. This allows replication_lag on the standby to more accurately reflect the possible drift locally.
2023-05-16 16:51:08 -07:00
Aaron Son 8bbb49b79e go: doltdb,sqle/cluster: Some PR feedback. Small cleanups. 2023-05-16 15:42:14 -07:00
Neil Macneale IV 7a740f3fa0 Use UTC timestamp in date comparison test. 2023-05-16 15:08:31 -07:00
Aaron Son 6ccae75a8d integration-tests/go-sql-server-driver: Add TestCluster/last_updated_heartbeats test which asserts that last_updated does not grow while there are no writes to replicate. 2023-05-16 14:21:41 -07:00
Neil Macneale IV a19dadd32b Use UTC timestamp in date comparison test.
Allows tests to run on laptops which aren't in UTC.
2023-05-16 13:24:07 -07:00
Jason Fulghum f1b5eab94d Merge pull request #5951 from dolthub/fulghum/bugfix
Handle unresolved/resolved foreign keys when determining equality
2023-05-16 10:26:06 -07:00
Aaron Son 2b159425f5 go: doltdb: hooksdatabase: Pass replication status controller as a field on the pass-by-value struct, instead of through the context. 2023-05-16 10:12:36 -07:00
timsehn ad455cf1ed [ga-bump-release] Update Dolt version to 1.1.0 and release v1.1.0 v1.1.0 2023-05-16 16:28:46 +00:00
Daylon Wilkins 1210311abd Merge pull request #5955 from dolthub/Hydrocharged-110a1193
[auto-bump] [no-release-notes] dependency by Hydrocharged
2023-05-16 07:43:36 -07:00
Neil Macneale IV 2f99ed0116 Print global arguments for 'dolt --help' but not 'dolt' 2023-05-16 07:29:28 -07:00
Daylon Wilkins 09648ef769 Second attempt at updating deps 2023-05-16 06:18:50 -07:00
Daylon Wilkins ef6f8e4a06 Updated deps 2023-05-16 06:06:44 -07:00
Hydrocharged 639c8cf181 [ga-bump-dep] Bump dependency in Dolt by Hydrocharged 2023-05-16 12:59:00 +00:00
Neil Macneale IV 9944a32b73 Now with no \n chars 2023-05-15 17:26:17 -07:00
Neil Macneale IV 6ab9794b04 Print global arguments for 'dolt --help' but not 'dolt' 2023-05-15 16:52:27 -07:00
Dustin Brown f2de3f5e8b Update ci-check-repo.yaml 2023-05-15 16:36:50 -07:00
Daylon Wilkins c030044bb0 Merge pull request #5947 from dolthub/Hydrocharged-5bd8954a
[auto-bump] [no-release-notes] dependency by Hydrocharged
2023-05-15 16:18:08 -07:00
Jason Fulghum 3899ddf05a First pass at FK equality checking to handle resolved/unresolved FKs. 2023-05-15 15:35:14 -07:00
Aaron Son e1cb32e022 Merge remote-tracking branch 'origin/main' into aaron/block-on-cluster-replication 2023-05-15 15:04:44 -07:00
reltuk 05125426dc [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2023-05-15 21:26:49 +00:00
bheni 070b8d3c6a [ga-bump-release] Update Dolt version to 1.0.2 and release v1.0.2 v1.0.2 2023-05-15 21:25:05 +00:00
Aaron Son a5358ff02d go: Catch some stragglers in _test files for an interface change. 2023-05-15 14:17:21 -07:00
Aaron Son 601d47bf08 Merge remote-tracking branch 'origin/main' into aaron/cluster-replication-heartbeats 2023-05-15 14:00:34 -07:00
Aaron Son 09eb9aaed5 go: sqle: cluster: Only close successChs when we are actually caught up. 2023-05-15 14:00:04 -07:00
Aaron Son a886ab276a go: sqle: cluster: Add a circuit breaker for dolt_cluster_ack_writes_timeout_secs. Once a replica fails the timeout, do not block on it going forward. 2023-05-15 14:00:04 -07:00
Aaron Son db9dce8e50 go: sqle: dsess/transactions: Turn replication failures into session warnings if dolt_cluster_ack_writes_timeout_secs is on. 2023-05-15 14:00:04 -07:00
Aaron Son c1fedfc457 go/libraries/doltcore/sqle: dprocedures: dolt_branch: Make dolt branch operations (and some related operations, like dolt checkout) able to block on cluster replication. 2023-05-15 14:00:04 -07:00
Aaron Son 535e59141d integration-tests/go-sql-server-driver: Cluster, dolt_cluster_ack_writes_timeout_secs, add a failing test to assert that dolt_branch modifications are waited on. 2023-05-15 14:00:04 -07:00
Nick Tobey 0a632eb8ce Incorporate feedback for https://github.com/dolthub/dolt/pull/5943. 2023-05-15 13:15:03 -07:00
Nick Tobey d80f046f98 Merge pull request #5923 from dolthub/nicktobey/create-like
Prepend table name to auto-generated constraint check names.
2023-05-15 11:56:47 -07:00
reltuk 5ce8cc03d9 [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2023-05-15 18:31:45 +00:00