You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hudi.apache.org by GitBox <gi...@apache.org> on 2020/04/19 22:34:27 UTC
[GitHub] [incubator-hudi] pratyakshsharma opened a new pull request #1532: [HUDI-794]: implemented optional use of --config-folder option in HoodieDeltaStreamer
pratyakshsharma opened a new pull request #1532:
URL: https://github.com/apache/incubator-hudi/pull/1532
## *Tips*
- *Thank you very much for contributing to Apache Hudi.*
- *Please review https://hudi.apache.org/contributing.html before opening a pull request.*
## What is the purpose of the pull request
*(For example: This pull request adds quick-start document.)*
## Brief change log
*(for example:)*
- *Modify AnnotationLocation checkstyle rule in checkstyle.xml*
## Verify this pull request
*(Please pick either of the following options)*
This pull request is a trivial rework / code cleanup without any test coverage.
*(or)*
This pull request is already covered by existing tests, such as *(please describe tests)*.
(or)
This change added tests and can be verified as follows:
*(example:)*
- *Added integration tests for end-to-end.*
- *Added HoodieClientWriteTest to verify the change.*
- *Manually verified the change by running a job locally.*
## Committer checklist
- [ ] Has a corresponding JIRA in PR title & commit
- [ ] Commit message is descriptive of the change
- [ ] CI is green
- [ ] Necessary doc changes done or have another open PR
- [ ] For large changes, please consider breaking it into sub-tasks under an umbrella JIRA.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-hudi] pratyakshsharma commented on issue #1532: [HUDI-794]: implemented optional use of --config-folder option in HoodieDeltaStreamer
Posted by GitBox <gi...@apache.org>.
pratyakshsharma commented on issue #1532:
URL: https://github.com/apache/incubator-hudi/pull/1532#issuecomment-616455775
@bvaradar please take a pass. Have tried to implement the usage of given parameter in an optional way so that it does not break the current functionality.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-hudi] bvaradar closed pull request #1532: [HUDI-794]: implemented optional use of --config-folder option in HoodieDeltaStreamer
Posted by GitBox <gi...@apache.org>.
bvaradar closed pull request #1532:
URL: https://github.com/apache/incubator-hudi/pull/1532
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-hudi] pratyakshsharma commented on a change in pull request #1532: [HUDI-794]: implemented optional use of --config-folder option in HoodieDeltaStreamer
Posted by GitBox <gi...@apache.org>.
pratyakshsharma commented on a change in pull request #1532:
URL: https://github.com/apache/incubator-hudi/pull/1532#discussion_r425122280
##########
File path: hudi-utilities/src/main/java/org/apache/hudi/utilities/DeltaStreamerUtility.java
##########
@@ -0,0 +1,128 @@
+/*
+ * 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.hudi.utilities;
+
+import org.apache.hudi.common.config.TypedProperties;
+import org.apache.hudi.common.util.StringUtils;
+import org.apache.hudi.utilities.deltastreamer.HoodieDeltaStreamer;
+import org.apache.hudi.utilities.deltastreamer.HoodieMultiTableDeltaStreamer;
+import org.apache.hudi.utilities.deltastreamer.TableExecutionContext;
+
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.FileUtil;
+import org.apache.hadoop.fs.Path;
+
+import java.io.IOException;
+import java.util.ArrayList;
+
+public class DeltaStreamerUtility {
+
+ public static String getDefaultConfigFilePath(String configFolder, String database, String currentTable) {
+ return configFolder + Constants.FILEDELIMITER + database + Constants.UNDERSCORE + currentTable + Constants.DEFAULT_CONFIG_FILE_NAME_SUFFIX;
+ }
+
+ public static String getTableWithDatabase(TableExecutionContext context) {
+ return context.getDatabase() + Constants.DELIMITER + context.getTableName();
+ }
+
+ public static void checkIfPropsFileAndConfigFolderExist(String commonPropsFile, String configFolder, FileSystem fs) throws IOException {
+ if (!fs.exists(new Path(commonPropsFile))) {
+ throw new IllegalArgumentException("Please provide valid common config file path!");
+ }
+
+ if (!fs.exists(new Path(configFolder))) {
+ fs.mkdirs(new Path(configFolder));
+ }
+ }
+
+ public static void checkIfTableConfigFileExists(String configFolder, FileSystem fs, String configFilePath) throws IOException {
+ if (!fs.exists(new Path(configFilePath)) || !fs.isFile(new Path(configFilePath))) {
+ throw new IllegalArgumentException("Please provide valid table config file path!");
+ }
+
+ Path path = new Path(configFilePath);
+ Path filePathInConfigFolder = new Path(configFolder, path.getName());
+ if (!fs.exists(filePathInConfigFolder)) {
+ FileUtil.copy(fs, path, fs, filePathInConfigFolder, false, fs.getConf());
+ }
+ }
+
+ public static TypedProperties getTablePropertiesFromConfigFolder(HoodieDeltaStreamer.Config cfg, FileSystem fs) throws IOException {
Review comment:
@bvaradar got chance to decide for this? Its been there for some time now :)
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-hudi] bvaradar commented on a change in pull request #1532: [HUDI-794]: implemented optional use of --config-folder option in HoodieDeltaStreamer
Posted by GitBox <gi...@apache.org>.
bvaradar commented on a change in pull request #1532:
URL: https://github.com/apache/incubator-hudi/pull/1532#discussion_r416909810
##########
File path: hudi-utilities/src/main/java/org/apache/hudi/utilities/DeltaStreamerUtility.java
##########
@@ -0,0 +1,128 @@
+/*
+ * 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.hudi.utilities;
+
+import org.apache.hudi.common.config.TypedProperties;
+import org.apache.hudi.common.util.StringUtils;
+import org.apache.hudi.utilities.deltastreamer.HoodieDeltaStreamer;
+import org.apache.hudi.utilities.deltastreamer.HoodieMultiTableDeltaStreamer;
+import org.apache.hudi.utilities.deltastreamer.TableExecutionContext;
+
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.FileUtil;
+import org.apache.hadoop.fs.Path;
+
+import java.io.IOException;
+import java.util.ArrayList;
+
+public class DeltaStreamerUtility {
+
+ public static String getDefaultConfigFilePath(String configFolder, String database, String currentTable) {
+ return configFolder + Constants.FILEDELIMITER + database + Constants.UNDERSCORE + currentTable + Constants.DEFAULT_CONFIG_FILE_NAME_SUFFIX;
+ }
+
+ public static String getTableWithDatabase(TableExecutionContext context) {
+ return context.getDatabase() + Constants.DELIMITER + context.getTableName();
+ }
+
+ public static void checkIfPropsFileAndConfigFolderExist(String commonPropsFile, String configFolder, FileSystem fs) throws IOException {
+ if (!fs.exists(new Path(commonPropsFile))) {
+ throw new IllegalArgumentException("Please provide valid common config file path!");
+ }
+
+ if (!fs.exists(new Path(configFolder))) {
+ fs.mkdirs(new Path(configFolder));
+ }
+ }
+
+ public static void checkIfTableConfigFileExists(String configFolder, FileSystem fs, String configFilePath) throws IOException {
+ if (!fs.exists(new Path(configFilePath)) || !fs.isFile(new Path(configFilePath))) {
+ throw new IllegalArgumentException("Please provide valid table config file path!");
+ }
+
+ Path path = new Path(configFilePath);
+ Path filePathInConfigFolder = new Path(configFolder, path.getName());
+ if (!fs.exists(filePathInConfigFolder)) {
+ FileUtil.copy(fs, path, fs, filePathInConfigFolder, false, fs.getConf());
+ }
+ }
+
+ public static TypedProperties getTablePropertiesFromConfigFolder(HoodieDeltaStreamer.Config cfg, FileSystem fs) throws IOException {
Review comment:
@pratyakshsharma : I am rethinking about this feature again. Looking at the changes and added config options, I feel that we are overcomplicating in trying to reuse a config structure which for MultiDeltaStreamer to fit to DeltaStreamer. If all we want to use HoodieDeltaStreamer but have config structure specific to HoodieMultiDeltaStreamer, can we just instantiate HoodieMultiDeltaStreamer with one source ?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-hudi] bvaradar commented on a change in pull request #1532: [HUDI-794]: implemented optional use of --config-folder option in HoodieDeltaStreamer
Posted by GitBox <gi...@apache.org>.
bvaradar commented on a change in pull request #1532:
URL: https://github.com/apache/incubator-hudi/pull/1532#discussion_r425579387
##########
File path: hudi-utilities/src/main/java/org/apache/hudi/utilities/DeltaStreamerUtility.java
##########
@@ -0,0 +1,128 @@
+/*
+ * 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.hudi.utilities;
+
+import org.apache.hudi.common.config.TypedProperties;
+import org.apache.hudi.common.util.StringUtils;
+import org.apache.hudi.utilities.deltastreamer.HoodieDeltaStreamer;
+import org.apache.hudi.utilities.deltastreamer.HoodieMultiTableDeltaStreamer;
+import org.apache.hudi.utilities.deltastreamer.TableExecutionContext;
+
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.FileUtil;
+import org.apache.hadoop.fs.Path;
+
+import java.io.IOException;
+import java.util.ArrayList;
+
+public class DeltaStreamerUtility {
+
+ public static String getDefaultConfigFilePath(String configFolder, String database, String currentTable) {
+ return configFolder + Constants.FILEDELIMITER + database + Constants.UNDERSCORE + currentTable + Constants.DEFAULT_CONFIG_FILE_NAME_SUFFIX;
+ }
+
+ public static String getTableWithDatabase(TableExecutionContext context) {
+ return context.getDatabase() + Constants.DELIMITER + context.getTableName();
+ }
+
+ public static void checkIfPropsFileAndConfigFolderExist(String commonPropsFile, String configFolder, FileSystem fs) throws IOException {
+ if (!fs.exists(new Path(commonPropsFile))) {
+ throw new IllegalArgumentException("Please provide valid common config file path!");
+ }
+
+ if (!fs.exists(new Path(configFolder))) {
+ fs.mkdirs(new Path(configFolder));
+ }
+ }
+
+ public static void checkIfTableConfigFileExists(String configFolder, FileSystem fs, String configFilePath) throws IOException {
+ if (!fs.exists(new Path(configFilePath)) || !fs.isFile(new Path(configFilePath))) {
+ throw new IllegalArgumentException("Please provide valid table config file path!");
+ }
+
+ Path path = new Path(configFilePath);
+ Path filePathInConfigFolder = new Path(configFolder, path.getName());
+ if (!fs.exists(filePathInConfigFolder)) {
+ FileUtil.copy(fs, path, fs, filePathInConfigFolder, false, fs.getConf());
+ }
+ }
+
+ public static TypedProperties getTablePropertiesFromConfigFolder(HoodieDeltaStreamer.Config cfg, FileSystem fs) throws IOException {
Review comment:
@pratyakshsharma : Sorry for the delay. I think we can close this PR. As a next step towards enhancing HoodieMultiDeltaStreamer, I think we can work on feature parity with : supporting parallel deltastreamer, support for MOR and async compaction. These would make HoodieMultiDeltaStreamer a really powerful tool :)
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-hudi] pratyakshsharma commented on a change in pull request #1532: [HUDI-794]: implemented optional use of --config-folder option in HoodieDeltaStreamer
Posted by GitBox <gi...@apache.org>.
pratyakshsharma commented on a change in pull request #1532:
URL: https://github.com/apache/incubator-hudi/pull/1532#discussion_r417355146
##########
File path: hudi-utilities/src/main/java/org/apache/hudi/utilities/DeltaStreamerUtility.java
##########
@@ -0,0 +1,128 @@
+/*
+ * 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.hudi.utilities;
+
+import org.apache.hudi.common.config.TypedProperties;
+import org.apache.hudi.common.util.StringUtils;
+import org.apache.hudi.utilities.deltastreamer.HoodieDeltaStreamer;
+import org.apache.hudi.utilities.deltastreamer.HoodieMultiTableDeltaStreamer;
+import org.apache.hudi.utilities.deltastreamer.TableExecutionContext;
+
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.FileUtil;
+import org.apache.hadoop.fs.Path;
+
+import java.io.IOException;
+import java.util.ArrayList;
+
+public class DeltaStreamerUtility {
+
+ public static String getDefaultConfigFilePath(String configFolder, String database, String currentTable) {
+ return configFolder + Constants.FILEDELIMITER + database + Constants.UNDERSCORE + currentTable + Constants.DEFAULT_CONFIG_FILE_NAME_SUFFIX;
+ }
+
+ public static String getTableWithDatabase(TableExecutionContext context) {
+ return context.getDatabase() + Constants.DELIMITER + context.getTableName();
+ }
+
+ public static void checkIfPropsFileAndConfigFolderExist(String commonPropsFile, String configFolder, FileSystem fs) throws IOException {
+ if (!fs.exists(new Path(commonPropsFile))) {
+ throw new IllegalArgumentException("Please provide valid common config file path!");
+ }
+
+ if (!fs.exists(new Path(configFolder))) {
+ fs.mkdirs(new Path(configFolder));
+ }
+ }
+
+ public static void checkIfTableConfigFileExists(String configFolder, FileSystem fs, String configFilePath) throws IOException {
+ if (!fs.exists(new Path(configFilePath)) || !fs.isFile(new Path(configFilePath))) {
+ throw new IllegalArgumentException("Please provide valid table config file path!");
+ }
+
+ Path path = new Path(configFilePath);
+ Path filePathInConfigFolder = new Path(configFolder, path.getName());
+ if (!fs.exists(filePathInConfigFolder)) {
+ FileUtil.copy(fs, path, fs, filePathInConfigFolder, false, fs.getConf());
+ }
+ }
+
+ public static TypedProperties getTablePropertiesFromConfigFolder(HoodieDeltaStreamer.Config cfg, FileSystem fs) throws IOException {
Review comment:
@bvaradar I guess you are right. My next question now is do we really want to reuse the config structure of HoodieMultiTableDeltaStreamer in HoodieDeltaStreamer or we can simply close this PR?
If you strongly feel, I would do changes to instantiate HoodieMultiTableDeltaStreamer with one table, else please go ahead and close this PR :)
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org