You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iceberg.apache.org by ao...@apache.org on 2020/04/09 15:35:38 UTC
[incubator-iceberg] branch master updated: Use null-safe locations
in metadata tables (#906)
This is an automated email from the ASF dual-hosted git repository.
aokolnychyi 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 0a42490 Use null-safe locations in metadata tables (#906)
0a42490 is described below
commit 0a42490ca3f63e7e13d651bd69338a34c8170382
Author: dingxiaokun <di...@gmail.com>
AuthorDate: Thu Apr 9 23:35:27 2020 +0800
Use null-safe locations in metadata tables (#906)
Fixes #904.
---
core/src/main/java/org/apache/iceberg/AllDataFilesTable.java | 5 -----
core/src/main/java/org/apache/iceberg/AllEntriesTable.java | 5 -----
core/src/main/java/org/apache/iceberg/AllManifestsTable.java | 5 -----
core/src/main/java/org/apache/iceberg/BaseMetadataTable.java | 5 +++++
core/src/main/java/org/apache/iceberg/DataFilesTable.java | 5 -----
core/src/main/java/org/apache/iceberg/HistoryTable.java | 5 -----
core/src/main/java/org/apache/iceberg/ManifestEntriesTable.java | 5 -----
core/src/main/java/org/apache/iceberg/ManifestsTable.java | 5 -----
core/src/main/java/org/apache/iceberg/PartitionsTable.java | 5 -----
core/src/main/java/org/apache/iceberg/SnapshotsTable.java | 5 -----
10 files changed, 5 insertions(+), 45 deletions(-)
diff --git a/core/src/main/java/org/apache/iceberg/AllDataFilesTable.java b/core/src/main/java/org/apache/iceberg/AllDataFilesTable.java
index 9dd3443..9381460 100644
--- a/core/src/main/java/org/apache/iceberg/AllDataFilesTable.java
+++ b/core/src/main/java/org/apache/iceberg/AllDataFilesTable.java
@@ -75,11 +75,6 @@ public class AllDataFilesTable extends BaseMetadataTable {
}
}
- @Override
- public String location() {
- return table.currentSnapshot().manifestListLocation();
- }
-
public static class AllDataFilesTableScan extends BaseTableScan {
private final Schema fileSchema;
diff --git a/core/src/main/java/org/apache/iceberg/AllEntriesTable.java b/core/src/main/java/org/apache/iceberg/AllEntriesTable.java
index aa455da..d221d7d 100644
--- a/core/src/main/java/org/apache/iceberg/AllEntriesTable.java
+++ b/core/src/main/java/org/apache/iceberg/AllEntriesTable.java
@@ -68,11 +68,6 @@ public class AllEntriesTable extends BaseMetadataTable {
}
}
- @Override
- public String location() {
- return table.currentSnapshot().manifestListLocation();
- }
-
private static class Scan extends BaseTableScan {
Scan(TableOperations ops, Table table, Schema schema) {
diff --git a/core/src/main/java/org/apache/iceberg/AllManifestsTable.java b/core/src/main/java/org/apache/iceberg/AllManifestsTable.java
index 1a600a6..f705e73 100644
--- a/core/src/main/java/org/apache/iceberg/AllManifestsTable.java
+++ b/core/src/main/java/org/apache/iceberg/AllManifestsTable.java
@@ -79,11 +79,6 @@ public class AllManifestsTable extends BaseMetadataTable {
}
@Override
- public String location() {
- return ops.current().file().location();
- }
-
- @Override
public Schema schema() {
return MANIFEST_FILE_SCHEMA;
}
diff --git a/core/src/main/java/org/apache/iceberg/BaseMetadataTable.java b/core/src/main/java/org/apache/iceberg/BaseMetadataTable.java
index 8060310..44ba380 100644
--- a/core/src/main/java/org/apache/iceberg/BaseMetadataTable.java
+++ b/core/src/main/java/org/apache/iceberg/BaseMetadataTable.java
@@ -38,6 +38,11 @@ abstract class BaseMetadataTable implements Table {
}
@Override
+ public String location() {
+ return table().location();
+ }
+
+ @Override
public EncryptionManager encryption() {
return table().encryption();
}
diff --git a/core/src/main/java/org/apache/iceberg/DataFilesTable.java b/core/src/main/java/org/apache/iceberg/DataFilesTable.java
index 1f9c292..7724458 100644
--- a/core/src/main/java/org/apache/iceberg/DataFilesTable.java
+++ b/core/src/main/java/org/apache/iceberg/DataFilesTable.java
@@ -67,11 +67,6 @@ public class DataFilesTable extends BaseMetadataTable {
}
}
- @Override
- public String location() {
- return table.currentSnapshot().manifestListLocation();
- }
-
public static class FilesTableScan extends BaseTableScan {
private final Schema fileSchema;
diff --git a/core/src/main/java/org/apache/iceberg/HistoryTable.java b/core/src/main/java/org/apache/iceberg/HistoryTable.java
index abc1829..fd4914a 100644
--- a/core/src/main/java/org/apache/iceberg/HistoryTable.java
+++ b/core/src/main/java/org/apache/iceberg/HistoryTable.java
@@ -65,11 +65,6 @@ public class HistoryTable extends BaseMetadataTable {
}
@Override
- public String location() {
- return ops.current().file().location();
- }
-
- @Override
public Schema schema() {
return HISTORY_SCHEMA;
}
diff --git a/core/src/main/java/org/apache/iceberg/ManifestEntriesTable.java b/core/src/main/java/org/apache/iceberg/ManifestEntriesTable.java
index f756025..5664678 100644
--- a/core/src/main/java/org/apache/iceberg/ManifestEntriesTable.java
+++ b/core/src/main/java/org/apache/iceberg/ManifestEntriesTable.java
@@ -68,11 +68,6 @@ public class ManifestEntriesTable extends BaseMetadataTable {
}
}
- @Override
- public String location() {
- return table.currentSnapshot().manifestListLocation();
- }
-
private static class EntriesTableScan extends BaseTableScan {
EntriesTableScan(TableOperations ops, Table table, Schema schema) {
diff --git a/core/src/main/java/org/apache/iceberg/ManifestsTable.java b/core/src/main/java/org/apache/iceberg/ManifestsTable.java
index 6c6dd37..25f0a58 100644
--- a/core/src/main/java/org/apache/iceberg/ManifestsTable.java
+++ b/core/src/main/java/org/apache/iceberg/ManifestsTable.java
@@ -69,11 +69,6 @@ public class ManifestsTable extends BaseMetadataTable {
}
@Override
- public String location() {
- return ops.current().file().location();
- }
-
- @Override
public Schema schema() {
return SNAPSHOT_SCHEMA;
}
diff --git a/core/src/main/java/org/apache/iceberg/PartitionsTable.java b/core/src/main/java/org/apache/iceberg/PartitionsTable.java
index d1de78d..6897034 100644
--- a/core/src/main/java/org/apache/iceberg/PartitionsTable.java
+++ b/core/src/main/java/org/apache/iceberg/PartitionsTable.java
@@ -59,11 +59,6 @@ public class PartitionsTable extends BaseMetadataTable {
}
@Override
- public String location() {
- return ops.current().file().location();
- }
-
- @Override
public Schema schema() {
return schema;
}
diff --git a/core/src/main/java/org/apache/iceberg/SnapshotsTable.java b/core/src/main/java/org/apache/iceberg/SnapshotsTable.java
index bcb59f3..bf3d62c 100644
--- a/core/src/main/java/org/apache/iceberg/SnapshotsTable.java
+++ b/core/src/main/java/org/apache/iceberg/SnapshotsTable.java
@@ -62,11 +62,6 @@ public class SnapshotsTable extends BaseMetadataTable {
}
@Override
- public String location() {
- return ops.current().file().location();
- }
-
- @Override
public Schema schema() {
return SNAPSHOT_SCHEMA;
}