This is an automated email from the ASF dual-hosted git repository.
lzljs3620320 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-paimon.git
The following commit(s) were added to refs/heads/master by this push:
new b221799dc [hotfix] Refactor some code style
b221799dc is described below
commit b221799dc9c7393753aa1091bf973ee9ad8f1abd
Author: Jingsong <[email protected]>
AuthorDate: Thu Aug 17 13:41:09 2023 +0800
[hotfix] Refactor some code style
---
.../main/java/org/apache/paimon/schema/IndexCastMapping.java | 1 +
.../main/java/org/apache/paimon/schema/SchemaManager.java | 4 ++--
.../main/java/org/apache/paimon/schema/SchemaValidation.java | 12 ++++++------
.../org/apache/paimon/sort/BinaryExternalSortBuffer.java | 2 +-
.../java/org/apache/paimon/sort/BinaryMergeIterator.java | 8 ++++----
.../src/main/java/org/apache/paimon/sort/HeapSort.java | 1 -
6 files changed, 14 insertions(+), 14 deletions(-)
diff --git
a/paimon-core/src/main/java/org/apache/paimon/schema/IndexCastMapping.java
b/paimon-core/src/main/java/org/apache/paimon/schema/IndexCastMapping.java
index 03a3778ec..b466d2f97 100644
--- a/paimon-core/src/main/java/org/apache/paimon/schema/IndexCastMapping.java
+++ b/paimon-core/src/main/java/org/apache/paimon/schema/IndexCastMapping.java
@@ -24,6 +24,7 @@ import javax.annotation.Nullable;
/** Class includes index mapping and cast mapping. */
public interface IndexCastMapping {
+
@Nullable
int[] getIndexMapping();
diff --git
a/paimon-core/src/main/java/org/apache/paimon/schema/SchemaManager.java
b/paimon-core/src/main/java/org/apache/paimon/schema/SchemaManager.java
index 2adee62ba..739abf118 100644
--- a/paimon-core/src/main/java/org/apache/paimon/schema/SchemaManager.java
+++ b/paimon-core/src/main/java/org/apache/paimon/schema/SchemaManager.java
@@ -137,7 +137,7 @@ public class SchemaManager implements Serializable {
}
String pk = options.get(CoreOptions.PRIMARY_KEY.key());
primaryKeys = Arrays.asList(pk.split(","));
- boolean exists =
primaryKeys.stream().allMatch(columnNames::contains);
+ boolean exists = columnNames.containsAll(primaryKeys);
if (!exists) {
throw new RuntimeException(
String.format(
@@ -154,7 +154,7 @@ public class SchemaManager implements Serializable {
}
String partitions = options.get(CoreOptions.PARTITION.key());
partitionKeys = Arrays.asList(partitions.split(","));
- boolean exists =
partitionKeys.stream().allMatch(columnNames::contains);
+ boolean exists = columnNames.containsAll(partitionKeys);
if (!exists) {
throw new RuntimeException(
String.format(
diff --git
a/paimon-core/src/main/java/org/apache/paimon/schema/SchemaValidation.java
b/paimon-core/src/main/java/org/apache/paimon/schema/SchemaValidation.java
index dd5929376..c9a99bf60 100644
--- a/paimon-core/src/main/java/org/apache/paimon/schema/SchemaValidation.java
+++ b/paimon-core/src/main/java/org/apache/paimon/schema/SchemaValidation.java
@@ -355,21 +355,21 @@ public class SchemaValidation {
List<DataField> fields = schema.fields();
- for (int i = 0; i < fields.size(); i++) {
- DataField dataField = fields.get(i);
- String defaultValueStr = defaultValues.get(dataField.name());
+ for (DataField field : fields) {
+ String defaultValueStr = defaultValues.get(field.name());
if (defaultValueStr == null) {
continue;
}
+ @SuppressWarnings("unchecked")
CastExecutor<Object, Object> resolve =
(CastExecutor<Object, Object>)
- CastExecutors.resolve(VarCharType.STRING_TYPE,
dataField.type());
+ CastExecutors.resolve(VarCharType.STRING_TYPE,
field.type());
if (resolve == null) {
throw new IllegalArgumentException(
String.format(
"The column %s with datatype %s is
currently not supported for default value.",
- dataField.name(),
dataField.type().asSQLString()));
+ field.name(), field.type().asSQLString()));
}
try {
@@ -378,7 +378,7 @@ public class SchemaValidation {
throw new IllegalArgumentException(
String.format(
"The default value %s of the column %s can
not be cast to datatype: %s",
- defaultValueStr, dataField.name(),
dataField.type()),
+ defaultValueStr, field.name(),
field.type()),
e);
}
}
diff --git
a/paimon-core/src/main/java/org/apache/paimon/sort/BinaryExternalSortBuffer.java
b/paimon-core/src/main/java/org/apache/paimon/sort/BinaryExternalSortBuffer.java
index 55df6205e..a7593930f 100644
---
a/paimon-core/src/main/java/org/apache/paimon/sort/BinaryExternalSortBuffer.java
+++
b/paimon-core/src/main/java/org/apache/paimon/sort/BinaryExternalSortBuffer.java
@@ -74,7 +74,7 @@ public class BinaryExternalSortBuffer implements SortBuffer {
pageSize,
maxNumFileHandles,
channelManager,
- (BinaryRowSerializer) serializer.duplicate(),
+ serializer.duplicate(),
comparator,
compressionCodecFactory,
compressionBlockSize);
diff --git
a/paimon-core/src/main/java/org/apache/paimon/sort/BinaryMergeIterator.java
b/paimon-core/src/main/java/org/apache/paimon/sort/BinaryMergeIterator.java
index 26d722924..dee125738 100644
--- a/paimon-core/src/main/java/org/apache/paimon/sort/BinaryMergeIterator.java
+++ b/paimon-core/src/main/java/org/apache/paimon/sort/BinaryMergeIterator.java
@@ -57,7 +57,7 @@ public class BinaryMergeIterator<Entry> implements
MutableObjectIterator<Entry>
@Override
public Entry next() throws IOException {
if (currHead != null) {
- if (!currHead.nextHead()) {
+ if (currHead.noMoreHead()) {
this.heap.poll();
} else {
this.heap.adjustTop();
@@ -80,7 +80,7 @@ public class BinaryMergeIterator<Entry> implements
MutableObjectIterator<Entry>
private HeadStream(MutableObjectIterator<Entry> iterator, Entry head)
throws IOException {
this.iterator = iterator;
this.head = head;
- if (!nextHead()) {
+ if (noMoreHead()) {
throw new IllegalStateException();
}
}
@@ -89,8 +89,8 @@ public class BinaryMergeIterator<Entry> implements
MutableObjectIterator<Entry>
return this.head;
}
- private boolean nextHead() throws IOException {
- return (this.head = this.iterator.next(head)) != null;
+ private boolean noMoreHead() throws IOException {
+ return (this.head = this.iterator.next(head)) == null;
}
}
}
diff --git a/paimon-core/src/main/java/org/apache/paimon/sort/HeapSort.java
b/paimon-core/src/main/java/org/apache/paimon/sort/HeapSort.java
index 88c5c94df..554c8c54f 100644
--- a/paimon-core/src/main/java/org/apache/paimon/sort/HeapSort.java
+++ b/paimon-core/src/main/java/org/apache/paimon/sort/HeapSort.java
@@ -25,7 +25,6 @@ package org.apache.paimon.sort;
* additional information regarding copyright ownership.
*/
public final class HeapSort implements IndexedSorter {
- public HeapSort() {}
private static void downHeap(final IndexedSortable s, final int b, int i,
final int n) {
for (int idx = i << 1; idx < n; idx = i << 1) {
