Skip to content

Commit

Permalink
rename variable
Browse files Browse the repository at this point in the history
  • Loading branch information
@crazycs520
crazycs520 committed Aug 10, 2019
1 parent dce01eb commit c3e7dba
Show file tree
Hide file tree
Showing 2 changed files with 61 additions and 61 deletions.
110 changes: 55 additions & 55 deletions executor/mem_reader.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ type memIndexReader struct {
outputOffset []int
// cache for decode handle.
handleBytes []byte
// memIdxHandles is uses to store the handle ids that has been read by memIndexReader.
memIdxHandles set.Int64Set
// memProcessedHandles is uses to store the handle ids that has been processed by memIndexReader.
memProcessedHandles set.Int64Set
// belowHandleIndex is the handle's position of the below scan plan.
belowHandleIndex int
}
Expand All @@ -56,18 +56,18 @@ func buildMemIndexReader(us *UnionScanExec, idxReader *IndexReaderExecutor) *mem
outputOffset = append(outputOffset, col.Index)
}
return &memIndexReader{
ctx: us.ctx,
index: idxReader.index,
table: idxReader.table.Meta(),
kvRanges: kvRanges,
desc: us.desc,
conditions: us.conditions,
addedRows: make([][]types.Datum, 0, 2),
retFieldTypes: retTypes(us),
outputOffset: outputOffset,
handleBytes: make([]byte, 0, 16),
memIdxHandles: set.NewInt64Set(),
belowHandleIndex: us.belowHandleIndex,
ctx: us.ctx,
index: idxReader.index,
table: idxReader.table.Meta(),
kvRanges: kvRanges,
desc: us.desc,
conditions: us.conditions,
addedRows: make([][]types.Datum, 0, 2),
retFieldTypes: retTypes(us),
outputOffset: outputOffset,
handleBytes: make([]byte, 0, 16),
memProcessedHandles: set.NewInt64Set(),
belowHandleIndex: us.belowHandleIndex,
}
}

Expand Down Expand Up @@ -96,7 +96,7 @@ func (m *memIndexReader) getMemRows() ([][]types.Datum, error) {
return err
}
handle := data[m.belowHandleIndex].GetInt64()
m.memIdxHandles.Insert(handle)
m.memProcessedHandles.Insert(handle)

mutableRow.SetDatums(data...)
matched, _, err := expression.EvalBool(m.ctx, m.conditions, mutableRow.ToRow())
Expand Down Expand Up @@ -146,10 +146,10 @@ type memTableReader struct {
desc bool
conditions []expression.Expression
addedRows [][]types.Datum
// memIdxHandles is uses to store the handle ids that has been read.
memIdxHandles set.Int64Set
retFieldTypes []*types.FieldType
colIDs map[int64]int
// memProcessedHandles is uses to store the handle ids that has been processed.
memProcessedHandles set.Int64Set
retFieldTypes []*types.FieldType
colIDs map[int64]int
// cache for decode handle.
handleBytes []byte
}
Expand All @@ -162,17 +162,17 @@ func buildMemTableReader(us *UnionScanExec, tblReader *TableReaderExecutor) *mem
}

return &memTableReader{
ctx: us.ctx,
table: tblReader.table.Meta(),
columns: us.columns,
kvRanges: kvRanges,
desc: us.desc,
conditions: us.conditions,
addedRows: make([][]types.Datum, 0, 2),
memIdxHandles: set.NewInt64Set(),
retFieldTypes: retTypes(us),
colIDs: colIDs,
handleBytes: make([]byte, 0, 16),
ctx: us.ctx,
table: tblReader.table.Meta(),
columns: us.columns,
kvRanges: kvRanges,
desc: us.desc,
conditions: us.conditions,
addedRows: make([][]types.Datum, 0, 2),
memProcessedHandles: set.NewInt64Set(),
retFieldTypes: retTypes(us),
colIDs: colIDs,
handleBytes: make([]byte, 0, 16),
}
}

Expand All @@ -190,17 +190,17 @@ func buildMemTableReaderWithFullRange(us *UnionScanExec) *memTableReader {

fullTableRange := distsql.TableRangesToKVRanges(getPhysicalTableID(us.table), ranger.FullIntRange(pkIsUnsigned), nil)
return &memTableReader{
ctx: us.ctx,
table: us.table.Meta(),
columns: us.columns,
kvRanges: fullTableRange,
desc: us.desc,
conditions: us.conditions,
addedRows: make([][]types.Datum, 0, 2),
memIdxHandles: set.NewInt64Set(),
retFieldTypes: retTypes(us),
colIDs: colIDs,
handleBytes: make([]byte, 0, 16),
ctx: us.ctx,
table: us.table.Meta(),
columns: us.columns,
kvRanges: fullTableRange,
desc: us.desc,
conditions: us.conditions,
addedRows: make([][]types.Datum, 0, 2),
memProcessedHandles: set.NewInt64Set(),
retFieldTypes: retTypes(us),
colIDs: colIDs,
handleBytes: make([]byte, 0, 16),
}
}

Expand Down Expand Up @@ -237,8 +237,8 @@ func (m *memTableReader) decodeRecordKeyValue(key, value []byte) ([]types.Datum,
if err != nil {
return nil, errors.Trace(err)
}
if m.memIdxHandles != nil {
m.memIdxHandles.Insert(handle)
if m.memProcessedHandles != nil {
m.memProcessedHandles.Insert(handle)
}
return decodeRowData(m.ctx, m.table, m.columns, m.colIDs, handle, m.handleBytes, value)
}
Expand Down Expand Up @@ -363,7 +363,7 @@ func (m *memIndexReader) getMemRowsHandle() ([]int64, error) {
return err
}
handles = append(handles, handle)
m.memIdxHandles[handle] = struct{}{}
m.memProcessedHandles[handle] = struct{}{}
return nil
})
if err != nil {
Expand Down Expand Up @@ -413,17 +413,17 @@ func buildMemIndexLookUpReader(us *UnionScanExec, idxLookUpReader *IndexLookUpEx
kvRanges := idxLookUpReader.kvRanges
outputOffset := []int{len(idxLookUpReader.index.Columns)}
memIdxReader := &memIndexReader{
ctx: us.ctx,
index: idxLookUpReader.index,
table: idxLookUpReader.table.Meta(),
kvRanges: kvRanges,
desc: idxLookUpReader.desc,
addedRows: make([][]types.Datum, 0, 2),
retFieldTypes: retTypes(us),
outputOffset: outputOffset,
handleBytes: make([]byte, 0, 16),
memIdxHandles: make(map[int64]struct{}, 2),
belowHandleIndex: us.belowHandleIndex,
ctx: us.ctx,
index: idxLookUpReader.index,
table: idxLookUpReader.table.Meta(),
kvRanges: kvRanges,
desc: idxLookUpReader.desc,
addedRows: make([][]types.Datum, 0, 2),
retFieldTypes: retTypes(us),
outputOffset: outputOffset,
handleBytes: make([]byte, 0, 16),
memProcessedHandles: make(map[int64]struct{}, 2),
belowHandleIndex: us.belowHandleIndex,
}

return &memIndexLookUpReader{
Expand Down
12 changes: 6 additions & 6 deletions executor/union_scan.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ type UnionScanExec struct {
belowHandleIndex int

addedRows [][]types.Datum
// memIdxHandles is uses to store the handle ids that has been read by memIndexReader.
memIdxHandles set.Int64Set
// memProcessedHandles is uses to store the handle ids that has been read by memIndexReader.
memProcessedHandles set.Int64Set
cursor4AddRows int
sortErr error
snapshotRows [][]types.Datum
Expand Down Expand Up @@ -81,7 +81,7 @@ func (us *UnionScanExec) open(ctx context.Context) error {
} else {
mIdxReader := buildMemIndexReader(us, x)
us.addedRows, err = mIdxReader.getMemRows()
us.memIdxHandles = mIdxReader.memIdxHandles
us.memProcessedHandles = mIdxReader.memProcessedHandles
}
case *IndexLookUpExecutor:
tid := getPhysicalTableID(x.table)
Expand All @@ -91,7 +91,7 @@ func (us *UnionScanExec) open(ctx context.Context) error {
} else {
idxLookup := buildMemIndexLookUpReader(us, x)
us.addedRows, err = idxLookup.getMemRows()
us.memIdxHandles = idxLookup.idxReader.memIdxHandles
us.memProcessedHandles = idxLookup.idxReader.memProcessedHandles
}
}
if err != nil {
Expand Down Expand Up @@ -177,7 +177,7 @@ func (us *UnionScanExec) getSnapshotRow(ctx context.Context) ([]types.Datum, err
if _, ok := us.deletedRows[snapshotHandle]; ok {
continue
}
if _, ok := us.memIdxHandles[snapshotHandle]; ok {
if _, ok := us.memProcessedHandles[snapshotHandle]; ok {
continue
}
us.snapshotRows = append(us.snapshotRows, row.GetDatumRow(retTypes(us.children[0])))
Expand Down Expand Up @@ -248,7 +248,7 @@ func (us *UnionScanExec) buildAndSortAddedRowsFromMemTableReader() error {
if err != nil {
return err
}
us.memIdxHandles = tableReaderWithFullRange.memIdxHandles
us.memProcessedHandles = tableReaderWithFullRange.memProcessedHandles
us.addedRows = make([][]types.Datum, 0, len(rows))
mutableRow := chunk.MutRowFromTypes(retTypes(us))
for _, row := range rows {
Expand Down

0 comments on commit c3e7dba

Please sign in to comment.