• A
    Separate internal and user key comparators in `BlockIter` (#6944) · dd29ad42
    Andrew Kryczka 提交于
    Summary:
    Replace `BlockIter::comparator_` and `IndexBlockIter::user_comparator_wrapper_` with a concrete `UserComparatorWrapper` and `InternalKeyComparator`. The motivation for this change was the inconvenience of not knowing the concrete type of `BlockIter::comparator_`, which prevented calling specialized internal key comparison functions to optimize comparison of keys with global seqno applied.
    
    Pull Request resolved: https://github.com/facebook/rocksdb/pull/6944
    
    Test Plan:
    benchmark setup -- single file DBs, in-memory, no compression. "normal_db"
    created by regular flush; "ingestion_db" created by ingesting a file. Both
    DBs have same contents.
    
    ```
    $ TEST_TMPDIR=/dev/shm/normal_db/ ./db_bench -benchmarks=fillrandom,compact -write_buffer_size=10485760000 -disable_auto_compactions=true -compression_type=none -num=1000000
    $ ./ldb write_extern_sst ./tmp.sst --db=/dev/shm/ingestion_db/dbbench/ --compression_type=no --hex --create_if_missing < <(./sst_dump --command=scan --output_hex --file=/dev/shm/normal_db/dbbench/000007.sst | awk 'began {print "0x" substr($1, 2, length($1) - 2), "==>", "0x" $5} ; /^Sst file format: block-based/ {began=1}')
    $ ./ldb ingest_extern_sst ./tmp.sst --db=/dev/shm/ingestion_db/dbbench/
    ```
    
    benchmark run command:
    
    ```
    $ TEST_TMPDIR=/dev/shm/$DB/ ./db_bench -benchmarks=seekrandom -seek_nexts=$SEEK_NEXT -use_existing_db=true -cache_index_and_filter_blocks=false -num=1000000 -cache_size=0 -threads=1 -reads=200000000 -mmap_read=1 -verify_checksum=false
    ```
    
    results: perf improved marginally for ingestion_db and did not change significantly for normal_db:
    
    SEEK_NEXT | DB | code | ops/sec | % change
    -- | -- | -- | -- | --
    0 | normal_db | master | 350880 |  
    0 | normal_db | PR6944 | 351040 | 0.0
    0 | ingestion_db | master | 343255 |  
    0 | ingestion_db | PR6944 | 349424 | 1.8
    10 | normal_db | master | 218711 |  
    10 | normal_db | PR6944 | 217892 | -0.4
    10 | ingestion_db | master | 220334 |  
    10 | ingestion_db | PR6944 | 226437 | 2.8
    
    Reviewed By: pdillinger
    
    Differential Revision: D21924676
    
    Pulled By: ajkr
    
    fbshipit-source-id: ea4288a2eefa8112eb6c651a671c1de18c12e538
    dd29ad42
block_based_table_reader.cc 132.3 KB