abhishekrb19 commented on code in PR #15738: URL: https://github.com/apache/druid/pull/15738#discussion_r1462650334
########## server/src/main/java/org/apache/druid/server/http/DataSegmentDto.java: ########## @@ -0,0 +1,224 @@ +/* + * 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.druid.server.http; + +import com.fasterxml.jackson.annotation.JacksonInject; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import org.apache.druid.guice.annotations.PublicApi; +import org.apache.druid.jackson.CommaListJoinDeserializer; +import org.apache.druid.jackson.CommaListJoinSerializer; +import org.apache.druid.timeline.CompactionState; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.SegmentId; +import org.apache.druid.timeline.partition.ShardSpec; +import org.joda.time.DateTime; +import org.joda.time.Interval; + +import javax.annotation.Nullable; +import java.util.List; +import java.util.Map; + +/** + * {@link DataSegment} to be transmitted externally + */ +@PublicApi +public class DataSegmentDto +{ + private final DataSegment dataSegment; + private final DateTime createdDate; + @Nullable + private final DateTime usedStatusLastUpdatedDate; + + public DataSegmentDto( + DataSegment dataSegment, + DateTime createdDate, + @Nullable DateTime usedStatusLastUpdatedDate + ) + { + this.dataSegment = dataSegment; + this.createdDate = createdDate; + this.usedStatusLastUpdatedDate = usedStatusLastUpdatedDate; + } + + @JsonCreator + public DataSegmentDto( + @JsonProperty("dataSource") String dataSource, + @JsonProperty("interval") Interval interval, + @JsonProperty("version") String version, + // use `Map` *NOT* `LoadSpec` because we want to do lazy materialization to prevent dependency pollution + @JsonProperty("loadSpec") @Nullable Map<String, Object> loadSpec, + @JsonProperty("dimensions") + @JsonDeserialize(using = CommaListJoinDeserializer.class) + @Nullable + List<String> dimensions, + @JsonProperty("metrics") + @JsonDeserialize(using = CommaListJoinDeserializer.class) + @Nullable + List<String> metrics, + @JsonProperty("shardSpec") @Nullable ShardSpec shardSpec, + @JsonProperty("lastCompactionState") @Nullable CompactionState lastCompactionState, + @JsonProperty("binaryVersion") Integer binaryVersion, + @JsonProperty("size") long size, + @JsonProperty("createdDate") @Nullable DateTime createdDate, + @JsonProperty("createdDate") @Nullable DateTime usedStatusLastUpdatedDate, Review Comment: ```suggestion @JsonProperty("usedStatusLastUpdated") @Nullable DateTime usedStatusLastUpdated, ``` ########## server/src/main/java/org/apache/druid/server/http/DataSegmentDto.java: ########## @@ -0,0 +1,224 @@ +/* + * 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.druid.server.http; + +import com.fasterxml.jackson.annotation.JacksonInject; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import org.apache.druid.guice.annotations.PublicApi; +import org.apache.druid.jackson.CommaListJoinDeserializer; +import org.apache.druid.jackson.CommaListJoinSerializer; +import org.apache.druid.timeline.CompactionState; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.SegmentId; +import org.apache.druid.timeline.partition.ShardSpec; +import org.joda.time.DateTime; +import org.joda.time.Interval; + +import javax.annotation.Nullable; +import java.util.List; +import java.util.Map; + +/** + * {@link DataSegment} to be transmitted externally + */ +@PublicApi +public class DataSegmentDto +{ + private final DataSegment dataSegment; + private final DateTime createdDate; + @Nullable + private final DateTime usedStatusLastUpdatedDate; + + public DataSegmentDto( + DataSegment dataSegment, + DateTime createdDate, + @Nullable DateTime usedStatusLastUpdatedDate + ) + { + this.dataSegment = dataSegment; + this.createdDate = createdDate; + this.usedStatusLastUpdatedDate = usedStatusLastUpdatedDate; + } + + @JsonCreator + public DataSegmentDto( + @JsonProperty("dataSource") String dataSource, + @JsonProperty("interval") Interval interval, + @JsonProperty("version") String version, + // use `Map` *NOT* `LoadSpec` because we want to do lazy materialization to prevent dependency pollution + @JsonProperty("loadSpec") @Nullable Map<String, Object> loadSpec, + @JsonProperty("dimensions") + @JsonDeserialize(using = CommaListJoinDeserializer.class) + @Nullable + List<String> dimensions, + @JsonProperty("metrics") + @JsonDeserialize(using = CommaListJoinDeserializer.class) + @Nullable + List<String> metrics, + @JsonProperty("shardSpec") @Nullable ShardSpec shardSpec, + @JsonProperty("lastCompactionState") @Nullable CompactionState lastCompactionState, + @JsonProperty("binaryVersion") Integer binaryVersion, + @JsonProperty("size") long size, + @JsonProperty("createdDate") @Nullable DateTime createdDate, + @JsonProperty("createdDate") @Nullable DateTime usedStatusLastUpdatedDate, + @JacksonInject DataSegment.PruneSpecsHolder pruneSpecsHolder + ) + { + this.dataSegment = new DataSegment( + dataSource, + interval, + version, + loadSpec, + dimensions, + metrics, + shardSpec, + lastCompactionState, + binaryVersion, + size, + pruneSpecsHolder + ); + this.createdDate = createdDate; + this.usedStatusLastUpdatedDate = usedStatusLastUpdatedDate; + } + + /** + * Get dataSource + * + * @return the dataSource + */ + @JsonProperty + public String getDataSource() Review Comment: Ditto. All these getters can be from the `DataSegment` embedded inside here. ########## server/src/main/java/org/apache/druid/server/http/DataSegmentDto.java: ########## @@ -0,0 +1,224 @@ +/* + * 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.druid.server.http; + +import com.fasterxml.jackson.annotation.JacksonInject; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import org.apache.druid.guice.annotations.PublicApi; +import org.apache.druid.jackson.CommaListJoinDeserializer; +import org.apache.druid.jackson.CommaListJoinSerializer; +import org.apache.druid.timeline.CompactionState; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.SegmentId; +import org.apache.druid.timeline.partition.ShardSpec; +import org.joda.time.DateTime; +import org.joda.time.Interval; + +import javax.annotation.Nullable; +import java.util.List; +import java.util.Map; + +/** + * {@link DataSegment} to be transmitted externally + */ +@PublicApi +public class DataSegmentDto +{ + private final DataSegment dataSegment; + private final DateTime createdDate; + @Nullable + private final DateTime usedStatusLastUpdatedDate; + + public DataSegmentDto( Review Comment: Perhaps call this `DataSegmentPlus`, so we have internal consistency with `TaskStatusPlus`, `QueryPlus`, etc? ########## server/src/main/java/org/apache/druid/metadata/SqlSegmentsMetadataQuery.java: ########## @@ -455,12 +547,73 @@ private UnmodifiableIterator<DataSegment> retrieveSegmentsInIntervalsBatch( @Nullable final SortOrder sortOrder, @Nullable final DateTime maxUsedStatusLastUpdatedTime ) + { + final Query<Map<String, Object>> sql = buildSegmentQuery( + dataSource, + intervals, + matchMode, + used, + limit, + lastSegmentId, + sortOrder, + maxUsedStatusLastUpdatedTime, + false + ); + + final ResultIterator<DataSegment> resultIterator = getDataSegmentResultIterator(sql); + + return filterDataSegmentIteratorByInterval(resultIterator, intervals, matchMode); + } + + private UnmodifiableIterator<DataSegmentDto> retrieveSegmentDtosInIntervalsBatch( + final String dataSource, + final Collection<Interval> intervals, + final IntervalMode matchMode, + final boolean used, + @Nullable final Integer limit, + @Nullable final String lastSegmentId, + @Nullable final SortOrder sortOrder, + @Nullable final DateTime maxUsedStatusLastUpdatedTime + ) + { + + final Query<Map<String, Object>> sql = buildSegmentQuery( + dataSource, + intervals, + matchMode, + used, + limit, + lastSegmentId, + sortOrder, + maxUsedStatusLastUpdatedTime, + true + ); + + final ResultIterator<DataSegmentDto> resultIterator = getDataSegmentDtoResultIterator(sql); + + return filterDataSegmentDtoIteratorByInterval(resultIterator, intervals, matchMode); + } + + private Query<Map<String, Object>> buildSegmentQuery( + final String dataSource, + final Collection<Interval> intervals, + final IntervalMode matchMode, + final boolean used, + @Nullable final Integer limit, + @Nullable final String lastSegmentId, + @Nullable final SortOrder sortOrder, + @Nullable final DateTime maxUsedStatusLastUpdatedTime, + boolean isDto Review Comment: ```suggestion final boolean includeExtraInfo ``` ########## server/src/main/java/org/apache/druid/server/http/DataSegmentDto.java: ########## @@ -0,0 +1,224 @@ +/* + * 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.druid.server.http; + +import com.fasterxml.jackson.annotation.JacksonInject; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import org.apache.druid.guice.annotations.PublicApi; +import org.apache.druid.jackson.CommaListJoinDeserializer; +import org.apache.druid.jackson.CommaListJoinSerializer; +import org.apache.druid.timeline.CompactionState; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.SegmentId; +import org.apache.druid.timeline.partition.ShardSpec; +import org.joda.time.DateTime; +import org.joda.time.Interval; + +import javax.annotation.Nullable; +import java.util.List; +import java.util.Map; + +/** + * {@link DataSegment} to be transmitted externally + */ +@PublicApi +public class DataSegmentDto +{ + private final DataSegment dataSegment; + private final DateTime createdDate; + @Nullable + private final DateTime usedStatusLastUpdatedDate; + + public DataSegmentDto( + DataSegment dataSegment, + DateTime createdDate, + @Nullable DateTime usedStatusLastUpdatedDate + ) + { + this.dataSegment = dataSegment; + this.createdDate = createdDate; + this.usedStatusLastUpdatedDate = usedStatusLastUpdatedDate; + } + + @JsonCreator + public DataSegmentDto( + @JsonProperty("dataSource") String dataSource, + @JsonProperty("interval") Interval interval, + @JsonProperty("version") String version, + // use `Map` *NOT* `LoadSpec` because we want to do lazy materialization to prevent dependency pollution + @JsonProperty("loadSpec") @Nullable Map<String, Object> loadSpec, + @JsonProperty("dimensions") + @JsonDeserialize(using = CommaListJoinDeserializer.class) + @Nullable + List<String> dimensions, + @JsonProperty("metrics") + @JsonDeserialize(using = CommaListJoinDeserializer.class) + @Nullable + List<String> metrics, + @JsonProperty("shardSpec") @Nullable ShardSpec shardSpec, + @JsonProperty("lastCompactionState") @Nullable CompactionState lastCompactionState, + @JsonProperty("binaryVersion") Integer binaryVersion, + @JsonProperty("size") long size, Review Comment: Hmm, do we need to duplicate all the fields from the `DataSegment` class here? If the jackson annotation wireup is done correctly, I think we can get rid of this constructor altogether and just have the above 3-arg constructor with `@JsonCreator` ########## server/src/main/java/org/apache/druid/server/http/DataSegmentDto.java: ########## @@ -0,0 +1,224 @@ +/* + * 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.druid.server.http; + +import com.fasterxml.jackson.annotation.JacksonInject; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import org.apache.druid.guice.annotations.PublicApi; +import org.apache.druid.jackson.CommaListJoinDeserializer; +import org.apache.druid.jackson.CommaListJoinSerializer; +import org.apache.druid.timeline.CompactionState; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.SegmentId; +import org.apache.druid.timeline.partition.ShardSpec; +import org.joda.time.DateTime; +import org.joda.time.Interval; + +import javax.annotation.Nullable; +import java.util.List; +import java.util.Map; + +/** + * {@link DataSegment} to be transmitted externally Review Comment: Could you please add javadocs to this class that it encapsulated additional metadata about a `DataSegment`? -- 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] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
