Skip to main content

Browse the archive

Revision ebcc8ae1d3875aa9529b05b31c3da396cdf0c7bc authored by Siying Dong on 02 April 2019, 16:57:35 UTC, committed by Facebook Github Bot on 02 April 2019, 17:00:38 UTC 
Revert "Avoid per-key upper bound check in BlockBasedTableIterator (#5101)" (#5132)
 
Summary:
This reverts commit f29dc1b90641e7f44b14f932e3866c5840391cd5.

In BlockBasedTableIterator, index_iter_->key() is sometimes a user key, so it is wrong to call ExtractUserKey() against it. This is a bug introduced by #5101.
Temporarily revert the diff to keep the branch clean.
Pull Request resolved: https://github.com/facebook/rocksdb/pull/5132

Differential Revision: D14718584

Pulled By: siying

fbshipit-source-id: 0ac55dc9b5dbc18c7809092146bdf7eb9364b9ad
1 parent fa1b558
Raw File
logging.h 
//  Copyright (c) 2011-present, Facebook, Inc.  All rights reserved.
//  This source code is licensed under both the GPLv2 (found in the
//  COPYING file in the root directory) and Apache 2.0 License
//  (found in the LICENSE.Apache file in the root directory).
//
// Copyright (c) 2011 The LevelDB Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. See the AUTHORS file for names of contributors.
//
// Must not be included from any .h files to avoid polluting the namespace
// with macros.

#pragma once

// Helper macros that include information about file name and line number
#define ROCKS_LOG_STRINGIFY(x) #x
#define ROCKS_LOG_TOSTRING(x) ROCKS_LOG_STRINGIFY(x)
#define ROCKS_LOG_PREPEND_FILE_LINE(FMT) ("[%s:" ROCKS_LOG_TOSTRING(__LINE__) "] " FMT)

inline const char* RocksLogShorterFileName(const char* file)
{
  // 15 is the length of "util/logging.h".
  // If the name of this file changed, please change this number, too.
  return file + (sizeof(__FILE__) > 15 ? sizeof(__FILE__) - 15 : 0);
}

// Don't inclide file/line info in HEADER level
#define ROCKS_LOG_HEADER(LGR, FMT, ...)                                          \
  rocksdb::Log(InfoLogLevel::HEADER_LEVEL, LGR, FMT, ##__VA_ARGS__)

#define ROCKS_LOG_DEBUG(LGR, FMT, ...)                                           \
  rocksdb::Log(InfoLogLevel::DEBUG_LEVEL, LGR, ROCKS_LOG_PREPEND_FILE_LINE(FMT), \
               RocksLogShorterFileName(__FILE__), ##__VA_ARGS__)

#define ROCKS_LOG_INFO(LGR, FMT, ...)                                            \
  rocksdb::Log(InfoLogLevel::INFO_LEVEL, LGR, ROCKS_LOG_PREPEND_FILE_LINE(FMT),  \
               RocksLogShorterFileName(__FILE__), ##__VA_ARGS__)

#define ROCKS_LOG_WARN(LGR, FMT, ...)                                            \
  rocksdb::Log(InfoLogLevel::WARN_LEVEL, LGR, ROCKS_LOG_PREPEND_FILE_LINE(FMT),  \
               RocksLogShorterFileName(__FILE__), ##__VA_ARGS__)

#define ROCKS_LOG_ERROR(LGR, FMT, ...)                                           \
  rocksdb::Log(InfoLogLevel::ERROR_LEVEL, LGR, ROCKS_LOG_PREPEND_FILE_LINE(FMT), \
               RocksLogShorterFileName(__FILE__), ##__VA_ARGS__)

#define ROCKS_LOG_FATAL(LGR, FMT, ...)                                           \
  rocksdb::Log(InfoLogLevel::FATAL_LEVEL, LGR, ROCKS_LOG_PREPEND_FILE_LINE(FMT), \
               RocksLogShorterFileName(__FILE__), ##__VA_ARGS__)

#define ROCKS_LOG_BUFFER(LOG_BUF, FMT, ...)                                      \
  rocksdb::LogToBuffer(LOG_BUF, ROCKS_LOG_PREPEND_FILE_LINE(FMT),                \
                       RocksLogShorterFileName(__FILE__), ##__VA_ARGS__)

#define ROCKS_LOG_BUFFER_MAX_SZ(LOG_BUF, MAX_LOG_SIZE, FMT, ...)                 \
  rocksdb::LogToBuffer(LOG_BUF, MAX_LOG_SIZE, ROCKS_LOG_PREPEND_FILE_LINE(FMT),  \
                       RocksLogShorterFileName(__FILE__), ##__VA_ARGS__)

#define ROCKS_LOG_DETAILS(LGR, FMT, ...) \
  ;  // due to overhead by default skip such lines
// ROCKS_LOG_DEBUG(LGR, FMT, ##__VA_ARGS__)
back to top