feat(connector): Enable case-sensitive identifier support for Prometheus connector #26260

Dilli-Babu-Godari · 2025-10-09T11:06:04Z

Description

Added catalog-level config to support case-sensitive-name-matching

This PR implements case sensitivity handling for Prometheus metric (table) names:

1. Added case-sensitive name matching support controlled by the case-sensitive-name-matching configuration property
2. Implemented normalizeIdentifier in PrometheusMetadata to respect case sensitivity settings
3. Modified PrometheusClient to preserve case when case-sensitive matching is enabled

When case-sensitive-name-matching is set to true:

1. Metric (table) names will preserve their original case
2. Queries must use the exact case as defined in Prometheus

When case-sensitive-name-matching is set to false (default for backward compatibility):

1. All names are normalized to lowercase
2. Queries are case-insensitive

Motivation and Context

Impact

Test Plan

Contributor checklist

Please make sure your submission complies with our contributing guide, in particular code style and commit standards.
PR description addresses the issue accurately and concisely. If the change is non-trivial, a GitHub Issue is referenced.
Documented new properties (with its default value), SQL syntax, functions, or other functionality.
If release notes are required, they follow the release notes guidelines.
Adequate tests were added if applicable.
CI passed.

Release Notes

Please follow release notes guidelines and fill in the release notes below.

== RELEASE NOTES ==
Prometheus Connector Changes
* Add mixed case-sensitive identifier support for Prometheus connector.

sourcery-ai · 2025-10-09T11:06:11Z

Reviewer's Guide

Introduce an optional case-sensitive identifier matching mode for Prometheus connector by extending configuration, updating metadata resolution logic to normalize and compare table names based on the mode, and enriching tests to cover both default and case-sensitive behaviors.

Class diagram for updated PrometheusConnectorConfig and PrometheusMetadata

classDiagram
    class PrometheusConnectorConfig {
        URI prometheusURI
        String trustStorePath
        String truststorePassword
        boolean verifyHostName
        boolean caseSensitiveNameMatchingEnabled
        +getPrometheusURI()
        +setVerifyHostName(boolean)
        +isCaseSensitiveNameMatchingEnabled()
        +setCaseSensitiveNameMatchingEnabled(boolean)
    }
    class PrometheusMetadata {
        PrometheusClient prometheusClient
        boolean caseSensitiveNameMatchingEnabled
        +normalizeIdentifier(ConnectorSession, String)
    }
    PrometheusMetadata --> PrometheusConnectorConfig : uses config
    PrometheusConnectorConfig <|-- PrometheusConnectorConfig : config property added

File-Level Changes

Change	Details	Files
Add case-sensitive-name-matching configuration flag	Introduce boolean field in PrometheusConnectorConfig Add setter with @config and getter Include new flag in default and explicit property mappings in tests	`PrometheusConnectorConfig.java` `TestPrometheusConnectorConfig.java`
Propagate config flag to metadata and implement normalization	Extend PrometheusMetadata constructor to accept config Store caseSensitiveNameMatchingEnabled flag Implement normalizeIdentifier honoring the flag Use Locale.ROOT for lowercase conversion	`PrometheusMetadata.java`
Enhance table lookup logic for case-sensitive matching	Replace single getTable calls with iteration over getTableNames Compare normalized requested vs actual names Return handle or metadata only on match Return null when no match	`PrometheusMetadata.java`
Support passing extra connector properties in tests	Add overloaded createPrometheusQueryRunner with extraProperties map Merge extraProperties into default properties	`PrometheusQueryRunner.java`
Update existing tests to use new metadata constructor	Pass config instance to PrometheusMetadata in all tests Ensure default flag behavior is preserved	`PrometheusQueryRunner.java` `TestPrometheusRetrieveUpValueIntegrationTests.java`
Add integration test for mixed-case matching	Implement TestPrometheusMixedCase extending AbstractTestQueryFramework Configure runner with case-sensitive property Validate success and failure of queries with correct and incorrect case	`TestPrometheusMixedCase.java`

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

Contact our support team for questions or feedback.
Visit our documentation for detailed guides and information.
Keep in touch with the Sourcery team by following us on X/Twitter, LinkedIn or GitHub.

sourcery-ai

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> `presto-prometheus/src/test/java/com/facebook/presto/plugin/prometheus/TestPrometheusMixedCase.java:63-64` </location>
<code_context>
+                .setCaseSensitiveNameMatchingEnabled(false));
     }

     @Test
</code_context>

<issue_to_address>
**suggestion (testing):** Missing test for case-insensitive mode with mixed-case table names.

Please add a test for the default case-insensitive mode to confirm that queries with varying table name casing (e.g., 'UP', 'Up', 'up') all work as expected.
</issue_to_address>

### Comment 2
<location> `presto-prometheus/src/test/java/com/facebook/presto/plugin/prometheus/TestPrometheusRetrieveUpValueIntegrationTests.java:57` </location>
<code_context>
     {
         this.server = new PrometheusServer();
         this.client = createPrometheusClient(server);
+        this.config = new PrometheusConnectorConfig();
     }

</code_context>

<issue_to_address>
**suggestion (testing):** Missing explicit tests for case sensitivity in PrometheusMetadata unit tests.

Please add unit tests for PrometheusMetadata with caseSensitiveNameMatchingEnabled set to both true and false, ensuring correct table handle resolution and metadata retrieval for mixed-case table names.

Suggested implementation:

```java
    private PrometheusServer server;
    private PrometheusClient client;
    private PrometheusConnectorConfig config;

    @BeforeClass
    protected void createQueryRunner()
    {
        this.server = new PrometheusServer();
        this.client = createPrometheusClient(server);
        this.config = new PrometheusConnectorConfig();
    }

    @Test
    public void testCaseSensitiveTableHandleResolution()
    {
        PrometheusConnectorConfig caseSensitiveConfig = new PrometheusConnectorConfig(true); // true for case sensitivity
        PrometheusMetadata metadata = new PrometheusMetadata(client, caseSensitiveConfig);

        // Assume "MixedCaseTable" exists in Prometheus
        SchemaTableName mixedCaseTable = new SchemaTableName("default", "MixedCaseTable");
        ConnectorTableHandle handle = metadata.getTableHandle(mixedCaseTable);

        assertNotNull(handle, "Table handle should be resolved for exact case match");

        // Try with different case
        SchemaTableName lowerCaseTable = new SchemaTableName("default", "mixedcasetable");
        ConnectorTableHandle lowerHandle = metadata.getTableHandle(lowerCaseTable);

        assertNull(lowerHandle, "Table handle should not be resolved for case mismatch when case sensitivity is enabled");
    }

    @Test
    public void testCaseInsensitiveTableHandleResolution()
    {
        PrometheusConnectorConfig caseInsensitiveConfig = new PrometheusConnectorConfig(false); // false for case insensitivity
        PrometheusMetadata metadata = new PrometheusMetadata(client, caseInsensitiveConfig);

        // Assume "MixedCaseTable" exists in Prometheus
        SchemaTableName mixedCaseTable = new SchemaTableName("default", "MixedCaseTable");
        ConnectorTableHandle handle = metadata.getTableHandle(mixedCaseTable);

        assertNotNull(handle, "Table handle should be resolved for exact case match");

        // Try with different case
        SchemaTableName lowerCaseTable = new SchemaTableName("default", "mixedcasetable");
        ConnectorTableHandle lowerHandle = metadata.getTableHandle(lowerCaseTable);

        assertNotNull(lowerHandle, "Table handle should be resolved for case mismatch when case sensitivity is disabled");
    }

```

- Ensure that `PrometheusConnectorConfig` has a constructor that accepts a boolean for `caseSensitiveNameMatchingEnabled`.
- Make sure that the Prometheus test server contains a table named "MixedCaseTable" for these tests to pass.
- If `PrometheusMetadata` or `PrometheusConnectorConfig` do not support these options, you will need to add them.
</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.}

steveburnett

Thanks for the doc! Only a few minor comments, overall it looks good.

presto-docs/src/main/sphinx/connector/prometheus.rst

steveburnett · 2025-10-09T14:57:50Z

Thanks for the release note! Nits:

== RELEASE NOTES ==
Prometheus Connector Changes
* Add mixed case-sensitive identifier support for Prometheus connector.

Dilli-Babu-Godari · 2025-10-09T15:43:47Z

Thanks for the release note! Nits:

== RELEASE NOTES ==
Prometheus Connector Changes
* Add mixed case-sensitive identifier support for Prometheus connector.

Thanks for the review! I’ve addressed all the comments.

steveburnett

LGTM! (docs)

Pull updated branch, new local doc build, looks good. Thanks!

presto-docs/src/main/sphinx/connector/prometheus.rst

presto-prometheus/src/main/java/com/facebook/presto/plugin/prometheus/PrometheusMetadata.java

steveburnett

LGTM! (docs)

Pull branch, local doc build, looks good. Thanks!

.../src/test/java/com/facebook/presto/plugin/prometheus/TestPrometheusMixedCaseIntegration.java

bibith4 · 2025-10-15T05:20:41Z

.../test/java/com/facebook/presto/plugin/prometheus/TestPrometheusCaseSensitiveIntegration.java

+            fail("Query should fail when using uppercase instead of lowercase with case sensitivity enabled");
+        }
+        catch (RuntimeException e) {
+            assertTrue(e.getMessage().contains("Table") || e.getMessage().contains("table") ||


@Dilli-Babu-Godari Can we assert against a common error message?

Updated. Thanks!

agrawalreetika · 2025-10-15T08:22:02Z

.../test/java/com/facebook/presto/plugin/prometheus/TestPrometheusCaseSensitiveIntegration.java

+                "SELECT * FROM prometheus.default." + METRIC_UP + " LIMIT 1").toTestTypes();
+        assertEquals(upResult.getRowCount(), 1, "Query with exact case should return 1 row");
+        MaterializedResult goInfoResult = getQueryRunner().execute(session,
+                "SELECT * FROM prometheus.default." + METRIC_GO_INFO + " LIMIT 1").toTestTypes();


what's the difference b/w this and earlier test case?

In this Tests case, we are checking whether the exact-case table is present. If no exact-case table exists, we assert a query failure, since that correctly enforces the mixed-case contract.

agrawalreetika · 2025-10-15T08:23:32Z

.../test/java/com/facebook/presto/plugin/prometheus/TestPrometheusCaseSensitiveIntegration.java

+        // 2. Verify that using a different case doesn't work
+        try {
+            getQueryRunner().execute(session, "SELECT * FROM prometheus.default." + METRIC_UP.toUpperCase() + " LIMIT 1");
+            fail("Query should fail when using uppercase instead of lowercase with case sensitivity enabled");


Why aren't we using assertQueryFails for failure tests, instead of catching it with exceptions?

uodated with assertQueryFails Thanks!

agrawalreetika · 2025-10-15T08:25:12Z

.../test/java/com/facebook/presto/plugin/prometheus/TestPrometheusCaseSensitiveIntegration.java

+        assertTrue(tableNames.contains(METRIC_GO_INFO),
+                METRIC_GO_INFO + " table not found");
+    }
+}


Why don't we use defined asserts for failure and success cases for the entire test case?

I used assertTrue to check whether the value is present in a collection or not. I didn’t find any other method in QueryAssertions for this case.

linux-foundation-easycla · 2025-10-17T13:07:10Z

The committers listed above are authorized under a signed CLA.

✅ login: Dilli-Babu-Godari / name: Dilli-Babu-Godari (9240905, daefbc0)

Dilli-Babu-Godari requested review from a team, elharo and steveburnett as code owners October 9, 2025 11:06

prestodb-ci added the from:IBM PR from IBM label Oct 9, 2025

prestodb-ci requested review from a team, Mariamalmesfer and jkhaliqi and removed request for a team October 9, 2025 11:06

sourcery-ai bot reviewed Oct 9, 2025

View reviewed changes

Dilli-Babu-Godari requested a review from agrawalreetika October 9, 2025 11:11

Dilli-Babu-Godari force-pushed the prometheus_mixedcase_revised branch 3 times, most recently from b5d3322 to ef3ff6c Compare October 9, 2025 12:55

steveburnett requested changes Oct 9, 2025

View reviewed changes

Dilli-Babu-Godari force-pushed the prometheus_mixedcase_revised branch 3 times, most recently from 5f71407 to 147b24e Compare October 9, 2025 15:29

Dilli-Babu-Godari force-pushed the prometheus_mixedcase_revised branch 2 times, most recently from ba85ae8 to 6ccf6bf Compare October 9, 2025 17:22

Dilli-Babu-Godari requested a review from steveburnett October 9, 2025 17:24

steveburnett previously approved these changes Oct 9, 2025

View reviewed changes

agrawalreetika requested changes Oct 9, 2025

View reviewed changes

agrawalreetika requested a review from bibith4 October 10, 2025 06:14

Dilli-Babu-Godari dismissed steveburnett’s stale review via 090d572 October 13, 2025 07:04

Dilli-Babu-Godari force-pushed the prometheus_mixedcase_revised branch from 6ccf6bf to 090d572 Compare October 13, 2025 07:04

Dilli-Babu-Godari requested a review from agrawalreetika October 13, 2025 07:10

Dilli-Babu-Godari force-pushed the prometheus_mixedcase_revised branch from 090d572 to 226f22a Compare October 13, 2025 09:32

Dilli-Babu-Godari force-pushed the prometheus_mixedcase_revised branch 3 times, most recently from 8a43087 to cac1576 Compare October 13, 2025 14:51

steveburnett previously approved these changes Oct 13, 2025

View reviewed changes

agrawalreetika requested changes Oct 14, 2025

View reviewed changes

.../src/test/java/com/facebook/presto/plugin/prometheus/TestPrometheusMixedCaseIntegration.java Outdated Show resolved Hide resolved

.../src/test/java/com/facebook/presto/plugin/prometheus/TestPrometheusMixedCaseIntegration.java Outdated Show resolved Hide resolved

Dilli-Babu-Godari dismissed steveburnett’s stale review via f6449e4 October 14, 2025 16:45

Dilli-Babu-Godari force-pushed the prometheus_mixedcase_revised branch 2 times, most recently from f6449e4 to d55d256 Compare October 14, 2025 16:48

Dilli-Babu-Godari requested a review from agrawalreetika October 14, 2025 17:04

bibith4 reviewed Oct 15, 2025

View reviewed changes

agrawalreetika requested changes Oct 15, 2025

View reviewed changes

Dilli-Babu-Godari force-pushed the prometheus_mixedcase_revised branch from d55d256 to bc0d1de Compare October 15, 2025 10:42

Dilli-Babu-Godari requested review from agrawalreetika and bibith4 October 15, 2025 11:03

Dilli-Babu-Godari force-pushed the prometheus_mixedcase_revised branch from bc0d1de to 9fb9eed Compare October 15, 2025 14:01

Enable case-senstive identifer support for Prometheus connector

daefbc0

Dilli-Babu-Godari force-pushed the prometheus_mixedcase_revised branch from 9fb9eed to daefbc0 Compare October 16, 2025 05:55

Updated Test cases

9240905

Dilli-Babu-Godari force-pushed the prometheus_mixedcase_revised branch from f28cb0e to 9240905 Compare October 17, 2025 13:08

Dilli-Babu-Godari changed the title ~~feat(Prometheus): Enable case-senstive identifer support for Prometheus connector~~ feat(connector): Enable case-sensitive identifier support for Prometheus connector Oct 17, 2025

feat(connector): Enable case-sensitive identifier support for Prometheus connector #26260

Are you sure you want to change the base?

feat(connector): Enable case-sensitive identifier support for Prometheus connector #26260

Uh oh!

Conversation

Dilli-Babu-Godari commented Oct 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Motivation and Context

Impact

Test Plan

Contributor checklist

Release Notes

Uh oh!

sourcery-ai bot commented Oct 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer's Guide

Class diagram for updated PrometheusConnectorConfig and PrometheusMetadata

File-Level Changes

Interacting with Sourcery

Customizing Your Experience

Getting Help

Uh oh!

sourcery-ai bot left a comment

Choose a reason for hiding this comment

Uh oh!

steveburnett left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

steveburnett commented Oct 9, 2025

Uh oh!

Dilli-Babu-Godari commented Oct 9, 2025

Uh oh!

steveburnett left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

steveburnett left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

linux-foundation-easycla bot commented Oct 17, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Dilli-Babu-Godari commented Oct 9, 2025 •

edited

Loading

sourcery-ai bot commented Oct 9, 2025 •

edited

Loading

linux-foundation-easycla bot commented Oct 17, 2025 •

edited

Loading