Skip to content

Conversation

@wendigo
Copy link
Contributor

@wendigo wendigo commented Oct 13, 2025

Description

Additional context and related issues

Release notes

(x) This is not user-visible or is docs only, and no release notes are required.
( ) Release notes are required. Please propose a release note for me.
( ) Release notes are required, with the following suggested text:

## Section
* Fix some things. ({issue}`issuenumber`)

Summary by Sourcery

Replace runtime regex operations with faster alternatives: use Guava CharMatcher for identifier sanitization and a precompiled Pattern for metadata path removal in the Iceberg Glue catalog.

Enhancements:

  • Use CharMatcher.replaceFrom instead of String.replaceAll in BytecodeUtils.sanitizeName
  • Introduce a precompiled METADATA_PATTERN and use matcher.replaceFirst to strip metadata paths in TrinoGlueCatalog.dropCorruptedTable

@cla-bot cla-bot bot added the cla-signed label Oct 13, 2025
@sourcery-ai
Copy link

sourcery-ai bot commented Oct 13, 2025

Reviewer's guide (collapsed on small PRs)

Reviewer's Guide

This PR replaces inline regular expression usage with precompiled or more efficient alternatives: it introduces a Guava CharMatcher for identifier sanitization and a precompiled Pattern for metadata path stripping, improving performance and code clarity.

Class diagram for updated BytecodeUtils identifier sanitization

classDiagram
    class BytecodeUtils {
        <<final>>
        +static CharMatcher ALLOWED_IDENTIFIER_CHARS
        +static String sanitizeName(String name)
    }
    class CharMatcher {
    }
    BytecodeUtils --> CharMatcher : uses
Loading

Class diagram for updated TrinoGlueCatalog metadata path handling

classDiagram
    class TrinoGlueCatalog {
        +static Pattern METADATA_PATTERN
        +void dropCorruptedTable(ConnectorSession session, SchemaTableName schemaTableName, Table table)
    }
    class Pattern {
    }
    TrinoGlueCatalog --> Pattern : uses
Loading

File-Level Changes

Change Details Files
Optimize identifier sanitization by replacing regex with CharMatcher
  • Introduce ALLOWED_IDENTIFIER_CHARS using CharMatcher ranges and or-conditions
  • Replace name.replaceAll("[^A-Za-z0-9_$]", "") with ALLOWED_IDENTIFIER_CHARS.replaceFrom(name, '')
core/trino-main/src/main/java/io/trino/sql/gen/BytecodeUtils.java
Precompile metadata path regex and use Pattern.replaceFirst
  • Add METADATA_PATTERN as a static compiled Pattern
  • Replace metadataLocation.replaceFirst("/metadata/[^/]*$", "") with METADATA_PATTERN.matcher(metadataLocation).replaceFirst("")
plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/glue/TrinoGlueCatalog.java

Possibly linked issues


Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

@github-actions github-actions bot added the iceberg Iceberg connector label Oct 13, 2025
Copy link

@sourcery-ai sourcery-ai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey there - I've reviewed your changes and they look great!

Prompt for AI Agents
Please address the comments from this code review:

## Individual Comments

### Comment 1
<location> `core/trino-main/src/main/java/io/trino/sql/gen/BytecodeUtils.java:462` </location>
<code_context>
     public static String sanitizeName(String name)
     {
-        return name.replaceAll("[^A-Za-z0-9_$]", "_");
+        return ALLOWED_IDENTIFIER_CHARS.replaceFrom(name, '_');
     }

</code_context>

<issue_to_address>
**issue:** replaceFrom may not match the original replaceAll behavior for consecutive invalid characters.

The previous code collapsed sequences of invalid characters into a single underscore, but the new approach may produce multiple consecutive underscores. To match the original behavior, use CharMatcher.negate().collapseFrom(name, '_').
</issue_to_address>

Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

@wendigo wendigo merged commit 0cae17a into master Oct 13, 2025
103 of 107 checks passed
@wendigo wendigo deleted the serafin/drop-regexp branch October 13, 2025 20:05
@github-actions github-actions bot added this to the 478 milestone Oct 13, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cla-signed iceberg Iceberg connector

Development

Successfully merging this pull request may close these issues.

3 participants