This is an automated email from the ASF dual-hosted git repository.
siddteotia pushed a commit to branch jia-hotfix
in repository https://gitbox.apache.org/repos/asf/pinot.git
The following commit(s) were added to refs/heads/jia-hotfix by this push:
new 61497ca854 Refactor padding check to support old segments with
"\\u0000" padding (#10276) (#10282)
61497ca854 is described below
commit 61497ca854fe42bf260c5aca4740b1e9692a6ef7
Author: Jia Guo <jia...@linkedin.com>
AuthorDate: Tue Feb 14 11:02:07 2023 -0800
Refactor padding check to support old segments with "\\u0000" padding
(#10276) (#10282)
(cherry picked from commit f4fad9b1cdc47a0dab9dd4930d2db8052d4390f5)
---
.../apache/pinot/segment/spi/index/metadata/ColumnMetadataImpl.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git
a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/metadata/ColumnMetadataImpl.java
b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/metadata/ColumnMetadataImpl.java
index dec639198b..86cce8615d 100644
---
a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/metadata/ColumnMetadataImpl.java
+++
b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/metadata/ColumnMetadataImpl.java
@@ -30,6 +30,7 @@ import java.util.concurrent.TimeUnit;
import javax.annotation.Nullable;
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.PropertiesConfiguration;
+import org.apache.commons.lang.StringEscapeUtils;
import org.apache.pinot.segment.spi.ColumnMetadata;
import org.apache.pinot.segment.spi.V1Constants;
import org.apache.pinot.segment.spi.V1Constants.MetadataKeys.Column;
@@ -290,8 +291,8 @@ public class ColumnMetadataImpl implements ColumnMetadata {
// Only support zero padding
String padding = config.getString(Segment.SEGMENT_PADDING_CHARACTER, null);
-
Preconditions.checkState(String.valueOf(V1Constants.Str.DEFAULT_STRING_PAD_CHAR).equals(padding),
- "Got non-zero string padding: %s", padding);
+
Preconditions.checkState(String.valueOf(V1Constants.Str.DEFAULT_STRING_PAD_CHAR)
+ .equals(StringEscapeUtils.unescapeJava(padding)), "Got non-zero string
padding: %s", padding);
String partitionFunctionName = config.getString(Column.getKeyFor(column,
Column.PARTITION_FUNCTION), null);
if (partitionFunctionName != null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org
For additional commands, e-mail: commits-h...@pinot.apache.org
