This is an automated email from the ASF dual-hosted git repository.
github-merge-queue[bot] pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/texera.git
The following commit(s) were added to refs/heads/main by this push:
new caeb27ea54 chore(amber): remove the unused ElidableStatement (#7451)
caeb27ea54 is described below
commit caeb27ea5476f0596054b20ed06ec667778c330b
Author: Xinyuan Lin <[email protected]>
AuthorDate: Sat Aug 29 05:21:41 2026 +0000
chore(amber): remove the unused ElidableStatement (#7451)
### What changes were proposed in this PR?
Deletes `ElidableStatement` and its spec. Pure deletion, no behaviour
change: **−175 lines**.
| Symbol | Location | Lines |
| --- | --- | ---: |
| `ElidableStatement` |
`amber/.../engine/common/ElidableStatement.scala` | 34 |
| `ElidableStatementSpec` |
`amber/.../engine/common/ElidableStatementSpec.scala` | 141 |
The object wraps statements in `scala.annotation.elidable` so they can
be compiled out below the `-Xelide-below` threshold. **It has no callers
anywhere in the repo** — that alone is why it goes. It picked up unit
tests during the 2026 coverage work, which is why it currently looks
live; the spec covers this object and nothing else, so it goes with it.
Sixteen `build.sbt` files pin `-Xelide-below` at `WARNING` (900). All
four wrappers — `FINEST` (300), `FINER` (400), `FINE` (500), and `INFO`
(800) — sit below that threshold, so calls to them were compiled out.
The deleted spec pinned that behavior: `assert(counter == 0)` after
`ElidableStatement.info { counter += 1 }` holds under elision. With zero
call sites, nothing was being elided, so the outcome is unchanged.
After this PR, no `@elidable` annotation remains in the tree, so
`-Xelide-below WARNING` switches nothing. Removing that dead option is
intentionally scoped to follow-up PR #7709, tracked by #7706.
### Any related issues, documentation, discussions?
Closes #7448
### How was this PR tested?
Existing tests only — this PR adds none, since it removes code and the
spec that covered it.
Locally, from the repo root with Java 17:
- `sbt "WorkflowExecutionService/Test/compile"` — success.
Verification, re-runnable by a reviewer:
```
git grep -in elide # nothing at this branch's head
git grep -n Xelide -- '*.sbt' # 16 modules, all WARNING — the switch, left
in place
```
### Was this PR authored or co-authored using generative AI tooling?
Generated-by: Claude Code (Claude Opus 5)
---
.../amber/engine/common/ElidableStatement.scala | 34 -----
.../engine/common/ElidableStatementSpec.scala | 141 ---------------------
2 files changed, 175 deletions(-)
diff --git
a/amber/src/main/scala/org/apache/texera/amber/engine/common/ElidableStatement.scala
b/amber/src/main/scala/org/apache/texera/amber/engine/common/ElidableStatement.scala
deleted file mode 100644
index bf78b290c3..0000000000
---
a/amber/src/main/scala/org/apache/texera/amber/engine/common/ElidableStatement.scala
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.texera.amber.engine.common
-
-import scala.annotation.elidable
-import scala.annotation.elidable._
-
-object ElidableStatement {
-
- @elidable(FINEST) def finest(operations: => Unit): Unit = operations
-
- @elidable(FINER) def finer(operations: => Unit): Unit = operations
-
- @elidable(FINE) def fine(operations: => Unit): Unit = operations
-
- @elidable(INFO) def info(operations: => Unit): Unit = operations
-}
diff --git
a/amber/src/test/scala/org/apache/texera/amber/engine/common/ElidableStatementSpec.scala
b/amber/src/test/scala/org/apache/texera/amber/engine/common/ElidableStatementSpec.scala
deleted file mode 100644
index 6f7e2eb2b3..0000000000
---
a/amber/src/test/scala/org/apache/texera/amber/engine/common/ElidableStatementSpec.scala
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.texera.amber.engine.common
-
-import org.scalatest.flatspec.AnyFlatSpec
-
-class ElidableStatementSpec extends AnyFlatSpec {
-
- //
---------------------------------------------------------------------------
- // Context — the texera build sets `-Xelide-below WARNING` (see
- // `amber/build.sbt`). Every `ElidableStatement` helper is annotated with
- // an elide level strictly below WARNING (FINEST / FINER / FINE / INFO),
- // so the Scala compiler replaces every CALL to these helpers with a
- // `()` Unit value at *compile* time. The by-name block argument is
- // never even constructed, let alone evaluated, in production / test
- // builds — that is the entire point of the abstraction.
- //
- // This spec pins that contract: a regression that bumped a method's
- // elide level above WARNING (e.g. `@elidable(SEVERE)`), removed the
- // `@elidable` annotation, or relaxed `-Xelide-below` in the build
- // would re-enable side effects and break the silent-in-production
- // promise — and this spec would catch it.
- //
---------------------------------------------------------------------------
-
- //
---------------------------------------------------------------------------
- // Each helper compiles to a no-op (block side effect does NOT fire)
- //
---------------------------------------------------------------------------
-
- "ElidableStatement.finest" should
- "be elided at the build's elide level — its by-name block must NOT
execute" in {
- var counter = 0
- ElidableStatement.finest { counter += 1 }
- assert(counter == 0, "block should be elided away, counter must remain at
0")
- }
-
- "ElidableStatement.finer" should
- "be elided at the build's elide level — its by-name block must NOT
execute" in {
- var counter = 0
- ElidableStatement.finer { counter += 1 }
- assert(counter == 0)
- }
-
- "ElidableStatement.fine" should
- "be elided at the build's elide level — its by-name block must NOT
execute" in {
- var counter = 0
- ElidableStatement.fine { counter += 1 }
- assert(counter == 0)
- }
-
- "ElidableStatement.info" should
- "be elided at the build's elide level — its by-name block must NOT
execute" in {
- var counter = 0
- ElidableStatement.info { counter += 1 }
- assert(counter == 0)
- }
-
- //
---------------------------------------------------------------------------
- // Even a throwing block must NOT propagate — it's never evaluated.
- //
---------------------------------------------------------------------------
-
- "Elided helpers" should
- "not propagate an exception that would have been thrown by their block" in
{
- // If `info` accidentally stopped being elided, this would re-raise the
- // RuntimeException and fail the test. Pinning the suppression directly
- // catches that regression.
- ElidableStatement.info { throw new RuntimeException("must never fire") }
- ElidableStatement.fine { throw new RuntimeException("must never fire") }
- ElidableStatement.finer { throw new RuntimeException("must never fire") }
- ElidableStatement.finest { throw new RuntimeException("must never fire") }
- succeed
- }
-
- //
---------------------------------------------------------------------------
- // Multiple calls don't accumulate side effects (each one is independently
- // elided).
- //
---------------------------------------------------------------------------
-
- "Repeated elided calls" should "stay no-ops across 1000 invocations" in {
- var counter = 0
- var i = 0
- while (i < 1000) {
- ElidableStatement.info { counter += 1 }
- i += 1
- }
- assert(
- counter == 0,
- s"1000 elided info calls should not accumulate side effects, got:
$counter"
- )
- }
-
- //
---------------------------------------------------------------------------
- // Return-type contract — each helper still type-checks as `=> Unit ⇒ Unit`.
- //
---------------------------------------------------------------------------
-
- "ElidableStatement methods" should "all return Unit (compile-time enforced)"
in {
- // Assignments would fail to typecheck if a method's signature drifted
- // — e.g. someone made `info` return the block's result. The fact that
- // these compile under `-Xelide-below WARNING` also confirms each call
- // is replaced with the Unit `()` value, not with an exception.
- val r1: Unit = ElidableStatement.info { () }
- val r2: Unit = ElidableStatement.fine { () }
- val r3: Unit = ElidableStatement.finer { () }
- val r4: Unit = ElidableStatement.finest { () }
- assert(r1 == r2 && r2 == r3 && r3 == r4)
- }
-
- //
---------------------------------------------------------------------------
- // By-name parameter shape — each helper accepts a `=> Unit` block
- // (verified at compile time by passing a parameter-less lambda body).
- //
---------------------------------------------------------------------------
-
- "ElidableStatement methods" should "accept a by-name `=> Unit` argument
(compile-time enforced)" in {
- // The fact that these expressions compile proves the parameter shape:
- // a value-typed expression of type Unit AND a thunk that runs side
- // effects are both accepted. Under `-Xelide-below WARNING`, neither
- // executes — but the type contract still holds.
- ElidableStatement.info { () }
- ElidableStatement.info { val x = 1; val y = x + 1; () }
- ElidableStatement.info {
- println("debug")
- }
- succeed
- }
-}
