Merge branch 'master' into fb1031-souhaila

This commit is contained in:
souhailanoor 2021-12-02 13:11:19 -06:00 committed by GitHub
commit 0189b2eef7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions

View file

@ -2485,7 +2485,7 @@ func (f *fragment) importPositions(tx Tx, set, clear []uint64, rowSet map[uint64
err = doFunc()
}
if err != nil {
if err != nil && f.storage != nil {
// we got an error. it's possible that the error indicates that something went wrong.
mappedIn, mappedOut, unmappedIn, errs, e2 := f.storage.SanityCheckMapping(f.currdata.from, f.currdata.to)
if errs != 0 {

View file

@ -93,12 +93,12 @@ The leaf page contains a series of cells with the header of:
[8] highbits
[4] flag
[4] child count
[*] array or RLE data
[*] array or RLE data or Handle (a pageno) to Bitmap Data
### Bitmap page
### Bitmap Data page
The data for the bitmap page takes up the entire 8KB.
The data for the bitmap data page takes up the entire 8KB.
## Proof of Concept Notes