Merge remote-tracking branch 'origin/master' into HEAD

docs/en/operations/settings/settings.md

@@ -3023,7 +3023,6 @@ SET limit = 5;
 SET offset = 7;
 SELECT * FROM test LIMIT 10 OFFSET 100;
 ```
-
 Result:
 
 ``` text
@@ -3034,4 +3033,36 @@ Result:
 └─────┘
 ```
 
+## optimize_fuse_sum_count_avg {#optimize_fuse_sum_count_avg}
+
+Enables to fuse aggregate functions with identical argument. It rewrites query contains at least two aggregate functions from [sum](../../sql-reference/aggregate-functions/reference/sum.md#agg_function-sum), [count](../../sql-reference/aggregate-functions/reference/count.md#agg_function-count) or [avg](../../sql-reference/aggregate-functions/reference/avg.md#agg_function-avg) with identical argument to [sumCount](../../sql-reference/aggregate-functions/reference/sumcount.md#agg_function-sumCount).
+
+Possible values:
+
+-   0 — Functions with identical argument are not fused.
+-   1 — Functions with identical argument are fused.
+
+Default value: `0`.
+
+**Example**
+
+Query:
+
+``` sql
+CREATE TABLE fuse_tbl(a Int8, b Int8) Engine = Log;
+SET optimize_fuse_sum_count_avg = 1;
+EXPLAIN SYNTAX SELECT sum(a), sum(b), count(b), avg(b) from fuse_tbl FORMAT TSV;
+```
+
+Result:
+
+``` text
+SELECT
+    sum(a),
+    sumCount(b).1,
+    sumCount(b).2,
+    (sumCount(b).1) / (sumCount(b).2)    
+FROM fuse_tbl
+```
+
 [Original article](https://clickhouse.tech/docs/en/operations/settings/settings/) <!-- hide -->

docs/en/sql-reference/aggregate-functions/reference/rankCorr.md

@@ -1,4 +1,8 @@
-## rankCorr {#agg_function-rankcorr}
+---
+toc_priority: 145
+---
+
+# rankCorr {#agg_function-rankcorr}
 
 Computes a rank correlation coefficient.
 

docs/en/sql-reference/aggregate-functions/reference/sumcount.md

@@ -0,0 +1,46 @@
+---
+toc_priority: 144
+---
+
+# sumCount {#agg_function-sumCount}
+
+Calculates the sum of the numbers and counts the number of rows at the same time.
+
+**Syntax**
+
+``` sql
+sumCount(x)
+```
+
+**Arguments** 
+
+-   `x` — Input value, must be [Integer](../../../sql-reference/data-types/int-uint.md), [Float](../../../sql-reference/data-types/float.md), or [Decimal](../../../sql-reference/data-types/decimal.md).
+
+**Returned value**
+
+-   Tuple `(sum, count)`, where `sum` is the sum of numbers and `count` is the number of rows with not-NULL values.
+
+Type: [Tuple](../../../sql-reference/data-types/tuple.md).
+
+**Example**
+
+Query:
+
+``` sql
+CREATE TABLE s_table (x Int8) Engine = Log;
+INSERT INTO s_table SELECT number FROM numbers(0, 20);
+INSERT INTO s_table VALUES (NULL);
+SELECT sumCount(x) from s_table;
+```
+
+Result:
+
+``` text
+┌─sumCount(x)─┐
+│ (190,20)    │
+└─────────────┘
+```
+
+**See also**
+
+- [optimize_fuse_sum_count_avg](../../../operations/settings/settings.md#optimize_fuse_sum_count_avg) setting.

docs/ru/operations/settings/settings.md

@@ -2924,4 +2924,36 @@ SELECT * FROM test LIMIT 10 OFFSET 100;
 
 Значение по умолчанию: `1800`.
 
+## optimize_fuse_sum_count_avg {#optimize_fuse_sum_count_avg}
+
+Позволяет объединить агрегатные функции с одинаковым аргументом. Запрос, содержащий по крайней мере две агрегатные функции: [sum](../../sql-reference/aggregate-functions/reference/sum.md#agg_function-sum), [count](../../sql-reference/aggregate-functions/reference/count.md#agg_function-count) или [avg](../../sql-reference/aggregate-functions/reference/avg.md#agg_function-avg) с одинаковым аргументом, перезаписывается как [sumCount](../../sql-reference/aggregate-functions/reference/sumcount.md#agg_function-sumCount).
+
+Возможные значения:
+
+-   0 — функции с одинаковым аргументом не объединяются.
+-   1 — функции с одинаковым аргументом объединяются.
+
+Значение по умолчанию: `0`.
+
+**Пример**
+
+Запрос:
+
+``` sql
+CREATE TABLE fuse_tbl(a Int8, b Int8) Engine = Log;
+SET optimize_fuse_sum_count_avg = 1;
+EXPLAIN SYNTAX SELECT sum(a), sum(b), count(b), avg(b) from fuse_tbl FORMAT TSV;
+```
+
+Результат:
+
+``` text
+SELECT
+    sum(a),
+    sumCount(b).1,
+    sumCount(b).2,
+    (sumCount(b).1) / (sumCount(b).2)
+FROM fuse_tbl
+```
+
 [Оригинальная статья](https://clickhouse.tech/docs/ru/operations/settings/settings/) <!--hide-->

docs/ru/sql-reference/aggregate-functions/reference/rankCorr.md

@@ -1,4 +1,8 @@
-## rankCorr {#agg_function-rankcorr}
+---
+toc_priority: 145
+---
+
+# rankCorr {#agg_function-rankcorr}
 
 Вычисляет коэффициент ранговой корреляции.
 

docs/ru/sql-reference/aggregate-functions/reference/sumcount.md

@@ -0,0 +1,46 @@
+---
+toc_priority: 144
+---
+
+# sumCount {#agg_function-sumCount}
+
+Вычисляет сумму чисел и одновременно подсчитывает количество строк.
+
+**Синтаксис**
+
+``` sql
+sumCount(x)
+```
+
+**Аргументы** 
+
+-   `x` — Входное значение типа [Integer](../../../sql-reference/data-types/int-uint.md), [Float](../../../sql-reference/data-types/float.md), или [Decimal](../../../sql-reference/data-types/decimal.md).
+
+**Возвращаемое значение**
+
+-   Кортеж из элементов `(sum, count)`, где `sum` — это сумма чисел и `count` — количество строк со значениями, отличными от `NULL`.
+
+Тип: [Tuple](../../../sql-reference/data-types/tuple.md).
+
+**Пример**
+
+Запрос:
+
+``` sql
+CREATE TABLE s_table (x Nullable(Int8)) Engine = Log;
+INSERT INTO s_table SELECT number FROM numbers(0, 20);
+INSERT INTO s_table VALUES (NULL);
+SELECT sumCount(x) from s_table;
+```
+
+Результат:
+
+``` text
+┌─sumCount(x)─┐
+│ (190,20)    │
+└─────────────┘
+```
+
+**Смотрите также**
+
+- Настройка [optimize_fuse_sum_count_avg](../../../operations/settings/settings.md#optimize_fuse_sum_count_avg)

src/Common/FileChecker.cpp

@@ -21,7 +21,15 @@ namespace ErrorCodes
 FileChecker::FileChecker(DiskPtr disk_, const String & file_info_path_) : disk(std::move(disk_))
 {
     setPath(file_info_path_);
-    load();
+    try
+    {
+        load();
+    }
+    catch (DB::Exception & e)
+    {
+        e.addMessage("Error loading file {}", files_info_path);
+        throw;
+    }
 }
 
 void FileChecker::setPath(const String & file_info_path_)

src/IO/ReadHelpers.h

@@ -270,16 +270,37 @@ ReturnType readIntTextImpl(T & x, ReadBuffer & buf)
     }
 
     const size_t initial_pos = buf.count();
+    bool has_sign = false;
+    bool has_number = false;
     while (!buf.eof())
     {
         switch (*buf.position())
         {
             case '+':
             {
+                if (has_sign || has_number)
+                {
+                    if constexpr (throw_exception)
+                        throw ParsingException(
+                            "Cannot parse number with multiple sign (+/-) characters or intermediate sign character",
+                            ErrorCodes::CANNOT_PARSE_NUMBER);
+                    else
+                        return ReturnType(false);
+                }
+                has_sign = true;
                 break;
             }
             case '-':
             {
+                if (has_sign || has_number)
+                {
+                    if constexpr (throw_exception)
+                        throw ParsingException(
+                            "Cannot parse number with multiple sign (+/-) characters or intermediate sign character",
+                            ErrorCodes::CANNOT_PARSE_NUMBER);
+                    else
+                        return ReturnType(false);
+                }
                 if constexpr (is_signed_v<T>)
                     negative = true;
                 else
@@ -289,6 +310,7 @@ ReturnType readIntTextImpl(T & x, ReadBuffer & buf)
                     else
                         return ReturnType(false);
                 }
+                has_sign = true;
                 break;
             }
             case '0': [[fallthrough]];
@@ -302,6 +324,7 @@ ReturnType readIntTextImpl(T & x, ReadBuffer & buf)
             case '8': [[fallthrough]];
             case '9':
             {
+                has_number = true;
                 if constexpr (check_overflow == ReadIntTextCheckOverflow::CHECK_OVERFLOW && !is_big_int_v<T>)
                 {
                     /// Perform relativelly slow overflow check only when
@@ -330,6 +353,14 @@ ReturnType readIntTextImpl(T & x, ReadBuffer & buf)
     }
 
 end:
+    if (has_sign && !has_number)
+    {
+        if constexpr (throw_exception)
+            throw ParsingException(
+                "Cannot parse number with a sign character but without any numeric character", ErrorCodes::CANNOT_PARSE_NUMBER);
+        else
+            return ReturnType(false);
+    }
     x = res;
     if constexpr (is_signed_v<T>)
     {

tests/performance/string_to_int.xml

@@ -0,0 +1,12 @@
+<test>
+    <create_query>DROP TABLE IF EXISTS numeric_strings</create_query>
+    <create_query>CREATE TABLE numeric_strings(num String) ENGINE Memory</create_query>
+
+    <fill_query>
+        INSERT INTO numeric_strings SELECT number FROM numbers(30000000)
+    </fill_query>
+
+    <query short="1">SELECT count(num::Int64) FROM numeric_strings FORMAT Null</query>
+
+    <drop_query>DROP TABLE IF EXISTS numeric_strings</drop_query>
+</test>

tests/queries/0_stateless/00574_empty_strings_deserialization.sh

@@ -8,8 +8,8 @@ $CLICKHOUSE_CLIENT -q "DROP TABLE IF EXISTS empty_strings_deserialization"
 $CLICKHOUSE_CLIENT -q "CREATE TABLE empty_strings_deserialization(s String, i Int32, f Float32) ENGINE Memory"
 
 echo ',,' | $CLICKHOUSE_CLIENT -q "INSERT INTO empty_strings_deserialization FORMAT CSV"
-echo 'aaa,-,' | $CLICKHOUSE_CLIENT -q "INSERT INTO empty_strings_deserialization FORMAT CSV"
-echo 'bbb,,-' | $CLICKHOUSE_CLIENT -q "INSERT INTO empty_strings_deserialization FORMAT CSV"
+echo 'aaa,,' | $CLICKHOUSE_CLIENT -q "INSERT INTO empty_strings_deserialization FORMAT CSV"
+echo 'bbb,,-0' | $CLICKHOUSE_CLIENT -q "INSERT INTO empty_strings_deserialization FORMAT CSV"
 
 $CLICKHOUSE_CLIENT -q "SELECT * FROM empty_strings_deserialization ORDER BY s"
 

tests/queries/0_stateless/01425_decimal_parse_big_negative_exponent.sql

@@ -1,4 +1,4 @@
-SELECT '-1E9-1E9-1E9-1E9' AS x, toDecimal32(x, 0); -- { serverError 6 }
+SELECT '-1E9-1E9-1E9-1E9' AS x, toDecimal32(x, 0); -- { serverError 72 }
 SELECT '-1E9' AS x, toDecimal32(x, 0); -- { serverError 69 }
 SELECT '1E-9' AS x, toDecimal32(x, 0);
 SELECT '1E-8' AS x, toDecimal32(x, 0);

tests/queries/0_stateless/01888_read_int_safe.reference

@@ -0,0 +1,2 @@
+1
+-1

tests/queries/0_stateless/01888_read_int_safe.sql

@@ -0,0 +1,10 @@
+select toInt64('--1'); -- { serverError 72; }
+select toInt64('+-1'); -- { serverError 72; }
+select toInt64('++1'); -- { serverError 72; }
+select toInt64('++'); -- { serverError 72; }
+select toInt64('+'); -- { serverError 72; }
+select toInt64('1+1'); -- { serverError 72; }
+select toInt64('1-1'); -- { serverError 72; }
+select toInt64(''); -- { serverError 32; }
+select toInt64('1');
+select toInt64('-1');