mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-03-17 23:56:33 -05:00
Code Issues Packages Projects Releases 147 Wiki Activity

Fixed bug in table editor for inserts combined with updates. Still kind of fragile and broken in other ways, probably.

Browse Source 
Signed-off-by: Zach Musgrave <zach@liquidata.co>
This commit is contained in:
Zach Musgrave
2019-12-04 11:16:36 -08:00
parent f3fe71ec31
commit 4faea631ea
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
go/libraries/doltcore/sqle/table_editor.go
View File

@@ -27,10 +27,11 @@ import (
// tableEditor supports making multiple row edits (inserts, updates, deletes) to a table. It does error checking for key
// collision etc. in the Close() method, as well as during Insert / Update.
type tableEditor struct {
t *DoltTable
ed *types.MapEditor
addedKeys map[hash.Hash]types.Value
removedKeys map[hash.Hash]types.Value
t *DoltTable
ed *types.MapEditor
insertedKeys map[hash.Hash]types.Value
addedKeys map[hash.Hash]types.Value
removedKeys map[hash.Hash]types.Value
}
var _ sql.RowReplacer = (*tableEditor)(nil)
@@ -41,6 +42,7 @@ var _ sql.RowDeleter = (*tableEditor)(nil)
func newTableEditor(t *DoltTable) *tableEditor {
return &tableEditor{
t: t,
insertedKeys: make(map[hash.Hash]types.Value),
addedKeys: make(map[hash.Hash]types.Value),
removedKeys: make(map[hash.Hash]types.Value),
}
@@ -67,6 +69,7 @@ func (te *tableEditor) Insert(ctx *sql.Context, sqlRow sql.Row) error {
if _, ok := te.addedKeys[hash]; ok {
return errors.New("duplicate primary key given")
}
te.insertedKeys[hash] = key
te.addedKeys[hash] = key
if te.ed == nil {
@@ -128,7 +131,7 @@ func (te *tableEditor) Update(ctx *sql.Context, oldRow sql.Row, newRow sql.Row)
return err
}
// If the PK is changed then we have to delete the old row first
// If the PK is changed then we need to delete the old value and insert the new one
dOldKey := dOldRow.NomsMapKey(te.t.sch)
dOldKeyVal, err := dOldKey.Value(ctx)
if err != nil {
@@ -150,12 +153,11 @@ func (te *tableEditor) Update(ctx *sql.Context, oldRow sql.Row, newRow sql.Row)
return err
}
// if _, ok := te.addedKeys[newHash]; ok {
// return errors.New("Cannot update key before flushing current batch")
// }
// if _, ok := te.addedKeys[oldHash]; ok {
// return errors.New("Cannot update key before flushing current batch")
// }
// If the old value of the primary key we just updated was previously inserted, then we need to remove it now.
if _, ok := te.insertedKeys[oldHash]; ok {
delete(te.insertedKeys, oldHash)
te.ed.Remove(dOldKeyVal)
}
te.addedKeys[newHash] = dNewKeyVal
te.removedKeys[oldHash] = dOldKeyVal

2
go/libraries/doltcore/sqle/table_editor_test.go
View File

@@ -137,7 +137,7 @@ func TestTableEditor(t *testing.T) {
setup: func(ctx *sql.Context, t *testing.T, ed *tableEditor) {
require.NoError(t, ed.Insert(ctx, r(edna, PeopleTestSchema)))
require.NoError(t, ed.Insert(ctx, r(krusty, PeopleTestSchema)))
expectedErr = ed.Update(ctx, r(edna, PeopleTestSchema), r(MutateRow(edna, IdTag, 30), PeopleTestSchema))
require.NoError(t, ed.Update(ctx, r(edna, PeopleTestSchema), r(MutateRow(edna, IdTag, 30), PeopleTestSchema)))
},
selectQuery: "select * from people where id >= 10",
expectedRows: CompressRows(PeopleTestSchema,