klsince commented on code in PR #12440: URL: https://github.com/apache/pinot/pull/12440#discussion_r1529050750
########## pinot-spi/src/main/java/org/apache/pinot/spi/env/SegmentMetadataPropertyReader.java: ########## @@ -0,0 +1,85 @@ +/** + * 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.pinot.spi.env; + +import com.google.common.base.Preconditions; +import java.io.Reader; +import java.util.List; +import org.apache.commons.configuration2.PropertiesConfiguration.PropertiesReader; + + +/** + * SegmentMetadataPropertyReader extends the PropertiesReader + * <p> + * Purpose: loads the segment metadata faster + * - by skipping the unescaping of key and + * - parsing the line by splitting based on first occurrence of separator + */ +class SegmentMetadataPropertyReader extends PropertiesReader { + private boolean _skipUnescapePropertyName; + private final String _segmentMetadataVersionHeader; + + public SegmentMetadataPropertyReader(Reader reader, String segmentMetadataVersionHeader) { + super(reader); + _segmentMetadataVersionHeader = segmentMetadataVersionHeader; + } + + @Override + protected void parseProperty(final String line) { + // if newer version of the segment metadata(based on version value in the property configuration header) + // skip the regex based parsing of the line content and splitting the content based on first occurrence of separator + if (!_skipUnescapePropertyName && getCommentLines().size() > 0) { + setSkipUnescapePropertyNameFlag(); + } + + if (_skipUnescapePropertyName) { + String[] keyValue = line.split(getPropertySeparator()); + Preconditions.checkArgument(keyValue.length == 2, "property content split should result in key and value"); + initPropertyName(keyValue[0]); + initPropertyValue(keyValue[1]); + initPropertySeparator(getPropertySeparator()); + } else { + // for backward compatability, follow the default approach + super.parseProperty(line); + } + } + + @Override + protected String unescapePropertyName(final String name) { + // skip the unescaping of the propertyName(key), if newer version of the segment metadata. + if (_skipUnescapePropertyName) { + return name; + } + return super.unescapePropertyName(name); + } + + // set the `_skipUnescapePropertyName` as true if the header comment line contains the segment metadata version. + private void setSkipUnescapePropertyNameFlag() { + List<String> commentLines = getCommentLines(); + if (commentLines.size() > 0) { + // assumes that header will have two lines + // first one with segment version header + // and second as a new line. + String headerComment = commentLines.get(0); + if (headerComment.contains(_segmentMetadataVersionHeader)) { Review Comment: format? and why need to assume there are `two lines`? looks like we just use the 1st line ########## pinot-spi/src/test/resources/segment-metadata-with-version-header.properties: ########## @@ -0,0 +1,125 @@ +# segment.metadata.version=version1 Review Comment: how did this header/comment line get written to the file? I must have missed it as I didn't notice any logic related to writing out this line in the SegmentMetadataPropertyWriter class ########## pinot-spi/src/main/java/org/apache/pinot/spi/env/PropertyIOFactoryKind.java: ########## @@ -0,0 +1,25 @@ +/** + * 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.pinot.spi.env; + +public enum PropertyIOFactoryKind { Review Comment: We probably don't need to explicitly define the 3 IO factory kinds. The util methods in the CommonsConfigurationFile class has specific helper methods for different cases, so we can just create the specific IO kind inside the util 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. To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org 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
