obelix74 commented on code in PR #3385: URL: https://github.com/apache/polaris/pull/3385#discussion_r2833802352
########## persistence/relational-jdbc/src/main/java/org/apache/polaris/persistence/relational/jdbc/JdbcMetricsPersistence.java: ########## @@ -0,0 +1,481 @@ +/* + * 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.polaris.persistence.relational.jdbc; + +import static org.apache.polaris.persistence.relational.jdbc.QueryGenerator.PreparedQuery; + +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.stream.Collectors; +import org.apache.polaris.core.persistence.metrics.CommitMetricsRecord; +import org.apache.polaris.core.persistence.metrics.MetricsPersistence; +import org.apache.polaris.core.persistence.metrics.MetricsQueryCriteria; +import org.apache.polaris.core.persistence.metrics.ReportIdToken; +import org.apache.polaris.core.persistence.metrics.ScanMetricsRecord; +import org.apache.polaris.core.persistence.pagination.Page; +import org.apache.polaris.core.persistence.pagination.PageToken; +import org.apache.polaris.core.persistence.pagination.Token; +import org.apache.polaris.persistence.relational.jdbc.models.ModelCommitMetricsReport; +import org.apache.polaris.persistence.relational.jdbc.models.ModelCommitMetricsReportConverter; +import org.apache.polaris.persistence.relational.jdbc.models.ModelScanMetricsReport; +import org.apache.polaris.persistence.relational.jdbc.models.ModelScanMetricsReportConverter; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * JDBC implementation of {@link MetricsPersistence}. + * + * <p>This class provides direct JDBC persistence for metrics reports, converting between SPI record + * types ({@link ScanMetricsRecord}, {@link CommitMetricsRecord}) and JDBC model types ({@link + * ModelScanMetricsReport}, {@link ModelCommitMetricsReport}). + * + * <p>This implementation assumes that metrics tables exist. The producer ({@link + * JdbcMetricsPersistenceProducer}) checks for metrics table availability at startup and returns + * {@link MetricsPersistence#NOOP} if tables are not present. + */ +public class JdbcMetricsPersistence implements MetricsPersistence { + + private static final Logger LOGGER = LoggerFactory.getLogger(JdbcMetricsPersistence.class); + + private final DatasourceOperations datasourceOperations; + private final String realmId; + + /** + * Creates a new JdbcMetricsPersistence instance. + * + * @param datasourceOperations the datasource operations for JDBC access + * @param realmId the realm ID for multi-tenancy + */ + public JdbcMetricsPersistence(DatasourceOperations datasourceOperations, String realmId) { + this.datasourceOperations = datasourceOperations; + this.realmId = realmId; + } + + @Override + public void writeScanReport(@Nonnull ScanMetricsRecord record) { + ModelScanMetricsReport model = SpiModelConverter.toModelScanReport(record, realmId); + writeScanMetricsReport(model); + } + + @Override + public void writeCommitReport(@Nonnull CommitMetricsRecord record) { + ModelCommitMetricsReport model = SpiModelConverter.toModelCommitReport(record, realmId); + writeCommitMetricsReport(model); + } + + @Override + @Nonnull + public Page<ScanMetricsRecord> queryScanReports( + @Nonnull MetricsQueryCriteria criteria, @Nonnull PageToken pageToken) { + // catalogId and tableId are required for queries + if (criteria.catalogId().isEmpty() || criteria.tableId().isEmpty()) { + return Page.fromItems(List.of()); + } + + int limit = pageToken.pageSize().orElse(100); + Long startTimeMs = criteria.startTime().map(t -> t.toEpochMilli()).orElse(null); + Long endTimeMs = criteria.endTime().map(t -> t.toEpochMilli()).orElse(null); + + // Extract cursor from page token if present + String lastReportId = + pageToken.valueAs(ReportIdToken.class).map(ReportIdToken::reportId).orElse(null); Review Comment: Fixed the pagination to use a composite cursor (timestamp_ms, report_id): - Primary sort by timestamp_ms for chronological ordering - Secondary sort by report_id as tie-breaker for same-millisecond entries - SQL: WHERE (timestamp_ms, report_id) > (?, ?) ORDER BY timestamp_ms ASC, report_id ASC This ensures results are returned in chronological order, not lexicographic UUID order. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
