Support extended stats creation on expressions (release-13.0)

.github/actions/upload_coverage/action.yml

@@ -13,15 +13,3 @@ runs:
       token: ${{ inputs.codecov_token }}
       verbose: true
       gcov: true
-  - name: Create codeclimate coverage
-    run: |-
-      lcov --directory . --capture --output-file lcov.info
-      lcov --remove lcov.info -o lcov.info '/usr/*'
-      sed "s=^SF:$PWD/=SF:=g" -i lcov.info # relative pats are required by codeclimate
-      mkdir -p /tmp/codeclimate
-      cc-test-reporter format-coverage -t lcov -o /tmp/codeclimate/${{ inputs.flags }}.json lcov.info
-    shell: bash
-  - uses: actions/upload-artifact@v4.6.0
-    with:
-      path: "/tmp/codeclimate/*.json"
-      name: codeclimate-${{ inputs.flags }}

.github/workflows/build_and_test.yml

@@ -394,29 +394,6 @@ jobs:
       with:
         flags: ${{ env.PG_MAJOR }}_citus_upgrade
         codecov_token: ${{ secrets.CODECOV_TOKEN }}
-  upload-coverage:
-    if: always()
-    env:
-      CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
-    runs-on: ubuntu-latest
-    container:
-      image: ${{ needs.params.outputs.test_image_name }}:${{ fromJson(needs.params.outputs.pg17_version).full }}${{ needs.params.outputs.image_suffix }}
-    needs:
-      - params
-      - test-citus
-      - test-arbitrary-configs
-      - test-citus-upgrade
-      - test-pg-upgrade
-    steps:
-      - uses: actions/download-artifact@v4.1.8
-        with:
-          pattern: codeclimate*
-          path: codeclimate
-          merge-multiple: true
-      - name: Upload coverage results to Code Climate
-        run: |-
-          cc-test-reporter sum-coverage codeclimate/*.json -o total.json
-          cc-test-reporter upload-coverage -i total.json
   ch_benchmark:
     name: CH Benchmark
     if: startsWith(github.ref, 'refs/heads/ch_benchmark/')

src/backend/distributed/deparser/deparse_statistics_stmts.c

@@ -15,11 +15,15 @@
 #include "catalog/namespace.h"
 #include "lib/stringinfo.h"
 #include "nodes/nodes.h"
+#include "parser/parse_expr.h"
 #include "utils/builtins.h"
+#include "utils/lsyscache.h"
+#include "utils/ruleutils.h"
 
 #include "pg_version_constants.h"
 
 #include "distributed/citus_ruleutils.h"
+#include "distributed/commands.h"
 #include "distributed/deparser.h"
 #include "distributed/listutils.h"
 #include "distributed/relay_utility.h"
@@ -231,6 +235,42 @@ AppendStatTypes(StringInfo buf, CreateStatsStmt *stmt)
 }
 
 
+/* See ruleutils.c in postgres for the logic here. */
+static bool
+looks_like_function(Node *node)
+{
+	if (node == NULL)
+	{
+		return false;           /* probably shouldn't happen */
+	}
+	switch (nodeTag(node))
+	{
+		case T_FuncExpr:
+		{
+			/* OK, unless it's going to deparse as a cast */
+			return (((FuncExpr *) node)->funcformat == COERCE_EXPLICIT_CALL ||
+					((FuncExpr *) node)->funcformat == COERCE_SQL_SYNTAX);
+		}
+
+		case T_NullIfExpr:
+		case T_CoalesceExpr:
+		case T_MinMaxExpr:
+		case T_SQLValueFunction:
+		case T_XmlExpr:
+		{
+			/* these are all accepted by func_expr_common_subexpr */
+			return true;
+		}
+
+		default:
+		{
+			break;
+		}
+	}
+	return false;
+}
+
+
 static void
 AppendColumnNames(StringInfo buf, CreateStatsStmt *stmt)
 {
@@ -240,15 +280,54 @@ AppendColumnNames(StringInfo buf, CreateStatsStmt *stmt)
 	{
 		if (!column->name)
 		{
-			ereport(ERROR,
-					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-					 errmsg(
-						 "only simple column references are allowed in CREATE STATISTICS")));
+			/*
+			 * Since these expressions are parser statements, we first call
+			 * transform to get the transformed Expr tree, and then deparse
+			 * the transformed tree. This is similar to the logic found in
+			 * deparse_table_stmts for check constraints.
+			 */
+			if (list_length(stmt->relations) != 1)
+			{
+				ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+								errmsg(
+									"cannot use expressions in CREATE STATISTICS with multiple relations")));
+			}
+
+			RangeVar *rel = (RangeVar *) linitial(stmt->relations);
+			bool missingOk = false;
+			Oid relOid = RangeVarGetRelid(rel, AccessShareLock, missingOk);
+
+			/* Add table name to the name space in parse state. Otherwise column names
+			 * cannot be found.
+			 */
+			Relation relation = table_open(relOid, AccessShareLock);
+			ParseState *pstate = make_parsestate(NULL);
+			AddRangeTableEntryToQueryCompat(pstate, relation);
+			Node *exprCooked = transformExpr(pstate, column->expr,
+											 EXPR_KIND_STATS_EXPRESSION);
+
+			char *relationName = get_rel_name(relOid);
+			List *relationCtx = deparse_context_for(relationName, relOid);
+
+			char *exprSql = deparse_expression(exprCooked, relationCtx, false, false);
+			relation_close(relation, NoLock);
+
+			/* Need parens if it's not a bare function call */
+			if (looks_like_function(exprCooked))
+			{
+				appendStringInfoString(buf, exprSql);
+			}
+			else
+			{
+				appendStringInfo(buf, "(%s)", exprSql);
+			}
 		}
+		else
+		{
+			const char *columnName = quote_identifier(column->name);
 
-		const char *columnName = quote_identifier(column->name);
-
-		appendStringInfoString(buf, columnName);
+			appendStringInfoString(buf, columnName);
+		}
 
 		if (column != llast(stmt->exprs))
 		{

src/test/regress/expected/pg14.out

@@ -231,19 +231,17 @@ DETAIL:  on server postgres@localhost:xxxxx connectionId: xxxxxxx
 reindex(TABLESPACE test_tablespace1) index idx;
 ERROR:  tablespace "test_tablespace1" does not exist
 reset citus.log_remote_commands;
--- CREATE STATISTICS only allow simple column references
+-- CREATE STATISTICS allows table references too
 CREATE TABLE tbl1(a timestamp, b int);
 SELECT create_distributed_table('tbl1','a');
  create_distributed_table
 ---------------------------------------------------------------------
 
 (1 row)
 
--- the last one should error out
 CREATE STATISTICS s1 (dependencies) ON a, b FROM tbl1;
 CREATE STATISTICS s2 (mcv) ON a, b FROM tbl1;
 CREATE STATISTICS s3 (ndistinct) ON date_trunc('month', a), date_trunc('day', a) FROM tbl1;
-ERROR:  only simple column references are allowed in CREATE STATISTICS
 set citus.log_remote_commands to off;
 -- error out in case of ALTER TABLE .. DETACH PARTITION .. CONCURRENTLY/FINALIZE
 -- only if it's a distributed partitioned table

src/test/regress/expected/propagate_statistics.out

@@ -53,6 +53,22 @@ SELECT create_distributed_table ('test_stats3','a');
 
 (1 row)
 
+-- test creating custom stats with expressions and distributing it.
+CREATE TABLE sc2.test_stats_expr (
+	a int,
+	b int,
+	c float8
+);
+CREATE STATISTICS s_expr ON (a + b / 2) FROM sc2.test_stats_expr;
+-- succeeds since we replicate it into the shards.
+SELECT create_distributed_table('sc2.test_stats_expr', 'a');
+ create_distributed_table
+---------------------------------------------------------------------
+
+(1 row)
+
+-- add expression stats on the distributed table should work.
+CREATE STATISTICS s_expr_post ON (a - (b * 2)), round(c) FROM sc2.test_stats_expr;
 -- test dropping statistics
 CREATE TABLE test_stats4 (
     a int,
@@ -112,7 +128,7 @@ WHERE stxnamespace IN (
 )
 AND stxname SIMILAR TO '%\_\d+'
 ORDER BY stxname ASC;
-     stxname
+      stxname
 ---------------------------------------------------------------------
  neW'Stat_980096
  neW'Stat_980098
@@ -162,22 +178,54 @@ ORDER BY stxname ASC;
  s2_980058
  s2_980060
  s2_980062
- s9_980129
- s9_980131
- s9_980133
- s9_980135
- s9_980137
- s9_980139
- s9_980141
- s9_980143
- s9_980145
- s9_980147
- s9_980149
- s9_980151
- s9_980153
- s9_980155
- s9_980157
- s9_980159
+ s9_980161
+ s9_980163
+ s9_980165
+ s9_980167
+ s9_980169
+ s9_980171
+ s9_980173
+ s9_980175
+ s9_980177
+ s9_980179
+ s9_980181
+ s9_980183
+ s9_980185
+ s9_980187
+ s9_980189
+ s9_980191
+ s_expr_980128
+ s_expr_980130
+ s_expr_980132
+ s_expr_980134
+ s_expr_980136
+ s_expr_980138
+ s_expr_980140
+ s_expr_980142
+ s_expr_980144
+ s_expr_980146
+ s_expr_980148
+ s_expr_980150
+ s_expr_980152
+ s_expr_980154
+ s_expr_980156
+ s_expr_980158
+ s_expr_post_980128
+ s_expr_post_980130
+ s_expr_post_980132
+ s_expr_post_980134
+ s_expr_post_980136
+ s_expr_post_980138
+ s_expr_post_980140
+ s_expr_post_980142
+ s_expr_post_980144
+ s_expr_post_980146
+ s_expr_post_980148
+ s_expr_post_980150
+ s_expr_post_980152
+ s_expr_post_980154
+ s_expr_post_980156
+ s_expr_post_980158
  st1_new_980064
  st1_new_980066
  st1_new_980068
@@ -194,23 +242,23 @@ ORDER BY stxname ASC;
  st1_new_980090
  st1_new_980092
  st1_new_980094
- stats_xy_980161
- stats_xy_980163
- stats_xy_980165
- stats_xy_980167
- stats_xy_980169
- stats_xy_980171
- stats_xy_980173
- stats_xy_980175
- stats_xy_980177
- stats_xy_980179
- stats_xy_980181
- stats_xy_980183
- stats_xy_980185
- stats_xy_980187
- stats_xy_980189
- stats_xy_980191
-(96 rows)
+ stats_xy_980193
+ stats_xy_980195
+ stats_xy_980197
+ stats_xy_980199
+ stats_xy_980201
+ stats_xy_980203
+ stats_xy_980205
+ stats_xy_980207
+ stats_xy_980209
+ stats_xy_980211
+ stats_xy_980213
+ stats_xy_980215
+ stats_xy_980217
+ stats_xy_980219
+ stats_xy_980221
+ stats_xy_980223
+(128 rows)
 
 SELECT count(DISTINCT stxnamespace)
 FROM pg_statistic_ext

src/test/regress/sql/pg14.sql

@@ -57,10 +57,9 @@ reindex(verbose, TABLESPACE test_tablespace) index idx ;
 -- should error saying table space doesn't exist
 reindex(TABLESPACE test_tablespace1) index idx;
 reset citus.log_remote_commands;
--- CREATE STATISTICS only allow simple column references
+-- CREATE STATISTICS allows table references too
 CREATE TABLE tbl1(a timestamp, b int);
 SELECT create_distributed_table('tbl1','a');
--- the last one should error out
 CREATE STATISTICS s1 (dependencies) ON a, b FROM tbl1;
 CREATE STATISTICS s2 (mcv) ON a, b FROM tbl1;
 CREATE STATISTICS s3 (ndistinct) ON date_trunc('month', a), date_trunc('day', a) FROM tbl1;

src/test/regress/sql/propagate_statistics.sql

@@ -44,6 +44,20 @@ CREATE SCHEMA sc2;
 CREATE STATISTICS sc2."neW'Stat" ON a,b FROM test_stats3;
 SELECT create_distributed_table ('test_stats3','a');
 
+-- test creating custom stats with expressions and distributing it.
+CREATE TABLE sc2.test_stats_expr (
+	a int,
+	b int,
+	c float8
+);
+CREATE STATISTICS s_expr ON (a + b / 2) FROM sc2.test_stats_expr;
+
+-- succeeds since we replicate it into the shards.
+SELECT create_distributed_table('sc2.test_stats_expr', 'a');
+
+-- add expression stats on the distributed table should work.
+CREATE STATISTICS s_expr_post ON (a - (b * 2)), round(c) FROM sc2.test_stats_expr;
+
 -- test dropping statistics
 CREATE TABLE test_stats4 (
     a int,