Jackie-Jiang commented on a change in pull request #6873:
URL: https://github.com/apache/incubator-pinot/pull/6873#discussion_r632141130
##########
File path:
pinot-server/src/main/java/org/apache/pinot/server/api/resources/SegmentMetadataFetcher.java
##########
@@ -62,24 +76,63 @@ public static String getSegmentMetadata(SegmentDataManager
segmentDataManager, L
columnSet = new HashSet<>(columns);
}
ObjectNode segmentMetadataJson = (ObjectNode)
segmentMetadata.toJson(columnSet);
- segmentMetadataJson.set("indexes",
JsonUtils.objectToJsonNode(getIndexesForSegmentColumns(segmentDataManager)));
+ segmentMetadataJson.set(COLUMN_INDEX_KEY,
JsonUtils.objectToJsonNode(getIndexesForSegmentColumns(segmentDataManager)));
+ segmentMetadataJson.set(STAR_TREE_INDEX_KEY,
JsonUtils.objectToJsonNode((getStartreeIndexForSegmentColumns(segmentDataManager))));
return JsonUtils.objectToString(segmentMetadataJson);
}
+ /**
+ * Get the JSON object containing star tree index details for a segment.
+ */
+ private static List<Map<String, Object>>
getStartreeIndexForSegmentColumns(SegmentDataManager segmentDataManager) {
+ List<Map<String, Object>> startreeDetails = new ArrayList<>();
+ ImmutableSegmentDataManager immutableSegmentDataManager =
(ImmutableSegmentDataManager) segmentDataManager;
+ ImmutableSegment immutableSegment =
immutableSegmentDataManager.getSegment();
+ List<StarTreeV2> starTrees = immutableSegment.getStarTrees();
+ if (starTrees == null) {
+ return startreeDetails;
+ }
+ startreeDetails = getImmutableSegmentStartreeIndexes(starTrees);
+ return startreeDetails;
Review comment:
Can be simplified. Also suggest returning `null` if index does not exist
```suggestion
List<StarTreeV2> starTrees =
segmentDataManager.getSegment().getStarTrees();
return starTrees != null ? getImmutableSegmentStartreeIndexes(starTrees)
: null;
```
##########
File path:
pinot-server/src/main/java/org/apache/pinot/server/api/resources/SegmentMetadataFetcher.java
##########
@@ -62,24 +76,63 @@ public static String getSegmentMetadata(SegmentDataManager
segmentDataManager, L
columnSet = new HashSet<>(columns);
}
ObjectNode segmentMetadataJson = (ObjectNode)
segmentMetadata.toJson(columnSet);
- segmentMetadataJson.set("indexes",
JsonUtils.objectToJsonNode(getIndexesForSegmentColumns(segmentDataManager)));
+ segmentMetadataJson.set(COLUMN_INDEX_KEY,
JsonUtils.objectToJsonNode(getIndexesForSegmentColumns(segmentDataManager)));
+ segmentMetadataJson.set(STAR_TREE_INDEX_KEY,
JsonUtils.objectToJsonNode((getStartreeIndexForSegmentColumns(segmentDataManager))));
return JsonUtils.objectToString(segmentMetadataJson);
}
+ /**
+ * Get the JSON object containing star tree index details for a segment.
+ */
+ private static List<Map<String, Object>>
getStartreeIndexForSegmentColumns(SegmentDataManager segmentDataManager) {
+ List<Map<String, Object>> startreeDetails = new ArrayList<>();
+ ImmutableSegmentDataManager immutableSegmentDataManager =
(ImmutableSegmentDataManager) segmentDataManager;
+ ImmutableSegment immutableSegment =
immutableSegmentDataManager.getSegment();
+ List<StarTreeV2> starTrees = immutableSegment.getStarTrees();
+ if (starTrees == null) {
+ return startreeDetails;
+ }
+ startreeDetails = getImmutableSegmentStartreeIndexes(starTrees);
+ return startreeDetails;
+ }
+
+ /**
+ * Helper to loop over star trees of a segment to create a map containing
star tree details.
+ */
+ private static List<Map<String, Object>>
getImmutableSegmentStartreeIndexes(List<StarTreeV2> starTrees){
+ List<Map<String, Object>> startreeDetails = new ArrayList<>();
+ for (StarTreeV2 starTree : starTrees) {
+ StarTreeV2Metadata starTreeMetadata = starTree.getMetadata();
+
+ Map<String, Object> starTreeIndexMap = new LinkedHashMap<>();
+
+ List<String> starTreeDimensions =
starTreeMetadata.getDimensionsSplitOrder();
+ starTreeIndexMap.put(STAR_TREE_DIMENSION_COLUMNS, starTreeDimensions);
+
+ List<String> starTreeMetricAggregations = new ArrayList<>();
+ Set<AggregationFunctionColumnPair> functionColumnPairs =
starTreeMetadata.getFunctionColumnPairs();
+ for (AggregationFunctionColumnPair functionColumnPair :
functionColumnPairs) {
+ starTreeMetricAggregations.add(functionColumnPair.toColumnName());
+ }
+ starTreeIndexMap.put(STAR_TREE_METRIC_AGGREGATIONS,
starTreeMetricAggregations);
+
+ starTreeIndexMap.put(STAR_TREE_MAX_LEAF_RECORDS,
starTreeMetadata.getMaxLeafRecords());
+ starTreeIndexMap.put(STAR_TREE_DIMENSION_COLUMNS_SKIPPED,
starTreeMetadata.getSkipStarNodeCreationForDimensions());
+ startreeDetails.add(starTreeIndexMap);
+ }
+ return startreeDetails;
+ }
+
/**
* Get the JSON object with the segment column's indexing metadata.
*/
private static Map<String, Map<String, String>>
getIndexesForSegmentColumns(SegmentDataManager segmentDataManager) {
Map<String, Map<String, String>> columnIndexMap = null;
- if (segmentDataManager instanceof ImmutableSegmentDataManager) {
- ImmutableSegmentDataManager immutableSegmentDataManager =
(ImmutableSegmentDataManager) segmentDataManager;
- ImmutableSegment immutableSegment =
immutableSegmentDataManager.getSegment();
- if (immutableSegment instanceof ImmutableSegmentImpl) {
- ImmutableSegmentImpl immutableSegmentImpl = (ImmutableSegmentImpl)
immutableSegment;
- Map<String, ColumnIndexContainer> columnIndexContainerMap =
immutableSegmentImpl.getIndexContainerMap();
- columnIndexMap =
getImmutableSegmentColumnIndexes(columnIndexContainerMap);
- }
- }
+ ImmutableSegmentDataManager immutableSegmentDataManager =
(ImmutableSegmentDataManager) segmentDataManager;
+ ImmutableSegment immutableSegment =
immutableSegmentDataManager.getSegment();
+ ImmutableSegmentImpl immutableSegmentImpl = (ImmutableSegmentImpl)
immutableSegment;
+ Map<String, ColumnIndexContainer> columnIndexContainerMap =
immutableSegmentImpl.getIndexContainerMap();
+ columnIndexMap = getImmutableSegmentColumnIndexes(columnIndexContainerMap);
Review comment:
Need to keep the check before casting here
```suggestion
IndexSegment segment = segmentDataManager.getSegment();
if (segment instanceof ImmutableSegmentImpl) {
return getImmutableSegmentColumnIndexes(((ImmutableSegmentImpl)
segment).getIndexContainerMap());
} else {
return null;
}
```
##########
File path:
pinot-server/src/main/java/org/apache/pinot/server/api/resources/SegmentMetadataFetcher.java
##########
@@ -62,24 +76,63 @@ public static String getSegmentMetadata(SegmentDataManager
segmentDataManager, L
columnSet = new HashSet<>(columns);
}
ObjectNode segmentMetadataJson = (ObjectNode)
segmentMetadata.toJson(columnSet);
- segmentMetadataJson.set("indexes",
JsonUtils.objectToJsonNode(getIndexesForSegmentColumns(segmentDataManager)));
+ segmentMetadataJson.set(COLUMN_INDEX_KEY,
JsonUtils.objectToJsonNode(getIndexesForSegmentColumns(segmentDataManager)));
+ segmentMetadataJson.set(STAR_TREE_INDEX_KEY,
JsonUtils.objectToJsonNode((getStartreeIndexForSegmentColumns(segmentDataManager))));
return JsonUtils.objectToString(segmentMetadataJson);
}
+ /**
+ * Get the JSON object containing star tree index details for a segment.
+ */
+ private static List<Map<String, Object>>
getStartreeIndexForSegmentColumns(SegmentDataManager segmentDataManager) {
Review comment:
(nit) Suggest putting the star-tree related methods after the indexes
related methods
--
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.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org
For additional commands, e-mail: commits-h...@pinot.apache.org
