Skip to content

Commit ed55822

Browse files
committed
PARQUET-430
1 parent 30ee10d commit ed55822

File tree

5 files changed

+15
-9
lines changed

5 files changed

+15
-9
lines changed

parquet-column/src/main/java/org/apache/parquet/filter2/predicate/Operators.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
package org.apache.parquet.filter2.predicate;
2020

2121
import java.io.Serializable;
22+
import java.util.Locale;
2223

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

132-
String name = getClass().getSimpleName().toLowerCase();
133+
String name = getClass().getSimpleName().toLowerCase(Locale.ENGLISH);
133134
this.toString = name + "(" + column.getColumnPath().toDotString() + ", " + value + ")";
134135
}
135136

@@ -258,7 +259,7 @@ private static abstract class BinaryLogicalFilterPredicate implements FilterPred
258259
protected BinaryLogicalFilterPredicate(FilterPredicate left, FilterPredicate right) {
259260
this.left = checkNotNull(left, "left");
260261
this.right = checkNotNull(right, "right");
261-
String name = getClass().getSimpleName().toLowerCase();
262+
String name = getClass().getSimpleName().toLowerCase(Locale.ENGLISH);
262263
this.toString = name + "(" + left + ", " + right + ")";
263264
}
264265

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

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

parquet-column/src/main/java/org/apache/parquet/schema/GroupType.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import java.util.Arrays;
2525
import java.util.HashMap;
2626
import java.util.List;
27+
import java.util.Locale;
2728
import java.util.Map;
2829

2930
import org.apache.parquet.io.InvalidRecordException;
@@ -208,7 +209,7 @@ void membersDisplayString(StringBuilder sb, String indent) {
208209
@Override
209210
public void writeToStringBuilder(StringBuilder sb, String indent) {
210211
sb.append(indent)
211-
.append(getRepetition().name().toLowerCase())
212+
.append(getRepetition().name().toLowerCase(Locale.ENGLISH))
212213
.append(" group ")
213214
.append(getName())
214215
.append(getOriginalType() == null ? "" : " (" + getOriginalType() +")")

parquet-column/src/main/java/org/apache/parquet/schema/MessageTypeParser.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
package org.apache.parquet.schema;
2020

2121
import java.util.Arrays;
22+
import java.util.Locale;
2223
import java.util.StringTokenizer;
2324

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

196197
private static PrimitiveTypeName asPrimitive(String t, Tokenizer st) {
197198
try {
198-
return PrimitiveTypeName.valueOf(t.toUpperCase());
199+
return PrimitiveTypeName.valueOf(t.toUpperCase(Locale.ENGLISH));
199200
} catch (IllegalArgumentException e) {
200201
throw new IllegalArgumentException("expected one of " + Arrays.toString(PrimitiveTypeName.values()) +" got " + t + " at " + st.getLocationString(), e);
201202
}
202203
}
203204

204205
private static Repetition asRepetition(String t, Tokenizer st) {
205206
try {
206-
return Repetition.valueOf(t.toUpperCase());
207+
return Repetition.valueOf(t.toUpperCase(Locale.ENGLISH));
207208
} catch (IllegalArgumentException e) {
208209
throw new IllegalArgumentException("expected one of " + Arrays.toString(Repetition.values()) +" got " + t + " at " + st.getLocationString(), e);
209210
}

parquet-column/src/main/java/org/apache/parquet/schema/PrimitiveType.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
import java.util.Arrays;
2222
import java.util.List;
23+
import java.util.Locale;
2324

2425
import org.apache.parquet.column.ColumnReader;
2526
import org.apache.parquet.io.InvalidRecordException;
@@ -394,7 +395,7 @@ public void accept(TypeVisitor visitor) {
394395
@Override
395396
public void writeToStringBuilder(StringBuilder sb, String indent) {
396397
sb.append(indent)
397-
.append(getRepetition().name().toLowerCase())
398+
.append(getRepetition().name().toLowerCase(Locale.ENGLISH))
398399
.append(" ")
399400
.append(primitive.name().toLowerCase());
400401
if (primitive == PrimitiveTypeName.FIXED_LEN_BYTE_ARRAY) {

parquet-hadoop/src/main/java/org/apache/parquet/hadoop/metadata/CompressionCodecName.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
import org.apache.parquet.format.CompressionCodec;
2222
import org.apache.parquet.hadoop.codec.CompressionCodecNotSupportedException;
2323

24+
import java.util.Locale;
25+
2426
public enum CompressionCodecName {
2527
UNCOMPRESSED(null, CompressionCodec.UNCOMPRESSED, ""),
2628
SNAPPY("org.apache.parquet.hadoop.codec.SnappyCodec", CompressionCodec.SNAPPY, ".snappy"),
@@ -31,7 +33,7 @@ public static CompressionCodecName fromConf(String name) {
3133
if (name == null) {
3234
return UNCOMPRESSED;
3335
}
34-
return valueOf(name.toUpperCase());
36+
return valueOf(name.toUpperCase(Locale.ENGLISH));
3537
}
3638

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

0 commit comments

Comments
 (0)