This is an automated email from the ASF dual-hosted git repository.
stevenwu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iceberg.git
The following commit(s) were added to refs/heads/master by this push:
new ad0f04dd90 Flink: Set up EnvironmentContext for Flink(Both JM and TM)
(#6936)
ad0f04dd90 is described below
commit ad0f04dd90cf42011535207e661924c3b0456f1c
Author: wangyinsheng <[email protected]>
AuthorDate: Sat Mar 4 10:54:19 2023 +0800
Flink: Set up EnvironmentContext for Flink(Both JM and TM) (#6936)
---
.../org/apache/iceberg/flink/FlinkCatalog.java | 5 +---
.../iceberg/flink/FlinkEnvironmentContext.java | 32 ++++++++++++++++++++++
.../java/org/apache/iceberg/flink/TableLoader.java | 2 ++
.../org/apache/iceberg/flink/FlinkCatalog.java | 5 +---
.../iceberg/flink/FlinkEnvironmentContext.java | 32 ++++++++++++++++++++++
.../java/org/apache/iceberg/flink/TableLoader.java | 2 ++
.../org/apache/iceberg/flink/FlinkCatalog.java | 5 +---
.../iceberg/flink/FlinkEnvironmentContext.java | 31 +++++++++++++++++++++
.../java/org/apache/iceberg/flink/TableLoader.java | 2 ++
9 files changed, 104 insertions(+), 12 deletions(-)
diff --git
a/flink/v1.14/flink/src/main/java/org/apache/iceberg/flink/FlinkCatalog.java
b/flink/v1.14/flink/src/main/java/org/apache/iceberg/flink/FlinkCatalog.java
index 15bd866b56..3ecddaa05c 100644
--- a/flink/v1.14/flink/src/main/java/org/apache/iceberg/flink/FlinkCatalog.java
+++ b/flink/v1.14/flink/src/main/java/org/apache/iceberg/flink/FlinkCatalog.java
@@ -53,7 +53,6 @@ import org.apache.flink.table.factories.Factory;
import org.apache.flink.util.StringUtils;
import org.apache.iceberg.CachingCatalog;
import org.apache.iceberg.DataFile;
-import org.apache.iceberg.EnvironmentContext;
import org.apache.iceberg.FileScanTask;
import org.apache.iceberg.MetadataTableType;
import org.apache.iceberg.PartitionField;
@@ -71,7 +70,6 @@ import org.apache.iceberg.exceptions.AlreadyExistsException;
import org.apache.iceberg.exceptions.NamespaceNotEmptyException;
import org.apache.iceberg.exceptions.NoSuchNamespaceException;
import org.apache.iceberg.flink.util.FlinkCompatibilityUtil;
-import org.apache.iceberg.flink.util.FlinkPackage;
import org.apache.iceberg.io.CloseableIterable;
import org.apache.iceberg.relocated.com.google.common.base.Preconditions;
import org.apache.iceberg.relocated.com.google.common.base.Splitter;
@@ -122,8 +120,7 @@ public class FlinkCatalog extends AbstractCatalog {
originalCatalog instanceof SupportsNamespaces ? (SupportsNamespaces)
originalCatalog : null;
closeable = originalCatalog instanceof Closeable ? (Closeable)
originalCatalog : null;
- EnvironmentContext.put(EnvironmentContext.ENGINE_NAME, "flink");
- EnvironmentContext.put(EnvironmentContext.ENGINE_VERSION,
FlinkPackage.version());
+ FlinkEnvironmentContext.init();
}
@Override
diff --git
a/flink/v1.14/flink/src/main/java/org/apache/iceberg/flink/FlinkEnvironmentContext.java
b/flink/v1.14/flink/src/main/java/org/apache/iceberg/flink/FlinkEnvironmentContext.java
new file mode 100644
index 0000000000..49602eea45
--- /dev/null
+++
b/flink/v1.14/flink/src/main/java/org/apache/iceberg/flink/FlinkEnvironmentContext.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.iceberg.flink;
+
+import org.apache.iceberg.EnvironmentContext;
+import org.apache.iceberg.flink.util.FlinkPackage;
+
+class FlinkEnvironmentContext {
+
+ private FlinkEnvironmentContext() {}
+
+ public static void init() {
+ EnvironmentContext.put(EnvironmentContext.ENGINE_NAME, "flink");
+ EnvironmentContext.put(EnvironmentContext.ENGINE_VERSION,
FlinkPackage.version());
+ }
+}
diff --git
a/flink/v1.14/flink/src/main/java/org/apache/iceberg/flink/TableLoader.java
b/flink/v1.14/flink/src/main/java/org/apache/iceberg/flink/TableLoader.java
index e128badb84..1365b8b20c 100644
--- a/flink/v1.14/flink/src/main/java/org/apache/iceberg/flink/TableLoader.java
+++ b/flink/v1.14/flink/src/main/java/org/apache/iceberg/flink/TableLoader.java
@@ -73,6 +73,7 @@ public interface TableLoader extends Closeable, Serializable {
@Override
public Table loadTable() {
+ FlinkEnvironmentContext.init();
return tables.load(location);
}
@@ -106,6 +107,7 @@ public interface TableLoader extends Closeable,
Serializable {
@Override
public Table loadTable() {
+ FlinkEnvironmentContext.init();
return catalog.loadTable(TableIdentifier.parse(identifier));
}
diff --git
a/flink/v1.15/flink/src/main/java/org/apache/iceberg/flink/FlinkCatalog.java
b/flink/v1.15/flink/src/main/java/org/apache/iceberg/flink/FlinkCatalog.java
index 15bd866b56..3ecddaa05c 100644
--- a/flink/v1.15/flink/src/main/java/org/apache/iceberg/flink/FlinkCatalog.java
+++ b/flink/v1.15/flink/src/main/java/org/apache/iceberg/flink/FlinkCatalog.java
@@ -53,7 +53,6 @@ import org.apache.flink.table.factories.Factory;
import org.apache.flink.util.StringUtils;
import org.apache.iceberg.CachingCatalog;
import org.apache.iceberg.DataFile;
-import org.apache.iceberg.EnvironmentContext;
import org.apache.iceberg.FileScanTask;
import org.apache.iceberg.MetadataTableType;
import org.apache.iceberg.PartitionField;
@@ -71,7 +70,6 @@ import org.apache.iceberg.exceptions.AlreadyExistsException;
import org.apache.iceberg.exceptions.NamespaceNotEmptyException;
import org.apache.iceberg.exceptions.NoSuchNamespaceException;
import org.apache.iceberg.flink.util.FlinkCompatibilityUtil;
-import org.apache.iceberg.flink.util.FlinkPackage;
import org.apache.iceberg.io.CloseableIterable;
import org.apache.iceberg.relocated.com.google.common.base.Preconditions;
import org.apache.iceberg.relocated.com.google.common.base.Splitter;
@@ -122,8 +120,7 @@ public class FlinkCatalog extends AbstractCatalog {
originalCatalog instanceof SupportsNamespaces ? (SupportsNamespaces)
originalCatalog : null;
closeable = originalCatalog instanceof Closeable ? (Closeable)
originalCatalog : null;
- EnvironmentContext.put(EnvironmentContext.ENGINE_NAME, "flink");
- EnvironmentContext.put(EnvironmentContext.ENGINE_VERSION,
FlinkPackage.version());
+ FlinkEnvironmentContext.init();
}
@Override
diff --git
a/flink/v1.15/flink/src/main/java/org/apache/iceberg/flink/FlinkEnvironmentContext.java
b/flink/v1.15/flink/src/main/java/org/apache/iceberg/flink/FlinkEnvironmentContext.java
new file mode 100644
index 0000000000..49602eea45
--- /dev/null
+++
b/flink/v1.15/flink/src/main/java/org/apache/iceberg/flink/FlinkEnvironmentContext.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.iceberg.flink;
+
+import org.apache.iceberg.EnvironmentContext;
+import org.apache.iceberg.flink.util.FlinkPackage;
+
+class FlinkEnvironmentContext {
+
+ private FlinkEnvironmentContext() {}
+
+ public static void init() {
+ EnvironmentContext.put(EnvironmentContext.ENGINE_NAME, "flink");
+ EnvironmentContext.put(EnvironmentContext.ENGINE_VERSION,
FlinkPackage.version());
+ }
+}
diff --git
a/flink/v1.15/flink/src/main/java/org/apache/iceberg/flink/TableLoader.java
b/flink/v1.15/flink/src/main/java/org/apache/iceberg/flink/TableLoader.java
index e128badb84..1365b8b20c 100644
--- a/flink/v1.15/flink/src/main/java/org/apache/iceberg/flink/TableLoader.java
+++ b/flink/v1.15/flink/src/main/java/org/apache/iceberg/flink/TableLoader.java
@@ -73,6 +73,7 @@ public interface TableLoader extends Closeable, Serializable {
@Override
public Table loadTable() {
+ FlinkEnvironmentContext.init();
return tables.load(location);
}
@@ -106,6 +107,7 @@ public interface TableLoader extends Closeable,
Serializable {
@Override
public Table loadTable() {
+ FlinkEnvironmentContext.init();
return catalog.loadTable(TableIdentifier.parse(identifier));
}
diff --git
a/flink/v1.16/flink/src/main/java/org/apache/iceberg/flink/FlinkCatalog.java
b/flink/v1.16/flink/src/main/java/org/apache/iceberg/flink/FlinkCatalog.java
index 15bd866b56..3ecddaa05c 100644
--- a/flink/v1.16/flink/src/main/java/org/apache/iceberg/flink/FlinkCatalog.java
+++ b/flink/v1.16/flink/src/main/java/org/apache/iceberg/flink/FlinkCatalog.java
@@ -53,7 +53,6 @@ import org.apache.flink.table.factories.Factory;
import org.apache.flink.util.StringUtils;
import org.apache.iceberg.CachingCatalog;
import org.apache.iceberg.DataFile;
-import org.apache.iceberg.EnvironmentContext;
import org.apache.iceberg.FileScanTask;
import org.apache.iceberg.MetadataTableType;
import org.apache.iceberg.PartitionField;
@@ -71,7 +70,6 @@ import org.apache.iceberg.exceptions.AlreadyExistsException;
import org.apache.iceberg.exceptions.NamespaceNotEmptyException;
import org.apache.iceberg.exceptions.NoSuchNamespaceException;
import org.apache.iceberg.flink.util.FlinkCompatibilityUtil;
-import org.apache.iceberg.flink.util.FlinkPackage;
import org.apache.iceberg.io.CloseableIterable;
import org.apache.iceberg.relocated.com.google.common.base.Preconditions;
import org.apache.iceberg.relocated.com.google.common.base.Splitter;
@@ -122,8 +120,7 @@ public class FlinkCatalog extends AbstractCatalog {
originalCatalog instanceof SupportsNamespaces ? (SupportsNamespaces)
originalCatalog : null;
closeable = originalCatalog instanceof Closeable ? (Closeable)
originalCatalog : null;
- EnvironmentContext.put(EnvironmentContext.ENGINE_NAME, "flink");
- EnvironmentContext.put(EnvironmentContext.ENGINE_VERSION,
FlinkPackage.version());
+ FlinkEnvironmentContext.init();
}
@Override
diff --git
a/flink/v1.16/flink/src/main/java/org/apache/iceberg/flink/FlinkEnvironmentContext.java
b/flink/v1.16/flink/src/main/java/org/apache/iceberg/flink/FlinkEnvironmentContext.java
new file mode 100644
index 0000000000..f35bb577fb
--- /dev/null
+++
b/flink/v1.16/flink/src/main/java/org/apache/iceberg/flink/FlinkEnvironmentContext.java
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.iceberg.flink;
+
+import org.apache.iceberg.EnvironmentContext;
+import org.apache.iceberg.flink.util.FlinkPackage;
+
+class FlinkEnvironmentContext {
+ private FlinkEnvironmentContext() {}
+
+ public static void init() {
+ EnvironmentContext.put(EnvironmentContext.ENGINE_NAME, "flink");
+ EnvironmentContext.put(EnvironmentContext.ENGINE_VERSION,
FlinkPackage.version());
+ }
+}
diff --git
a/flink/v1.16/flink/src/main/java/org/apache/iceberg/flink/TableLoader.java
b/flink/v1.16/flink/src/main/java/org/apache/iceberg/flink/TableLoader.java
index e128badb84..1365b8b20c 100644
--- a/flink/v1.16/flink/src/main/java/org/apache/iceberg/flink/TableLoader.java
+++ b/flink/v1.16/flink/src/main/java/org/apache/iceberg/flink/TableLoader.java
@@ -73,6 +73,7 @@ public interface TableLoader extends Closeable, Serializable {
@Override
public Table loadTable() {
+ FlinkEnvironmentContext.init();
return tables.load(location);
}
@@ -106,6 +107,7 @@ public interface TableLoader extends Closeable,
Serializable {
@Override
public Table loadTable() {
+ FlinkEnvironmentContext.init();
return catalog.loadTable(TableIdentifier.parse(identifier));
}
