You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iceberg.apache.org by bl...@apache.org on 2019/06/22 23:51:30 UTC
[incubator-iceberg] branch master updated: Remove usage of
deprecated Schema.Field constructor (#231) (#231)
This is an automated email from the ASF dual-hosted git repository.
blue pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-iceberg.git
The following commit(s) were added to refs/heads/master by this push:
new 6075753 Remove usage of deprecated Schema.Field constructor (#231) (#231)
6075753 is described below
commit 6075753b34f6e6d6bdb8872359e4444e881ac34c
Author: David Phillips <da...@acz.org>
AuthorDate: Sat Jun 22 16:51:26 2019 -0700
Remove usage of deprecated Schema.Field constructor (#231) (#231)
Without the cast, the deprecated variant that takes JsonNode is
chosen by Java's overload resolution because it is "more specific".
---
core/src/main/java/org/apache/iceberg/avro/AvroSchemaUtil.java | 4 ++--
core/src/main/java/org/apache/iceberg/util/Pair.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/core/src/main/java/org/apache/iceberg/avro/AvroSchemaUtil.java b/core/src/main/java/org/apache/iceberg/avro/AvroSchemaUtil.java
index e9cc5ca..3ae089b 100644
--- a/core/src/main/java/org/apache/iceberg/avro/AvroSchemaUtil.java
+++ b/core/src/main/java/org/apache/iceberg/avro/AvroSchemaUtil.java
@@ -158,7 +158,7 @@ public class AvroSchemaUtil {
int valueId, Schema valueSchema) {
String keyValueName = "k" + keyId + "_v" + valueId;
- Schema.Field keyField = new Schema.Field("key", keySchema, null, null);
+ Schema.Field keyField = new Schema.Field("key", keySchema, null, (Object) null);
keyField.addProp(FIELD_ID_PROP, keyId);
Schema.Field valueField = new Schema.Field("value", valueSchema, null,
@@ -174,7 +174,7 @@ public class AvroSchemaUtil {
int valueId, String valueName, Schema valueSchema) {
String keyValueName = "k" + keyId + "_v" + valueId;
- Schema.Field keyField = new Schema.Field("key", keySchema, null, null);
+ Schema.Field keyField = new Schema.Field("key", keySchema, null, (Object) null);
if (!"key".equals(keyName)) {
keyField.addAlias(keyName);
}
diff --git a/core/src/main/java/org/apache/iceberg/util/Pair.java b/core/src/main/java/org/apache/iceberg/util/Pair.java
index 3a1a0af..633e1a0 100644
--- a/core/src/main/java/org/apache/iceberg/util/Pair.java
+++ b/core/src/main/java/org/apache/iceberg/util/Pair.java
@@ -44,8 +44,8 @@ public class Pair<X, Y> implements IndexedRecord, SpecificData.SchemaConstructab
Schema xSchema = ReflectData.get().getSchema(key.first);
Schema ySchema = ReflectData.get().getSchema(key.second);
return Schema.createRecord("pair", null, null, false, Lists.newArrayList(
- new Schema.Field("x", xSchema, null, null),
- new Schema.Field("y", ySchema, null, null)
+ new Schema.Field("x", xSchema, null, (Object) null),
+ new Schema.Field("y", ySchema, null, (Object) null)
));
}
});