refactor(ir): remove now obsolete ops.Named mixin (ibis-project#8244)

Co-authored-by: Phillip Cloud <417981+cpcloud@users.noreply.github.com>

ibis/backends/clickhouse/tests/snapshots/test_functions/test_timestamp_from_integer/out.sql

@@ -1,3 +1,3 @@
 SELECT
-  toDateTime("t0"."int_col") AS "TimestampFromUNIX(int_col)"
+  toDateTime("t0"."int_col") AS "TimestampFromUNIX(int_col, SECOND)"
 FROM "functional_alltypes" AS "t0"

ibis/backends/clickhouse/tests/snapshots/test_functions/test_timestamp_truncate/d/out.sql

@@ -1,2 +1,2 @@
 SELECT
-  toDate(parseDateTimeBestEffort('2009-05-17T12:34:56')) AS "TimestampTruncate(datetime.datetime(2009, 5, 17, 12, 34, 56))"
+  toDate(parseDateTimeBestEffort('2009-05-17T12:34:56')) AS "TimestampTruncate(datetime.datetime(2009, 5, 17, 12, 34, 56), DAY)"

ibis/backends/clickhouse/tests/snapshots/test_functions/test_timestamp_truncate/h/out.sql

@@ -1,2 +1,2 @@
 SELECT
-  toStartOfHour(parseDateTimeBestEffort('2009-05-17T12:34:56')) AS "TimestampTruncate(datetime.datetime(2009, 5, 17, 12, 34, 56))"
+  toStartOfHour(parseDateTimeBestEffort('2009-05-17T12:34:56')) AS "TimestampTruncate(datetime.datetime(2009, 5, 17, 12, 34, 56), HOUR)"

ibis/backends/clickhouse/tests/snapshots/test_functions/test_timestamp_truncate/m/out.sql

@@ -1,2 +1,2 @@
 SELECT
-  toStartOfMinute(parseDateTimeBestEffort('2009-05-17T12:34:56')) AS "TimestampTruncate(datetime.datetime(2009, 5, 17, 12, 34, 56))"
+  toStartOfMinute(parseDateTimeBestEffort('2009-05-17T12:34:56')) AS "TimestampTruncate(datetime.datetime(2009, 5, 17, 12, 34, 56), MINUTE)"

ibis/backends/clickhouse/tests/snapshots/test_functions/test_timestamp_truncate/minute/out.sql

@@ -1,2 +1,2 @@
 SELECT
-  toStartOfMinute(parseDateTimeBestEffort('2009-05-17T12:34:56')) AS "TimestampTruncate(datetime.datetime(2009, 5, 17, 12, 34, 56))"
+  toStartOfMinute(parseDateTimeBestEffort('2009-05-17T12:34:56')) AS "TimestampTruncate(datetime.datetime(2009, 5, 17, 12, 34, 56), MINUTE)"

ibis/backends/clickhouse/tests/snapshots/test_functions/test_timestamp_truncate/w/out.sql

@@ -1,2 +1,2 @@
 SELECT
-  toMonday(parseDateTimeBestEffort('2009-05-17T12:34:56')) AS "TimestampTruncate(datetime.datetime(2009, 5, 17, 12, 34, 56))"
+  toMonday(parseDateTimeBestEffort('2009-05-17T12:34:56')) AS "TimestampTruncate(datetime.datetime(2009, 5, 17, 12, 34, 56), WEEK)"

ibis/backends/clickhouse/tests/snapshots/test_functions/test_timestamp_truncate/y/out.sql

@@ -1,2 +1,2 @@
 SELECT
-  toStartOfYear(parseDateTimeBestEffort('2009-05-17T12:34:56')) AS "TimestampTruncate(datetime.datetime(2009, 5, 17, 12, 34, 56))"
+  toStartOfYear(parseDateTimeBestEffort('2009-05-17T12:34:56')) AS "TimestampTruncate(datetime.datetime(2009, 5, 17, 12, 34, 56), YEAR)"

ibis/backends/impala/tests/snapshots/test_bucket_histogram/test_bucket_assign_labels/out.sql

@@ -10,7 +10,7 @@ SELECT
     THEN '25 to 50'
     ELSE 'error'
   END AS `tier2`,
-  `t1`.`CountStar()`
+  `t1`.`CountStar(alltypes)`
 FROM (
   SELECT
     CASE
@@ -36,7 +36,7 @@ FROM (
       THEN 3
       ELSE CAST(NULL AS TINYINT)
     END AS `tier`,
-    COUNT(*) AS `CountStar()`
+    COUNT(*) AS `CountStar(alltypes)`
   FROM `alltypes` AS `t0`
   GROUP BY
     1

ibis/backends/impala/tests/snapshots/test_sql/test_nested_join_base/out.sql

@@ -1,18 +1,18 @@
 WITH `t1` AS (
   SELECT
     `t0`.`uuid`,
-    COUNT(*) AS `CountStar()`
+    COUNT(*) AS `CountStar(t)`
   FROM `t` AS `t0`
   GROUP BY
     1
 )
 SELECT
   `t5`.`uuid`,
-  `t3`.`CountStar()`
+  `t3`.`CountStar(t)`
 FROM (
   SELECT
     `t2`.`uuid`,
-    MAX(`t2`.`CountStar()`) AS `max_count`
+    MAX(`t2`.`CountStar(t)`) AS `max_count`
   FROM `t1` AS `t2`
   GROUP BY
     1

ibis/backends/impala/tests/snapshots/test_sql/test_nested_joins_single_cte/out.sql

@@ -1,25 +1,25 @@
 WITH `t1` AS (
   SELECT
     `t0`.`uuid`,
-    COUNT(*) AS `CountStar()`
+    COUNT(*) AS `CountStar(t)`
   FROM `t` AS `t0`
   GROUP BY
     1
 )
 SELECT
   `t7`.`uuid`,
-  `t4`.`CountStar()`,
+  `t4`.`CountStar(t)`,
   `t5`.`last_visit`
 FROM (
   SELECT
     `t2`.`uuid`,
-    MAX(`t2`.`CountStar()`) AS `max_count`
+    MAX(`t2`.`CountStar(t)`) AS `max_count`
   FROM `t1` AS `t2`
   GROUP BY
     1
 ) AS `t7`
 LEFT OUTER JOIN `t1` AS `t4`
-  ON `t7`.`uuid` = `t4`.`uuid` AND `t7`.`max_count` = `t4`.`CountStar()`
+  ON `t7`.`uuid` = `t4`.`uuid` AND `t7`.`max_count` = `t4`.`CountStar(t)`
 LEFT OUTER JOIN (
   SELECT
     `t0`.`uuid`,

ibis/backends/impala/tests/snapshots/test_value_exprs/test_timestamp_from_integer/default/out.sql

@@ -1,3 +1,3 @@
 SELECT
-  CAST(FROM_UNIXTIME(CAST(`t0`.`c` AS INT)) AS TIMESTAMP) AS `TimestampFromUNIX(c)`
+  CAST(FROM_UNIXTIME(CAST(`t0`.`c` AS INT)) AS TIMESTAMP) AS `TimestampFromUNIX(c, SECOND)`
 FROM `alltypes` AS `t0`

ibis/backends/impala/tests/snapshots/test_value_exprs/test_timestamp_from_integer/ms/out.sql

@@ -1,3 +1,3 @@
 SELECT
-  CAST(FROM_UNIXTIME(CAST(CAST(`t0`.`c` / 1000 AS INT) AS INT)) AS TIMESTAMP) AS `TimestampFromUNIX(c)`
+  CAST(FROM_UNIXTIME(CAST(CAST(`t0`.`c` / 1000 AS INT) AS INT)) AS TIMESTAMP) AS `TimestampFromUNIX(c, MILLISECOND)`
 FROM `alltypes` AS `t0`

ibis/backends/impala/tests/snapshots/test_value_exprs/test_timestamp_from_integer/us/out.sql

@@ -1,3 +1,3 @@
 SELECT
-  CAST(FROM_UNIXTIME(CAST(CAST(`t0`.`c` / 1000000 AS INT) AS INT)) AS TIMESTAMP) AS `TimestampFromUNIX(c)`
+  CAST(FROM_UNIXTIME(CAST(CAST(`t0`.`c` / 1000000 AS INT) AS INT)) AS TIMESTAMP) AS `TimestampFromUNIX(c, MICROSECOND)`
 FROM `alltypes` AS `t0`

ibis/backends/tests/sql/snapshots/test_compiler/test_having_size/out.sql

@@ -1,10 +1,10 @@
 SELECT
   "t1"."string_col",
-  "t1"."CountStar()"
+  "t1"."CountStar(functional_alltypes)"
 FROM (
   SELECT
     "t0"."string_col",
-    COUNT(*) AS "CountStar()",
+    COUNT(*) AS "CountStar(functional_alltypes)",
     MAX("t0"."double_col") AS "Max(double_col)"
   FROM "functional_alltypes" AS "t0"
   GROUP BY

ibis/backends/tests/sql/snapshots/test_select_sql/test_aggregate_having/inline.sql

@@ -5,10 +5,10 @@ FROM (
   SELECT
     "t0"."foo_id",
     SUM("t0"."f") AS "total",
-    COUNT(*) AS "CountStar()"
+    COUNT(*) AS "CountStar(star1)"
   FROM "star1" AS "t0"
   GROUP BY
     1
 ) AS "t1"
 WHERE
-  "t1"."CountStar()" > CAST(100 AS TINYINT)
+  "t1"."CountStar(star1)" > CAST(100 AS TINYINT)

ibis/backends/tests/sql/snapshots/test_select_sql/test_select_sql/aggregate_table_count_metric/out.sql

@@ -1,3 +1,3 @@
 SELECT
-  COUNT(*) AS "CountStar()"
+  COUNT(*) AS "CountStar(star1)"
 FROM "star1" AS "t0"

ibis/backends/tests/sql/snapshots/test_sql/test_aggregate/having_count/out.sql

@@ -5,10 +5,10 @@ FROM (
   SELECT
     "t0"."foo_id",
     SUM("t0"."f") AS "total",
-    COUNT(*) AS "CountStar()"
+    COUNT(*) AS "CountStar(star1)"
   FROM "star1" AS "t0"
   GROUP BY
     1
 ) AS "t1"
 WHERE
-  "t1"."CountStar()" > CAST(100 AS TINYINT)
+  "t1"."CountStar(star1)" > CAST(100 AS TINYINT)

ibis/expr/operations/core.py

@@ -11,11 +11,10 @@
 import ibis.expr.rules as rlz
 from ibis import util
 from ibis.common.annotations import attribute
-from ibis.common.bases import Abstract
 from ibis.common.graph import Node as Traversable
 from ibis.common.grounds import Concrete
 from ibis.common.patterns import Coercible, CoercionError
-from ibis.common.typing import DefaultTypeVars, VarTuple
+from ibis.common.typing import DefaultTypeVars
 
 
 @public
@@ -41,29 +40,12 @@ def op(self) -> Self:
     #     return super().__children__
 
 
-# TODO(kszucs): remove this mixin
-@public
-class Named(Abstract):
-    __slots__: VarTuple[str] = tuple()
-
-    @property
-    @abstractmethod
-    def name(self) -> str:
-        """Name of the operation.
-
-        Returns
-        -------
-        str
-
-        """
-
-
 T = TypeVar("T", bound=dt.DataType, covariant=True)
 S = TypeVar("S", bound=ds.DataShape, default=ds.Any, covariant=True)
 
 
 @public
-class Value(Node, Named, Coercible, DefaultTypeVars, Generic[T, S]):
+class Value(Node, Coercible, DefaultTypeVars, Generic[T, S]):
     @classmethod
     def __coerce__(
         cls, value: Any, T: Optional[type] = None, S: Optional[type] = None
@@ -103,8 +85,8 @@ def __coerce__(
     # TODO(kszucs): figure out how to represent not named arguments
     @property
     def name(self) -> str:
-        args = ", ".join(arg.name for arg in self.__args__ if isinstance(arg, Named))
-        return f"{self.__class__.__name__}({args})"
+        names = (arg.name for arg in self.__args__ if hasattr(arg, "name"))
+        return f"{self.__class__.__name__}({', '.join(names)})"
 
     @property
     @abstractmethod

ibis/expr/operations/generic.py

@@ -15,12 +15,12 @@
 from ibis.common.grounds import Singleton
 from ibis.common.patterns import InstanceOf, Length  # noqa: TCH001
 from ibis.common.typing import VarTuple  # noqa: TCH001
-from ibis.expr.operations.core import Named, Scalar, Unary, Value
+from ibis.expr.operations.core import Scalar, Unary, Value
 from ibis.expr.operations.relations import Relation  # noqa: TCH001
 
 
 @public
-class RowID(Value, Named):
+class RowID(Value):
     """The row number (an autonumeric) of the returned result."""
 
     name = "rowid"
@@ -160,7 +160,7 @@ def name(self):
 
 
 @public
-class ScalarParameter(Scalar, Named):
+class ScalarParameter(Scalar):
     _counter = itertools.count()
 
     dtype: dt.DataType

ibis/expr/tests/snapshots/test_format/test_table_count_expr/cnt_repr.txt

@@ -2,4 +2,4 @@ r0 := UnboundTable: t1
   a int64
   b float64
 
-CountStar(): CountStar(r0)
+CountStar(t1): CountStar(r0)

ibis/expr/types/core.py

@@ -137,7 +137,7 @@ def __bool__(self) -> bool:
 
     def has_name(self):
         """Check whether this expression has an explicit name."""
-        return isinstance(self._arg, ops.Named)
+        return hasattr(self._arg, "name")
 
     def get_name(self):
         """Return the name of this expression."""

ibis/util.py

@@ -610,7 +610,7 @@ def slice_to_limit_offset(
       a int64
       b string
     <BLANKLINE>
-    Add(CountStar(), -10): CountStar(r0) + -10
+    Add(CountStar(t), -10): CountStar(r0) + -10
 
     From 5th row to 10th row
     >>> what = slice(5, 10)