Commit Graph

265 Commits

Author SHA1 Message Date
Taylor Bantle
30ec1e7e79 Progress on new diff --summary 2023-02-23 12:20:17 -08:00
Taylor Bantle
6b87f9885c Rename dolt_diff_summary table function to dolt_diff_stat 2023-02-22 13:46:41 -08:00
Taylor Bantle
be862d796c Rename dolt diff --summary to dolt diff --stat, remove some unused code 2023-02-22 13:41:46 -08:00
Daylon Wilkins
75ec9ca946 Line-based diffs for modified multiline rows 2023-02-22 07:44:52 -08:00
Dhruv Sringari
7e08fbb636 Change dolt_diff_summary table function to return empty diffs for tables with pk set changes.
- The 3 argument version returns an error if the table specified has a pk set change.
- The 2 argument verison returns empty diffs and returns a warning.

I considered approximating the diff for the pk set change, but it feels like an overreach
for the customers need.
2022-11-17 12:11:05 -08:00
Andy Arthur
258c89ee43 example identity tests for column/table matching 2022-10-12 15:36:34 -07:00
jennifersp
691997b87a support dolt_diff_summary_table_function (#4363) 2022-09-26 09:48:58 -07:00
Zach Musgrave
0b0d352483 Finished killing pipeline package 2022-09-12 15:50:05 -07:00
Zach Musgrave
593e32fe6a Merge main 2022-08-24 16:00:36 -07:00
Andy Arthur
cae47d06ff cleanup some uses of doltdb.Table.GetNomsRowData 2022-08-24 14:05:20 -07:00
Zach Musgrave
a07dceeb75 Moved start and close code for json writer around 2022-08-24 10:30:54 -07:00
Aaron Son
0ff751a2f5 Merge remote-tracking branch 'origin/main' into aaron/fb-error-on-new-fields 2022-08-23 12:06:20 -07:00
Zach Musgrave
b05235dae8 Fleshing out table diff writer interface and its needs, did some renaming of related interfaces 2022-08-23 10:26:49 -07:00
Zach Musgrave
4e7f392dbd Bug fixes, new schema diff interface 2022-08-23 10:03:31 -07:00
Dhruv Sringari
9758e697c8 Allows diff to be performed across primary key renames (#4156)
* allow diff across pk renames

* pr comments
2022-08-22 14:58:55 -07:00
Dhruv Sringari
4df584336e Fix for diffing across Dolt databases (#4097) 2022-08-16 14:18:35 -07:00
Aaron Son
e16975e50c Merge remote-tracking branch 'origin/main' into aaron/fb-error-on-new-fields 2022-08-16 12:06:40 -07:00
Aaron Son
7906c9e98f go/{store,libraries,gen}: Adopt new flatc, throw an error if we encounter unknown fields. 2022-08-16 11:57:14 -07:00
Andy Arthur
7a70fe1856 cleanup remaining references to __DOLT_1__ 2022-08-09 15:34:10 -07:00
Dhruv Sringari
cad363deeb Fix indeterministic diff delta matching (#4036)
* fix indeterministic diff delta matching

Before this fix, tables with different names would attempted to be matched even if there was a pair of tables with a matching name.

* add a test

* [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh

* copyright

Co-authored-by: druvv <druvv@users.noreply.github.com>
2022-08-08 17:44:28 -07:00
Dhruv Sringari
2cf9a2134f [no-release-notes] In __DOLT_1__, throw error if schemas have different primary key types (#3852)
* In __DOLT_1__, throw error if schemas have different primary key types

* [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh

* schema integration test fix

* [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh

* Compare SQL types

Co-authored-by: druvv <druvv@users.noreply.github.com>
2022-07-19 16:59:12 -07:00
Andy Arthur
1c5481d6e5 Merge remote-tracking branch 'origin/main' into andy/dolt-docs 2022-07-15 10:01:03 -07:00
Dhruv Sringari
d2d0864391 [no-release-notes] keyless diff for the new format (#3817)
* keyless diff for the new format

* [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh

* pr comment

Co-authored-by: druvv <druvv@users.noreply.github.com>
2022-07-13 14:42:43 -07:00
Andy Arthur
faaf7da768 Merge remote-tracking branch 'origin/main' into andy/dolt-docs 2022-07-13 11:15:19 -07:00
Andy Arthur
7b6e77e565 rip out docs 2022-07-05 17:25:28 -07:00
Aaron Son
829981ad64 doltdb: Remove some shims from VRW to NodeStore; carry NodeStores around. 2022-07-05 13:28:56 -07:00
zachmu
ea9ee3f9bd [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2022-06-28 00:34:12 +00:00
Zach Musgrave
45bd67cc94 Clean up and refactor 2022-06-27 15:44:59 -07:00
Zach Musgrave
f1591568f5 Reverted name change for diff enum so it matches what we return in the diff table results 2022-06-24 12:51:38 -07:00
Zach Musgrave
5f193d2e29 Removed obsolete files, moved diff constants / interfaces into their own file 2022-06-24 12:49:37 -07:00
Zach Musgrave
b79bbc9646 SQL diff writer implementation and interface 2022-06-23 15:08:15 -07:00
Zach Musgrave
e7ab49a926 Fixed diff summary bug, starting to implement sql diff writer 2022-06-23 11:47:19 -07:00
Zach Musgrave
9212ae916e Bug fix and skipped a --summary test 2022-06-22 17:19:44 -07:00
Zach Musgrave
ea07611e90 Diff summary for new format 2022-06-22 16:56:05 -07:00
Zach Musgrave
e1e9823102 Moved diffsplitter into its own file 2022-06-22 10:25:46 -07:00
Zach Musgrave
3bff8a7867 Small bug fixes for schema methods with nil schemas 2022-06-21 09:30:03 -07:00
Zach Musgrave
044ff2747e Merge main 2022-06-17 15:53:15 -07:00
Dhruv Sringari
f608335ba7 [no-release-notes] foreign key constraint violations for new storage format (#3605)
* Add Hash160Enc

* persist and read conflicts from merge artifacts table

* update some tests

* [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh

* comment / cleanup prolly/artifact_map.go

* ~copyright~

* reskip TestDoltMerge

* rename Hash160Enc to Address

* change ArtifactType from string to uint8

* fix zero value for ArtifactType

* merge sets of conflicts together, update some tests

* [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh

* pr comments

* cvs can be written to and read

* merge with CVs for new storage format

* working!

* skip cv test

* unskips dolt transaction tests

* [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh

* some cleanup, fix tests

* [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh

* copyright

* fix cv hash roundtripping

* pr comments

* [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh

* cleanup

* fix vet errors and tests

Co-authored-by: druvv <druvv@users.noreply.github.com>
2022-06-14 19:45:22 -07:00
Zach Musgrave
2f91870c17 Slowly gutting color diff sink 2022-06-14 11:40:58 -07:00
Zach Musgrave
df798b77b4 Change table writer interface to use change type instead of color 2022-06-14 11:29:11 -07:00
Dhruv Sringari
06947de821 [no-release-notes] merge sets of conflicts together (#3586)
* Add Hash160Enc

* persist and read conflicts from merge artifacts table

* update some tests

* [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh

* comment / cleanup prolly/artifact_map.go

* ~copyright~

* reskip TestDoltMerge

* rename Hash160Enc to Address

* change ArtifactType from string to uint8

* fix zero value for ArtifactType

* merge sets of conflicts together, update some tests

* [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh

* pr comments

* skip cv test

Co-authored-by: druvv <druvv@users.noreply.github.com>
2022-06-13 14:37:23 -07:00
Zach Musgrave
58a40792fe Cleaned up row splitter methods 2022-06-10 09:47:04 -07:00
Jason Fulghum
d86e097bdf Removing prereq edge cases for TableDelta's HasHashChanged and HasSchemaChanged. 2022-06-08 11:54:18 -07:00
Jason Fulghum
c62fe307c9 Adding helper methods to TableDelta 2022-06-07 11:58:37 -07:00
James Cor
9b3178e45f merge with main 2022-06-06 09:30:27 -07:00
Dhruv Sringari
bb1eab6e7f [no-release-notes] progress on Diff and Merge (#3523)
* resolving conflicts from SQL for new format

also some diff work
fix new format diff bug

I flipped n and m

* reskip test

* [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh

* pr feedback

* unskip TestDiffTableFunction, fix TestTransactions

Co-authored-by: druvv <druvv@users.noreply.github.com>
2022-06-03 11:03:23 -07:00
James Cor
e5c1aa002a working even when adding from columns 2022-06-01 11:24:40 -07:00
James Cor
a6c2c23933 fixing async tests 2022-06-01 10:15:17 -07:00
James Cor
96baacda14 cleaning up: 2022-06-01 10:11:22 -07:00
James Cor
e4238b774a indexed look ups mostly working, but lower bound always inclusive? 2022-06-01 10:00:03 -07:00