Make clang-format sort includes

To reduce amount of noise due to include sorting have clang-format
enforce consistent sorting across all includes.

Author: svenklemm

.clang-format

@@ -65,12 +65,18 @@ ForEachMacros:
   - forthree
 IncludeBlocks:   Preserve # separate include blocks will not be merged
 IncludeCategories: # we want to ensure c.h and postgres.h appear first
-  - Regex:           '.*'
-    Priority:        1
-  - Regex:            '^<c\.h>'
-    Priority:        -1
+  - Regex:            '^<(string|unistd)\.h>'
+    Priority:        -2
   - Regex:            '^<postgres\.h>'
     Priority:        -1
+  - Regex:            '^(<|")compat/compat\.h'
+    Priority:        -2
+  - Regex:            '^"compat/compat-msvc-enter\.h'
+    Priority:        -1 
+  - Regex:            '^"compat/compat-msvc-exit\.h'
+    Priority:         2000000000
+  - Regex:            '.*'
+    Priority:         1
 IncludeIsMainRegex: '' # filename_<suffix> will be seen as the primary include
 IndentCaseLabels: true
 IndentPPDirectives: None # do not indent preprocessor directives after the '#'
@@ -97,7 +103,7 @@ PenaltyExcessCharacter: 1000000
 PenaltyReturnTypeOnItsOwnLine: 60
 PointerAlignment: Right # as in char *foo;
 ReflowComments:  true # break up long comments into multiple lines
-SortIncludes:    false # keep includes in the same order as we write them
+SortIncludes: CaseInsensitive # sort includes
 SortUsingDeclarations: false # N/A c++
 SpaceAfterCStyleCast: true
 SpaceAfterTemplateKeyword: false # N/A c++

src/adts/bit_array.h

@@ -10,8 +10,8 @@
 #include <lib/stringinfo.h>
 #include <libpq/pqformat.h>
 
-#include <adts/uint64_vec.h>
 #include "bit_array_impl.h"
+#include <adts/uint64_vec.h>
 
 /*******************
  ***  Public API ***

src/adts/bit_array_impl.h

@@ -10,8 +10,8 @@
 #include <lib/stringinfo.h>
 #include <libpq/pqformat.h>
 
-#include "adts/uint64_vec.h"
 #include "compat/compat.h"
+#include "adts/uint64_vec.h"
 
 #define BITS_PER_BUCKET 64
 

src/agg_bookend.c

@@ -4,12 +4,12 @@
  * LICENSE-APACHE for a copy of the license.
  */
 #include <postgres.h>
-#include <fmgr.h>
 #include <access/htup_details.h>
 #include <catalog/namespace.h>
 #include <catalog/pg_type.h>
-#include <libpq/pqformat.h>
+#include <fmgr.h>
 #include <lib/stringinfo.h>
+#include <libpq/pqformat.h>
 #include <nodes/value.h>
 #include <utils/datum.h>
 #include <utils/lsyscache.h>

src/bgw/job.c

@@ -5,6 +5,7 @@
  */
 #include <postgres.h>
 
+#include <unistd.h>
 #include <access/xact.h>
 #include <catalog/pg_authid.h>
 #include <executor/execdebug.h>
@@ -21,7 +22,6 @@
 #include <storage/procarray.h>
 #include <storage/sinvaladt.h>
 #include <tcop/tcopprot.h>
-#include <unistd.h>
 #include <utils/acl.h>
 #include <utils/builtins.h>
 #include <utils/elog.h>
@@ -31,16 +31,16 @@
 #include <utils/syscache.h>
 #include <utils/timestamp.h>
 
+#include "compat/compat.h"
+#include "bgw/scheduler.h"
 #include "bgw_policy/chunk_stats.h"
 #include "bgw_policy/policy.h"
-#include "bgw/scheduler.h"
-#include "compat/compat.h"
 #include "config.h"
 #include "cross_module_fn.h"
 #include "debug_assert.h"
 #include "extension.h"
-#include "job_stat.h"
 #include "job.h"
+#include "job_stat.h"
 #include "jsonb_utils.h"
 #include "license_guc.h"
 #include "scan_iterator.h"

src/bgw/job.h

@@ -6,8 +6,8 @@
 #pragma once
 
 #include <postgres.h>
-#include <storage/lock.h>
 #include <postmaster/bgworker.h>
+#include <storage/lock.h>
 
 #include "export.h"
 #include "ts_catalog/catalog.h"

src/bgw/job_stat.c

@@ -13,8 +13,8 @@
 #include <utils/resowner.h>
 
 #include "guc.h"
-#include "job_stat_history.h"
 #include "job_stat.h"
+#include "job_stat_history.h"
 #include "jsonb_utils.h"
 #include "scanner.h"
 #include "time_bucket.h"

src/bgw/job_stat.h

@@ -5,8 +5,8 @@
  */
 #pragma once
 
-#include "ts_catalog/catalog.h"
 #include "job.h"
+#include "ts_catalog/catalog.h"
 
 #define JOB_STAT_FLAGS_DEFAULT 0
 #define LAST_CRASH_REPORTED 1

src/bgw/job_stat_history.h

@@ -5,9 +5,9 @@
  */
 #pragma once
 
-#include "ts_catalog/catalog.h"
 #include "job.h"
 #include "job_stat.h"
+#include "ts_catalog/catalog.h"
 
 #define INVALID_BGW_JOB_STAT_HISTORY_ID 0
 

src/bgw/launcher_interface.c

@@ -7,9 +7,9 @@
 
 #include <fmgr.h>
 
+#include "compat/compat.h"
 #include "extension.h"
 #include "launcher_interface.h"
-#include "compat/compat.h"
 
 #define MIN_LOADER_API_VERSION 4
 

src/bgw/scheduler.c

@@ -12,23 +12,23 @@
  */
 #include <postgres.h>
 
+#include <access/xact.h>
 #include <miscadmin.h>
+#include <nodes/pg_list.h>
+#include <pgstat.h>
 #include <postmaster/bgworker.h>
 #include <storage/ipc.h>
 #include <storage/latch.h>
 #include <storage/lwlock.h>
 #include <storage/proc.h>
 #include <storage/shmem.h>
+#include <tcop/tcopprot.h>
 #include <utils/acl.h>
 #include <utils/inval.h>
 #include <utils/jsonb.h>
-#include <utils/timestamp.h>
-#include <utils/snapmgr.h>
 #include <utils/memutils.h>
-#include <access/xact.h>
-#include <pgstat.h>
-#include <tcop/tcopprot.h>
-#include <nodes/pg_list.h>
+#include <utils/snapmgr.h>
+#include <utils/timestamp.h>
 
 #include "compat/compat.h"
 #include "extension.h"

src/bgw/scheduler.h

@@ -5,9 +5,9 @@
  */
 #pragma once
 
+#include "compat/compat.h"
 #include <postgres.h>
 #include <fmgr.h>
-#include "compat/compat.h"
 #include <postmaster/bgworker.h>
 
 #include "timer.h"

src/bgw/timer.c

@@ -4,23 +4,23 @@
  * LICENSE-APACHE for a copy of the license.
  */
 #include <postgres.h>
+#include <access/xact.h>
 #include <miscadmin.h>
+#include <pgstat.h>
 #include <postmaster/bgworker.h>
 #include <storage/ipc.h>
 #include <storage/latch.h>
 #include <storage/lwlock.h>
 #include <storage/proc.h>
 #include <storage/shmem.h>
 #include <utils/jsonb.h>
-#include <utils/timestamp.h>
-#include <utils/snapmgr.h>
 #include <utils/memutils.h>
-#include <access/xact.h>
-#include <pgstat.h>
+#include <utils/snapmgr.h>
+#include <utils/timestamp.h>
 
-#include "timer.h"
 #include "compat/compat.h"
 #include "config.h"
+#include "timer.h"
 
 #define MAX_TIMEOUT (5 * INT64CONST(1000))
 #define MILLISECS_PER_SEC INT64CONST(1000)

src/bgw_policy/chunk_stats.c

@@ -8,10 +8,10 @@
 #include <executor/tuptable.h>
 
 #include "bgw/job.h"
-#include "ts_catalog/catalog.h"
 #include "chunk_stats.h"
-#include "utils.h"
 #include "policy.h"
+#include "ts_catalog/catalog.h"
+#include "utils.h"
 
 #include "compat/compat.h"
 

src/bgw_policy/chunk_stats.h

@@ -5,8 +5,8 @@
  */
 #pragma once
 
-#include "ts_catalog/catalog.h"
 #include "export.h"
+#include "ts_catalog/catalog.h"
 
 typedef struct BgwPolicyChunkStats
 {

src/bgw_policy/policy.h

@@ -5,10 +5,10 @@
  */
 #pragma once
 
+#include "config.h"
+#include "export.h"
 #include "scanner.h"
 #include "ts_catalog/catalog.h"
-#include "export.h"
-#include "config.h"
 
 extern ScanTupleResult ts_bgw_policy_delete_row_only_tuple_found(TupleInfo *ti, void *const data);
 

src/cache.c

@@ -7,8 +7,8 @@
 #include <access/xact.h>
 #include <storage/ipc.h>
 
-#include "cache.h"
 #include "compat/compat.h"
+#include "cache.h"
 
 /* List of pinned caches. A cache occurs once in this list for every pin
  * taken */

src/cache.h

@@ -6,8 +6,8 @@
 #pragma once
 
 #include <postgres.h>
-#include <utils/memutils.h>
 #include <utils/hsearch.h>
+#include <utils/memutils.h>
 
 #include "export.h"
 

src/cache_invalidate.c

@@ -5,22 +5,22 @@
  */
 #include <postgres.h>
 #include <access/xact.h>
-#include <utils/lsyscache.h>
-#include <utils/inval.h>
 #include <catalog/namespace.h>
-#include <nodes/nodes.h>
 #include <miscadmin.h>
+#include <nodes/nodes.h>
+#include <utils/inval.h>
+#include <utils/lsyscache.h>
 #include <utils/syscache.h>
 
-#include "annotations.h"
-#include "ts_catalog/catalog.h"
 #include "compat/compat.h"
+#include "annotations.h"
 #include "extension.h"
 #include "hypertable_cache.h"
+#include "ts_catalog/catalog.h"
 
 #include "bgw/scheduler.h"
-#include "cross_module_fn.h"
 #include "cache_invalidate.h"
+#include "cross_module_fn.h"
 
 /*
  * Notes on the way cache invalidation works.

src/chunk.c

@@ -5,8 +5,8 @@
  */
 #include <postgres.h>
 
-#include <access/htup_details.h>
 #include <access/htup.h>
+#include <access/htup_details.h>
 #include <access/reloptions.h>
 #include <access/tupdesc.h>
 #include <access/xact.h>
@@ -41,23 +41,23 @@
 
 #include "chunk.h"
 
+#include "compat/compat.h"
 #include "bgw_policy/chunk_stats.h"
 #include "cache.h"
 #include "chunk_index.h"
 #include "chunk_scan.h"
-#include "compat/compat.h"
 #include "cross_module_fn.h"
 #include "debug_assert.h"
 #include "debug_point.h"
+#include "dimension.h"
 #include "dimension_slice.h"
 #include "dimension_vector.h"
-#include "dimension.h"
 #include "errors.h"
 #include "export.h"
 #include "extension.h"
 #include "hypercube.h"
-#include "hypertable_cache.h"
 #include "hypertable.h"
+#include "hypertable_cache.h"
 #include "osm_callbacks.h"
 #include "partitioning.h"
 #include "process_utility.h"

src/chunk.h

@@ -8,14 +8,13 @@
 #include <postgres.h>
 #include <access/htup.h>
 #include <access/tupdesc.h>
-#include <utils/hsearch.h>
 #include <foreign/foreign.h>
+#include <utils/hsearch.h>
 
-#include "export.h"
-#include "ts_catalog/catalog.h"
 #include "chunk_constraint.h"
-#include "hypertable.h"
 #include "export.h"
+#include "hypertable.h"
+#include "ts_catalog/catalog.h"
 
 #define INVALID_CHUNK_ID 0
 #define IS_OSM_CHUNK(chunk) ((chunk)->fd.osm_chunk == true)