mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-02-05 10:31:30 -06:00
Code Issues Packages Projects Releases 126 Wiki Activity

index bug fix (#1139)

Browse Source
This commit is contained in:
Brian Hendriks
2020-12-21 16:30:51 -08:00
committed by GitHub
parent bddb90b999
commit f07170be23
2 changed files with 30 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
go/libraries/doltcore/diff/querydiff/query_differ_test.go
View File

@@ -371,6 +371,16 @@ var engineTestSetup = []testCommand{
{commands.SqlCmd{}, []string{"-q", `create view myview as select * from mytable`}},
//{commands.SqlCmd{}, []string{"-q", "create view myview1 as select * from myhistorytable"}},
{commands.SqlCmd{}, []string{"-q", "create view myview2 as select * from myview where i = 1"}},
{commands.SqlCmd{}, []string{"-q", `
CREATE TABLE people (
dob DATE,
first_name VARCHAR(64),
last_name VARCHAR(64),
middle_name VARCHAR(64),
height_inches TINYINT,
gender TINYINT,
primary key (dob,first_name,last_name,middle_name)
)`}},
{commands.AddCmd{}, []string{"."}},
{commands.CommitCmd{}, []string{"-m", "setup enginetest test tables"}},
{commands.SqlCmd{}, []string{"-q", "insert into mytable values " +
@@ -444,13 +454,21 @@ var engineTestSetup = []testCommand{
"(6, NULL, '2');"}},
{commands.SqlCmd{}, []string{"-q", `insert into reservedWordsTable values
("1", "1.1", "aaa", "create");`}},
{commands.SqlCmd{}, []string{"-q", `
INSERT INTO people (dob,first_name,last_name,middle_name,height_inches,gender)
VALUES
("1970-12-01", "jon", "smith", "", 72, 0),
("1980-01-11", "jon", "smith", "", 67, 0),
("1990-02-21", "jane", "doe", "", 68, 1),
("2000-12-31", "frank", "franklin", "", 70, 2),
("2010-03-15", "jane", "doe", "", 69, 1)`}},
}
func setupEngineTests(t *testing.T) *env.DoltEnv {
dEnv := dtestutils.CreateTestEnv()
for _, c := range engineTestSetup {
exitCode := c.cmd.Exec(context.Background(), c.cmd.Name(), c.args, dEnv)
assert.Equal(t, 0, exitCode)
require.Equal(t, 0, exitCode)
}
return dEnv
}

16
go/libraries/doltcore/sqle/index_row_iter.go
View File

@@ -30,7 +30,7 @@ import (
type indexLookupRowIterAdapter struct {
idx DoltIndex
keyIter nomsKeyIter
pkTags *set.Uint64Set
pkTags map[uint64]int
conv *KVToSqlRowConverter
ctx *sql.Context
rowChan chan sql.Row
@@ -45,7 +45,11 @@ type keyPos struct {
// NewIndexLookupRowIterAdapter returns a new indexLookupRowIterAdapter.
func NewIndexLookupRowIterAdapter(ctx *sql.Context, idx DoltIndex, keyIter nomsKeyIter) *indexLookupRowIterAdapter {
pkTags := set.NewUint64Set(idx.Schema().GetPKCols().Tags)
pkTags := make(map[uint64]int)
for i, tag := range idx.Schema().GetPKCols().Tags {
pkTags[tag] = i
}
conv := NewKVToSqlRowConverterForCols(idx.Schema().GetAllCols().GetColumns())
iter := &indexLookupRowIterAdapter{
idx: idx,
@@ -132,7 +136,7 @@ func (i *indexLookupRowIterAdapter) indexKeyToTableKey(nbf *types.NomsBinFormat,
return nil, err
}
var resVals []types.Value
resVals := make([]types.Value, len(i.pkTags)*2)
for {
_, tagVal, err := tplItr.Next()
@@ -145,15 +149,17 @@ func (i *indexLookupRowIterAdapter) indexKeyToTableKey(nbf *types.NomsBinFormat,
}
tag := uint64(tagVal.(types.Uint))
idx, inPK := i.pkTags[tag]
if i.pkTags.Contains(tag) {
if inPK {
_, valVal, err := tplItr.Next()
if err != nil {
return nil, err
}
resVals = append(resVals, tagVal, valVal)
resVals[idx*2] = tagVal
resVals[idx*2+1] = valVal
} else {
err := tplItr.Skip()