From 424cf407b026d7e9b185aaebca51cf2db8f94465 Mon Sep 17 00:00:00 2001
From: yingsu00 <yingsu00@outlook.com>
Date: Fri, 30 Aug 2024 20:54:35 -0700
Subject: [PATCH] Clean up the headers

---
 velox/common/base/Exceptions.h          | 3 +--
 velox/common/base/Fs.cpp                | 1 +
 velox/common/base/RuntimeMetrics.h      | 5 +++--
 velox/common/base/SpillStats.h          | 2 ++
 velox/common/base/Status.h              | 5 +++--
 velox/common/caching/AsyncDataCache.h   | 3 ++-
 velox/dwio/catalog/fbhive/FileUtils.cpp | 7 +++++--
 velox/exec/Driver.cpp                   | 2 ++
 velox/exec/Driver.h                     | 4 +++-
 velox/exec/Task.h                       | 1 +
 velox/exec/tests/TableScanTest.cpp      | 7 ++++---
 velox/type/fbhive/HiveTypeParser.h      | 3 ++-
 12 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/velox/common/base/Exceptions.h b/velox/common/base/Exceptions.h
index f552f0709c0b..4b78d3ba763b 100644
--- a/velox/common/base/Exceptions.h
+++ b/velox/common/base/Exceptions.h
@@ -20,9 +20,8 @@
 #include <sstream>
 
 #include <fmt/format.h>
-#include <folly/Preprocessor.h>
-
 #include <fmt/ostream.h>
+#include <folly/Preprocessor.h>
 
 #include "velox/common/base/FmtStdFormatters.h"
 #include "velox/common/base/VeloxException.h"
diff --git a/velox/common/base/Fs.cpp b/velox/common/base/Fs.cpp
index 82c748fae843..bbea7b77878b 100644
--- a/velox/common/base/Fs.cpp
+++ b/velox/common/base/Fs.cpp
@@ -15,6 +15,7 @@
  */
 
 #include "velox/common/base/Fs.h"
+
 #include <fmt/format.h>
 #include <glog/logging.h>
 
diff --git a/velox/common/base/RuntimeMetrics.h b/velox/common/base/RuntimeMetrics.h
index d5d814a31168..7bb45ab4807d 100644
--- a/velox/common/base/RuntimeMetrics.h
+++ b/velox/common/base/RuntimeMetrics.h
@@ -16,11 +16,12 @@
 
 #pragma once
 
-#include <fmt/format.h>
-#include <folly/CppAttributes.h>
 #include <limits>
 #include <sstream>
 
+#include <fmt/format.h>
+#include <folly/CppAttributes.h>
+
 namespace facebook::velox {
 
 struct RuntimeCounter {
diff --git a/velox/common/base/SpillStats.h b/velox/common/base/SpillStats.h
index c7c2d066a960..e88db0527c05 100644
--- a/velox/common/base/SpillStats.h
+++ b/velox/common/base/SpillStats.h
@@ -14,10 +14,12 @@
  * limitations under the License.
  */
 #pragma once
+
 #include <stdint.h>
 #include <string.h>
 
 #include <folly/executors/CPUThreadPoolExecutor.h>
+
 #include "velox/common/compression/Compression.h"
 
 namespace facebook::velox::common {
diff --git a/velox/common/base/Status.h b/velox/common/base/Status.h
index 90e99dc2eea0..2f99acca70ec 100644
--- a/velox/common/base/Status.h
+++ b/velox/common/base/Status.h
@@ -18,12 +18,13 @@
 
 #pragma once
 
+#include <string>
+#include <utility>
+
 #include <fmt/format.h>
 #include <fmt/ostream.h>
 #include <folly/Expected.h>
 #include <folly/Likely.h>
-#include <string>
-#include <utility>
 
 namespace facebook::velox {
 
diff --git a/velox/common/caching/AsyncDataCache.h b/velox/common/caching/AsyncDataCache.h
index 91450ea4e03f..b1e3c6a409c0 100644
--- a/velox/common/caching/AsyncDataCache.h
+++ b/velox/common/caching/AsyncDataCache.h
@@ -19,10 +19,11 @@
 #include <deque>
 
 #include <fmt/format.h>
+#include <folly/GLog.h>
 #include <folly/chrono/Hardware.h>
 #include <folly/container/F14Set.h>
 #include <folly/futures/SharedPromise.h>
-#include "folly/GLog.h"
+
 #include "velox/common/base/BitUtil.h"
 #include "velox/common/base/CoalesceIo.h"
 #include "velox/common/base/Portability.h"
diff --git a/velox/dwio/catalog/fbhive/FileUtils.cpp b/velox/dwio/catalog/fbhive/FileUtils.cpp
index 1f13d30c3634..94c75dffd995 100644
--- a/velox/dwio/catalog/fbhive/FileUtils.cpp
+++ b/velox/dwio/catalog/fbhive/FileUtils.cpp
@@ -15,9 +15,12 @@
  */
 
 #include "FileUtils.h"
-#include <fmt/core.h>
+
 #include <bitset>
-#include "folly/container/Array.h"
+
+#include <fmt/core.h>
+#include <folly/container/Array.h>
+
 #include "velox/dwio/common/exception/Exception.h"
 
 namespace facebook {
diff --git a/velox/exec/Driver.cpp b/velox/exec/Driver.cpp
index f511d247a117..590817521e36 100644
--- a/velox/exec/Driver.cpp
+++ b/velox/exec/Driver.cpp
@@ -15,10 +15,12 @@
  */
 
 #include "velox/exec/Driver.h"
+
 #include <folly/ScopeGuard.h>
 #include <folly/executors/QueuedImmediateExecutor.h>
 #include <folly/executors/thread_factory/InitThreadFactory.h>
 #include <gflags/gflags.h>
+
 #include "velox/common/base/Counters.h"
 #include "velox/common/base/StatsReporter.h"
 #include "velox/common/process/TraceContext.h"
diff --git a/velox/exec/Driver.h b/velox/exec/Driver.h
index 31d92be44703..61a9b2f56d39 100644
--- a/velox/exec/Driver.h
+++ b/velox/exec/Driver.h
@@ -14,10 +14,12 @@
  * limitations under the License.
  */
 #pragma once
+
+#include <memory>
+
 #include <folly/executors/CPUThreadPoolExecutor.h>
 #include <folly/futures/Future.h>
 #include <folly/portability/SysSyscall.h>
-#include <memory>
 
 #include "velox/common/base/Counters.h"
 #include "velox/common/base/StatsReporter.h"
diff --git a/velox/exec/Task.h b/velox/exec/Task.h
index 76fe838cf61f..34b7c8c12936 100644
--- a/velox/exec/Task.h
+++ b/velox/exec/Task.h
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 #pragma once
+
 #include "velox/core/PlanFragment.h"
 #include "velox/core/QueryCtx.h"
 #include "velox/exec/Driver.h"
diff --git a/velox/exec/tests/TableScanTest.cpp b/velox/exec/tests/TableScanTest.cpp
index 107772423ffe..cb3a64126d0a 100644
--- a/velox/exec/tests/TableScanTest.cpp
+++ b/velox/exec/tests/TableScanTest.cpp
@@ -13,13 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+#include <atomic>
+#include <shared_mutex>
+
 #include <fmt/ranges.h>
+#include <folly/experimental/EventCount.h>
 #include <folly/synchronization/Baton.h>
 #include <folly/synchronization/Latch.h>
-#include <atomic>
-#include <shared_mutex>
 
-#include "folly/experimental/EventCount.h"
 #include "velox/common/base/Fs.h"
 #include "velox/common/base/tests/GTestUtils.h"
 #include "velox/common/file/tests/FaultyFile.h"
diff --git a/velox/type/fbhive/HiveTypeParser.h b/velox/type/fbhive/HiveTypeParser.h
index a7a983f58e02..a35cea77fd3d 100644
--- a/velox/type/fbhive/HiveTypeParser.h
+++ b/velox/type/fbhive/HiveTypeParser.h
@@ -22,7 +22,8 @@
 #include <string>
 #include <vector>
 
-#include "folly/Range.h"
+#include <folly/Range.h>
+
 #include "velox/type/TypeParser.h"
 
 namespace facebook::velox::type::fbhive {