mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-02-13 11:19:49 -06:00
Code Issues Packages Projects Releases 129 Wiki Activity

PR feedback

Browse Source
This commit is contained in:
Daylon Wilkins
2022-06-03 10:55:50 -07:00
committed by Daylon Wilkins
parent 3fe01d4157
commit b02c0b86f3
3 changed files with 19 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
go/libraries/doltcore/sqle/writer/prolly_fk_indexer.go
View File

@@ -56,11 +56,10 @@ func (n prollyFkIndexer) Partitions(ctx *sql.Context) (sql.PartitionIter, error)
// PartitionRows implements the interface sql.Table.
func (n prollyFkIndexer) PartitionRows(ctx *sql.Context, _ sql.Partition) (sql.RowIter, error) {
var idxWriter indexWriter
var ok bool
if n.index.IsPrimaryKey() {
idxWriter = n.writer.primary
} else if idxWriterPosition, ok := n.writer.secNames[n.index.ID()]; ok {
idxWriter = n.writer.secondary[idxWriterPosition]
} else {
} else if idxWriter, ok = n.writer.secondary[n.index.ID()]; !ok {
return nil, fmt.Errorf("unable to find writer for index `%s`", n.index.ID())
}

36
go/libraries/doltcore/sqle/writer/prolly_table_writer.go
View File

@@ -38,8 +38,7 @@ type prollyTableWriter struct {
dbName string
primary indexWriter
secondary []indexWriter
secNames map[string]int
secondary map[string]indexWriter
tbl *doltdb.Table
sch schema.Schema
@@ -55,17 +54,18 @@ type prollyTableWriter struct {
var _ TableWriter = &prollyTableWriter{}
func getSecondaryProllyIndexWriters(ctx context.Context, t *doltdb.Table, sqlSch sql.Schema, sch schema.Schema) ([]indexWriter, error) {
func getSecondaryProllyIndexWriters(ctx context.Context, t *doltdb.Table, sqlSch sql.Schema, sch schema.Schema) (map[string]indexWriter, error) {
s, err := t.GetIndexSet(ctx)
if err != nil {
return nil, err
}
definitions := sch.Indexes().AllIndexes()
writers := make([]indexWriter, len(definitions))
writers := make(map[string]indexWriter)
for i, def := range definitions {
idxRows, err := s.GetIndex(ctx, sch, def.Name())
for _, def := range definitions {
defName := def.Name()
idxRows, err := s.GetIndex(ctx, sch, defName)
if err != nil {
return nil, err
}
@@ -74,8 +74,8 @@ func getSecondaryProllyIndexWriters(ctx context.Context, t *doltdb.Table, sqlSch
keyMap, valMap := ordinalMappingsFromSchema(sqlSch, def.Schema())
keyDesc, valDesc := m.Descriptors()
writers[i] = prollyIndexWriter{
name: def.Name(),
writers[defName] = prollyIndexWriter{
name: defName,
mut: m.Mutate(),
keyBld: val.NewTupleBuilder(keyDesc),
keyMap: keyMap,
@@ -87,17 +87,18 @@ func getSecondaryProllyIndexWriters(ctx context.Context, t *doltdb.Table, sqlSch
return writers, nil
}
func getSecondaryKeylessProllyWriters(ctx context.Context, t *doltdb.Table, sqlSch sql.Schema, sch schema.Schema, primary prollyKeylessWriter) ([]indexWriter, error) {
func getSecondaryKeylessProllyWriters(ctx context.Context, t *doltdb.Table, sqlSch sql.Schema, sch schema.Schema, primary prollyKeylessWriter) (map[string]indexWriter, error) {
s, err := t.GetIndexSet(ctx)
if err != nil {
return nil, err
}
definitions := sch.Indexes().AllIndexes()
writers := make([]indexWriter, len(definitions))
writers := make(map[string]indexWriter)
for i, def := range definitions {
idxRows, err := s.GetIndex(ctx, sch, def.Name())
for _, def := range definitions {
defName := def.Name()
idxRows, err := s.GetIndex(ctx, sch, defName)
if err != nil {
return nil, err
}
@@ -107,8 +108,8 @@ func getSecondaryKeylessProllyWriters(ctx context.Context, t *doltdb.Table, sqlS
keyMap, valMap := ordinalMappingsFromSchema(sqlSch, def.Schema())
keyDesc, valDesc := m.Descriptors()
writers[i] = prollyKeylessSecondaryWriter{
name: def.Name(),
writers[defName] = prollyKeylessSecondaryWriter{
name: defName,
mut: m.Mutate(),
primary: primary,
unique: def.IsUnique(),
@@ -261,7 +262,7 @@ func (w *prollyTableWriter) Reset(ctx context.Context, sess *prollyWriteSession,
aiCol := autoIncrementColFromSchema(sch)
var newPrimary indexWriter
var newSecondaries []indexWriter
var newSecondaries map[string]indexWriter
if schema.IsKeyless(sch) {
newPrimary, err = getPrimaryKeylessProllyWriter(ctx, tbl, sqlSch.Schema, sch)
if err != nil {
@@ -281,17 +282,12 @@ func (w *prollyTableWriter) Reset(ctx context.Context, sess *prollyWriteSession,
return err
}
}
secNames := make(map[string]int)
for i, secondaryWriter := range newSecondaries {
secNames[secondaryWriter.Name()] = i
}
w.tbl = tbl
w.sch = sch
w.sqlSch = sqlSch.Schema
w.primary = newPrimary
w.secondary = newSecondaries
w.secNames = secNames
w.aiCol = aiCol
w.flusher = sess

7
go/libraries/doltcore/sqle/writer/prolly_write_session.go
View File

@@ -66,7 +66,7 @@ func (s *prollyWriteSession) GetTableWriter(ctx context.Context, table, db strin
autoCol := autoIncrementColFromSchema(sch)
var pw indexWriter
var sws []indexWriter
var sws map[string]indexWriter
if schema.IsKeyless(sch) {
pw, err = getPrimaryKeylessProllyWriter(ctx, t, pkSch.Schema, sch)
if err != nil {
@@ -86,17 +86,12 @@ func (s *prollyWriteSession) GetTableWriter(ctx context.Context, table, db strin
return nil, err
}
}
secNames := make(map[string]int)
for i, secondaryWriter := range sws {
secNames[secondaryWriter.Name()] = i
}
twr := &prollyTableWriter{
tableName: table,
dbName: db,
primary: pw,
secondary: sws,
secNames: secNames,
tbl: t,
sch: sch,
sqlSch: pkSch.Schema,