You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@orc.apache.org by wi...@apache.org on 2022/07/23 06:40:38 UTC
[orc] branch main updated: ORC-1219: Remove redundant `toString`
This is an automated email from the ASF dual-hosted git repository.
william pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/orc.git
The following commit(s) were added to refs/heads/main by this push:
new a61d5e96f ORC-1219: Remove redundant `toString`
a61d5e96f is described below
commit a61d5e96f9ae01a7c35362b0bb570965322636a5
Author: Luning Wang <wa...@gmail.com>
AuthorDate: Fri Jul 22 23:39:59 2022 -0700
ORC-1219: Remove redundant `toString`
### What changes were proposed in this pull request?
This PR aims to clean up redundant `toString` invocation style.
ORC-1219 will be assigned to deadwind4 .
### Why are the changes needed?
Simple clean ups.
### How was this patch tested?
Pass the CIs.
Closes #1181
Closes #1185 from dongjoon-hyun/ORC-1219.
Lead-authored-by: Luning Wang <wa...@gmail.com>
Co-authored-by: Dongjoon Hyun <do...@apache.org>
Signed-off-by: William Hyun <wi...@apache.org>
---
java/core/src/java/org/apache/orc/Reader.java | 2 +-
java/core/src/java/org/apache/orc/impl/OutStream.java | 13 +++++--------
java/core/src/java/org/apache/orc/impl/ParserUtils.java | 4 ++--
.../src/java/org/apache/orc/impl/RecordReaderUtils.java | 2 +-
java/core/src/java/org/apache/orc/impl/SchemaEvolution.java | 4 ++--
java/core/src/java/org/apache/orc/util/BloomFilter.java | 2 +-
java/tools/src/java/org/apache/orc/tools/FileDump.java | 8 ++++----
java/tools/src/java/org/apache/orc/tools/PrintData.java | 3 +--
java/tools/src/java/org/apache/orc/tools/json/HiveType.java | 2 +-
.../java/org/apache/orc/tools/json/JsonSchemaFinder.java | 2 +-
.../test/org/apache/orc/tools/convert/TestJsonReader.java | 12 ++++++------
11 files changed, 25 insertions(+), 29 deletions(-)
diff --git a/java/core/src/java/org/apache/orc/Reader.java b/java/core/src/java/org/apache/orc/Reader.java
index eb1515bfe..2ef805ab6 100644
--- a/java/core/src/java/org/apache/orc/Reader.java
+++ b/java/core/src/java/org/apache/orc/Reader.java
@@ -611,7 +611,7 @@ public interface Reader extends Closeable {
buffer.append(length);
if (sarg != null) {
buffer.append(", sarg: ");
- buffer.append(sarg.toString());
+ buffer.append(sarg);
}
if (schema != null) {
buffer.append(", schema: ");
diff --git a/java/core/src/java/org/apache/orc/impl/OutStream.java b/java/core/src/java/org/apache/orc/impl/OutStream.java
index 45e636e9e..d71b558b6 100644
--- a/java/core/src/java/org/apache/orc/impl/OutStream.java
+++ b/java/core/src/java/org/apache/orc/impl/OutStream.java
@@ -131,11 +131,9 @@ public class OutStream extends PositionedOutputStream {
try {
cipher.init(Cipher.ENCRYPT_MODE, key, new IvParameterSpec(iv));
} catch (InvalidKeyException e) {
- throw new IllegalStateException("ORC bad encryption key for " +
- toString(), e);
+ throw new IllegalStateException("ORC bad encryption key for " + this, e);
} catch (InvalidAlgorithmParameterException e) {
- throw new IllegalStateException("ORC bad encryption parameter for " +
- toString(), e);
+ throw new IllegalStateException("ORC bad encryption parameter for " + this, e);
}
}
@@ -154,10 +152,10 @@ public class OutStream extends PositionedOutputStream {
receiver.output(output);
if (encrypted != len) {
throw new IllegalArgumentException("Encryption of incomplete buffer "
- + len + " -> " + encrypted + " in " + toString());
+ + len + " -> " + encrypted + " in " + this);
}
} catch (ShortBufferException e) {
- throw new IOException("Short buffer in encryption in " + toString(), e);
+ throw new IOException("Short buffer in encryption in " + this, e);
}
} else {
receiver.output(buffer);
@@ -172,8 +170,7 @@ public class OutStream extends PositionedOutputStream {
try {
byte[] finalBytes = cipher.doFinal();
if (finalBytes != null && finalBytes.length != 0) {
- throw new IllegalStateException("We shouldn't have remaining bytes " +
- toString());
+ throw new IllegalStateException("We shouldn't have remaining bytes " + this);
}
} catch (IllegalBlockSizeException e) {
throw new IllegalArgumentException("Bad block size", e);
diff --git a/java/core/src/java/org/apache/orc/impl/ParserUtils.java b/java/core/src/java/org/apache/orc/impl/ParserUtils.java
index 15cbc3802..6491fb8ba 100644
--- a/java/core/src/java/org/apache/orc/impl/ParserUtils.java
+++ b/java/core/src/java/org/apache/orc/impl/ParserUtils.java
@@ -387,7 +387,7 @@ public class ParserUtils {
}
} catch (NumberFormatException e) {
throw new IllegalArgumentException("Field " + first +
- "not found in " + current.toString(), e);
+ "not found in " + current, e);
}
break;
}
@@ -396,7 +396,7 @@ public class ParserUtils {
}
if (posn < 0) {
throw new IllegalArgumentException("Field " + first +
- " not found in " + current.toString());
+ " not found in " + current);
}
current = current.getChildren().get(posn);
visitor.visit(current, posn);
diff --git a/java/core/src/java/org/apache/orc/impl/RecordReaderUtils.java b/java/core/src/java/org/apache/orc/impl/RecordReaderUtils.java
index 19902d299..58eca6387 100644
--- a/java/core/src/java/org/apache/orc/impl/RecordReaderUtils.java
+++ b/java/core/src/java/org/apache/orc/impl/RecordReaderUtils.java
@@ -304,7 +304,7 @@ public class RecordReaderUtils {
buffer.append("{");
}
isFirst = false;
- buffer.append(range.toString());
+ buffer.append(range);
buffer.append("}");
range = range.next;
}
diff --git a/java/core/src/java/org/apache/orc/impl/SchemaEvolution.java b/java/core/src/java/org/apache/orc/impl/SchemaEvolution.java
index cb35f2af9..60aeba536 100644
--- a/java/core/src/java/org/apache/orc/impl/SchemaEvolution.java
+++ b/java/core/src/java/org/apache/orc/impl/SchemaEvolution.java
@@ -565,8 +565,8 @@ public class SchemaEvolution {
throw new IllegalEvolutionException(
String.format("ORC does not support type conversion from file" +
" type %s (%d) to reader type %s (%d)",
- fileType.toString(), fileType.getId(),
- readerType.toString(), readerType.getId()));
+ fileType, fileType.getId(),
+ readerType, readerType.getId()));
}
}
diff --git a/java/core/src/java/org/apache/orc/util/BloomFilter.java b/java/core/src/java/org/apache/orc/util/BloomFilter.java
index 3aa12ec28..32429436d 100644
--- a/java/core/src/java/org/apache/orc/util/BloomFilter.java
+++ b/java/core/src/java/org/apache/orc/util/BloomFilter.java
@@ -238,7 +238,7 @@ public class BloomFilter {
this.bitSet.putAll(that.bitSet);
} else {
throw new IllegalArgumentException("BloomFilters are not compatible for merging." +
- " this - " + this.toString() + " that - " + that.toString());
+ " this - " + this + " that - " + that);
}
}
diff --git a/java/tools/src/java/org/apache/orc/tools/FileDump.java b/java/tools/src/java/org/apache/orc/tools/FileDump.java
index abd82d925..d4d00d2fd 100644
--- a/java/tools/src/java/org/apache/orc/tools/FileDump.java
+++ b/java/tools/src/java/org/apache/orc/tools/FileDump.java
@@ -289,7 +289,7 @@ public final class FileDump {
buffer.append(' ');
buffer.append(file);
}
- System.err.println(buffer.toString());
+ System.err.println(buffer);
System.out.println(SEPARATOR);
}
}
@@ -386,9 +386,9 @@ public final class FileDump {
if (tz == null || tz.isEmpty()) {
tz = UNKNOWN;
}
- System.out.println(" Stripe: " + stripe.toString() + " timezone: " + tz);
+ System.out.println(" Stripe: " + stripe + " timezone: " + tz);
} else {
- System.out.println(" Stripe: " + stripe.toString());
+ System.out.println(" Stripe: " + stripe);
}
long sectionStart = stripeStart;
for (OrcProto.Stream section : footer.getStreamsList()) {
@@ -755,7 +755,7 @@ public final class FileDump {
ColumnStatisticsImpl.deserialize(colSchema, colStats,
reader.writerUsedProlepticGregorian(),
reader.getConvertToProlepticGregorian());
- buf.append(cs.toString());
+ buf.append(cs);
}
buf.append(" positions: ");
for (int posIx = 0; posIx < entry.getPositionsCount(); ++posIx) {
diff --git a/java/tools/src/java/org/apache/orc/tools/PrintData.java b/java/tools/src/java/org/apache/orc/tools/PrintData.java
index dc33b7dbb..2846166ca 100644
--- a/java/tools/src/java/org/apache/orc/tools/PrintData.java
+++ b/java/tools/src/java/org/apache/orc/tools/PrintData.java
@@ -172,8 +172,7 @@ public class PrintData {
printUnion(writer, (UnionColumnVector) vector, schema, row);
break;
default:
- throw new IllegalArgumentException("Unknown type " +
- schema.toString());
+ throw new IllegalArgumentException("Unknown type " + schema);
}
} else {
writer.nullValue();
diff --git a/java/tools/src/java/org/apache/orc/tools/json/HiveType.java b/java/tools/src/java/org/apache/orc/tools/json/HiveType.java
index 609e3b2c3..82a949aa1 100644
--- a/java/tools/src/java/org/apache/orc/tools/json/HiveType.java
+++ b/java/tools/src/java/org/apache/orc/tools/json/HiveType.java
@@ -89,7 +89,7 @@ abstract class HiveType {
* @param prefix the prefix to add to each field name
*/
public void printFlat(PrintStream out, String prefix) {
- out.println(prefix + ": " + toString());
+ out.println(prefix + ": " + this);
}
public abstract TypeDescription getSchema();
diff --git a/java/tools/src/java/org/apache/orc/tools/json/JsonSchemaFinder.java b/java/tools/src/java/org/apache/orc/tools/json/JsonSchemaFinder.java
index 3a1c9149c..358eb21a5 100644
--- a/java/tools/src/java/org/apache/orc/tools/json/JsonSchemaFinder.java
+++ b/java/tools/src/java/org/apache/orc/tools/json/JsonSchemaFinder.java
@@ -174,7 +174,7 @@ public class JsonSchemaFinder {
if (type == null) {
out.print("void");
} else if (type.kind.isPrimitive) {
- out.print(type.toString());
+ out.print(type);
} else {
switch (type.kind) {
case STRUCT:
diff --git a/java/tools/src/test/org/apache/orc/tools/convert/TestJsonReader.java b/java/tools/src/test/org/apache/orc/tools/convert/TestJsonReader.java
index ef385db1f..17c688c16 100644
--- a/java/tools/src/test/org/apache/orc/tools/convert/TestJsonReader.java
+++ b/java/tools/src/test/org/apache/orc/tools/convert/TestJsonReader.java
@@ -89,9 +89,9 @@ public class TestJsonReader {
public void testDateTypeSupport() throws IOException {
LocalDate date1 = LocalDate.of(2021, 1, 18);
LocalDate date2 = LocalDate.now();
- String inputString = "{\"dt\": \"" + date1.toString() + "\"}\n" +
- "{\"dt\": \"" + date2.toString() + "\"}\n" +
- "{\"dt\": \"" + date2.toString() + "\"}\n" +
+ String inputString = "{\"dt\": \"" + date1 + "\"}\n" +
+ "{\"dt\": \"" + date2 + "\"}\n" +
+ "{\"dt\": \"" + date2 + "\"}\n" +
"{\"dt\": null}";
@@ -123,9 +123,9 @@ public class TestJsonReader {
String datetime4Str = datetime4.toString();
datetime4Str = datetime4Str.substring(0, datetime4Str.length() - 5) + "0700";
- String inputString = "{\"dt\": \"" + datetime1.toString() + "\"}\n" +
- "{\"dt\": \"" + datetime2.toString() + "\"}\n" +
- "{\"dt\": \"" + datetime3.toString() + "\"}\n" +
+ String inputString = "{\"dt\": \"" + datetime1 + "\"}\n" +
+ "{\"dt\": \"" + datetime2 + "\"}\n" +
+ "{\"dt\": \"" + datetime3 + "\"}\n" +
"{\"dt\": \"" + datetime4Str + "\"}\n" +
"{\"dt\": \"" + datetime5.toLocalDateTime().toString() + "[" + datetime5.getZone() + "]\"}\n" +
"{\"dt\": \"" + datetime6.toLocalDateTime().toString() + "[" + datetime6.getZone() + "]\"}\n";