Merge branch 'master' into wenxuan/ingest-by-split-2

pingcap · Dec 1, 2022 · 742f389 · 742f389
2 parents e4b5c02 + e773b82
commit 742f389
Show file tree

Hide file tree

Showing 20 changed files with 1,860 additions and 402 deletions.
diff --git a/dbms/src/Common/MyDuration.h b/dbms/src/Common/MyDuration.h
@@ -41,19 +41,19 @@ class MyDuration
     static constexpr Int64 NANOS_PER_MINUTE = 60 * NANOS_PER_SECOND;
     static constexpr Int64 NANOS_PER_HOUR = 60 * NANOS_PER_MINUTE;
 
+    static const int8_t DefaultFsp = 6;
+
+    Int64 nanos;
+    UInt8 fsp;
+
+public:
     static constexpr Int64 MAX_HOUR_PART = 838;
     static constexpr Int64 MAX_MINUTE_PART = 59;
     static constexpr Int64 MAX_SECOND_PART = 59;
     static constexpr Int64 MAX_MICRO_PART = 999999;
     static constexpr Int64 MAX_NANOS = MAX_HOUR_PART * NANOS_PER_HOUR + MAX_MINUTE_PART * NANOS_PER_MINUTE + MAX_SECOND_PART * NANOS_PER_SECOND + MAX_MICRO_PART * NANOS_PER_MICRO;
     static_assert(MAX_NANOS > 0);
 
-    static const int8_t DefaultFsp = 6;
-
-    Int64 nanos;
-    UInt8 fsp;
-
-public:
     MyDuration() = default;
     explicit MyDuration(Int64 nanos_)
         : nanos(nanos_)