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 2020/04/29 23:34:29 UTC
[incubator-iceberg] branch master updated: Add back deprecated
methods used by Presto (#986)
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 53c10a2 Add back deprecated methods used by Presto (#986)
53c10a2 is described below
commit 53c10a2df905be74c2d950989dcfef0147fc2480
Author: Ryan Blue <bl...@apache.org>
AuthorDate: Wed Apr 29 16:34:21 2020 -0700
Add back deprecated methods used by Presto (#986)
---
core/src/main/java/org/apache/iceberg/TableMetadata.java | 12 ++++++++++++
.../main/java/org/apache/iceberg/TableMetadataParser.java | 8 ++++++++
.../java/org/apache/iceberg/TableMetadataParserTest.java | 3 ++-
3 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/core/src/main/java/org/apache/iceberg/TableMetadata.java b/core/src/main/java/org/apache/iceberg/TableMetadata.java
index 1b1021f..5325ba2 100644
--- a/core/src/main/java/org/apache/iceberg/TableMetadata.java
+++ b/core/src/main/java/org/apache/iceberg/TableMetadata.java
@@ -48,6 +48,18 @@ public class TableMetadata {
static final int SUPPORTED_TABLE_FORMAT_VERSION = 2;
static final int INITIAL_SPEC_ID = 0;
+ /**
+ * @deprecated will be removed in 0.9.0; use newTableMetadata(Schema, PartitionSpec, String, Map) instead.
+ */
+ @Deprecated
+ public static TableMetadata newTableMetadata(TableOperations ops,
+ Schema schema,
+ PartitionSpec spec,
+ String location,
+ Map<String, String> properties) {
+ return newTableMetadata(schema, spec, location, properties, DEFAULT_TABLE_FORMAT_VERSION);
+ }
+
public static TableMetadata newTableMetadata(Schema schema,
PartitionSpec spec,
String location,
diff --git a/core/src/main/java/org/apache/iceberg/TableMetadataParser.java b/core/src/main/java/org/apache/iceberg/TableMetadataParser.java
index f746860..ed9d479 100644
--- a/core/src/main/java/org/apache/iceberg/TableMetadataParser.java
+++ b/core/src/main/java/org/apache/iceberg/TableMetadataParser.java
@@ -214,6 +214,14 @@ public class TableMetadataParser {
generator.writeEndObject();
}
+ /**
+ * @deprecated will be removed in 0.9.0; use read(FileIO, InputFile) instead.
+ */
+ @Deprecated
+ public static TableMetadata read(TableOperations ops, InputFile file) {
+ return read(ops.io(), file);
+ }
+
public static TableMetadata read(FileIO io, String path) {
return read(io, io.newInputFile(path));
}
diff --git a/core/src/test/java/org/apache/iceberg/TableMetadataParserTest.java b/core/src/test/java/org/apache/iceberg/TableMetadataParserTest.java
index a03a38a..f353989 100644
--- a/core/src/test/java/org/apache/iceberg/TableMetadataParserTest.java
+++ b/core/src/test/java/org/apache/iceberg/TableMetadataParserTest.java
@@ -30,6 +30,7 @@ import java.util.Map;
import java.util.zip.GZIPInputStream;
import java.util.zip.ZipException;
import org.apache.iceberg.TableMetadataParser.Codec;
+import org.apache.iceberg.io.FileIO;
import org.apache.iceberg.io.OutputFile;
import org.apache.iceberg.types.Types.BooleanType;
import org.junit.After;
@@ -74,7 +75,7 @@ public class TableMetadataParserTest {
TableMetadata metadata = newTableMetadata(SCHEMA, unpartitioned(), location, properties);
TableMetadataParser.write(metadata, outputFile);
Assert.assertEquals(codec == Codec.GZIP, isCompressed(fileName));
- TableMetadata actualMetadata = TableMetadataParser.read(null, Files.localInput(new File(fileName)));
+ TableMetadata actualMetadata = TableMetadataParser.read((FileIO) null, Files.localInput(new File(fileName)));
verifyMetadata(metadata, actualMetadata);
}