Fix improper merge

Author: edouarda

cloud/aws/aws_env.cc

@@ -595,16 +595,6 @@ Status AwsEnv::NewAwsEnv(Env* base_env, const CloudEnvOptions& cloud_options,
   return status;
 }
 
-uint64_t AwsEnv::gettid() {
-#ifdef _WIN32_WINNT
-  return static_cast<uint64_t>(::GetCurrentThreadId());
-#else
-  static_assert(sizeof(pthread_t) <= sizeof(uint64_t),
-                "pthread_t is expected to be smaller or equal than 64-bit");
-  return static_cast<uint64_t>(pthread_self());
-#endif
-}
-
 std::string AwsEnv::GetWALCacheDir() {
   return cloud_env_options.cloud_log_controller->GetCacheDir();
 }

cloud/cloud_env_impl.cc

@@ -20,10 +20,6 @@
 #include "rocksdb/status.h"
 #include "util/xxhash.h"
 
-#ifdef _MSC_VER
-#undef GetObject
-#endif
-
 namespace rocksdb {
 
 CloudEnvImpl::CloudEnvImpl(const CloudEnvOptions& opts, Env* base,

table/block_based/block_based_table_reader.cc

@@ -4094,12 +4094,10 @@ uint64_t BlockBasedTable::ApproximateOffsetOf(const Slice& key,
                                               TableReaderCaller caller) {
   BlockCacheLookupContext context(caller);
   IndexBlockIter iiter_on_stack;
-
   ReadOptions ro;
   ro.total_order_seek = true;
-
   auto index_iter =
-      NewIndexIterator(ro, /*disable_prefix_seek=*/false,
+      NewIndexIterator(ro, /*disable_prefix_seek=*/true,
                        /*input_iter=*/&iiter_on_stack, /*get_context=*/nullptr,
                        /*lookup_context=*/&context);
   std::unique_ptr<InternalIteratorBase<IndexValue>> iiter_unique_ptr;
@@ -4117,12 +4115,10 @@ uint64_t BlockBasedTable::ApproximateSize(const Slice& start, const Slice& end,
 
   BlockCacheLookupContext context(caller);
   IndexBlockIter iiter_on_stack;
-
   ReadOptions ro;
   ro.total_order_seek = true;
-
   auto index_iter =
-      NewIndexIterator(ro, /*disable_prefix_seek=*/false,
+      NewIndexIterator(ro, /*disable_prefix_seek=*/true,
                        /*input_iter=*/&iiter_on_stack, /*get_context=*/nullptr,
                        /*lookup_context=*/&context);
   std::unique_ptr<InternalIteratorBase<IndexValue>> iiter_unique_ptr;