Skip to content

PARQUET-430: Change to use Locale parameterized version of String.toUpperCase()/toLowerCase #312

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
lw-lin wants to merge 1 commit into from
Closed

PARQUET-430: Change to use Locale parameterized version of String.toUpperCase()/toLowerCase #312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions parquet-column/src/main/java/org/apache/parquet/filter2/predicate/Operators.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
package org.apache.parquet.filter2.predicate;

import java.io.Serializable;
import java.util.Locale;

import org.apache.parquet.hadoop.metadata.ColumnPath;
import org.apache.parquet.io.api.Binary;
Expand Down Expand Up @@ -129,7 +130,7 @@ protected ColumnFilterPredicate(Column<T> column, T value) {
// null in their own constructors.
this.value = value;

String name = getClass().getSimpleName().toLowerCase();
String name = getClass().getSimpleName().toLowerCase(Locale.ENGLISH);
this.toString = name + "(" + column.getColumnPath().toDotString() + ", " + value + ")";
}

Expand Down Expand Up @@ -258,7 +259,7 @@ private static abstract class BinaryLogicalFilterPredicate implements FilterPred
protected BinaryLogicalFilterPredicate(FilterPredicate left, FilterPredicate right) {
this.left = checkNotNull(left, "left");
this.right = checkNotNull(right, "right");
String name = getClass().getSimpleName().toLowerCase();
String name = getClass().getSimpleName().toLowerCase(Locale.ENGLISH);
this.toString = name + "(" + left + ", " + right + ")";
}

Expand Down Expand Up @@ -386,7 +387,7 @@ public static final class UserDefinedByClass<T extends Comparable<T>, U extends
UserDefinedByClass(Column<T> column, Class<U> udpClass) {
super(column);
this.udpClass = checkNotNull(udpClass, "udpClass");
String name = getClass().getSimpleName().toLowerCase();
String name = getClass().getSimpleName().toLowerCase(Locale.ENGLISH);
this.toString = name + "(" + column.getColumnPath().toDotString() + ", " + udpClass.getName() + ")";

// defensively try to instantiate the class early to make sure that it's possible
Expand Down Expand Up @@ -442,7 +443,7 @@ public static final class UserDefinedByInstance<T extends Comparable<T>, U exten
UserDefinedByInstance(Column<T> column, U udpInstance) {
super(column);
this.udpInstance = checkNotNull(udpInstance, "udpInstance");
String name = getClass().getSimpleName().toLowerCase();
String name = getClass().getSimpleName().toLowerCase(Locale.ENGLISH);
this.toString = name + "(" + column.getColumnPath().toDotString() + ", " + udpInstance + ")";
}

Expand Down
3 changes: 2 additions & 1 deletion parquet-column/src/main/java/org/apache/parquet/schema/GroupType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;

import org.apache.parquet.io.InvalidRecordException;
Expand Down Expand Up @@ -208,7 +209,7 @@ void membersDisplayString(StringBuilder sb, String indent) {
@Override
public void writeToStringBuilder(StringBuilder sb, String indent) {
sb.append(indent)
.append(getRepetition().name().toLowerCase())
.append(getRepetition().name().toLowerCase(Locale.ENGLISH))
.append(" group ")
.append(getName())
.append(getOriginalType() == null ? "" : " (" + getOriginalType() +")")
Expand Down
5 changes: 3 additions & 2 deletions parquet-column/src/main/java/org/apache/parquet/schema/MessageTypeParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
package org.apache.parquet.schema;

import java.util.Arrays;
import java.util.Locale;
import java.util.StringTokenizer;

import org.apache.parquet.Log;
Expand Down Expand Up @@ -195,15 +196,15 @@ private static void addPrimitiveType(Tokenizer st, PrimitiveTypeName type, Repet

private static PrimitiveTypeName asPrimitive(String t, Tokenizer st) {
try {
return PrimitiveTypeName.valueOf(t.toUpperCase());
return PrimitiveTypeName.valueOf(t.toUpperCase(Locale.ENGLISH));
} catch (IllegalArgumentException e) {
throw new IllegalArgumentException("expected one of " + Arrays.toString(PrimitiveTypeName.values()) +" got " + t + " at " + st.getLocationString(), e);
}
}

private static Repetition asRepetition(String t, Tokenizer st) {
try {
return Repetition.valueOf(t.toUpperCase());
return Repetition.valueOf(t.toUpperCase(Locale.ENGLISH));
} catch (IllegalArgumentException e) {
throw new IllegalArgumentException("expected one of " + Arrays.toString(Repetition.values()) +" got " + t + " at " + st.getLocationString(), e);
}
Expand Down
3 changes: 2 additions & 1 deletion parquet-column/src/main/java/org/apache/parquet/schema/PrimitiveType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

import java.util.Arrays;
import java.util.List;
import java.util.Locale;

import org.apache.parquet.column.ColumnReader;
import org.apache.parquet.io.InvalidRecordException;
Expand Down Expand Up @@ -394,7 +395,7 @@ public void accept(TypeVisitor visitor) {
@Override
public void writeToStringBuilder(StringBuilder sb, String indent) {
sb.append(indent)
.append(getRepetition().name().toLowerCase())
.append(getRepetition().name().toLowerCase(Locale.ENGLISH))
.append(" ")
.append(primitive.name().toLowerCase());
if (primitive == PrimitiveTypeName.FIXED_LEN_BYTE_ARRAY) {
Expand Down
4 changes: 3 additions & 1 deletion parquet-hadoop/src/main/java/org/apache/parquet/hadoop/metadata/CompressionCodecName.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
import org.apache.parquet.format.CompressionCodec;
import org.apache.parquet.hadoop.codec.CompressionCodecNotSupportedException;

import java.util.Locale;

public enum CompressionCodecName {
UNCOMPRESSED(null, CompressionCodec.UNCOMPRESSED, ""),
SNAPPY("org.apache.parquet.hadoop.codec.SnappyCodec", CompressionCodec.SNAPPY, ".snappy"),
Expand All @@ -31,7 +33,7 @@ public static CompressionCodecName fromConf(String name) {
if (name == null) {
return UNCOMPRESSED;
}
return valueOf(name.toUpperCase());
return valueOf(name.toUpperCase(Locale.ENGLISH));
}

public static CompressionCodecName fromCompressionCodec(Class<?> clazz) {
Expand Down