This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new 86b6d62d66 Fix duplicate TABLE_COLUMN condition in
JDBCMetadataQueryDAO.findEndpoint() (#13794)
86b6d62d66 is described below
commit 86b6d62d66e8d33bafeac94a3fb21ef390729863
Author: Hyunjin-Jeong <[email protected]>
AuthorDate: Mon Apr 6 21:46:00 2026 +0900
Fix duplicate TABLE_COLUMN condition in JDBCMetadataQueryDAO.findEndpoint()
(#13794)
`findEndpoint()` was adding the `TABLE_COLUMN = ?` WHERE condition twice
and binding `EndpointTraffic.INDEX_NAME` as a parameter twice, due to a
copy-paste error.
The generated SQL was:
```sql
select * from endpoint_traffic where table_name = ? and service_id = ? and
table_name = ? ...
```
The second `table_name = ?` condition is redundant. All other methods in
`JDBCMetadataQueryDAO` add the `TABLE_COLUMN` condition exactly once. The fix
removes the duplicate condition and its corresponding parameter binding.
---
docs/en/changes/changes.md | 1 +
.../jdbc/common/dao/JDBCMetadataQueryDAO.java | 8 +-
.../jdbc/common/dao/JDBCMetadataQueryDAOTest.java | 128 +++++++++++++++++++++
3 files changed, 135 insertions(+), 2 deletions(-)
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index 0918ae388d..8e5a10c1df 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -10,6 +10,7 @@
* Push `taskId` filter down to the storage layer in
`IAsyncProfilerTaskLogQueryDAO`, removing in-memory filtering from
`AsyncProfilerQueryService`.
* Fix missing parentheses around OR conditions in
`JDBCZipkinQueryDAO.getTraces()`, which caused the table filter to be bypassed
for all but the first trace ID. Replaced with a proper `IN` clause.
* Fix missing `and` keyword in `JDBCEBPFProfilingTaskDAO.getTaskRecord()` SQL
query, which caused a syntax error on every invocation.
+* Fix duplicate `TABLE_COLUMN` condition in
`JDBCMetadataQueryDAO.findEndpoint()`, which was binding the same parameter
twice due to a copy-paste error.
#### UI
diff --git
a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/common/dao/JDBCMetadataQueryDAO.java
b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/common/dao/JDBCMetadataQueryDAO.java
index 8dbb702a32..fd334d5273 100644
---
a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/common/dao/JDBCMetadataQueryDAO.java
+++
b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/common/dao/JDBCMetadataQueryDAO.java
@@ -73,6 +73,12 @@ public class JDBCMetadataQueryDAO implements
IMetadataQueryDAO {
this.tableHelper = new TableHelper(moduleManager, jdbcClient);
}
+ JDBCMetadataQueryDAO(JDBCClient jdbcClient, int metadataQueryMaxSize,
TableHelper tableHelper) {
+ this.jdbcClient = jdbcClient;
+ this.metadataQueryMaxSize = metadataQueryMaxSize;
+ this.tableHelper = tableHelper;
+ }
+
@Override
@SneakyThrows
public List<Service> listServices() {
@@ -217,8 +223,6 @@ public class JDBCMetadataQueryDAO implements
IMetadataQueryDAO {
condition.add(EndpointTraffic.INDEX_NAME);
sql.append(" and
").append(EndpointTraffic.SERVICE_ID).append("=?");
condition.add(serviceId);
- sql.append(" and
").append(JDBCTableInstaller.TABLE_COLUMN).append(" = ?");
- condition.add(EndpointTraffic.INDEX_NAME);
if (!Strings.isNullOrEmpty(keyword)) {
sql.append(" and ").append(EndpointTraffic.NAME).append(" like
concat('%',?,'%') ");
condition.add(keyword);
diff --git
a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/test/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/common/dao/JDBCMetadataQueryDAOTest.java
b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/test/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/common/dao/JDBCMetadataQueryDAOTest.java
new file mode 100644
index 0000000000..bf438aa8ed
--- /dev/null
+++
b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/test/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/common/dao/JDBCMetadataQueryDAOTest.java
@@ -0,0 +1,128 @@
+/*
+ * 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.skywalking.oap.server.storage.plugin.jdbc.common.dao;
+
+import
org.apache.skywalking.oap.server.core.analysis.manual.endpoint.EndpointTraffic;
+import
org.apache.skywalking.oap.server.library.client.jdbc.hikaricp.JDBCClient;
+import
org.apache.skywalking.oap.server.storage.plugin.jdbc.common.JDBCTableInstaller;
+import org.apache.skywalking.oap.server.storage.plugin.jdbc.common.TableHelper;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.concurrent.atomic.AtomicReference;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
+class JDBCMetadataQueryDAOTest {
+
+ @Mock
+ private JDBCClient jdbcClient;
+ @Mock
+ private TableHelper tableHelper;
+
+ private JDBCMetadataQueryDAO dao;
+
+ @BeforeEach
+ void setUp() {
+ dao = new JDBCMetadataQueryDAO(jdbcClient, 100, tableHelper);
+ }
+
+ @Test
+ void findEndpoint_shouldContainTableColumnConditionOnlyOnce() throws
Exception {
+ when(tableHelper.getTablesWithinTTL(EndpointTraffic.INDEX_NAME))
+ .thenReturn(Collections.singletonList("endpoint_traffic"));
+
+ final AtomicReference<String> capturedSql = new AtomicReference<>();
+ final AtomicReference<Object[]> capturedParams = new
AtomicReference<>();
+ doAnswer(invocation -> {
+ capturedSql.set(invocation.getArgument(0));
+ final Object[] allArgs = invocation.getArguments();
+ capturedParams.set(Arrays.copyOfRange(allArgs, 2, allArgs.length));
+ return new ArrayList<>();
+ }).when(jdbcClient).executeQuery(anyString(), any(),
any(Object[].class));
+
+ dao.findEndpoint("keyword", "serviceId", 10, null);
+
+ final String sql = capturedSql.get();
+ final long tableColumnCount = countOccurrences(sql,
JDBCTableInstaller.TABLE_COLUMN + " = ?");
+ assertThat(tableColumnCount)
+ .as("TABLE_COLUMN condition should appear exactly once in WHERE
clause")
+ .isEqualTo(1);
+
+ final Object[] params = capturedParams.get();
+ final long tableNameParamCount = countOccurrences(params,
EndpointTraffic.INDEX_NAME);
+ assertThat(tableNameParamCount)
+ .as("EndpointTraffic.INDEX_NAME should be bound exactly once as a
parameter")
+ .isEqualTo(1);
+ }
+
+ @Test
+ void findEndpoint_shouldFilterByServiceId() throws Exception {
+ when(tableHelper.getTablesWithinTTL(EndpointTraffic.INDEX_NAME))
+ .thenReturn(Collections.singletonList("endpoint_traffic"));
+
+ final AtomicReference<String> capturedSql = new AtomicReference<>();
+ final AtomicReference<Object[]> capturedParams = new
AtomicReference<>();
+ doAnswer(invocation -> {
+ capturedSql.set(invocation.getArgument(0));
+ final Object[] allArgs = invocation.getArguments();
+ capturedParams.set(Arrays.copyOfRange(allArgs, 2, allArgs.length));
+ return new ArrayList<>();
+ }).when(jdbcClient).executeQuery(anyString(), any(),
any(Object[].class));
+
+ dao.findEndpoint(null, "my-service", 10, null);
+
+ assertThat(capturedSql.get()).contains(EndpointTraffic.SERVICE_ID +
"=?");
+ assertThat(capturedParams.get()).contains("my-service");
+ }
+
+ private long countOccurrences(final String text, final String target) {
+ int count = 0;
+ int index = 0;
+ while ((index = text.indexOf(target, index)) != -1) {
+ count++;
+ index += target.length();
+ }
+ return count;
+ }
+
+ private long countOccurrences(final Object[] array, final Object target) {
+ long count = 0;
+ for (final Object item : array) {
+ if (target.equals(item)) {
+ count++;
+ }
+ }
+ return count;
+ }
+}
