Merge #104677 #104929 #104946

104677: ui: Redirect Range Report page to Hot Ranges page r=gtr a=gtr

Fixes: #102377.

Previously, when a user selected a range ID from the Hot Ranges page,
the left side menu would switch to Advanced Debug and the back button
would also redirect to the Advanced Dedug page. This commit ensures that
when a range ID is selected, the left side menu will stay on the Hot
Ranges page and also changes the back button to redirect back to the
Hot Ranges page.

<img width="791" alt="image" src="https://github.com/cockroachdb/cockroach/assets/35943354/41afa924-7395-4101-a14c-bb4cdeccec0c">

Release note (ui change): The Range Report page (route
`/reports/range/:rangeID`) shows the "Hot Ranges" menu item as
highlighted in the left side menu. The back button in the Range Report
page redirects back to the Hot Ranges page.

104929: opt: resolve TupleStars in UDFs and views r=mgartner a=mgartner

Star expressions have been allowed in UDFs since #95710 and in views
since #97515. This commit lifts a restriction that prevented table
references from being resolved as TupleStars in SELECT lists inside UDFs
and views. For example, an expression like `SELECT tbl FROM tbl` is now
allowed inside views and UDFs.

Fixes #104927
Fixes #97602 

Release note (sql change): Table names are now allowed in SELECT lists
inside view and UDF definitions.


104946: sql: update tenant_span builtins for consistent output r=arulajmani a=stevendanna

The codec's TenantSpan() function was changed to avoid PrefixEnd(). Here, we update overloads of crdb_internal.tenant_span to all use TenantSpan() to avoid inconsistent output from different overloads.

Note, I don't believe that the use of PrefixEnd() in this function constituted a problem in our current usage as the only real use of this function was in calls to crdb_internal.fingerprint() or crdb_internal.scan() where the EndKey is only used as an upper-bound for iteration.

Informs #104928

Epic: none

Release note: None

Co-authored-by: gtr <gerardo@cockroachlabs.com>
Co-authored-by: Marcus Gartner <marcus@cockroachlabs.com>
Co-authored-by: Steven Danna <danna@cockroachlabs.com>

pkg/sql/logictest/testdata/logic_test/span_builtins

@@ -41,6 +41,20 @@ SELECT crdb_internal.tenant_span(2)
 
 subtest end
 
+subtest tenant_span_at_uint_boundary
+
+query T
+SELECT crdb_internal.pretty_key(crdb_internal.tenant_span(108)[2], 0)
+----
+/109
+
+query T
+SELECT crdb_internal.pretty_key(crdb_internal.tenant_span(109)[2], 0)
+----
+/110
+
+subtest end
+
 subtest table_span
 
 query T

pkg/sql/logictest/testdata/logic_test/udf

@@ -2464,16 +2464,15 @@ SELECT imp(), (1,2,'a')::imp = imp(), pg_typeof(imp())
 ----
 (1,2,a) true imp
 
-# TODO(#90080): Allow star expressions in UDFs.
-# statement ok
-# CREATE FUNCTION imp_star() RETURNS imp LANGUAGE SQL AS $$
-# SELECT * FROM imp
-# $$
-#
-# query TBT
-# SELECT imp_star(), (1,2,'a')::imp = imp_star(), pg_typeof(imp_star())
-# ----
-# (1,2,a) true imp
+statement ok
+CREATE FUNCTION imp_star() RETURNS imp LANGUAGE SQL AS $$
+ SELECT * FROM imp
+$$
+
+query TBT
+SELECT imp_star(), (1,2,'a')::imp = imp_star(), pg_typeof(imp_star())
+----
+(1,2,a) true imp
 
 statement ok
 INSERT INTO imp VALUES (100, 200, 'z')
@@ -3087,10 +3086,10 @@ SELECT oid, proname, pronamespace, proowner, prolang, proleakproof, proisstrict,
 FROM pg_catalog.pg_proc WHERE proname IN ('f_93314', 'f_93314_alias', 'f_93314_comp', 'f_93314_comp_t')
 ORDER BY oid;
 ----
-100272 f_93314 105 1546506610 14 false false false v 0 100271 · {} NULL SELECT i, e FROM test.public.t_93314 ORDER BY i LIMIT 1;
-100274 f_93314_alias 105 1546506610 14 false false false v 0 100273 · {} NULL SELECT i, e FROM test.public.t_93314_alias ORDER BY i LIMIT 1;
-100278 f_93314_comp 105 1546506610 14 false false false v 0 100275 · {} NULL SELECT (1, 2);
-100279 f_93314_comp_t 105 1546506610 14 false false false v 0 100277 · {} NULL SELECT a, c FROM test.public.t_93314_comp LIMIT 1;
+100273 f_93314 105 1546506610 14 false false false v 0 100272 · {} NULL SELECT i, e FROM test.public.t_93314 ORDER BY i LIMIT 1;
+100275 f_93314_alias 105 1546506610 14 false false false v 0 100274 · {} NULL SELECT i, e FROM test.public.t_93314_alias ORDER BY i LIMIT 1;
+100279 f_93314_comp 105 1546506610 14 false false false v 0 100276 · {} NULL SELECT (1, 2);
+100280 f_93314_comp_t 105 1546506610 14 false false false v 0 100278 · {} NULL SELECT a, c FROM test.public.t_93314_comp LIMIT 1;
 
 # Regression test for #95240. Strict UDFs that are inlined should result in NULL
 # when presented with NULL arguments.
@@ -3459,6 +3458,8 @@ $func$;
 # Regression test for #100915. Do not error when attempting to inline a UDF when
 # it has a subquery argument that corresponds to a parameter that is referenced
 # multiple times in the UDF body.
+subtest regression_100915
+
 statement ok
 CREATE FUNCTION f100915(i INT) RETURNS BOOL STABLE LANGUAGE SQL AS $$
  SELECT i = 0 OR i = 10
@@ -3532,3 +3533,36 @@ SELECT schema_name FROM [SHOW SCHEMAS] WHERE schema_name LIKE 'pg_temp_%';
 
 statement error pgcode 0A000 unimplemented: cannot create UDFs under a temporary schema
 CREATE FUNCTION $temp_schema_102964.f_102964 () RETURNS INT AS 'SELECT 1' LANGUAGE sql;
+
+# Regression test for #104927. Correctly resolve table references in UDFs as
+# TupleStars.
+subtest regression_104927
+
+statement ok
+CREATE TABLE t104927 (
+ i INT,
+ s STRING
+);
+INSERT INTO t104927 VALUES (1, 'foo');
+
+query T
+SELECT json_agg(r) FROM (
+ SELECT i, s
+ FROM t104927
+) AS r
+----
+[{"i": 1, "s": "foo"}]
+
+statement ok
+CREATE FUNCTION f104927() RETURNS TEXT LANGUAGE SQL AS $$
+ SELECT json_agg(r) FROM (
+ SELECT i, s
+ FROM t104927
+ ) AS r
+$$
+
+# The output should match the output above where the query was run directly.
+query T
+SELECT f104927()
+----
+[{"i": 1, "s": "foo"}]

pkg/sql/logictest/testdata/logic_test/views

@@ -1869,3 +1869,34 @@ DROP VIEW cd_v1;
 
 statement ok
 DROP VIEW cd_v1 CASCADE;
+
+# Regression test for #104927. Correctly resolve table references in views as
+# TupleStars.
+subtest regression_104927
+
+statement ok
+CREATE TABLE t104927 (
+ i INT,
+ s STRING
+);
+INSERT INTO t104927 VALUES (1, 'foo');
+
+query T
+SELECT json_agg(r) FROM (
+ SELECT i, s
+ FROM t104927
+) AS r
+----
+[{"i": 1, "s": "foo"}]
+
+statement ok
+CREATE VIEW v104927 AS SELECT json_agg(r) FROM (
+ SELECT i, s
+ FROM t104927
+) AS r
+
+# The output should match the output above where the query was run directly.
+query T
+SELECT * FROM v104927
+----
+[{"i": 1, "s": "foo"}]

pkg/sql/opt/optbuilder/project.go

@@ -220,11 +220,8 @@ func (b *Builder) resolveColRef(e tree.Expr, inScope *scope) tree.TypedExpr {
  _, srcMeta, _, resolveErr := inScope.FindSourceProvidingColumn(b.ctx, tree.Name(colName))
  if resolveErr != nil {
  // It may be a reference to a table, e.g. SELECT tbl FROM tbl.
- // Attempt to resolve as a TupleStar. We do not attempt to resolve
- // as a TupleStar if we are inside a view or function definition
- // because views and functions do not support * expressions.
- if !b.insideViewDef && !b.insideFuncDef &&
- sqlerrors.IsUndefinedColumnError(resolveErr) {
+ // Attempt to resolve as a TupleStar.
+ if sqlerrors.IsUndefinedColumnError(resolveErr) {
  return func() tree.TypedExpr {
  defer wrapColTupleStarPanic(resolveErr)
  return inScope.resolveType(columnNameAsTupleStar(colName), types.Any)

pkg/sql/opt/optbuilder/scope.go

@@ -1026,11 +1026,8 @@ func (s *scope) VisitPre(expr tree.Expr) (recurse bool, newExpr tree.Expr) {
  colI, resolveErr := colinfo.ResolveColumnItem(s.builder.ctx, s, t)
  if resolveErr != nil {
  // It may be a reference to a table, e.g. SELECT tbl FROM tbl.
- // Attempt to resolve as a TupleStar. We do not attempt to resolve
- // as a TupleStar if we are inside a view or function definition
- // because views and functions do not support * expressions.
- if !s.builder.insideViewDef && !s.builder.insideFuncDef &&
- sqlerrors.IsUndefinedColumnError(resolveErr) {
+ // Attempt to resolve as a TupleStar.
+ if sqlerrors.IsUndefinedColumnError(resolveErr) {
  // Attempt to resolve as columnname.*, which allows items
  // such as SELECT row_to_json(tbl_name) FROM tbl_name to work.
  return func() (bool, tree.Expr) {

pkg/sql/sem/builtins/builtins.go

@@ -5428,19 +5428,8 @@ DO NOT USE -- USE 'CREATE TENANT' INSTEAD`,
  if err != nil {
  return nil, err
  }
- start := keys.MakeTenantPrefix(roachpb.MustMakeTenantID(uint64(sTenID)))
- end := start.PrefixEnd()
-
- result := tree.NewDArray(types.Bytes)
- if err := result.Append(tree.NewDBytes(tree.DBytes(start))); err != nil {
- return nil, err
- }
-
- if err := result.Append(tree.NewDBytes(tree.DBytes(end))); err != nil {
- return nil, err
- }
-
- return result, nil
+ codec := keys.MakeSQLCodec(roachpb.MustMakeTenantID(uint64(sTenID)))
+ return spanToDatum(codec.TenantSpan())
  },
  Info: "This function returns the span that contains the keys for the given tenant.",
  Volatility: volatility.Immutable,
@@ -5457,11 +5446,7 @@ DO NOT USE -- USE 'CREATE TENANT' INSTEAD`,
  if err != nil {
  return nil, err
  }
- start := keys.MakeTenantPrefix(tid)
- return spanToDatum(roachpb.Span{
- Key: start,
- EndKey: start.PrefixEnd(),
- })
+ return spanToDatum(keys.MakeSQLCodec(tid).TenantSpan())
  },
  Info: "This function returns the span that contains the keys for the given tenant.",
  Volatility: volatility.Immutable,

pkg/ui/workspaces/db-console/src/views/app/components/layoutSidebar/index.tsx

@@ -59,15 +59,15 @@ export class Sidebar extends React.Component<SidebarProps> {
  {
  path: "/hotranges",
  text: "Hot Ranges",
- activeFor: ["/hotranges"],
+ activeFor: ["/hotranges", "/reports/range"],
  },
  { path: "/jobs", text: "Jobs", activeFor: [] },
  { path: "/schedules", text: "Schedules", activeFor: [] },
  {
  path: "/debug",
  text: "Advanced Debug",
  activeFor: ["/reports", "/data-distribution", "/raft", "/keyvisualizer"],
- ignoreFor: ["/reports/network"],
+ ignoreFor: ["/reports/network", "/reports/range"],
  },
  ];
 

pkg/ui/workspaces/db-console/src/views/reports/containers/range/index.tsx

@@ -35,7 +35,8 @@ import AllocatorOutput from "src/views/reports/containers/range/allocator";
 import RangeInfo from "src/views/reports/containers/range/rangeInfo";
 import LeaseTable from "src/views/reports/containers/range/leaseTable";
 import { getMatchParamByName } from "src/util/query";
-import { BackToAdvanceDebug } from "../util";
+import { Button, commonStyles } from "@cockroachlabs/cluster-ui";
+import { ArrowLeft } from "@cockroachlabs/icons";
 
 interface RangeDispatchProps {
  refreshRange: typeof refreshRange;
@@ -111,6 +112,10 @@ export class Range extends React.Component<RangeProps, {}> {
  }
  }
 
+ backToHotRanges = (): void => {
+ this.props.history.push("/hotranges");
+ };
+
  render() {
  const { range, match } = this.props;
  const rangeID = getMatchParamByName(match, rangeIDAttr);
@@ -188,7 +193,16 @@ export class Range extends React.Component<RangeProps, {}> {
  return (
  <div className="section">
  <Helmet title={`r${responseRangeID.toString()} Range | Debug`} />
- <BackToAdvanceDebug history={this.props.history} />
+ <Button
+ onClick={this.backToHotRanges}
+ type="unstyled-link"
+ size="small"
+ icon={<ArrowLeft fontSize={"10px"} />}
+ iconPosition="left"
+ className={commonStyles("small-margin")}
+ >
+ Hot Ranges
+ </Button>
  <h1 className="base-heading">
  Range Report for r{responseRangeID.toString()}
  </h1>