Merge branch 'master' of github.com:ClickHouse/ClickHouse into fix-inconsistent-formatting-except

Author: alexey-milovidov

base/base/Decimal.h

@@ -10,6 +10,7 @@ namespace DB
 {
 template <class> struct Decimal;
 class DateTime64;
+class Time64;
 
 #define FOR_EACH_UNDERLYING_DECIMAL_TYPE(M) \
     M(Int32) \
@@ -142,6 +143,16 @@ class DateTime64 : public Decimal64
 
     constexpr DateTime64(const Base & v): Base(v) {} // NOLINT(google-explicit-constructor)
 };
+
+class Time64 : public Decimal64
+{
+public:
+    using Base = Decimal64;
+    using Base::Base;
+    using NativeType = Base::NativeType;
+
+    constexpr Time64(const Base & v): Base(v) {} // NOLINT(google-explicit-constructor)
+};
 }
 
 constexpr UInt64 max_uint_mask = std::numeric_limits<UInt64>::max();
@@ -173,6 +184,15 @@ namespace std
         }
     };
 
+    template <>
+    struct hash<DB::Time64>
+    {
+        size_t operator()(const DB::Time64 & x) const
+        {
+            return std::hash<DB::Time64::NativeType>()(x);
+        }
+    };
+
     template <>
     struct hash<DB::Decimal256>
     {

base/base/Decimal_fwd.h

@@ -27,14 +27,16 @@ using Decimal128 = Decimal<Int128>;
 using Decimal256 = Decimal<Int256>;
 
 class DateTime64;
+class Time64;
 
 template <class T>
 concept is_decimal =
     std::is_same_v<T, Decimal32>
     || std::is_same_v<T, Decimal64>
     || std::is_same_v<T, Decimal128>
     || std::is_same_v<T, Decimal256>
-    || std::is_same_v<T, DateTime64>;
+    || std::is_same_v<T, DateTime64>
+    || std::is_same_v<T, Time64>;
 
 template <class T>
 concept is_over_big_int =

base/base/TypeName.h

@@ -44,6 +44,7 @@ TN_MAP(Decimal64)
 TN_MAP(Decimal128)
 TN_MAP(Decimal256)
 TN_MAP(DateTime64)
+TN_MAP(Time64)
 TN_MAP(Array)
 TN_MAP(Tuple)
 TN_MAP(Map)

base/base/extended_types.h

@@ -74,6 +74,7 @@ template <typename T> concept is_floating_point =
     M(DataTypeDate) \
     M(DataTypeDate32) \
     M(DataTypeDateTime) \
+    M(DataTypeTime) \
     M(DataTypeInt8) \
     M(DataTypeUInt8) \
     M(DataTypeInt16) \
@@ -94,6 +95,7 @@ template <typename T> concept is_floating_point =
     M(DataTypeDate, X) \
     M(DataTypeDate32, X) \
     M(DataTypeDateTime, X) \
+    M(DataTypeTime, X) \
     M(DataTypeInt8, X) \
     M(DataTypeUInt8, X) \
     M(DataTypeInt16, X) \

ci/jobs/docs_job.py

@@ -77,7 +77,6 @@
         Result.from_commands_run(
             name=testname,
             command=[
-                "yarn build-api-doc",
                 "yarn build-swagger",
                 "export DOCUSAURUS_IGNORE_SSG_WARNINGS=true && yarn build-docs",
             ],

ci/jobs/scripts/check_style/aspell-ignore/en/aspell-dict.txt

@@ -3045,6 +3045,7 @@ toStartOfYear
 toString
 toStringCutToZero
 toTime
+toTimeWithFixedDate
 toTimeZone
 toType
 toTypeName

ci/jobs/scripts/functional_tests_results.py

@@ -26,10 +26,6 @@
 #         out = csv.writer(f, delimiter="\t")
 #         out.writerow(status)
 
-BROKEN_TESTS_ANALYZER_TECH_DEBT = [
-    "01624_soft_constraints",
-]
-
 
 class FTResultsProcessor:
     @dataclasses.dataclass
@@ -50,7 +46,6 @@ def __init__(self, wd):
         self.tests_output_file = f"{wd}/test_result.txt"
         # self.test_results_parsed_file = f"{wd}/test_result.tsv"
         # self.status_file = f"{wd}/check_status.tsv"
-        self.broken_tests = BROKEN_TESTS_ANALYZER_TECH_DEBT
 
     def _process_test_output(self):
         total = 0
@@ -97,41 +92,20 @@ def _process_test_output(self):
 
                     total += 1
                     if TIMEOUT_SIGN in line:
-                        if test_name in self.broken_tests:
-                            success += 1
-                            test_results.append((test_name, "BROKEN", test_time, []))
-                        else:
-                            failed += 1
-                            test_results.append((test_name, "Timeout", test_time, []))
+                        failed += 1
+                        test_results.append((test_name, "Timeout", test_time, []))
                     elif FAIL_SIGN in line:
-                        if test_name in self.broken_tests:
-                            success += 1
-                            test_results.append((test_name, "BROKEN", test_time, []))
-                        else:
-                            failed += 1
-                            test_results.append((test_name, "FAIL", test_time, []))
+                        failed += 1
+                        test_results.append((test_name, "FAIL", test_time, []))
                     elif UNKNOWN_SIGN in line:
                         unknown += 1
                         test_results.append((test_name, "FAIL", test_time, []))
                     elif SKIPPED_SIGN in line:
                         skipped += 1
                         test_results.append((test_name, "SKIPPED", test_time, []))
                     else:
-                        if OK_SIGN in line and test_name in self.broken_tests:
-                            skipped += 1
-                            test_results.append(
-                                (
-                                    test_name,
-                                    "NOT_FAILED",
-                                    test_time,
-                                    [
-                                        "This test passed. Update analyzer_tech_debt.txt.\n"
-                                    ],
-                                )
-                            )
-                        else:
-                            success += int(OK_SIGN in line)
-                            test_results.append((test_name, "OK", test_time, []))
+                        success += int(OK_SIGN in line)
+                        test_results.append((test_name, "OK", test_time, []))
                     test_end = False
                 elif (
                     len(test_results) > 0

docs/en/engines/table-engines/mergetree-family/summingmergetree.md

@@ -9,7 +9,7 @@ title: 'SummingMergeTree'
 
 # SummingMergeTree
 
-The engine inherits from [MergeTree](/engines/table-engines/mergetree-family/versionedcollapsingmergetree). The difference is that when merging data parts for `SummingMergeTree` tables ClickHouse replaces all the rows with the same primary key (or more accurately, with the same [sorting key](../../../engines/table-engines/mergetree-family/mergetree.md)) with one row which contains summarized values for the columns with the numeric data type. If the sorting key is composed in a way that a single key value corresponds to large number of rows, this significantly reduces storage volume and speeds up data selection.
+The engine inherits from [MergeTree](/engines/table-engines/mergetree-family/versionedcollapsingmergetree). The difference is that when merging data parts for `SummingMergeTree` tables ClickHouse replaces all the rows with the same primary key (or more accurately, with the same [sorting key](../../../engines/table-engines/mergetree-family/mergetree.md)) with one row which contains summed values for the columns with the numeric data type. If the sorting key is composed in a way that a single key value corresponds to large number of rows, this significantly reduces storage volume and speeds up data selection.
 
 We recommend using the engine together with `MergeTree`. Store complete data in `MergeTree` table, and use `SummingMergeTree` for aggregated data storing, for example, when preparing reports. Such an approach will prevent you from losing valuable data due to an incorrectly composed primary key.
 
@@ -34,7 +34,7 @@ For a description of request parameters, see [request description](../../../sql-
 
 #### columns {#columns}
 
-`columns` - a tuple with the names of columns where values will be summarized. Optional parameter.
+`columns` - a tuple with the names of columns where values will be summed. Optional parameter.
     The columns must be of a numeric type and must not be in the partition or sorting key.
 
  If `columns` is not specified, ClickHouse summarizes the values in all columns with a numeric data type that are not in the sorting key.
@@ -62,7 +62,7 @@ CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
 
 All of the parameters excepting `columns` have the same meaning as in `MergeTree`.
 
-- `columns` — tuple with names of columns values of which will be summarized. Optional parameter. For a description, see the text above.
+- `columns` — tuple with names of columns values of which will be summed. Optional parameter. For a description, see the text above.
 
 </details>
 
@@ -107,13 +107,13 @@ ClickHouse can merge the data parts so that different resulting parts of data ca
 
 ### Common Rules for Summation {#common-rules-for-summation}
 
-The values in the columns with the numeric data type are summarized. The set of columns is defined by the parameter `columns`.
+The values in the columns with the numeric data type are summed. The set of columns is defined by the parameter `columns`.
 
 If the values were 0 in all of the columns for summation, the row is deleted.
 
-If column is not in the primary key and is not summarized, an arbitrary value is selected from the existing ones.
+If column is not in the primary key and is not summed, an arbitrary value is selected from the existing ones.
 
-The values are not summarized for columns in the primary key.
+The values are not summed for columns in the primary key.
 
 ### The Summation in the Aggregatefunction Columns {#the-summation-in-the-aggregatefunction-columns}
 

docs/en/interfaces/third-party/client-libraries.md

@@ -28,6 +28,7 @@ ClickHouse Inc does **not** maintain the libraries listed below and hasn't done
  - [SeasClick C++ client](https://github.com/SeasX/SeasClick)
  - [one-ck](https://github.com/lizhichao/one-ck)
  - [glushkovds/phpclickhouse-laravel](https://packagist.org/packages/glushkovds/phpclickhouse-laravel)
+ - [glushkovds/php-clickhouse-schema-builder](https://packagist.org/packages/glushkovds/php-clickhouse-schema-builder)
  - [kolya7k ClickHouse PHP extension](https://github.com//kolya7k/clickhouse-php)
  - [hyvor/clickhouse-php](https://github.com/hyvor/clickhouse-php)
 ### Go {#go}

docs/en/operations/system-tables/error_log.md

@@ -2,7 +2,7 @@
 description: 'System table containing the history of error values from table `system.errors`,
   periodically flushed to disk.'
 keywords: ['system table', 'error_log']
-slug: /operations/system-tables/error_log
+slug: /operations/system-tables/system-error-log
 title: 'system.error_log'
 ---