lib/mergeset: consistency renaming: ip->mp for inmemoryPart vars

This commit is contained in:
Aliaksandr Valialkin 2022-03-03 15:48:22 +02:00
parent e8fdb27625
commit 7da4068f48
No known key found for this signature in database
GPG key ID: A72BEC6CD3D0DED1
2 changed files with 12 additions and 12 deletions

View file

@ -98,20 +98,20 @@ func (bsr *blockStreamReader) String() string {
return bsr.ph.String() return bsr.ph.String()
} }
// InitFromInmemoryPart initializes bsr from the given ip. // InitFromInmemoryPart initializes bsr from the given mp.
func (bsr *blockStreamReader) InitFromInmemoryPart(ip *inmemoryPart) { func (bsr *blockStreamReader) InitFromInmemoryPart(mp *inmemoryPart) {
bsr.reset() bsr.reset()
var err error var err error
bsr.mrs, err = unmarshalMetaindexRows(bsr.mrs[:0], ip.metaindexData.NewReader()) bsr.mrs, err = unmarshalMetaindexRows(bsr.mrs[:0], mp.metaindexData.NewReader())
if err != nil { if err != nil {
logger.Panicf("BUG: cannot unmarshal metaindex rows from inmemory part: %s", err) logger.Panicf("BUG: cannot unmarshal metaindex rows from inmemory part: %s", err)
} }
bsr.ph.CopyFrom(&ip.ph) bsr.ph.CopyFrom(&mp.ph)
bsr.indexReader = ip.indexData.NewReader() bsr.indexReader = mp.indexData.NewReader()
bsr.itemsReader = ip.itemsData.NewReader() bsr.itemsReader = mp.itemsData.NewReader()
bsr.lensReader = ip.lensData.NewReader() bsr.lensReader = mp.lensData.NewReader()
if bsr.ph.itemsCount <= 0 { if bsr.ph.itemsCount <= 0 {
logger.Panicf("BUG: source inmemoryPart must contain at least a single item") logger.Panicf("BUG: source inmemoryPart must contain at least a single item")

View file

@ -63,17 +63,17 @@ func (bsw *blockStreamWriter) reset() {
bsw.mrFirstItemCaught = false bsw.mrFirstItemCaught = false
} }
func (bsw *blockStreamWriter) InitFromInmemoryPart(ip *inmemoryPart) { func (bsw *blockStreamWriter) InitFromInmemoryPart(mp *inmemoryPart) {
bsw.reset() bsw.reset()
// Use the minimum compression level for in-memory blocks, // Use the minimum compression level for in-memory blocks,
// since they are going to be re-compressed during the merge into file-based blocks. // since they are going to be re-compressed during the merge into file-based blocks.
bsw.compressLevel = -5 // See https://github.com/facebook/zstd/releases/tag/v1.3.4 bsw.compressLevel = -5 // See https://github.com/facebook/zstd/releases/tag/v1.3.4
bsw.metaindexWriter = &ip.metaindexData bsw.metaindexWriter = &mp.metaindexData
bsw.indexWriter = &ip.indexData bsw.indexWriter = &mp.indexData
bsw.itemsWriter = &ip.itemsData bsw.itemsWriter = &mp.itemsData
bsw.lensWriter = &ip.lensData bsw.lensWriter = &mp.lensData
} }
// InitFromFilePart initializes bsw from a file-based part on the given path. // InitFromFilePart initializes bsw from a file-based part on the given path.