]> git-server-git.apps.pok.os.sepia.ceph.com Git - rocksdb.git/commitdiff
Suppress lint in old files rocksdb-5.10.2 v5.10.2
authorMark Isaacson <markisaa@fb.com>
Mon, 29 Jan 2018 20:43:56 +0000 (12:43 -0800)
committerYi Wu <yiwu@fb.com>
Wed, 31 Jan 2018 01:15:39 +0000 (17:15 -0800)
Summary: Grandfather in super old lint issues to make a clean slate for moving forward that allows us to have stronger enforcement on new issues.

Reviewed By: yiwu-arbug

Differential Revision: D6821806

fbshipit-source-id: 22797d31ec58e9eb0255d3b66fedfcfcb0dc127c

29 files changed:
buckifier/buckify_rocksdb.py
buckifier/rocks_test_runner.sh
build_tools/cont_integration.sh
build_tools/dependencies.sh
build_tools/dependencies_4.8.1.sh
build_tools/make_package.sh
coverage/parse_gcov_output.py
db/log_reader.h
hdfs/setup.sh
java/jdb_bench.sh
java/rocksjni/compaction_filter_factory.cc
java/rocksjni/ingest_external_file_options.cc
java/rocksjni/jnicallback.cc
java/rocksjni/jnicallback.h
java/rocksjni/rocks_callback_object.cc
java/rocksjni/statisticsjni.cc
java/rocksjni/statisticsjni.h
table/cuckoo_table_builder_test.cc
tools/auto_sanity_test.sh
tools/benchmark.sh
tools/benchmark_leveldb.sh
tools/db_crashtest.py
tools/ldb_test.py
tools/regression_test.sh
tools/rocksdb_dump_test.sh
tools/write_stress_runner.py
utilities/env_librados.cc
utilities/simulator_cache/sim_cache.cc
utilities/simulator_cache/sim_cache_test.cc

index a3c8be3b17cdb5e14f44c9bac5aee56b89d6918f..6d4136468defad2f78e66bb1cbfaf8330ac09953 100644 (file)
@@ -36,7 +36,7 @@ def parse_src_mk(repo_path):
 # get all .cc / .c files
 def get_cc_files(repo_path):
     cc_files = []
-    for root, dirnames, filenames in os.walk(repo_path):
+    for root, dirnames, filenames in os.walk(repo_path):  # noqa: B007 T25377293 Grandfathered in
         root = root[(len(repo_path) + 1):]
         if "java" in root:
             # Skip java
index e1f48a760d3bac2a505c812c237f91ace72c544b..baca6c2e4084b45dabd0b7ad784b5b81135ff70e 100755 (executable)
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
 # Create a tmp directory for the test to use
 TEST_DIR=$(mktemp -d /dev/shm/fbcode_rocksdb_XXXXXXX)
+# shellcheck disable=SC2068
 TEST_TMPDIR="$TEST_DIR" $@ && rm -rf "$TEST_DIR"
index 06f25c596e4a1ba7e6182bd3859778e3e197702c..66d2552278506da8d84e7c24ab0d397a147db0f9 100755 (executable)
@@ -13,10 +13,12 @@ error=0
 
 function log {
   DATE=`date +%Y-%m-%d:%H:%M:%S`
+  # shellcheck disable=SC2068
   echo $DATE $@
 }
 
 function log_err {
+  # shellcheck disable=SC2145
   log "ERROR: $@ Error code: $error."
 }
 
index 06c7097149356af0ce9e9baeb05452099ba455ab..78f4393b91f2af40130deafe8c0e448842ceb80e 100644 (file)
@@ -1,3 +1,4 @@
+# shellcheck disable=SC2148
 GCC_BASE=/mnt/gvfs/third-party2/gcc/8219ec1bcedf8ad9da05e121e193364de2cc4f61/5.x/centos6-native/c447969
 CLANG_BASE=/mnt/gvfs/third-party2/llvm-fb/64d8d58e3d84f8bde7a029763d4f5baf39d0d5b9/stable/centos6-native/6aaf4de
 LIBGCC_BASE=/mnt/gvfs/third-party2/libgcc/ba9be983c81de7299b59fe71950c664a84dcb5f8/5.x/gcc-5-glibc-2.23/339d858
index ef0cda2398f305c843a97837bca4ccaa8631ed61..bd02165d8a03281ab6ddc89983be110e5d091b76 100644 (file)
@@ -1,3 +1,4 @@
+# shellcheck disable=SC2148
 GCC_BASE=/mnt/gvfs/third-party2/gcc/cf7d14c625ce30bae1a4661c2319c5a283e4dd22/4.8.1/centos6-native/cc6c9dc
 CLANG_BASE=/mnt/gvfs/third-party2/llvm-fb/8598c375b0e94e1448182eb3df034704144a838d/stable/centos6-native/3f16ddd
 LIBGCC_BASE=/mnt/gvfs/third-party2/libgcc/d6e0a7da6faba45f5e5b1638f9edd7afc2f34e7d/4.8.1/gcc-4.8.1-glibc-2.17/8aac7fc
index 58bac4473926a91365191e4bc23a9372b196e0fe..0d86548e82198081d7738d477417c57048b33a17 100755 (executable)
@@ -1,3 +1,4 @@
+# shellcheck disable=SC1113
 #/usr/bin/env bash
 
 set -e
@@ -28,12 +29,14 @@ function package() {
     if dpkg --get-selections | grep --quiet $1; then
       log "$1 is already installed. skipping."
     else
+      # shellcheck disable=SC2068
       apt-get install $@ -y
     fi
   elif [[ $OS = "centos" ]]; then
     if rpm -qa | grep --quiet $1; then
       log "$1 is already installed. skipping."
     else
+      # shellcheck disable=SC2068
       yum install $@ -y
     fi
   fi
@@ -52,6 +55,7 @@ function gem_install() {
   if gem list | grep --quiet $1; then
     log "$1 is already installed. skipping."
   else
+    # shellcheck disable=SC2068
     gem install $@
   fi
 }
@@ -125,4 +129,5 @@ function main() {
     include $LIB_DIR
 }
 
+# shellcheck disable=SC2068
 main $@
index 72e8b07230bb44debb63d7f53dba3720f49d2d03..b007e13b5b73cf36fa06c4613d9d721fae2a2d30 100644 (file)
@@ -72,7 +72,7 @@ def display_file_coverage(per_file_coverage, total_coverage):
     header_template = \
         "%" + str(max_file_name_length) + "s\t%s\t%s"
     separator = "-" * (max_file_name_length + 10 + 20)
-    print header_template % ("Filename", "Coverage", "Lines")
+    print header_template % ("Filename", "Coverage", "Lines")  # noqa: E999 T25377293 Grandfathered in
     print separator
 
     # -- Print body
index c6a471cda4444934fdbcb01639852202819ae634..44db6770291d60b87225a6be40932eabfe8da8f5 100644 (file)
@@ -54,6 +54,7 @@ class Reader {
   // The Reader will start reading at the first record located at physical
   // position >= initial_offset within the file.
   Reader(std::shared_ptr<Logger> info_log,
+  // @lint-ignore TXT2 T25377293 Grandfathered in
         unique_ptr<SequentialFileReader>&& file,
          Reporter* reporter, bool checksum, uint64_t initial_offset,
          uint64_t log_num);
index ac69b525dfdfab229c7ddf0522913462be888e2a..f071b7e3146836fd7499796db947877ac76c035f 100644 (file)
@@ -1,3 +1,4 @@
+# shellcheck disable=SC2148
 export USE_HDFS=1
 export LD_LIBRARY_PATH=$JAVA_HOME/jre/lib/amd64/server:$JAVA_HOME/jre/lib/amd64:/usr/lib/hadoop/lib/native
 
index 9665de785ed480686e7f4e5ea6b1e624b5725845..0a07fa8e2fe3dc131f13fb18d0ba1473d16c9eff 100755 (executable)
@@ -1,3 +1,4 @@
+# shellcheck disable=SC2148
 PLATFORM=64
 if [ `getconf LONG_BIT` != "64" ]
 then
@@ -7,4 +8,5 @@ fi
 ROCKS_JAR=`find target -name rocksdbjni*.jar`
 
 echo "Running benchmark in $PLATFORM-Bit mode."
+# shellcheck disable=SC2068
 java -server -d$PLATFORM -XX:NewSize=4m -XX:+AggressiveOpts -Djava.library.path=target -cp "${ROCKS_JAR}:benchmark/target/classes" org.rocksdb.benchmark.DbBenchmark $@
index 06dc795acced6216041c53a82fbddfc019a73f89..ae0b0222442254240108463ed2ee749ae42ba686 100644 (file)
@@ -34,4 +34,5 @@ void Java_org_rocksdb_AbstractCompactionFilterFactory_disposeInternal(
   auto* ptr_sptr_cff =
       reinterpret_cast<std::shared_ptr<rocksdb::CompactionFilterFactoryJniCallback> *>(jhandle);
   delete ptr_sptr_cff;
+// @lint-ignore TXT4 T25377293 Grandfathered in
 }
\ No newline at end of file
index 251a6e3c627e1f64edf6d45fa38ca39a687eb612..7bca967daa35d2c7e883739d6c544cf716ed695b 100644 (file)
@@ -146,4 +146,5 @@ void Java_org_rocksdb_IngestExternalFileOptions_disposeInternal(
   auto* options =
       reinterpret_cast<rocksdb::IngestExternalFileOptions*>(jhandle);
   delete options;
+// @lint-ignore TXT4 T25377293 Grandfathered in
 }
\ No newline at end of file
index 301f46229216fa2fc70a6c7e8ef05a10fa0b9f68..f72eecd4c26f6912a0908bc44b446624ff73e414 100644 (file)
@@ -49,4 +49,5 @@ JniCallback::~JniCallback() {
 
   releaseJniEnv(attached_thread);
 }
+// @lint-ignore TXT4 T25377293 Grandfathered in
 }  // namespace rocksdb
\ No newline at end of file
index c3068dec05aeb1d089f6ecf66bb71ca39a706bee..940ecf064d5e100fb36b361d044569ea6ed1f013 100644 (file)
@@ -25,4 +25,5 @@ namespace rocksdb {
   };
 }
 
+// @lint-ignore TXT4 T25377293 Grandfathered in
 #endif  // JAVA_ROCKSJNI_JNICALLBACK_H_
\ No newline at end of file
index ddaf83b3f88ca754ad1517bbc20134f03270ff79..c5d6c22d3ddc293c70d245b3935baa733d88d9e0 100644 (file)
@@ -24,4 +24,5 @@ void Java_org_rocksdb_RocksCallbackObject_disposeInternal(
       //   2) Comparator -> BaseComparatorJniCallback + JniCallback -> ComparatorJniCallback
       // I think this is okay, as Comparator and JniCallback both have virtual destructors...
       delete reinterpret_cast<rocksdb::JniCallback*>(handle);
+// @lint-ignore TXT4 T25377293 Grandfathered in
 }
\ No newline at end of file
index 584ab5aa6107e7401b8c6f6b549f15dbdcfee248..3ac1e5b413e07d4a55a8850bf20ad591a8f9e7e4 100644 (file)
@@ -30,4 +30,5 @@ namespace rocksdb {
 
     return true;
   }
+// @lint-ignore TXT4 T25377293 Grandfathered in
 };
\ No newline at end of file
index 600d9a6763256e6d08d5a65989de55d6c19225c7..56186789a9b5c96c975c9843ec39643abc473ba5 100644 (file)
@@ -30,4 +30,5 @@ namespace rocksdb {
 
 }  // namespace rocksdb
 
+// @lint-ignore TXT4 T25377293 Grandfathered in
 #endif  // JAVA_ROCKSJNI_STATISTICSJNI_H_
\ No newline at end of file
index 93daaca472b172f4af17bb4382c3086edca60bc8..d896ed4b1bc5a10bfc4558637c0698dee28c0503 100644 (file)
@@ -49,6 +49,7 @@ class CuckooBuilderTest : public testing::Test {
     uint64_t read_file_size;
     ASSERT_OK(env_->GetFileSize(fname, &read_file_size));
 
+   // @lint-ignore TXT2 T25377293 Grandfathered in
          Options options;
          options.allow_mmap_reads = true;
          ImmutableCFOptions ioptions(options);
index 54577ffb77ccd9774afe59c9ac7fed86c4dca891..c98bd661c9d3b870a6dcaadf10326d42f62a21d5 100755 (executable)
@@ -1,3 +1,4 @@
+# shellcheck disable=SC2148
 TMP_DIR="${TMPDIR:-/tmp}/rocksdb-sanity-test"
 
 if [ "$#" -lt 2 ]; then
index 1a2c38439cf4db88a26226569ffd5e6933b8c8ad..b997b2c11152ddcbc7ef29e84c2cb4b9b2cb29e0 100755 (executable)
@@ -449,6 +449,7 @@ echo "===== Benchmark ====="
 
 # Run!!!
 IFS=',' read -a jobs <<< $1
+# shellcheck disable=SC2068
 for job in ${jobs[@]}; do
 
   if [ $job != debug ]; then
index 7769969809f3704f6a19289fbda76527b1b9ab87..40c7733cea336b52185beaf14e21a51ac8bc388e 100755 (executable)
@@ -151,6 +151,7 @@ echo "===== Benchmark ====="
 
 # Run!!!
 IFS=',' read -a jobs <<< $1
+# shellcheck disable=SC2068
 for job in ${jobs[@]}; do
 
   if [ $job != debug ]; then
index 0c649722f8a1520f47c43a3422692745d534b3f2..6a7222e5b4dced9c97be7e5f9fc8f67cedd326d2 100644 (file)
@@ -317,7 +317,7 @@ def whitebox_crash_main(args):
         cmd = gen_cmd(dict(cmd_params.items() + additional_opts.items()
                            + {'db': dbname}.items()))
 
-        print "Running:" + ' '.join(cmd) + "\n"
+        print "Running:" + ' '.join(cmd) + "\n"  # noqa: E999 T25377293 Grandfathered in
 
         popen = subprocess.Popen(cmd, stdout=subprocess.PIPE,
                                  stderr=subprocess.STDOUT)
index 5d52d79c30033e8d6c6b69cbd594ac3deed6c124..fa0ded4382d4af61be807b64f67f8fdfab8452e6 100644 (file)
@@ -229,7 +229,7 @@ class LDBTestCase(unittest.TestCase):
         self.assertRunFAIL("get --ttl a3")
         self.assertRunOK("checkconsistency", "OK")
 
-    def testInvalidCmdLines(self):
+    def testInvalidCmdLines(self):  # noqa: F811 T25377293 Grandfathered in
         print "Running testInvalidCmdLines..."
         # db not specified
         self.assertRunFAILFull("put 0x6133 0x6233 --hex --create_if_missing")
@@ -516,7 +516,7 @@ class LDBTestCase(unittest.TestCase):
 
     def testColumnFamilies(self):
         print "Running testColumnFamilies..."
-        dbPath = os.path.join(self.TMP_DIR, self.DB_NAME)
+        dbPath = os.path.join(self.TMP_DIR, self.DB_NAME)  # noqa: F841 T25377293 Grandfathered in
         self.assertRunOK("put cf1_1 1 --create_if_missing", "OK")
         self.assertRunOK("put cf1_2 2 --create_if_missing", "OK")
         self.assertRunOK("put cf1_3 3 --try_load_options", "OK")
index 72eb8bfab60e87193b9050842bd39dbea61e78c8..69a53a470a6a18c54383f223def8b247ff8f558a 100755 (executable)
@@ -465,4 +465,5 @@ function cleanup_test_directory {
 
 ############################################################################
 
+# shellcheck disable=SC2068
 main $@
index 2cf8c060ba249ffd91f3ddb385980e8258860285..8d9c7f520894d57eec9261b89773477a5444d36f 100755 (executable)
@@ -1,3 +1,4 @@
+# shellcheck disable=SC2148
 TESTDIR=`mktemp -d ${TMPDIR:-/tmp}/rocksdb-dump-test.XXXXX`
 DUMPFILE="tools/sample-dump.dmp"
 
index f69657832ed5b6c14bd80ec9cc221984f1df0fe1..b84dfd3cad4b62a383b297404c3beb0543f4c691 100644 (file)
@@ -21,7 +21,7 @@ def generate_runtimes(total_runtime):
 
 def main(args):
     runtimes = generate_runtimes(int(args.runtime_sec))
-    print "Going to execute write stress for " + str(runtimes)
+    print "Going to execute write stress for " + str(runtimes)  # noqa: E999 T25377293 Grandfathered in
     first_time = True
 
     for runtime in runtimes:
index 4a0b26273959a80737f8e812ee6972dac58bf984..753444da16a105287ce60e0d0ec30bdb3093b48f 100644 (file)
@@ -1485,4 +1485,5 @@ EnvLibrados* EnvLibrados::Default() {
                                  default_pool_name);
   return &default_env;
 }
+// @lint-ignore TXT4 T25377293 Grandfathered in
 }
\ No newline at end of file
index 020cdaa3cfb88a929f46c26f480e8e3128adb89d..28d8c7a14d20a465ab7b986302cafa386e4e7757 100644 (file)
@@ -89,6 +89,7 @@ class CacheActivityLogger {
     log_line += key.ToString(true);
     log_line += " - ";
     AppendNumberTo(&log_line, size);
+  // @lint-ignore TXT2 T25377293 Grandfathered in
                log_line += "\n";
 
     // line format: "ADD - <KEY> - <KEY-SIZE>"
index 4c175c947753567e5fd52b382af2c212bb33ccec..4e9793817295838cafda1fdb2df6d27b90eab52b 100644 (file)
@@ -193,6 +193,7 @@ TEST_F(SimCacheTest, SimCacheLogging) {
   ASSERT_EQ(add_num, num_block_entries);
 
   // Log things again but stop logging automatically after reaching 512 bytes
+ // @lint-ignore TXT2 T25377293 Grandfathered in
        int max_size = 512;
   ASSERT_OK(sim_cache->StartActivityLogging(log_file, env_, max_size));
   for (int it = 0; it < 10; it++) {