revert unnecessary file changes

githubzilla · githubzilla · commit 0e058a54dd77 · 2023-10-26T06:50:50.000Z
diff --git a/.gitignore b/.gitignore
@@ -99,7 +99,3 @@ fuzz/crash-*
 
 cmake-build-*
 third-party/folly/
-
-.clang-format
-.editorconfig
-*.vim
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1656,4 +1656,4 @@ endif()
 option(WITH_BENCHMARK "build benchmark tests" OFF)
 if(WITH_BENCHMARK)
   add_subdirectory(${PROJECT_SOURCE_DIR}/microbench/)
-endif()
+endif()
diff --git a/cloud/aws/aws_s3.cc b/cloud/aws/aws_s3.cc
@@ -688,7 +688,7 @@ IOStatus S3StorageProvider::ExistsCloudObject(const std::string& bucket_name,
 IOStatus S3StorageProvider::GetCloudObjectSize(const std::string& bucket_name,
                                                const std::string& object_path,
                                                uint64_t* filesize) {
-  HeadObjectResult result;
+  HeadObjectResult result;                                             
   result.size = filesize;
   return HeadObject(bucket_name, object_path, &result);
 }
@@ -1064,4 +1064,4 @@ Status CloudStorageProviderImpl::CreateS3Provider(
 #endif /* USE_AWS */
 }
 }  // namespace ROCKSDB_NAMESPACE
-#endif  // ROCKSDB_LITE
+#endif  // ROCKSDB_LITE

Original file line number	Diff line number	Diff line change
`@@ -688,7 +688,7 @@ IOStatus S3StorageProvider::ExistsCloudObject(const std::string& bucket_name,`
`688`	`688`	`IOStatus S3StorageProvider::GetCloudObjectSize(const std::string& bucket_name,`
`689`	`689`	`const std::string& object_path,`
`690`	`690`	`uint64_t* filesize) {`
`691`		`- HeadObjectResult result;`
	`691`	`+ HeadObjectResult result;`
`692`	`692`	`result.size = filesize;`
`693`	`693`	`return HeadObject(bucket_name, object_path, &result);`
`694`	`694`	`}`
`@@ -1064,4 +1064,4 @@ Status CloudStorageProviderImpl::CreateS3Provider(`
`1064`	`1064`	`#endif /* USE_AWS */`
`1065`	`1065`	`}`
`1066`	`1066`	`} // namespace ROCKSDB_NAMESPACE`
`1067`		`-#endif // ROCKSDB_LITE`
	`1067`	`+#endif // ROCKSDB_LITE`