Raname uniqThetaSketch to uniqTheta

2024-11-21 07:01:59 +00:00 · 2021-05-11 17:36:26 +03:00 · 2021-05-11 17:36:26 +03:00 · 704bbe0aeb
commit 704bbe0aeb
parent e85d87feec
12 changed files with 107 additions and 107 deletions
--- a/docs/en/sql-reference/aggregate-functions/reference/uniq.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/uniq.md
@ -38,4 +38,4 @@ We recommend using this function in almost all scenarios.
 -   [uniqCombined64](../../../sql-reference/aggregate-functions/reference/uniqcombined64.md#agg_function-uniqcombined64)
 -   [uniqHLL12](../../../sql-reference/aggregate-functions/reference/uniqhll12.md#agg_function-uniqhll12)
 -   [uniqExact](../../../sql-reference/aggregate-functions/reference/uniqexact.md#agg_function-uniqexact)
-   [uniqThetaSketch](../../../sql-reference/aggregate-functions/reference/uniqthetasketch.md#agg_function-uniqthetasketch)
+-   [uniqTheta](../../../sql-reference/aggregate-functions/reference/uniqthetasketch.md#agg_function-uniqthetasketch)
--- a/docs/en/sql-reference/aggregate-functions/reference/uniqcombined.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/uniqcombined.md
@ -49,4 +49,4 @@ Compared to the [uniq](../../../sql-reference/aggregate-functions/reference/uniq
 -   [uniqCombined64](../../../sql-reference/aggregate-functions/reference/uniqcombined64.md#agg_function-uniqcombined64)
 -   [uniqHLL12](../../../sql-reference/aggregate-functions/reference/uniqhll12.md#agg_function-uniqhll12)
 -   [uniqExact](../../../sql-reference/aggregate-functions/reference/uniqexact.md#agg_function-uniqexact)
-   [uniqThetaSketch](../../../sql-reference/aggregate-functions/reference/uniqthetasketch.md#agg_function-uniqthetasketch)
+-   [uniqTheta](../../../sql-reference/aggregate-functions/reference/uniqthetasketch.md#agg_function-uniqthetasketch)
--- a/docs/en/sql-reference/aggregate-functions/reference/uniqexact.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/uniqexact.md
@ -23,4 +23,4 @@ The function takes a variable number of parameters. Parameters can be `Tuple`, `
 -   [uniq](../../../sql-reference/aggregate-functions/reference/uniq.md#agg_function-uniq)
 -   [uniqCombined](../../../sql-reference/aggregate-functions/reference/uniq.md#agg_function-uniqcombined)
 -   [uniqHLL12](../../../sql-reference/aggregate-functions/reference/uniq.md#agg_function-uniqhll12)
-   [uniqThetaSketch](../../../sql-reference/aggregate-functions/reference/uniqthetasketch.md#agg_function-uniqthetasketch)
+-   [uniqTheta](../../../sql-reference/aggregate-functions/reference/uniqthetasketch.md#agg_function-uniqthetasketch)
--- a/docs/en/sql-reference/aggregate-functions/reference/uniqhll12.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/uniqhll12.md
@ -37,4 +37,4 @@ We don’t recommend using this function. In most cases, use the [uniq](../../..
 -   [uniq](../../../sql-reference/aggregate-functions/reference/uniq.md#agg_function-uniq)
 -   [uniqCombined](../../../sql-reference/aggregate-functions/reference/uniqcombined.md#agg_function-uniqcombined)
 -   [uniqExact](../../../sql-reference/aggregate-functions/reference/uniqexact.md#agg_function-uniqexact)
-   [uniqThetaSketch](../../../sql-reference/aggregate-functions/reference/uniqthetasketch.md#agg_function-uniqthetasketch)
+-   [uniqTheta](../../../sql-reference/aggregate-functions/reference/uniqthetasketch.md#agg_function-uniqthetasketch)
--- a/docs/en/sql-reference/aggregate-functions/reference/uniqthetasketch.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/uniqthetasketch.md
@ -2,12 +2,12 @@
 toc_priority: 195
 ---

-# uniqThetaSketch {#agg_function-uniqthetasketch}
+# uniqTheta {#agg_function-uniqthetasketch}

 Calculates the approximate number of different argument values, using the [Theta Sketch Framework](https://datasketches.apache.org/docs/Theta/ThetaSketchFramework.html).

 ``` sql
-uniqThetaSketch(x[, ...])
+uniqTheta(x[, ...])
 ```

 **Arguments**
--- a/src/AggregateFunctions/AggregateFunctionUniq.cpp
+++ b/src/AggregateFunctions/AggregateFunctionUniq.cpp
@ -134,8 +134,8 @@ void registerAggregateFunctionsUniq(AggregateFunctionFactory & factory)
        {createAggregateFunctionUniq<true, AggregateFunctionUniqExactData, AggregateFunctionUniqExactData<String>>, properties});

 #if USE_DATASKETCHES
-    factory.registerFunction("uniqThetaSketch",
-        {createAggregateFunctionUniq<AggregateFunctionUniqThetaSketchData, AggregateFunctionUniqThetaSketchData>, properties});
+    factory.registerFunction("uniqTheta",
+        {createAggregateFunctionUniq<AggregateFunctionUniqThetaData, AggregateFunctionUniqThetaData>, properties});
 #endif

 }
--- a/src/AggregateFunctions/AggregateFunctionUniq.h
+++ b/src/AggregateFunctions/AggregateFunctionUniq.h
@ -125,15 +125,15 @@ struct AggregateFunctionUniqExactData<String>
 };


-/// uniqThetaSketch
+/// uniqTheta
 #if USE_DATASKETCHES

-struct AggregateFunctionUniqThetaSketchData
+struct AggregateFunctionUniqThetaData
 {
    using Set = ThetaSketchData<UInt64>;
    Set set;

-    static String getName() { return "uniqThetaSketch"; }
+    static String getName() { return "uniqTheta"; }
 };

 #endif
@ -202,7 +202,7 @@ struct OneAdder
            }
        }
 #if USE_DATASKETCHES
-        else if constexpr (std::is_same_v<Data, AggregateFunctionUniqThetaSketchData>)
+        else if constexpr (std::is_same_v<Data, AggregateFunctionUniqThetaData>)
        {
            data.set.insertOriginal(column.getDataAt(row_num));
        }
--- a/src/Interpreters/RemoveInjectiveFunctionsVisitor.cpp
+++ b/src/Interpreters/RemoveInjectiveFunctionsVisitor.cpp
@ -13,7 +13,7 @@ static bool isUniq(const ASTFunction & func)
 {
    return func.name == "uniq" || func.name == "uniqExact" || func.name == "uniqHLL12"
        || func.name == "uniqCombined" || func.name == "uniqCombined64"
-        || func.name == "uniqThetaSketch";
+        || func.name == "uniqTheta";
 }

 /// Remove injective functions of one argument: replace with a child
--- a/tests/queries/0_stateless/01798_uniq_theta_sketch.reference
+++ b/tests/queries/0_stateless/01798_uniq_theta_sketch.reference
@ -1,4 +1,4 @@
-uniqThetaSketch many agrs
+uniqTheta many agrs
 10	10	100	100	1000	1000
 17	10	10	100	100	610	610	766
 52	10	10	100	100	608	608	766
@ -10,14 +10,14 @@ uniqThetaSketch many agrs
 50	10	10	100	100	608	608	765
 54	10	10	100	100	609	609	765
 56	10	10	100	100	608	608	765
-uniqThetaSketch distinct
+uniqTheta distinct
 123
 143
-uniqThetaSketch arrays
+uniqTheta arrays
 2
 3
 3
-uniqThetaSketch complex types
+uniqTheta complex types
 3
 3
 3
@ -27,17 +27,17 @@ uniqThetaSketch complex types
 3
 3
 3
-uniqThetaSketch decimals
+uniqTheta decimals
 (0,0,0)
 (101,101,101)
-uniqThetaSketch remove injective
-SELECT uniqThetaSketch(x)
+uniqTheta remove injective
+SELECT uniqTheta(x)
 FROM 
 (
    SELECT number % 2 AS x
    FROM numbers(10)
 )
-SELECT uniqThetaSketch(x + y)
+SELECT uniqTheta(x + y)
 FROM 
 (
    SELECT
@ -45,37 +45,37 @@ FROM
        number % 3 AS y
    FROM numbers(10)
 )
-SELECT uniqThetaSketch(x)
+SELECT uniqTheta(x)
 FROM 
 (
    SELECT number % 2 AS x
    FROM numbers(10)
 )
-SELECT uniqThetaSketch(x)
+SELECT uniqTheta(x)
 FROM 
 (
    SELECT number % 2 AS x
    FROM numbers(10)
 )
-SELECT uniqThetaSketch(x)
+SELECT uniqTheta(x)
 FROM 
 (
    SELECT number % 2 AS x
    FROM numbers(10)
 )
-SELECT uniqThetaSketch(x)
+SELECT uniqTheta(x)
 FROM 
 (
    SELECT number % 2 AS x
    FROM numbers(10)
 )
-SELECT uniqThetaSketch(x)
+SELECT uniqTheta(x)
 FROM 
 (
    SELECT number % 2 AS x
    FROM numbers(10)
 )
-SELECT uniqThetaSketch(x + y)
+SELECT uniqTheta(x + y)
 FROM 
 (
    SELECT
@ -83,25 +83,25 @@ FROM
        number % 3 AS y
    FROM numbers(10)
 )
-SELECT uniqThetaSketch(-x)
+SELECT uniqTheta(-x)
 FROM 
 (
    SELECT number % 2 AS x
    FROM numbers(10)
 )
-SELECT uniqThetaSketch(bitNot(x))
+SELECT uniqTheta(bitNot(x))
 FROM 
 (
    SELECT number % 2 AS x
    FROM numbers(10)
 )
-SELECT uniqThetaSketch(bitNot(-x))
+SELECT uniqTheta(bitNot(-x))
 FROM 
 (
    SELECT number % 2 AS x
    FROM numbers(10)
 )
-SELECT uniqThetaSketch(-bitNot(-x))
+SELECT uniqTheta(-bitNot(-x))
 FROM 
 (
    SELECT number % 2 AS x
--- a/tests/queries/0_stateless/01798_uniq_theta_sketch.sql
+++ b/tests/queries/0_stateless/01798_uniq_theta_sketch.sql
@ -1,7 +1,7 @@
-SELECT 'uniqThetaSketch many agrs';
+SELECT 'uniqTheta many agrs';

 SELECT
-    uniqThetaSketch(x), uniqThetaSketch((x)), uniqThetaSketch(x, y), uniqThetaSketch((x, y)), uniqThetaSketch(x, y, z), uniqThetaSketch((x, y, z))
+    uniqTheta(x), uniqTheta((x)), uniqTheta(x, y), uniqTheta((x, y)), uniqTheta(x, y, z), uniqTheta((x, y, z))
 FROM
 (
    SELECT
@ -13,7 +13,7 @@ FROM


 SELECT k,
-    uniqThetaSketch(x), uniqThetaSketch((x)), uniqThetaSketch(x, y), uniqThetaSketch((x, y)), uniqThetaSketch(x, y, z), uniqThetaSketch((x, y, z)),
+    uniqTheta(x), uniqTheta((x)), uniqTheta(x, y), uniqTheta((x, y)), uniqTheta(x, y, z), uniqTheta((x, y, z)),
    count() AS c
 FROM
 (
@ -29,34 +29,34 @@ ORDER BY c DESC, k ASC
 LIMIT 10;


-SELECT 'uniqThetaSketch distinct';
+SELECT 'uniqTheta distinct';

-SET count_distinct_implementation = 'uniqThetaSketch';
+SET count_distinct_implementation = 'uniqTheta';
 SELECT count(DISTINCT x) FROM (SELECT number % 123 AS x FROM system.numbers LIMIT 1000);
 SELECT count(DISTINCT x, y) FROM (SELECT number % 11 AS x, number % 13 AS y FROM system.numbers LIMIT 1000);


-SELECT 'uniqThetaSketch arrays';
+SELECT 'uniqTheta arrays';

-SELECT uniqThetaSketchArray([0, 1, 1], [0, 1, 1], [0, 1, 1]);
-SELECT uniqThetaSketchArray([0, 1, 1], [0, 1, 1], [0, 1, 0]);
-SELECT uniqThetaSketch(x) FROM (SELECT arrayJoin([[1, 2], [1, 2], [1, 2, 3], []]) AS x);
+SELECT uniqThetaArray([0, 1, 1], [0, 1, 1], [0, 1, 1]);
+SELECT uniqThetaArray([0, 1, 1], [0, 1, 1], [0, 1, 0]);
+SELECT uniqTheta(x) FROM (SELECT arrayJoin([[1, 2], [1, 2], [1, 2, 3], []]) AS x);


-SELECT 'uniqThetaSketch complex types';
+SELECT 'uniqTheta complex types';

-SELECT uniqThetaSketch(x) FROM (SELECT arrayJoin([[], ['a'], ['a', 'b'], []]) AS x);
-SELECT uniqThetaSketch(x) FROM (SELECT arrayJoin([[[]], [['a', 'b']], [['a'], ['b']], [['a', 'b']]]) AS x);
-SELECT uniqThetaSketch(x, x) FROM (SELECT arrayJoin([[], ['a'], ['a', 'b'], []]) AS x);
-SELECT uniqThetaSketch(x, arrayMap(elem -> [elem, elem], x)) FROM (SELECT arrayJoin([[], ['a'], ['a', 'b'], []]) AS x);
-SELECT uniqThetaSketch(x, toString(x)) FROM (SELECT arrayJoin([[], ['a'], ['a', 'b'], []]) AS x);
-SELECT uniqThetaSketch((x, x)) FROM (SELECT arrayJoin([[], ['a'], ['a', 'b'], []]) AS x);
-SELECT uniqThetaSketch((x, arrayMap(elem -> [elem, elem], x))) FROM (SELECT arrayJoin([[], ['a'], ['a', 'b'], []]) AS x);
-SELECT uniqThetaSketch((x, toString(x))) FROM (SELECT arrayJoin([[], ['a'], ['a', 'b'], []]) AS x);
-SELECT uniqThetaSketch(x) FROM (SELECT arrayJoin([[], ['a'], ['a', NULL, 'b'], []]) AS x);
+SELECT uniqTheta(x) FROM (SELECT arrayJoin([[], ['a'], ['a', 'b'], []]) AS x);
+SELECT uniqTheta(x) FROM (SELECT arrayJoin([[[]], [['a', 'b']], [['a'], ['b']], [['a', 'b']]]) AS x);
+SELECT uniqTheta(x, x) FROM (SELECT arrayJoin([[], ['a'], ['a', 'b'], []]) AS x);
+SELECT uniqTheta(x, arrayMap(elem -> [elem, elem], x)) FROM (SELECT arrayJoin([[], ['a'], ['a', 'b'], []]) AS x);
+SELECT uniqTheta(x, toString(x)) FROM (SELECT arrayJoin([[], ['a'], ['a', 'b'], []]) AS x);
+SELECT uniqTheta((x, x)) FROM (SELECT arrayJoin([[], ['a'], ['a', 'b'], []]) AS x);
+SELECT uniqTheta((x, arrayMap(elem -> [elem, elem], x))) FROM (SELECT arrayJoin([[], ['a'], ['a', 'b'], []]) AS x);
+SELECT uniqTheta((x, toString(x))) FROM (SELECT arrayJoin([[], ['a'], ['a', 'b'], []]) AS x);
+SELECT uniqTheta(x) FROM (SELECT arrayJoin([[], ['a'], ['a', NULL, 'b'], []]) AS x);


-SELECT 'uniqThetaSketch decimals';
+SELECT 'uniqTheta decimals';

 DROP TABLE IF EXISTS decimal;
 CREATE TABLE decimal
@ -66,38 +66,38 @@ CREATE TABLE decimal
    c Decimal128(8)
 ) ENGINE = Memory;

-SELECT (uniqThetaSketch(a), uniqThetaSketch(b), uniqThetaSketch(c))
+SELECT (uniqTheta(a), uniqTheta(b), uniqTheta(c))
 FROM (SELECT * FROM decimal ORDER BY a);

 INSERT INTO decimal (a, b, c)
 SELECT toDecimal32(number - 50, 4), toDecimal64(number - 50, 8) / 3, toDecimal128(number - 50, 8) / 5
 FROM system.numbers LIMIT 101;

-SELECT (uniqThetaSketch(a), uniqThetaSketch(b), uniqThetaSketch(c))
+SELECT (uniqTheta(a), uniqTheta(b), uniqTheta(c))
 FROM (SELECT * FROM decimal ORDER BY a);

 DROP TABLE decimal;


-SELECT 'uniqThetaSketch remove injective';
+SELECT 'uniqTheta remove injective';

 set optimize_injective_functions_inside_uniq = 1;

-EXPLAIN SYNTAX select uniqThetaSketch(x) from (select number % 2 as x from numbers(10));
-EXPLAIN SYNTAX select uniqThetaSketch(x + y) from (select number % 2 as x, number % 3 y from numbers(10));
-EXPLAIN SYNTAX select uniqThetaSketch(-x) from (select number % 2 as x from numbers(10));
-EXPLAIN SYNTAX select uniqThetaSketch(bitNot(x)) from (select number % 2 as x from numbers(10));
-EXPLAIN SYNTAX select uniqThetaSketch(bitNot(-x)) from (select number % 2 as x from numbers(10));
-EXPLAIN SYNTAX select uniqThetaSketch(-bitNot(-x)) from (select number % 2 as x from numbers(10));
+EXPLAIN SYNTAX select uniqTheta(x) from (select number % 2 as x from numbers(10));
+EXPLAIN SYNTAX select uniqTheta(x + y) from (select number % 2 as x, number % 3 y from numbers(10));
+EXPLAIN SYNTAX select uniqTheta(-x) from (select number % 2 as x from numbers(10));
+EXPLAIN SYNTAX select uniqTheta(bitNot(x)) from (select number % 2 as x from numbers(10));
+EXPLAIN SYNTAX select uniqTheta(bitNot(-x)) from (select number % 2 as x from numbers(10));
+EXPLAIN SYNTAX select uniqTheta(-bitNot(-x)) from (select number % 2 as x from numbers(10));

 set optimize_injective_functions_inside_uniq = 0;

-EXPLAIN SYNTAX select uniqThetaSketch(x) from (select number % 2 as x from numbers(10));
-EXPLAIN SYNTAX select uniqThetaSketch(x + y) from (select number % 2 as x, number % 3 y from numbers(10));
-EXPLAIN SYNTAX select uniqThetaSketch(-x) from (select number % 2 as x from numbers(10));
-EXPLAIN SYNTAX select uniqThetaSketch(bitNot(x)) from (select number % 2 as x from numbers(10));
-EXPLAIN SYNTAX select uniqThetaSketch(bitNot(-x)) from (select number % 2 as x from numbers(10));
-EXPLAIN SYNTAX select uniqThetaSketch(-bitNot(-x)) from (select number % 2 as x from numbers(10));
+EXPLAIN SYNTAX select uniqTheta(x) from (select number % 2 as x from numbers(10));
+EXPLAIN SYNTAX select uniqTheta(x + y) from (select number % 2 as x, number % 3 y from numbers(10));
+EXPLAIN SYNTAX select uniqTheta(-x) from (select number % 2 as x from numbers(10));
+EXPLAIN SYNTAX select uniqTheta(bitNot(x)) from (select number % 2 as x from numbers(10));
+EXPLAIN SYNTAX select uniqTheta(bitNot(-x)) from (select number % 2 as x from numbers(10));
+EXPLAIN SYNTAX select uniqTheta(-bitNot(-x)) from (select number % 2 as x from numbers(10));


 DROP TABLE IF EXISTS stored_aggregates;
@ -107,7 +107,7 @@ CREATE TABLE stored_aggregates
 (
    d Date,
    Uniq AggregateFunction(uniq, UInt64),
-    UniqThetaSketch AggregateFunction(uniqThetaSketch, UInt64)
+    UniqThetaSketch AggregateFunction(uniqTheta, UInt64)
 )
 ENGINE = AggregatingMergeTree(d, d, 8192);

@ -115,21 +115,21 @@ INSERT INTO stored_aggregates
 SELECT
    toDate('2014-06-01') AS d,
    uniqState(number) AS Uniq,
-    uniqThetaSketchState(number) AS UniqThetaSketch
+    uniqThetaState(number) AS UniqThetaSketch
 FROM
 (
    SELECT * FROM system.numbers LIMIT 1000
 );

-SELECT uniqMerge(Uniq), uniqThetaSketchMerge(UniqThetaSketch) FROM stored_aggregates;
+SELECT uniqMerge(Uniq), uniqThetaMerge(UniqThetaSketch) FROM stored_aggregates;

-SELECT d, uniqMerge(Uniq), uniqThetaSketchMerge(UniqThetaSketch) FROM stored_aggregates GROUP BY d ORDER BY d;
+SELECT d, uniqMerge(Uniq), uniqThetaMerge(UniqThetaSketch) FROM stored_aggregates GROUP BY d ORDER BY d;

 OPTIMIZE TABLE stored_aggregates;

-SELECT uniqMerge(Uniq), uniqThetaSketchMerge(UniqThetaSketch) FROM stored_aggregates;
+SELECT uniqMerge(Uniq), uniqThetaMerge(UniqThetaSketch) FROM stored_aggregates;

-SELECT d, uniqMerge(Uniq), uniqThetaSketchMerge(UniqThetaSketch) FROM stored_aggregates GROUP BY d ORDER BY d;
+SELECT d, uniqMerge(Uniq), uniqThetaMerge(UniqThetaSketch) FROM stored_aggregates GROUP BY d ORDER BY d;

 DROP TABLE stored_aggregates;

@ -140,7 +140,7 @@ CREATE TABLE stored_aggregates
 	k1 	UInt64,
 	k2 	String,
 	Uniq 			AggregateFunction(uniq, UInt64),
-    UniqThetaSketch	AggregateFunction(uniqThetaSketch, UInt64)
+    UniqThetaSketch	AggregateFunction(uniqTheta, UInt64)
 )
 ENGINE = AggregatingMergeTree(d, (d, k1, k2), 8192);

@ -150,7 +150,7 @@ SELECT
 	intDiv(number, 100) AS k1,
 	toString(intDiv(number, 10)) AS k2,
 	uniqState(toUInt64(number % 7)) AS Uniq,
-    uniqThetaSketchState(toUInt64(number % 7)) AS UniqThetaSketch
+    uniqThetaState(toUInt64(number % 7)) AS UniqThetaSketch
 FROM
 (
 	SELECT * FROM system.numbers LIMIT 1000
@ -159,19 +159,19 @@ GROUP BY d, k1, k2
 ORDER BY d, k1, k2;

 SELECT d, k1, k2,
-	uniqMerge(Uniq), uniqThetaSketchMerge(UniqThetaSketch)
+	uniqMerge(Uniq), uniqThetaMerge(UniqThetaSketch)
 FROM stored_aggregates
 GROUP BY d, k1, k2
 ORDER BY d, k1, k2;

 SELECT d, k1,
-	uniqMerge(Uniq), uniqThetaSketchMerge(UniqThetaSketch)
+	uniqMerge(Uniq), uniqThetaMerge(UniqThetaSketch)
 FROM stored_aggregates
 GROUP BY d, k1
 ORDER BY d, k1;

 SELECT d,
-	uniqMerge(Uniq), uniqThetaSketchMerge(UniqThetaSketch)
+	uniqMerge(Uniq), uniqThetaMerge(UniqThetaSketch)
 FROM stored_aggregates
 GROUP BY d
 ORDER BY d;
@ -193,18 +193,18 @@ create materialized view summing_merge_tree_aggregate_function (
    k UInt64,
    c UInt64,
    un AggregateFunction(uniq, UInt64),
-    ut AggregateFunction(uniqThetaSketch, UInt64)
+    ut AggregateFunction(uniqTheta, UInt64)
 ) engine=SummingMergeTree(d, k, 8192)
-as select d, k, sum(c) as c, uniqState(u) as un, uniqThetaSketchState(u) as ut
+as select d, k, sum(c) as c, uniqState(u) as un, uniqThetaState(u) as ut
 from summing_merge_tree_null
 group by d, k;

 -- prime number 53 to avoid resonanse between %3 and %53
 insert into summing_merge_tree_null select number % 3, 1, number % 53 from numbers(999999);

-select k, sum(c), uniqMerge(un), uniqThetaSketchMerge(ut) from summing_merge_tree_aggregate_function group by k order by k;
+select k, sum(c), uniqMerge(un), uniqThetaMerge(ut) from summing_merge_tree_aggregate_function group by k order by k;
 optimize table summing_merge_tree_aggregate_function;
-select k, sum(c), uniqMerge(un), uniqThetaSketchMerge(ut) from summing_merge_tree_aggregate_function group by k order by k;
+select k, sum(c), uniqMerge(un), uniqThetaMerge(ut) from summing_merge_tree_aggregate_function group by k order by k;

 drop table summing_merge_tree_aggregate_function;
 drop table summing_merge_tree_null;
--- a/tests/queries/0_stateless/01799_long_uniq_theta_sketch.reference
+++ b/tests/queries/0_stateless/01799_long_uniq_theta_sketch.reference
@ -1,4 +1,4 @@
-uniqThetaSketch
+uniqTheta
 1	1
 3	1
 6	1
@ -51,7 +51,7 @@ uniqThetaSketch
 31	54139
 35	52331
 36	53766
-uniqThetaSketch round(float)
+uniqTheta round(float)
 0.125	1
 0.5	1
 0.05	1
@ -104,7 +104,7 @@ uniqThetaSketch round(float)
 0.043	54690
 0.037	53716
 0.071	53479
-uniqThetaSketch round(toFloat32())
+uniqTheta round(toFloat32())
 0.5	1
 0.05	1
 0.25	1
@ -157,7 +157,7 @@ uniqThetaSketch round(toFloat32())
 0.037	53716
 0.1	54408
 1	55018
-uniqThetaSketch IPv4NumToString
+uniqTheta IPv4NumToString
 1	1
 3	1
 6	1
@ -210,9 +210,9 @@ uniqThetaSketch IPv4NumToString
 31	54012
 35	54826
 36	54910
-uniqThetaSketch remote()
+uniqTheta remote()
 1
-uniqThetaSketch precise
+uniqTheta precise
 10000000
 10021957
 10021969
--- a/tests/queries/0_stateless/01799_long_uniq_theta_sketch.sql
+++ b/tests/queries/0_stateless/01799_long_uniq_theta_sketch.sql
@ -1,35 +1,35 @@
-SELECT 'uniqThetaSketch';
+SELECT 'uniqTheta';

-SELECT Y, uniqThetaSketch(X) FROM (SELECT number AS X, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 15) GROUP BY Y;
-SELECT Y, uniqThetaSketch(X) FROM (SELECT number AS X, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 3000) GROUP BY Y;
-SELECT Y, uniqThetaSketch(X) FROM (SELECT number AS X, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y;
+SELECT Y, uniqTheta(X) FROM (SELECT number AS X, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 15) GROUP BY Y;
+SELECT Y, uniqTheta(X) FROM (SELECT number AS X, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 3000) GROUP BY Y;
+SELECT Y, uniqTheta(X) FROM (SELECT number AS X, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y;

-SELECT 'uniqThetaSketch round(float)';
+SELECT 'uniqTheta round(float)';

-SELECT Y, uniqThetaSketch(X) FROM (SELECT number AS X, round(1/(1 + (3*X*X - 7*X + 11) % 37), 3) AS Y FROM system.numbers LIMIT 15) GROUP BY Y;
-SELECT Y, uniqThetaSketch(X) FROM (SELECT number AS X, round(1/(1 + (3*X*X - 7*X + 11) % 37), 3) AS Y FROM system.numbers LIMIT 3000) GROUP BY Y;
-SELECT Y, uniqThetaSketch(X) FROM (SELECT number AS X, round(1/(1 + (3*X*X - 7*X + 11) % 37), 3) AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y;
+SELECT Y, uniqTheta(X) FROM (SELECT number AS X, round(1/(1 + (3*X*X - 7*X + 11) % 37), 3) AS Y FROM system.numbers LIMIT 15) GROUP BY Y;
+SELECT Y, uniqTheta(X) FROM (SELECT number AS X, round(1/(1 + (3*X*X - 7*X + 11) % 37), 3) AS Y FROM system.numbers LIMIT 3000) GROUP BY Y;
+SELECT Y, uniqTheta(X) FROM (SELECT number AS X, round(1/(1 + (3*X*X - 7*X + 11) % 37), 3) AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y;

-SELECT 'uniqThetaSketch round(toFloat32())';
+SELECT 'uniqTheta round(toFloat32())';

-SELECT Y, uniqThetaSketch(X) FROM (SELECT number AS X, round(toFloat32(1/(1 + (3*X*X - 7*X + 11) % 37)), 3) AS Y FROM system.numbers LIMIT 15) GROUP BY Y;
-SELECT Y, uniqThetaSketch(X) FROM (SELECT number AS X, round(toFloat32(1/(1 + (3*X*X - 7*X + 11) % 37)), 3) AS Y FROM system.numbers LIMIT 3000) GROUP BY Y;
-SELECT Y, uniqThetaSketch(X) FROM (SELECT number AS X, round(toFloat32(1/(1 + (3*X*X - 7*X + 11) % 37)), 3) AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y;
+SELECT Y, uniqTheta(X) FROM (SELECT number AS X, round(toFloat32(1/(1 + (3*X*X - 7*X + 11) % 37)), 3) AS Y FROM system.numbers LIMIT 15) GROUP BY Y;
+SELECT Y, uniqTheta(X) FROM (SELECT number AS X, round(toFloat32(1/(1 + (3*X*X - 7*X + 11) % 37)), 3) AS Y FROM system.numbers LIMIT 3000) GROUP BY Y;
+SELECT Y, uniqTheta(X) FROM (SELECT number AS X, round(toFloat32(1/(1 + (3*X*X - 7*X + 11) % 37)), 3) AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y;

-SELECT 'uniqThetaSketch IPv4NumToString';
+SELECT 'uniqTheta IPv4NumToString';

-SELECT Y, uniqThetaSketch(Z) FROM (SELECT number AS X, IPv4NumToString(toUInt32(X)) AS Z, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 15) GROUP BY Y;
-SELECT Y, uniqThetaSketch(Z) FROM (SELECT number AS X, IPv4NumToString(toUInt32(X)) AS Z, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 3000) GROUP BY Y;
-SELECT Y, uniqThetaSketch(Z) FROM (SELECT number AS X, IPv4NumToString(toUInt32(X)) AS Z, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y;
+SELECT Y, uniqTheta(Z) FROM (SELECT number AS X, IPv4NumToString(toUInt32(X)) AS Z, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 15) GROUP BY Y;
+SELECT Y, uniqTheta(Z) FROM (SELECT number AS X, IPv4NumToString(toUInt32(X)) AS Z, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 3000) GROUP BY Y;
+SELECT Y, uniqTheta(Z) FROM (SELECT number AS X, IPv4NumToString(toUInt32(X)) AS Z, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y;

-SELECT 'uniqThetaSketch remote()';
+SELECT 'uniqTheta remote()';

-SELECT uniqThetaSketch(dummy) FROM remote('127.0.0.{2,3}', system.one);
+SELECT uniqTheta(dummy) FROM remote('127.0.0.{2,3}', system.one);


-SELECT 'uniqThetaSketch precise';
+SELECT 'uniqTheta precise';
 SELECT uniqExact(number) FROM numbers(1e7);
 SELECT uniqCombined(number) FROM numbers(1e7);
 SELECT uniqCombined64(number) FROM numbers(1e7);
-SELECT uniqThetaSketch(number) FROM numbers(1e7);
+SELECT uniqTheta(number) FROM numbers(1e7);