Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev spark load #40182

Open
wants to merge 28 commits into
base: ingest_load
Choose a base branch
from
Open

Dev spark load #40182

wants to merge 28 commits into from

Conversation

gnehil
Copy link
Contributor

@gnehil gnehil commented Aug 30, 2024

Proposed changes

Issue Number: close #xxx

@doris-robot
Copy link

Thank you for your contribution to Apache Doris.
Don't know what should be done next? See How to process your PR

Since 2024-03-18, the Document has been moved to doris-website.
See Doris Document.

Copy link
Contributor

clang-tidy review says "All clean, LGTM! 👍"

1 similar comment
Copy link
Contributor

clang-tidy review says "All clean, LGTM! 👍"

Copy link
Contributor

sh-checker report

To get the full details, please check in the job output.

shellcheck errors

'shellcheck ' returned error 1 finding the following syntactical issues:

----------

In samples/datalake/deltalake_and_kudu/start-trinoconnector-compose.sh line 162:
export KUDU_QUICKSTART_IP=$(ifconfig | grep "inet " | grep -Fv 127.0.0.1 |  awk '{print $2}' | tail -1)
       ^----------------^ SC2155 (warning): Declare and assign separately to avoid masking return values.


In samples/datalake/deltalake_and_kudu/stop-trinoconnector-compose.sh line 20:
export KUDU_QUICKSTART_IP=$(ifconfig | grep "inet " | grep -Fv 127.0.0.1 |  awk '{print $2}' | tail -1)
       ^----------------^ SC2155 (warning): Declare and assign separately to avoid masking return values.

For more information:
  https://www.shellcheck.net/wiki/SC2155 -- Declare and assign separately to ...
----------

You can address the above issues in one of three ways:
1. Manually correct the issue in the offending shell script;
2. Disable specific issues by adding the comment:
  # shellcheck disable=NNNN
above the line that contains the issue, where NNNN is the error code;
3. Add '-e NNNN' to the SHELLCHECK_OPTS setting in your .yml action file.



shfmt errors

'shfmt ' returned error 1 finding the following formatting issues:

----------
--- samples/datalake/deltalake_and_kudu/scripts/start_doris.sh.orig
+++ samples/datalake/deltalake_and_kudu/scripts/start_doris.sh
@@ -20,8 +20,8 @@
 export JAVA_HOME=/opt/jdk-17.0.2
 
 cp -r /opt/doris-bin /opt/doris
-echo "trino_connector_plugin_dir=/opt/connectors/" >> /opt/doris/fe/conf/fe.conf
-echo "trino_connector_plugin_dir=/opt/connectors/" >> /opt/doris/be/conf/be.conf
+echo "trino_connector_plugin_dir=/opt/connectors/" >>/opt/doris/fe/conf/fe.conf
+echo "trino_connector_plugin_dir=/opt/connectors/" >>/opt/doris/be/conf/be.conf
 
 /opt/doris/fe/bin/start_fe.sh --daemon
 /opt/doris/be/bin/start_be.sh --daemon
--- samples/datalake/deltalake_and_kudu/start-trinoconnector-compose.sh.orig
+++ samples/datalake/deltalake_and_kudu/start-trinoconnector-compose.sh
@@ -33,7 +33,6 @@
 hdfs_plugin="ff4a3e3b32dcce27f4df58f17938abde"
 kudu_java_example="1afe0a890785e8d0011ea7342ae5e43d"
 
-
 download_source_file() {
     local FILE_PATH="$1"
     local EXPECTED_MD5="$2"
@@ -79,9 +78,6 @@
 download_source_file "trino-hdfs-435-20240724.tar.gz" "${hdfs_plugin}" "https://github.com/apache/doris-thirdparty/releases/download/trino-435-20240724"
 download_source_file "kudu-java-example-1.0-SNAPSHOT.jar" "${kudu_java_example}" "https://github.com/apache/doris-thirdparty/releases/download/trino-435-20240724"
 
-
-
-
 if [[ ! -f "jdk-17.0.2/SUCCESS" ]]; then
     echo "Prepare jdk17 environment"
     if [[ -d "jdk-17.0.2" ]]; then
@@ -156,10 +152,9 @@
     touch connectors/trino-delta-lake-435/hdfs/SUCCESS
 fi
 
-
 cd ../
 
-export KUDU_QUICKSTART_IP=$(ifconfig | grep "inet " | grep -Fv 127.0.0.1 |  awk '{print $2}' | tail -1)
+export KUDU_QUICKSTART_IP=$(ifconfig | grep "inet " | grep -Fv 127.0.0.1 | awk '{print $2}' | tail -1)
 
 docker compose -f trinoconnector-compose.yml --env-file trinoconnector-compose.env up -d
 echo "Create hive table ..."
--- samples/datalake/deltalake_and_kudu/stop-trinoconnector-compose.sh.orig
+++ samples/datalake/deltalake_and_kudu/stop-trinoconnector-compose.sh
@@ -17,6 +17,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-export KUDU_QUICKSTART_IP=$(ifconfig | grep "inet " | grep -Fv 127.0.0.1 |  awk '{print $2}' | tail -1)
+export KUDU_QUICKSTART_IP=$(ifconfig | grep "inet " | grep -Fv 127.0.0.1 | awk '{print $2}' | tail -1)
 
 docker compose -f trinoconnector-compose.yml --env-file trinoconnector-compose.env down
----------

You can reformat the above files to meet shfmt's requirements by typing:

  shfmt  -w filename


Copy link
Contributor

sh-checker report

To get the full details, please check in the job output.

shellcheck errors

'shellcheck ' returned error 1 finding the following syntactical issues:

----------

In samples/datalake/deltalake_and_kudu/start-trinoconnector-compose.sh line 162:
export KUDU_QUICKSTART_IP=$(ifconfig | grep "inet " | grep -Fv 127.0.0.1 |  awk '{print $2}' | tail -1)
       ^----------------^ SC2155 (warning): Declare and assign separately to avoid masking return values.


In samples/datalake/deltalake_and_kudu/stop-trinoconnector-compose.sh line 20:
export KUDU_QUICKSTART_IP=$(ifconfig | grep "inet " | grep -Fv 127.0.0.1 |  awk '{print $2}' | tail -1)
       ^----------------^ SC2155 (warning): Declare and assign separately to avoid masking return values.

For more information:
  https://www.shellcheck.net/wiki/SC2155 -- Declare and assign separately to ...
----------

You can address the above issues in one of three ways:
1. Manually correct the issue in the offending shell script;
2. Disable specific issues by adding the comment:
  # shellcheck disable=NNNN
above the line that contains the issue, where NNNN is the error code;
3. Add '-e NNNN' to the SHELLCHECK_OPTS setting in your .yml action file.



shfmt errors

'shfmt ' returned error 1 finding the following formatting issues:

----------
--- samples/datalake/deltalake_and_kudu/scripts/start_doris.sh.orig
+++ samples/datalake/deltalake_and_kudu/scripts/start_doris.sh
@@ -20,8 +20,8 @@
 export JAVA_HOME=/opt/jdk-17.0.2
 
 cp -r /opt/doris-bin /opt/doris
-echo "trino_connector_plugin_dir=/opt/connectors/" >> /opt/doris/fe/conf/fe.conf
-echo "trino_connector_plugin_dir=/opt/connectors/" >> /opt/doris/be/conf/be.conf
+echo "trino_connector_plugin_dir=/opt/connectors/" >>/opt/doris/fe/conf/fe.conf
+echo "trino_connector_plugin_dir=/opt/connectors/" >>/opt/doris/be/conf/be.conf
 
 /opt/doris/fe/bin/start_fe.sh --daemon
 /opt/doris/be/bin/start_be.sh --daemon
--- samples/datalake/deltalake_and_kudu/start-trinoconnector-compose.sh.orig
+++ samples/datalake/deltalake_and_kudu/start-trinoconnector-compose.sh
@@ -33,7 +33,6 @@
 hdfs_plugin="ff4a3e3b32dcce27f4df58f17938abde"
 kudu_java_example="1afe0a890785e8d0011ea7342ae5e43d"
 
-
 download_source_file() {
     local FILE_PATH="$1"
     local EXPECTED_MD5="$2"
@@ -79,9 +78,6 @@
 download_source_file "trino-hdfs-435-20240724.tar.gz" "${hdfs_plugin}" "https://github.com/apache/doris-thirdparty/releases/download/trino-435-20240724"
 download_source_file "kudu-java-example-1.0-SNAPSHOT.jar" "${kudu_java_example}" "https://github.com/apache/doris-thirdparty/releases/download/trino-435-20240724"
 
-
-
-
 if [[ ! -f "jdk-17.0.2/SUCCESS" ]]; then
     echo "Prepare jdk17 environment"
     if [[ -d "jdk-17.0.2" ]]; then
@@ -156,10 +152,9 @@
     touch connectors/trino-delta-lake-435/hdfs/SUCCESS
 fi
 
-
 cd ../
 
-export KUDU_QUICKSTART_IP=$(ifconfig | grep "inet " | grep -Fv 127.0.0.1 |  awk '{print $2}' | tail -1)
+export KUDU_QUICKSTART_IP=$(ifconfig | grep "inet " | grep -Fv 127.0.0.1 | awk '{print $2}' | tail -1)
 
 docker compose -f trinoconnector-compose.yml --env-file trinoconnector-compose.env up -d
 echo "Create hive table ..."
--- samples/datalake/deltalake_and_kudu/stop-trinoconnector-compose.sh.orig
+++ samples/datalake/deltalake_and_kudu/stop-trinoconnector-compose.sh
@@ -17,6 +17,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-export KUDU_QUICKSTART_IP=$(ifconfig | grep "inet " | grep -Fv 127.0.0.1 |  awk '{print $2}' | tail -1)
+export KUDU_QUICKSTART_IP=$(ifconfig | grep "inet " | grep -Fv 127.0.0.1 | awk '{print $2}' | tail -1)
 
 docker compose -f trinoconnector-compose.yml --env-file trinoconnector-compose.env down
----------

You can reformat the above files to meet shfmt's requirements by typing:

  shfmt  -w filename


Copy link
Contributor

clang-tidy review says "All clean, LGTM! 👍"

Copy link
Contributor

clang-tidy review says "All clean, LGTM! 👍"

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants