refactor: use 'trino' (not 'java') consistently for the Trino TPC-DS port

'java' is ambiguous — there may be multiple Java TPC-DS implementations.
The reference we target is specifically the Trino library, so name
everything after it for clarity:

  - tests/fixtures/scale-N-java/   -> tests/fixtures/scale-N-trino/
  - scripts/bootstrap-java.sh       -> scripts/bootstrap-trino.sh
  - TPCDS_JAVA_REPO  env var        -> TPCDS_TRINO_REPO
  - JAVA_DIR / JAVA_REPO_URL vars   -> TRINO_DIR / TRINO_REPO_URL
  - find_java_jar / clone_java_repo / build_java / test_java
        -> find_trino_jar / clone_trino_repo / build_trino / test_trino
  - CI artifact `test-fixtures-java` -> `test-fixtures-trino`
  - "Java fixture" log labels        -> "Trino fixture"
  - Doc references throughout READMEs and script headers updated.

Kept as-is: `actions/setup-java@v5`, `Java 11+` requirement, `java -jar`
/ `java -version` invocations, and `mvn`/`openjdk` references — those
refer to the Java language/runtime, not the Trino implementation.

The CLI flag and Rust `CompatMode::Trino` were already named `trino`;
this commit aligns the rest of the codebase.

Verified: `./scripts/test-all-tables.sh` passes 24/24 vs Trino, and
`./scripts/test-all-tables.sh --compat c` passes 23/23 vs C dsdgen
(customer.dat still skipped pending alamb/tpcds-data regeneration).

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

Author: alamb

.github/workflows/tpcdsgen-conformance.yml

@@ -51,7 +51,7 @@ jobs:
     - name: Bootstrap Java TPC-DS implementation
       run: |
         cd tpcdsgen
-        ./scripts/bootstrap-java.sh
+        ./scripts/bootstrap-trino.sh
 
     - name: Build Rust table generators
       run: |
@@ -71,7 +71,7 @@ jobs:
       if: failure()  # Upload fixtures if tests fail for debugging
       uses: actions/upload-artifact@v7
       with:
-        name: test-fixtures-java
+        name: test-fixtures-trino
         path: tpcdsgen/tests/fixtures/
         retention-days: 7
 

tpcdsgen/README.md

@@ -29,9 +29,9 @@ Fixtures are pre-generated TPC-DS data files used for conformance testing.
 
 ```
 tests/fixtures/
-├── scale-1-java/    # Java reference fixtures (`--compat trino`)
+├── scale-1-trino/    # Java reference fixtures (`--compat trino`)
 ├── scale-1-c/       # C dsdgen reference fixtures (`--compat c`)
-└── scale-10-java/   # higher scale factors as needed
+└── scale-10-trino/   # higher scale factors as needed
 ```
 
 ### Conformance Testing
@@ -44,9 +44,9 @@ scripts that do byte-for-byte (MD5) comparison of `.dat` output. See
 
 ```bash
 # One-time: clone & build the Java TPC-DS implementation.
-./scripts/bootstrap-java.sh
+./scripts/bootstrap-trino.sh
 
-# Generate Java reference fixtures into tests/fixtures/scale-N-java/.
+# Generate Java reference fixtures into tests/fixtures/scale-N-trino/.
 ./scripts/generate-fixtures.sh
 
 # Compare Rust output byte-for-byte against the Java fixtures.
@@ -77,13 +77,13 @@ Each fixture directory contains an `MD5SUMS` file for verification.
 
 **On Linux:**
 ```bash
-cd tests/fixtures/scale-1-java
+cd tests/fixtures/scale-1-trino
 md5sum -c MD5SUMS
 ```
 
 **On macOS:**
 ```bash
-cd tests/fixtures/scale-1-java
+cd tests/fixtures/scale-1-trino
 while read hash file; do
   [[ $(md5 -q "$file") == "$hash" ]] && echo "$file: OK" || echo "$file: FAILED"
 done < MD5SUMS

tpcdsgen/scripts/README.md

@@ -20,7 +20,7 @@ MD5/`diff` comparison.
 tpcdsgen/
 ├── tests/
 │   └── fixtures/                # Reference data (gitignored)
-│       ├── scale-1-java/        # Java reference (`--compat trino`)
+│       ├── scale-1-trino/        # Java reference (`--compat trino`)
 │       │   ├── call_center.dat
 │       │   ├── warehouse.dat
 │       │   └── ... (all 25 tables)
@@ -29,7 +29,7 @@ tpcdsgen/
 │           ├── warehouse.dat
 │           └── ... (all 25 tables)
 └── scripts/
-    ├── bootstrap-java.sh        # Clone + build the Java TPC-DS impl
+    ├── bootstrap-trino.sh        # Clone + build the Java TPC-DS impl
     ├── generate-fixtures.sh     # Generate/download reference fixtures
     │                            #   (Java via --compat trino; C via --compat c)
     ├── compare-table.sh         # Compare one table
@@ -42,9 +42,9 @@ tpcdsgen/
 
 ```bash
 # 1. Bootstrap Java implementation (first time only)
-./scripts/bootstrap-java.sh
+./scripts/bootstrap-trino.sh
 
-# 2. Generate Java reference fixtures into tests/fixtures/scale-N-java/.
+# 2. Generate Java reference fixtures into tests/fixtures/scale-N-trino/.
 ./scripts/generate-fixtures.sh
 
 # 3. Test all ported tables against the Java reference.
@@ -93,8 +93,8 @@ table below is just a roadmap.
 
 | Script                    | Purpose                                                                                                                         |
 |---------------------------|---------------------------------------------------------------------------------------------------------------------------------|
-| `bootstrap-java.sh`       | Clone and build the Java / Trino reference implementation into `../tpcds/`. Run once before Java conformance.                   |
-| `generate-fixtures.sh`    | Populate `tests/fixtures/scale-N-{java,c}/` with reference data. `--compat trino` (default) runs the Java impl; `--compat c` downloads pre-generated C `dsdgen` data from [alamb/tpcds-data](https://github.com/alamb/tpcds-data). |
+| `bootstrap-trino.sh`       | Clone and build the Java / Trino reference implementation into `../tpcds/`. Run once before Java conformance.                   |
+| `generate-fixtures.sh`    | Populate `tests/fixtures/scale-N-{trino,c}/` with reference data. `--compat trino` (default) runs the Java impl; `--compat c` downloads pre-generated C `dsdgen` data from [alamb/tpcds-data](https://github.com/alamb/tpcds-data). |
 | `compare-table.sh`        | Compare one table's Rust output against the selected reference (`--compat trino` or `--compat c`) via MD5 + diff.               |
 | `test-all-tables.sh`      | Run the full conformance suite for one compat mode (the main CI entry point). Honors per-mode skip lists at the top of the script. |
 | `clean-fixtures.sh`       | Remove all generated fixtures under `tests/fixtures/`.                                                                          |
@@ -134,7 +134,7 @@ Run any script with `--help` to print its usage block.
 
 ## Requirements
 
-- **Java:** Maven-built TPC-DS JAR at `../tpcds/target/tpcds-*-jar-with-dependencies.jar` (`bootstrap-java.sh` handles this).
+- **Java:** Maven-built TPC-DS JAR at `../tpcds/target/tpcds-*-jar-with-dependencies.jar` (`bootstrap-trino.sh` handles this).
 - **C dsdgen reference:** `git`, `tar`, `bzip2` for `generate-fixtures.sh --compat c`. No C compiler required — data is pre-generated.
 - **Rust:** Cargo-built `tpcdsgen` binary at `target/debug/tpcdsgen` or `target/release/tpcdsgen`.
 - **Disk space:** ~1 GB for SF1 Java fixtures; ~2.4 GB for SF1 C fixtures.
@@ -178,7 +178,7 @@ These scripts are designed to be CI-friendly:
 
 ```yaml
 # Java conformance
-- run: ./scripts/bootstrap-java.sh
+- run: ./scripts/bootstrap-trino.sh
 - run: ./scripts/generate-fixtures.sh --quiet
 - run: ./scripts/test-all-tables.sh --quiet
 

tpcdsgen/scripts/bootstrap-java.sh tpcdsgen/scripts/bootstrap-trino.shtpcdsgen/scripts/bootstrap-java.sh renamed to tpcdsgen/scripts/bootstrap-trino.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# bootstrap-java.sh — Set up the Java / Trino TPC-DS reference
+# bootstrap-trino.sh — Set up the Trino TPC-DS Java reference
 # implementation used by `--compat trino` conformance testing.
 #
 # Please see print_usage() below for details.
@@ -9,25 +9,25 @@ set -euo pipefail
 
 print_usage() {
     cat << 'EOF'
-bootstrap-java.sh — Set up the Java / Trino TPC-DS reference implementation.
+bootstrap-trino.sh — Set up the Trino TPC-DS Java reference implementation.
 
 What it does:
     1. Checks that Java 11+ and Maven are installed.
-    2. Clones the Java TPC-DS repository into ../tpcds/ (if not present).
-    3. Builds the Java implementation with `mvn clean package -DskipTests`.
+    2. Clones the Trino TPC-DS repository into ../tpcds/ (if not present).
+    3. Builds the implementation with `mvn clean package -DskipTests`.
     4. Runs a small smoke test to confirm the JAR works.
 
 Usage:
-    bootstrap-java.sh [OPTIONS]
+    bootstrap-trino.sh [OPTIONS]
 
 Options:
     --rebuild       Force rebuild even if the JAR already exists.
     --verify        Only verify the existing installation; do not clone/build.
     --help          Show this help message.
 
 Environment variables:
-    TPCDS_JAVA_REPO    Git URL for Java TPC-DS repo.
-                       Default: https://github.com/trinodb/tpcds.git
+    TPCDS_TRINO_REPO    Git URL for the Trino TPC-DS repo.
+                        Default: https://github.com/trinodb/tpcds.git
 
 Requirements: Java 11+, Maven, git.
 
@@ -36,9 +36,9 @@ Output:
     ../tpcds/target/tpcds-*-jar-with-dependencies.jar.
 
 Examples:
-    bootstrap-java.sh              # Clone and build if needed.
-    bootstrap-java.sh --rebuild    # Force clean rebuild.
-    bootstrap-java.sh --verify     # Just check existing install.
+    bootstrap-trino.sh              # Clone and build if needed.
+    bootstrap-trino.sh --rebuild    # Force clean rebuild.
+    bootstrap-trino.sh --verify     # Just check existing install.
 
 See scripts/README.md for the full conformance-testing workflow.
 EOF
@@ -56,10 +56,10 @@ NC='\033[0m' # No Color
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 PROJECT_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)"
 TPCDS_ROOT="$(cd "$PROJECT_ROOT/.." && pwd)"
-JAVA_DIR="$TPCDS_ROOT/tpcds"
+TRINO_DIR="$TPCDS_ROOT/tpcds"
 
 # Configuration
-JAVA_REPO_URL="${TPCDS_JAVA_REPO:-https://github.com/trinodb/tpcds.git}"
+TRINO_REPO_URL="${TPCDS_TRINO_REPO:-https://github.com/trinodb/tpcds.git}"
 FORCE_REBUILD=0
 VERIFY_ONLY=0
 
@@ -109,64 +109,59 @@ check_prerequisites() {
     return 0
 }
 
-# Find Java JAR file
-find_java_jar() {
-    local jar_pattern="$JAVA_DIR/target/tpcds-*-jar-with-dependencies.jar"
+# Find the built Trino TPC-DS JAR
+find_trino_jar() {
     local jar_file
-
-    jar_file=$(find "$JAVA_DIR/target" -name "tpcds-*-jar-with-dependencies.jar" 2>/dev/null | head -1)
-
+    jar_file=$(find "$TRINO_DIR/target" -name "tpcds-*-jar-with-dependencies.jar" 2>/dev/null | head -1)
     if [[ -z "$jar_file" ]]; then
         return 1
     fi
-
     echo "$jar_file"
-    return 0
 }
 
-# Clone the Java repository
-clone_java_repo() {
-    log_info "Cloning Java TPC-DS repository..."
-    log_info "Source: $JAVA_REPO_URL"
-    log_info "Target: $JAVA_DIR"
+# Clone the Trino TPC-DS repository
+clone_trino_repo() {
+    log_info "Cloning Trino TPC-DS repository..."
+    log_info "Source: $TRINO_REPO_URL"
+    log_info "Target: $TRINO_DIR"
 
-    if [[ -d "$JAVA_DIR" ]]; then
-        log_warn "Directory already exists: $JAVA_DIR"
+    if [[ -d "$TRINO_DIR" ]]; then
+        log_warn "Directory already exists: $TRINO_DIR"
 
         # Check if it's a git repo
-        if [[ -d "$JAVA_DIR/.git" ]]; then
+        if [[ -d "$TRINO_DIR/.git" ]]; then
             log_info "Existing git repository found, pulling latest changes..."
-            cd "$JAVA_DIR"
+            cd "$TRINO_DIR"
             git pull || log_warn "Failed to pull latest changes"
             cd - >/dev/null
             return 0
         else
             log_error "Directory exists but is not a git repository"
-            log_error "Please remove $JAVA_DIR and try again"
+            log_error "Please remove $TRINO_DIR and try again"
             return 1
         fi
     fi
 
     # Clone the repository
-    if ! git clone "$JAVA_REPO_URL" "$JAVA_DIR"; then
-        log_error "Failed to clone Java repository"
+    if ! git clone "$TRINO_REPO_URL" "$TRINO_DIR"; then
+        log_error "Failed to clone Trino TPC-DS repository"
         return 1
     fi
 
-    log_success "Successfully cloned Java TPC-DS repository"
+    log_success "Successfully cloned Trino TPC-DS repository"
     return 0
 }
 
-# Build the Java implementation
-build_java() {
-    log_info "Building Java TPC-DS implementation..."
+# Build the Trino TPC-DS JAR
+build_trino() {
+    log_info "Building Trino TPC-DS implementation..."
 
-    if [[ ! -d "$JAVA_DIR" ]]; then
-        log_error "Java directory does not exist: $JAVA_DIR"
+    if [[ ! -d "$TRINO_DIR" ]]; then
+        log_error "Trino directory does not exist: $TRINO_DIR"
         return 1
     fi
 
-    cd "$JAVA_DIR"
+    cd "$TRINO_DIR"
 
     # Clean build
     log_info "Running: mvn clean package -DskipTests"
@@ -180,7 +175,7 @@ build_java() {
 
     # Verify JAR was created
     local jar_file
-    if jar_file=$(find_java_jar); then
+    if jar_file=$(find_trino_jar); then
         local jar_size
         jar_size=$(du -h "$jar_file" | cut -f1)
         log_success "Build complete: $jar_file ($jar_size)"
@@ -191,12 +186,12 @@ build_java() {
     fi
 }
 
-# Test the Java implementation
-test_java() {
-    log_info "Testing Java TPC-DS implementation..."
+# Smoke-test the built JAR
+test_trino() {
+    log_info "Testing Trino TPC-DS JAR..."
 
     local jar_file
-    if ! jar_file=$(find_java_jar); then
+    if ! jar_file=$(find_trino_jar); then
         log_error "JAR file not found"
         return 1
     fi
@@ -233,32 +228,32 @@ test_java() {
     fi
 }
 
-# Verify installation
+# Verify the installation
 verify_installation() {
-    log_info "Verifying Java TPC-DS installation..."
+    log_info "Verifying Trino TPC-DS installation..."
 
     # Check directory exists
-    if [[ ! -d "$JAVA_DIR" ]]; then
-        log_error "Java directory does not exist: $JAVA_DIR"
+    if [[ ! -d "$TRINO_DIR" ]]; then
+        log_error "Trino directory does not exist: $TRINO_DIR"
         return 1
     fi
 
     # Check JAR exists
     local jar_file
-    if ! jar_file=$(find_java_jar); then
-        log_error "JAR file not found in $JAVA_DIR/target/"
+    if ! jar_file=$(find_trino_jar); then
+        log_error "JAR file not found in $TRINO_DIR/target/"
         log_error "Run without --verify to build"
         return 1
     fi
 
     log_success "Found JAR: $jar_file"
 
     # Test it works
-    if ! test_java; then
+    if ! test_trino; then
         return 1
     fi
 
-    log_success "Java TPC-DS installation verified"
+    log_success "Trino TPC-DS installation verified"
     return 0
 }
 
@@ -291,10 +286,10 @@ main() {
     done
 
     log_info "========================================="
-    log_info "Java TPC-DS Bootstrap"
+    log_info "Trino TPC-DS Bootstrap"
     log_info "========================================="
-    log_info "Java directory: $JAVA_DIR"
-    log_info "Repository: $JAVA_REPO_URL"
+    log_info "Trino directory: $TRINO_DIR"
+    log_info "Repository: $TRINO_REPO_URL"
     log_info "========================================="
 
     start_time=$(date +%s)
@@ -314,26 +309,26 @@ main() {
     fi
 
     # Clone repository if needed
-    if [[ ! -d "$JAVA_DIR" ]]; then
-        if ! clone_java_repo; then
+    if [[ ! -d "$TRINO_DIR" ]]; then
+        if ! clone_trino_repo; then
             exit 1
         fi
     else
-        log_success "Java repository already exists"
+        log_success "Trino repository already exists"
     fi
 
     # Build if needed or forced
     local jar_file
-    if [[ $FORCE_REBUILD -eq 1 ]] || ! find_java_jar >/dev/null 2>&1; then
-        if ! build_java; then
+    if [[ $FORCE_REBUILD -eq 1 ]] || ! find_trino_jar >/dev/null 2>&1; then
+        if ! build_trino; then
             exit 1
         fi
     else
-        log_success "JAR already built: $(find_java_jar)"
+        log_success "JAR already built: $(find_trino_jar)"
     fi
 
     # Test the installation
-    if ! test_java; then
+    if ! test_trino; then
         exit 1
     fi
 
@@ -344,7 +339,7 @@ main() {
     log_info "========================================="
     log_info "Bootstrap Complete"
     log_info "========================================="
-    log_success "Java TPC-DS is ready for conformance testing"
+    log_success "Trino TPC-DS is ready for conformance testing"
     log_info "Time: ${duration}s"
     log_info ""
     log_info "Next steps:"