Fix tabs and lint-ignores (#6734)

Summary: Pull Request resolved: https://github.com/facebook/rocksdb/pull/6734

Reviewed By: cheng-chang

Differential Revision: D21134556

Pulled By: pdillinger

fbshipit-source-id: 3636cc1d1333137b70031f8277458781c21631fb

db/log_reader.h

@@ -49,7 +49,6 @@ class Reader {
   //
   // If "checksum" is true, verify checksums if available.
   Reader(std::shared_ptr<Logger> info_log,
-         // @lint-ignore TXT2 T25377293 Grandfathered in
          std::unique_ptr<SequentialFileReader>&& file, Reporter* reporter,
          bool checksum, uint64_t log_num);
   // No copying allowed
@@ -159,7 +158,6 @@ class Reader {
 class FragmentBufferedReader : public Reader {
  public:
   FragmentBufferedReader(std::shared_ptr<Logger> info_log,
-                         // @lint-ignore TXT2 T25377293 Grandfathered in
                          std::unique_ptr<SequentialFileReader>&& _file,
                          Reporter* reporter, bool checksum, uint64_t log_num)
       : Reader(info_log, std::move(_file), reporter, checksum, log_num),

java/rocksjni/jnicallback.cc

@@ -43,11 +43,10 @@ JniCallback::~JniCallback() {
   JNIEnv* env = getJniEnv(&attached_thread);
   assert(env != nullptr);
 
-  if(m_jcallback_obj != nullptr) {    
+  if (m_jcallback_obj != nullptr) {
     env->DeleteGlobalRef(m_jcallback_obj);
   }
 
   releaseJniEnv(attached_thread);
 }
-// @lint-ignore TXT4 T25377293 Grandfathered in
 }  // namespace ROCKSDB_NAMESPACE

java/rocksjni/jnicallback.h

@@ -27,5 +27,4 @@ class JniCallback {
   };
   }  // namespace ROCKSDB_NAMESPACE
 
-// @lint-ignore TXT4 T25377293 Grandfathered in
 #endif  // JAVA_ROCKSJNI_JNICALLBACK_H_

java/rocksjni/rocks_callback_object.cc

@@ -27,5 +27,4 @@ void Java_org_rocksdb_RocksCallbackObject_disposeInternal(JNIEnv* /*env*/,
   // I think this is okay, as Comparator and JniCallback both have virtual
   // destructors...
   delete reinterpret_cast<ROCKSDB_NAMESPACE::JniCallback*>(handle);
-  // @lint-ignore TXT4 T25377293 Grandfathered in
 }

java/rocksjni/statisticsjni.cc

@@ -28,5 +28,4 @@ bool StatisticsJni::HistEnabledForType(uint32_t type) const {
 
   return true;
 }
-// @lint-ignore TXT4 T25377293 Grandfathered in
-};  // namespace ROCKSDB_NAMESPACE
+}  // namespace ROCKSDB_NAMESPACE

java/rocksjni/statisticsjni.h

@@ -30,5 +30,4 @@ class StatisticsJni : public StatisticsImpl {
 
  }  // namespace ROCKSDB_NAMESPACE
 
-// @lint-ignore TXT4 T25377293 Grandfathered in
 #endif  // JAVA_ROCKSJNI_STATISTICSJNI_H_

table/cuckoo/cuckoo_table_builder_test.cc

@@ -57,7 +57,6 @@ 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);

utilities/simulator_cache/sim_cache.cc

@@ -92,7 +92,6 @@ 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>"

utilities/simulator_cache/sim_cache_test.cc

@@ -199,7 +199,6 @@ 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++) {

utilities/ttl/ttl_test.cc

@@ -668,7 +668,6 @@ TEST_F(TtlTest, ChangeTtlOnOpenDb) {
 
   OpenTtl(1);                                  // T=0:Open the db with ttl = 2
   SetTtl(3);
-  // @lint-ignore TXT2 T25377293 Grandfathered in
   PutValues(0, kSampleSize_);                  // T=0:Insert Set1. Delete at t=2
   SleepCompactCheck(2, 0, kSampleSize_, true); // T=2:Set1 should be there
   CloseTtl();