fix tests

apache · Oct 29, 2024 · dbc583e · dbc583e
1 parent 2290a82
commit dbc583e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/...ontroller/src/main/java/org/apache/pinot/controller/util/ServerSegmentMetadataReader.java b/...ontroller/src/main/java/org/apache/pinot/controller/util/ServerSegmentMetadataReader.java
@@ -416,7 +416,7 @@ public String generateTableMetadataServerURL(String tableNameWithType, List<Stri
                                                Set<String> segmentsToInclude, String endpoint) {
     tableNameWithType = URLEncoder.encode(tableNameWithType, StandardCharsets.UTF_8);
     String paramsStr = generateColumnsParam(columns)
-            + generateSegmentsParam(new ArrayList<>(segmentsToInclude));
+            + generateSegmentsParam(segmentsToInclude);
     return String.format("%s/tables/%s/metadata?%s", endpoint, tableNameWithType, paramsStr);
   }
 
@@ -479,7 +479,7 @@ private String generateColumnsParam(List<String> columns) {
     return paramsStr;
   }
 
-  private String generateSegmentsParam(List<String> values) {
+  private String generateSegmentsParam(Set<String> values) {
     String paramsStr = "";
     if (values == null || values.isEmpty()) {
       return paramsStr;

diff --git a/pinot-server/src/main/java/org/apache/pinot/server/api/resources/TablesResource.java b/pinot-server/src/main/java/org/apache/pinot/server/api/resources/TablesResource.java
@@ -192,8 +192,8 @@ public String getSegmentMetadata(
       @ApiParam(value = "Table Name with type", required = true) @PathParam("tableName") String tableName,
       @ApiParam(value = "Column name", allowMultiple = true) @QueryParam("columns") @DefaultValue("")
       List<String> columns,
-      @ApiParam(value = "List of segments to fetch metadata for") @QueryParam("segmentsToInclude") @DefaultValue("")
-      List<String> segmentsToInclude, @Context HttpHeaders headers)
+      @ApiParam(value = "List of segments to fetch metadata for", allowMultiple = true) @QueryParam("segmentsToInclude")
+      @DefaultValue("") List<String> segmentsToInclude, @Context HttpHeaders headers)
       throws WebApplicationException {
     tableName = DatabaseUtils.translateTableName(tableName, headers);
     InstanceDataManager instanceDataManager = _serverInstance.getInstanceDataManager();
@@ -212,6 +212,14 @@ public String getSegmentMetadata(
       decodedColumns.add(URIUtils.decode(column));
     }
 
+    List<String> decodedSegments = new ArrayList<>();
+    if (segmentsToInclude != null && !segmentsToInclude.isEmpty()) {
+      for (String segment : segmentsToInclude) {
+        if (!segment.isEmpty()) {
+          decodedSegments.add(URIUtils.decode(segment));
+        }
+      }
+    }
     boolean allColumns = false;
     // For robustness, loop over all columns, if any of the columns is "*", return metadata for all columns.
     for (String column : decodedColumns) {
@@ -222,8 +230,8 @@ public String getSegmentMetadata(
     }
     Set<String> columnSet = allColumns ? null : new HashSet<>(decodedColumns);
     List<SegmentDataManager> segmentDataManagers;
-    if (segmentsToInclude != null && !segmentsToInclude.isEmpty()) {
-      segmentDataManagers = tableDataManager.acquireSegments(segmentsToInclude, new ArrayList<>());
+    if (!decodedSegments.isEmpty()) {
+      segmentDataManagers = tableDataManager.acquireSegments(decodedSegments, new ArrayList<>());
     } else {
       segmentDataManagers = tableDataManager.acquireAllSegments();
     }