This is an automated email from the ASF dual-hosted git repository. morningman pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-doris-spark-connector.git
commit 0923ced1cb255d5d0937e588cca6b6d5d233958c Author: morningman <[email protected]> AuthorDate: Fri Feb 11 23:26:38 2022 +0800 [init] do some init work --- .github/ISSUE_TEMPLATE/bug_report.yml | 109 +++++++++++++++ .github/ISSUE_TEMPLATE/config.yml | 23 ++++ .github/ISSUE_TEMPLATE/enhancement.yml | 76 +++++++++++ .github/ISSUE_TEMPLATE/feature-request.yml | 78 +++++++++++ .github/PULL_REQUEST_TEMPLATE.md | 19 +++ .github/workflows/approve-label-trigger.yml | 28 ++++ .github/workflows/approve-label.yml | 67 +++++++++ .github/workflows/build-extension.yml | 56 ++++++++ .github/workflows/license-eyes.yml | 35 +++++ .gitignore | 4 + .licenserc.yaml | 36 +++++ CODE_OF_CONDUCT.md | 95 +++++++++++++ CONTRIBUTING.md | 24 ++++ CONTRIBUTING_CN.md | 24 ++++ DISCLAIMER | 12 ++ LICENSE-dependencies.txt | 64 +++++++++ LICENSE.txt | 202 ++++++++++++++++++++++++++++ NOTICE.txt | 5 + README.md | 49 +++++++ custom_env.sh.tpl | 3 + env.sh | 91 +++++++++++++ spark-doris-connector/build.sh | 19 +-- spark-doris-connector/pom.xml | 17 ++- 23 files changed, 1118 insertions(+), 18 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml new file mode 100644 index 0000000..acabcb1 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -0,0 +1,109 @@ +# +# 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. +# + +name: Doris Bug report +title: "[Bug] " +description: Problems and issues with code of Apache Doris +labels: [ "kind/bug" ] +body: + - type: markdown + attributes: + value: | + Thank you very much for submitting feedback to Doris to help Doris develop better. + + If it is an idea or help wanted, please go to: + + 1. [Dev Mail List](mailto:[email protected]): This will be your FASTEST way to get help！[How to subscribe](mailto:[email protected]) + 2. [Github Discussion](https://github.com/apache/incubator-doris/discussions) + + - type: checkboxes + attributes: + label: Search before asking + description: > + Please make sure to search in the [issues](https://github.com/apache/incubator-doris/issues?q=is%3Aissue) first to see + whether the same issue was reported already. + options: + - label: > + I had searched in the [issues](https://github.com/apache/incubator-doris/issues?q=is%3Aissue) and found no similar + issues. + required: true + + - type: textarea + attributes: + label: Version + description: What is the current version + placeholder: > + Please provide the version you are using. + If it is the trunk version, please input commit id. + validations: + required: true + + - type: textarea + attributes: + label: What's Wrong? + description: Describe the bug. + placeholder: > + Describe the specific problem, the more detailed the better. + validations: + required: true + + - type: textarea + attributes: + label: What You Expected? + validations: + required: true + + - type: textarea + attributes: + label: How to Reproduce? + placeholder: > + Please try to give reproducing steps to facilitate quick location of the problem. + + - What actions were performed + - Table building statement + - Import statement + - Cluster information: number of nodes, configuration, etc. + + If it is hard to reproduce, please also explain the general scene. + + - type: textarea + attributes: + label: Anything Else? + + - type: checkboxes + attributes: + label: Are you willing to submit PR? + description: > + We very much look forward to developers or users to help solve the Doris problem together. + If you are willing to submit a PR to fix this problem, please tick it. + options: + - label: Yes I am willing to submit a PR! + + - type: checkboxes + attributes: + label: Code of Conduct + description: The Code of Conduct helps create a safe space for everyone. We require that everyone agrees to it. + options: + - label: > + I agree to follow this project's + [Code of Conduct](https://www.apache.org/foundation/policies/conduct) + required: true + + - type: markdown + attributes: + value: "Thanks for completing our form!" + diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml new file mode 100644 index 0000000..8e0108e --- /dev/null +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -0,0 +1,23 @@ +# +# 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. +# + +blank_issues_enabled: true +contact_links: + - name: Ask a question or get support + url: https://github.com/apache/incubator-doris/discussions + about: Ask a question or request support for using Apache Doris + diff --git a/.github/ISSUE_TEMPLATE/enhancement.yml b/.github/ISSUE_TEMPLATE/enhancement.yml new file mode 100644 index 0000000..df617e8 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/enhancement.yml @@ -0,0 +1,76 @@ +# +# 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. +# + +name: Doris enhancement +description: Add an enhanment for Apache Doris +title: "[Enhancement] " +labels: [ "kind/enhancement" ] +body: + - type: markdown + attributes: + value: | + Thank you very much for your good enhancement for Doris. + + Please help sync to the [Dev Mail List](mailto:[email protected]). You will get FASTER help！[How to subscribe](mailto:[email protected]) + + - type: checkboxes + attributes: + label: Search before asking + description: > + Please make sure to search in the [issues](https://github.com/apache/incubator-doris/issues?q=is%3Aissue) first to see + whether the same issue was reported already. + options: + - label: > + I had searched in the [issues](https://github.com/apache/incubator-doris/issues?q=is%3Aissue) and found no similar + issues. + required: true + + - type: textarea + attributes: + label: Description + description: Describe the enhancement what you want, including motivation if it exists. + + - type: textarea + attributes: + label: Solution + placeholder: > + Add overview of proposed solution. + + Add related materials like links if they exist. + + - type: checkboxes + attributes: + label: Are you willing to submit PR? + description: > + We very much look forward to developers or users to help develop the Doris together. + If you are willing to submit a PR to implement this feature, please tick it. + options: + - label: Yes I am willing to submit a PR! + + - type: checkboxes + attributes: + label: Code of Conduct + description: The Code of Conduct helps create a safe space for everyone. We require that everyone agrees to it. + options: + - label: > + I agree to follow this project's + [Code of Conduct](https://www.apache.org/foundation/policies/conduct) + required: true + + - type: markdown + attributes: + value: "Thanks for completing our form!" diff --git a/.github/ISSUE_TEMPLATE/feature-request.yml b/.github/ISSUE_TEMPLATE/feature-request.yml new file mode 100644 index 0000000..0a7d82e --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature-request.yml @@ -0,0 +1,78 @@ +# +# 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. +# +name: Doris feature request +description: Suggest an idea for Apache Doris +title: "[Feature] " +labels: [ "kind/feature" ] +body: + - type: markdown + attributes: + value: | + Thank you very much for your good ideas and suggestions for Doris + + Please help sync to the [Dev Mail List](mailto:[email protected]). You will get FASTER help！[How to subscribe](mailto:[email protected]) + + - type: checkboxes + attributes: + label: Search before asking + description: > + Please make sure to search in the [issues](https://github.com/apache/incubator-doris/issues?q=is%3Aissue) first to see + whether the same issue was reported already. + options: + - label: > + I had searched in the [issues](https://github.com/apache/incubator-doris/issues?q=is%3Aissue) and found no similar + issues. + required: true + + - type: textarea + attributes: + label: Description + description: Describe your ideas and needs. + + - type: textarea + attributes: + label: Use case + placeholder: > + What problem does this feature mainly solve, or what scenarios it is suitable for. + + - type: textarea + attributes: + label: Related issues + description: Is there currently another issue associated with this? + + - type: checkboxes + attributes: + label: Are you willing to submit PR? + description: > + We very much look forward to developers or users to help develop the Doris together. + If you are willing to submit a PR to implement this feature, please tick it. + options: + - label: Yes I am willing to submit a PR! + + - type: checkboxes + attributes: + label: Code of Conduct + description: The Code of Conduct helps create a safe space for everyone. We require that everyone agrees to it. + options: + - label: > + I agree to follow this project's + [Code of Conduct](https://www.apache.org/foundation/policies/conduct) + required: true + + - type: markdown + attributes: + value: "Thanks for completing our form!" diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 0000000..6f56b55 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,19 @@ +# Proposed changes + +Issue Number: close #xxx + +## Problem Summary: + +Describe the overview of changes. + +## Checklist(Required) + +1. Does it affect the original behavior: (Yes/No/I Don't know) +2. Has unit tests been added: (Yes/No/No Need) +3. Has document been added or modified: (Yes/No/No Need) +4. Does it need to update dependencies: (Yes/No) +5. Are there any changes that cannot be rolled back: (Yes/No) + +## Further comments + +If this is a relatively large or complex change, kick off the discussion at [[email protected]](mailto:[email protected]) by explaining why you chose the solution you did and what alternatives you considered, etc... diff --git a/.github/workflows/approve-label-trigger.yml b/.github/workflows/approve-label-trigger.yml new file mode 100644 index 0000000..1a9cb84 --- /dev/null +++ b/.github/workflows/approve-label-trigger.yml @@ -0,0 +1,28 @@ +# 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. +# +--- +name: Label when reviewed +on: pull_request_review +jobs: + + label-when-reviewed: + name: "Label PRs when reviewed" + runs-on: ubuntu-latest + steps: + - name: "Do nothing. Only trigger corresponding workflow_run event" + run: echo diff --git a/.github/workflows/approve-label.yml b/.github/workflows/approve-label.yml new file mode 100644 index 0000000..f022578 --- /dev/null +++ b/.github/workflows/approve-label.yml @@ -0,0 +1,67 @@ +# 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. +# +--- +name: Label when approved workflow run +on: + workflow_run: + workflows: ["Label when reviewed"] + types: ['requested'] +permissions: + # All other permissions are set to none + checks: write + contents: read + pull-requests: write + +jobs: + + label-when-approved: + name: "Label when approved" + runs-on: ubuntu-latest + outputs: + isApprovedByCommiters: ${{ steps.label-when-approved-by-commiters.outputs.isApproved }} + isApprovedByAnyone: ${{ steps.label-when-approved-by-anyone.outputs.isApproved }} + steps: + - name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )" + uses: actions/checkout@v2 + with: + persist-credentials: false + submodules: recursive + - name: "Get information about the original trigger of the run" + uses: ./.github/actions/get-workflow-origin + id: source-run-info + with: + token: ${{ secrets.GITHUB_TOKEN }} + sourceRunId: ${{ github.event.workflow_run.id }} + - name: Label when approved by commiters + uses: ./.github/actions/label-when-approved-action + id: label-when-approved-by-commiters + with: + token: ${{ secrets.GITHUB_TOKEN }} + label: 'approved' + require_committers_approval: 'true' + remove_label_when_approval_missing: 'true' + pullRequestNumber: ${{ steps.source-run-info.outputs.pullRequestNumber }} + comment: 'PR approved by at least one committer and no changes requested.' + - name: Label when approved by anyone + uses: ./.github/actions/label-when-approved-action + id: label-when-approved-by-anyone + with: + token: ${{ secrets.GITHUB_TOKEN }} + label: 'reviewed' + pullRequestNumber: ${{ steps.source-run-info.outputs.pullRequestNumber }} + comment: 'PR approved by anyone and no changes requested.' diff --git a/.github/workflows/build-extension.yml b/.github/workflows/build-extension.yml new file mode 100644 index 0000000..bce2a12 --- /dev/null +++ b/.github/workflows/build-extension.yml @@ -0,0 +1,56 @@ +# 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. +# +--- +name: Build Extensions +on: + pull_request: + push: + +jobs: + build-extension: + name: "Build Extensions" + runs-on: ubuntu-latest + defaults: + run: + shell: bash + steps: + - name: Checkout + uses: actions/checkout@master + + - name: Setup java + uses: actions/setup-java@v2 + with: + distribution: adopt + java-version: '8' + + - name: Setup thrift + run: | + sudo apt-get update + sudo DEBIAN_FRONTEND=noninteractive apt-get install -y thrift-compiler=0.13.0-2build2 + thrift --version + touch custom_env.sh + echo 'export THRIFT_BIN=/usr/bin/thrift' >> custom_env.sh + + - name: Build spark connector v2 + run: | + cd spark-doris-connector/ && /bin/bash build.sh 2.3.4 2.11 + + - name: Build spark connector v3 + run: | + cd spark-doris-connector/ && /bin/bash build.sh 3.1.2 2.12 + diff --git a/.github/workflows/license-eyes.yml b/.github/workflows/license-eyes.yml new file mode 100644 index 0000000..c9b4cd2 --- /dev/null +++ b/.github/workflows/license-eyes.yml @@ -0,0 +1,35 @@ +# 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. +# +--- +name: License Check +on: + pull_request: + push: + branches: + - master +jobs: + license-check: + name: "License Check" + runs-on: ubuntu-latest + steps: + - name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )" + uses: actions/checkout@v2 + - name: Check License + uses: apache/[email protected] + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..43ebf0c --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +custom_env.sh +spark-doris-connector/dependency-reduced-pom.xml +spark-doris-connector/output/ +spark-doris-connector/target/ diff --git a/.licenserc.yaml b/.licenserc.yaml new file mode 100644 index 0000000..c1f8109 --- /dev/null +++ b/.licenserc.yaml @@ -0,0 +1,36 @@ +header: + license: + spdx-id: Apache-2.0 + copyright-owner: Apache Software Foundation + + paths-ignore: + - 'dist' + - 'licenses' + - '**/*.md' + - 'LICENSE' + - 'NOTICE' + - 'DISCLAIMER' + - '.clang-format' + - '.clang-format-ignore' + - '.gitattributes' + - '.gitignore' + - '.gitmodules' + - '.licenserc.yaml' + - '.rat-excludes' + - 'be/src/common/status.cpp' + - 'be/src/common/status.h' + - 'be/src/env/env.h' + - 'be/src/env/env_posix.cpp' + - '**/glibc-compatibility/**' + - '**/gutil/**' + - '**/test_data/**' + - '**/jmockit/**' + - '**/*.json' + - '**/*.dat' + - '**/*.svg' + - '**/*.md5' + - '**/*.patch' + - '**/*.log' + - 'custom_env.sh.tpl' + + comment: on-failure diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md new file mode 100644 index 0000000..c9b8f87 --- /dev/null +++ b/CODE_OF_CONDUCT.md @@ -0,0 +1,95 @@ +<!-- +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. +--> + +# Contributor Covenant Code of Conduct + +## Our Pledge + +In the interest of fostering an open and welcoming environment, we as +contributors and maintainers pledge to making participation in our project and +our community a harassment-free experience for everyone, regardless of age, body +size, disability, ethnicity, sex characteristics, gender identity and expression, +level of experience, education, socio-economic status, nationality, personal +appearance, race, religion, or sexual identity and orientation. + +## Our Standards + +Examples of behavior that contributes to creating a positive environment +include: + +* Using welcoming and inclusive language +* Being respectful of differing viewpoints and experiences +* Gracefully accepting constructive criticism +* Focusing on what is best for the community +* Showing empathy towards other community members + +Examples of unacceptable behavior by participants include: + +* The use of sexualized language or imagery and unwelcome sexual attention or + advances +* Trolling, insulting/derogatory comments, and personal or political attacks +* Public or private harassment +* Publishing others' private information, such as a physical or electronic + address, without explicit permission +* Other conduct which could reasonably be considered inappropriate in a + professional setting + +## Our Responsibilities + +Project maintainers are responsible for clarifying the standards of acceptable +behavior and are expected to take appropriate and fair corrective action in +response to any instances of unacceptable behavior. + +Project maintainers have the right and responsibility to remove, edit, or +reject comments, commits, code, wiki edits, issues, and other contributions +that are not aligned to this Code of Conduct, or to ban temporarily or +permanently any contributor for other behaviors that they deem inappropriate, +threatening, offensive, or harmful. + +## Scope + +This Code of Conduct applies both within project spaces and in public spaces +when an individual is representing the project or its community. Examples of +representing a project or community include using an official project e-mail +address, posting via an official social media account, or acting as an appointed +representative at an online or offline event. Representation of a project may be +further defined and clarified by project maintainers. + +## Enforcement + +Instances of abusive, harassing, or otherwise unacceptable behavior may be +reported by contacting the project team at [email protected]. All +complaints will be reviewed and investigated and will result in a response that +is deemed necessary and appropriate to the circumstances. The project team is +obligated to maintain confidentiality with regard to the reporter of an incident. +Further details of specific enforcement policies may be posted separately. + +Project maintainers who do not follow or enforce the Code of Conduct in good +faith may face temporary or permanent repercussions as determined by other +members of the project's leadership. + +## Attribution + +This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, +available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html + +[homepage]: https://www.contributor-covenant.org + +For answers to common questions about this code of conduct, see +https://www.contributor-covenant.org/faq diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 0000000..3c353cb --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,24 @@ +<!-- +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. +--> + +# Contribute to Doris + +Thank you very much for your interest in the Doris project. We welcome your suggestions, comments (including criticisms), comments and contributions to the Doris project. + +For more information on how to contribute to Doris, please go to the Doris main repository [CONTRIBUTING](https://github.com/apache/incubator-doris/blob/master/CONTRIBUTING.md) diff --git a/CONTRIBUTING_CN.md b/CONTRIBUTING_CN.md new file mode 100644 index 0000000..5dc5fbe --- /dev/null +++ b/CONTRIBUTING_CN.md @@ -0,0 +1,24 @@ +<!-- +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. +--> + +# 为 Doris 做贡献 + +非常感谢您对 Doris 项目感兴趣，我们非常欢迎您对 Doris 项目的各种建议、意见（包括批评）、评论和贡献。 + +关于如何为 Doris 做贡献，请前往 Doris 主库查阅 [CONTRIBUTING_CN](https://github.com/apache/incubator-doris/blob/master/CONTRIBUTING_CN.md) diff --git a/DISCLAIMER b/DISCLAIMER new file mode 100644 index 0000000..bcae8b9 --- /dev/null +++ b/DISCLAIMER @@ -0,0 +1,12 @@ +Apache Doris (incubating) is an effort undergoing incubation at The +Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC. + +Incubation is required of all newly accepted +projects until a further review indicates that the +infrastructure, communications, and decision making process have +stabilized in a manner consistent with other successful ASF +projects. + +While incubation status is not necessarily a reflection +of the completeness or stability of the code, it does indicate +that the project has yet to be fully endorsed by the ASF. diff --git a/LICENSE-dependencies.txt b/LICENSE-dependencies.txt new file mode 100644 index 0000000..9306e2a --- /dev/null +++ b/LICENSE-dependencies.txt @@ -0,0 +1,64 @@ +This file contains all third-party dependencies that are not part of the APLv2 protocol. +Generated by license-maven-plugin. + +Each time you build spark-connector, ./target/classes/THIRD-PARTY.txt is generated. +If new dependencies are added, we need to update this file. +====================================================================================== + +(New BSD License) Kryo Shaded (com.esotericsoftware:kryo-shaded:3.0.3 - https://github.com/EsotericSoftware/kryo/kryo-shaded) +(New BSD License) MinLog (com.esotericsoftware:minlog:1.3.0 - https://github.com/EsotericSoftware/minlog) +(BSD 2-Clause License) zstd-jni (com.github.luben:zstd-jni:1.3.2-2 - https://github.com/luben/zstd-jni) +(New BSD license) Protocol Buffer Java API (com.google.protobuf:protobuf-java:2.5.0 - http://code.google.com/p/protobuf) +(BSD) ParaNamer Core (com.thoughtworks.paranamer:paranamer:2.3 - http://paranamer.codehaus.org/paranamer) +(Unknown license) commons-beanutils (commons-beanutils:commons-beanutils:1.7.0 - no url defined) +(COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0) JavaBeans(TM) Activation Framework (javax.activation:activation:1.1.1 - http://java.sun.com/javase/technologies/desktop/javabeans/jaf/index.jsp) +(CDDL + GPLv2 with classpath exception) javax.annotation API (javax.annotation:javax.annotation-api:1.3.2 - http://jcp.org/en/jsr/detail?id=250) +(CDDL + GPLv2 with classpath exception) Java Servlet API (javax.servlet:javax.servlet-api:3.1.0 - http://servlet-spec.java.net) +(CDDL 1.1) (GPL2 w/ CPE) javax.ws.rs-api (javax.ws.rs:javax.ws.rs-api:2.0.1 - http://jax-rs-spec.java.net) +(CDDL 1.1) (GPL2 w/ CPE) JAXB API bundle for GlassFish V3 (javax.xml.bind:jaxb-api:2.2.2 - https://jaxb.dev.java.net/) +(COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0) (GNU General Public Library) Streaming API for XML (javax.xml.stream:stax-api:1.0-2 - no url defined) +(Common Public License Version 1.0) JUnit (junit:junit:4.11 - http://junit.org) +(Public domain) base64 (net.iharder:base64:2.3.8 - http://iharder.net/base64/) +(MIT License) pyrolite (net.razorvine:pyrolite:4.13 - https://github.com/irmen/Pyrolite) +(The New BSD License) Py4J (net.sf.py4j:py4j:0.10.7 - http://nexus.sonatype.org/oss-repository-hosting.html/py4j) +(The BSD License) ANTLR 4 Runtime (org.antlr:antlr4-runtime:4.7 - http://www.antlr.org/antlr4-runtime) +(Unknown license) zookeeper (org.apache.zookeeper:zookeeper:3.4.6 - no url defined) +(Bouncy Castle Licence) Bouncy Castle Provider (org.bouncycastle:bcprov-jdk15on:1.52 - http://www.bouncycastle.org/java.html) +(GNU Lesser General Public License (LGPL), Version 2.1) (The Apache Software License, Version 2.0) JAX-RS provider for JSON content type (org.codehaus.jackson:jackson-jaxrs:1.9.13 - http://jackson.codehaus.org) +(GNU Lesser General Public License (LGPL), Version 2.1) (The Apache Software License, Version 2.0) Xml Compatibility extensions for Jackson (org.codehaus.jackson:jackson-xc:1.9.13 - http://jackson.codehaus.org) +(New BSD License) commons-compiler (org.codehaus.janino:commons-compiler:3.0.8 - http://janino-compiler.github.io/commons-compiler/) +(New BSD License) janino (org.codehaus.janino:janino:3.0.8 - http://janino-compiler.github.io/janino/) +(The BSD 3-Clause License) leveldbjni-all (org.fusesource.leveldbjni:leveldbjni-all:1.8 - http://leveldbjni.fusesource.org/leveldbjni-all) +(CDDL + GPLv2 with classpath exception) HK2 API module (org.glassfish.hk2:hk2-api:2.4.0-b34 - https://hk2.java.net/hk2-api) +(CDDL + GPLv2 with classpath exception) ServiceLocator Default Implementation (org.glassfish.hk2:hk2-locator:2.4.0-b34 - https://hk2.java.net/hk2-locator) +(CDDL + GPLv2 with classpath exception) HK2 Implementation Utilities (org.glassfish.hk2:hk2-utils:2.4.0-b34 - https://hk2.java.net/hk2-utils) +(CDDL + GPLv2 with classpath exception) OSGi resource locator bundle - used by various API providers that rely on META-INF/services mechanism to locate providers. (org.glassfish.hk2:osgi-resource-locator:1.0.1 - http://glassfish.org/osgi-resource-locator/) +(CDDL + GPLv2 with classpath exception) aopalliance version 1.0 repackaged as a module (org.glassfish.hk2.external:aopalliance-repackaged:2.4.0-b34 - https://hk2.java.net/external/aopalliance-repackaged) +(CDDL + GPLv2 with classpath exception) javax.inject:1 as OSGi bundle (org.glassfish.hk2.external:javax.inject:2.4.0-b34 - https://hk2.java.net/external/javax.inject) +(CDDL+GPL License) jersey-repackaged-guava (org.glassfish.jersey.bundles.repackaged:jersey-guava:2.22.2 - https://jersey.java.net/project/project/jersey-guava/) +(CDDL+GPL License) jersey-container-servlet (org.glassfish.jersey.containers:jersey-container-servlet:2.22.2 - https://jersey.java.net/project/jersey-container-servlet/) +(CDDL+GPL License) jersey-container-servlet-core (org.glassfish.jersey.containers:jersey-container-servlet-core:2.22.2 - https://jersey.java.net/project/jersey-container-servlet-core/) +(CDDL+GPL License) jersey-core-client (org.glassfish.jersey.core:jersey-client:2.22.2 - https://jersey.java.net/jersey-client/) +(CDDL+GPL License) jersey-core-common (org.glassfish.jersey.core:jersey-common:2.22.2 - https://jersey.java.net/jersey-common/) +(CDDL+GPL License) jersey-core-server (org.glassfish.jersey.core:jersey-server:2.22.2 - https://jersey.java.net/jersey-server/) +(CDDL+GPL License) jersey-media-jaxb (org.glassfish.jersey.media:jersey-media-jaxb:2.22.2 - https://jersey.java.net/project/jersey-media-jaxb/) +(New BSD License) Hamcrest Core (org.hamcrest:hamcrest-core:1.3 - https://github.com/hamcrest/JavaHamcrest/hamcrest-core) +(ASL) json4s-ast (org.json4s:json4s-ast_2.11:3.2.11 - https://github.com/json4s/json4s) +(ASL) json4s-core (org.json4s:json4s-core_2.11:3.2.11 - https://github.com/json4s/json4s) +(ASL) json4s-jackson (org.json4s:json4s-jackson_2.11:3.2.11 - https://github.com/json4s/json4s) +(The MIT License) mockito-core (org.mockito:mockito-core:2.27.0 - https://github.com/mockito/mockito) +(MIT) mockito-scala (org.mockito:mockito-scala_2.11:1.4.7 - https://github.com/mockito/mockito-scala) +(BSD 3-Clause) Scala Compiler (org.scala-lang:scala-compiler:2.11.0 - http://www.scala-lang.org/) +(BSD 3-Clause) Scala Library (org.scala-lang:scala-library:2.11.8 - http://www.scala-lang.org/) +(BSD 3-Clause) Scala Compiler (org.scala-lang:scala-reflect:2.11.12 - http://www.scala-lang.org/) +(BSD 3-Clause) Scalap (org.scala-lang:scalap:2.11.0 - http://www.scala-lang.org/) +(BSD 3-clause) scala-parser-combinators (org.scala-lang.modules:scala-parser-combinators_2.11:1.0.4 - http://www.scala-lang.org/) +(BSD 3-clause) scala-xml (org.scala-lang.modules:scala-xml_2.11:1.0.1 - http://www.scala-lang.org/) +(MIT License) JCL 1.1.1 implemented over SLF4J (org.slf4j:jcl-over-slf4j:1.7.16 - http://www.slf4j.org) +(MIT License) JUL to SLF4J bridge (org.slf4j:jul-to-slf4j:1.7.16 - http://www.slf4j.org) +(MIT License) SLF4J API Module (org.slf4j:slf4j-api:1.7.16 - http://www.slf4j.org) +(MIT License) SLF4J LOG4J-12 Binding (org.slf4j:slf4j-log4j12:1.7.16 - http://www.slf4j.org) +(Public Domain) XZ for Java (org.tukaani:xz:1.0 - http://tukaani.org/xz/java.html) +(Unknown license) oro (oro:oro:2.0.8 - no url defined) +(The MIT License) generics-resolver (ru.vyarus:generics-resolver:3.0.0 - https://github.com/xvik/generics-resolver) +(The BSD License) xmlenc Library (xmlenc:xmlenc:0.52 - http://xmlenc.sourceforge.net) diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..57bc88a --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,202 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed 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. + diff --git a/NOTICE.txt b/NOTICE.txt new file mode 100644 index 0000000..f8c43b1 --- /dev/null +++ b/NOTICE.txt @@ -0,0 +1,5 @@ +Apache Doris (incubating) +Copyright 2018-2022 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). diff --git a/README.md b/README.md new file mode 100644 index 0000000..f4e9246 --- /dev/null +++ b/README.md @@ -0,0 +1,49 @@ +<!-- +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. +--> + +# Spark Connector for Apache Doris (incubating) + +[](https://www.apache.org/licenses/LICENSE-2.0.html) +[](https://join.slack.com/t/apachedoriscommunity/shared_invite/zt-11jb8gesh-7IukzSrdea6mqoG0HB4gZg) + +### Spark Doris Connector + +More information about compilation and usage, please visit [Spark Doris Connector](http://doris.apache.org/extending-doris/spark-doris-connector.html) + +## License + +[Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0) + +## Report issues or submit pull request + +If you find any bugs, feel free to file a [GitHub issue](https://github.com/apache/incubator-doris/issues) or fix it by submitting a [pull request](https://github.com/apache/incubator-doris/pulls). + +## Contact Us + +Contact us through the following mailing list. + +| Name | Scope | | | | +|:------------------------------------------------------------------------------|:--------------------------------|:----------------------------------------------------------------|:--------------------------------------------------------------------|:-----------------------------------------------------------------------------| +| [[email protected]](mailto:[email protected]) | Development-related discussions | [Subscribe](mailto:[email protected]) | [Unsubscribe](mailto:[email protected]) | [Archives](http://mail-archives.apache.org/mod_mbox/doris-dev/) | + +## Links + +* Doris official site - <http://doris.incubator.apache.org> +* Developer Mailing list - <[email protected]>. Mail to <[email protected]>, follow the reply to subscribe the mail list. +* Slack channel - [Join the Slack](https://join.slack.com/t/apachedoriscommunity/shared_invite/zt-11jb8gesh-7IukzSrdea6mqoG0HB4gZg) diff --git a/custom_env.sh.tpl b/custom_env.sh.tpl new file mode 100644 index 0000000..7399923 --- /dev/null +++ b/custom_env.sh.tpl @@ -0,0 +1,3 @@ +#export THRIFT_BIN= +#export MVN_BIN= +#export JAVA_HOME= diff --git a/env.sh b/env.sh new file mode 100755 index 0000000..ef7a808 --- /dev/null +++ b/env.sh @@ -0,0 +1,91 @@ +# 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. + +# check DORIS_HOME +export LC_ALL=C + +if [[ -z ${DORIS_HOME} ]]; then + echo "Error: DORIS_HOME is not set" + exit 1 +fi + +# check OS type +if [[ ! -z "$OSTYPE" ]]; then + if [[ ${OSTYPE} != "linux-gnu" ]] && [[ ${OSTYPE:0:6} != "darwin" ]]; then + echo "Error: Unsupported OS type: $OSTYPE" + exit 1 + fi +fi + +# include custom environment variables +if [[ -f ${DORIS_HOME}/custom_env.sh ]]; then + . ${DORIS_HOME}/custom_env.sh +fi + +thrift_help() { + echo "You can rename 'custom_env.sh.tpl' to 'custom_env.sh' and set THRIFT_BIN to the thrift binary" + echo "For example: " + echo " THRIFT_BIN=/path/to/thrift/bin/thrift" + echo "" + echo "You can install [email protected] by yourself, or if you have compiled the Doris core source file," + echo "there is thrift in 'thirdparty/installed/bin/'" +} + +# check thrift +if [ -z "$THRIFT_BIN" ]; then + thrift_help + exit 1 +fi + +if ! ${THRIFT_BIN} --version; then + thrift_help + exit 1 +fi + +# check java home +if [ -z "$JAVA_HOME" ]; then + export JAVACMD=$(which java) + JAVAP=$(which javap) +else + export JAVA="${JAVA_HOME}/bin/java" + JAVAP="${JAVA_HOME}/bin/javap" +fi + +if [ ! -x "$JAVA" ]; then + echo "The JAVA_HOME environment variable is not defined correctly" + echo "This environment variable is needed to run this program" + echo "NB: JAVA_HOME should point to a JDK not a JRE" + exit 1 +fi + +JAVA_VER=$(${JAVAP} -verbose java.lang.String | grep "major version" | cut -d " " -f5) +if [[ $JAVA_VER -lt 52 ]]; then + echo "Error: require JAVA with JDK version at least 1.8" + exit 1 +fi + +# check maven +if [ -z "$MVN_BIN" ]; then + export MVN_BIN=$(which mvn) +fi +if ! ${MVN_BIN} --version; then + echo "Error: mvn is not found" + echo "You can rename 'custom_env.sh.tpl' to 'custom_env.sh' and set MVN_BIN to the mvn binary" + echo "For example:" + echo " export MVN_BIN=/path/to/maven/bin/mvn" + exit 1 +fi diff --git a/spark-doris-connector/build.sh b/spark-doris-connector/build.sh index e6d4783..4a3d67b 100755 --- a/spark-doris-connector/build.sh +++ b/spark-doris-connector/build.sh @@ -43,8 +43,7 @@ fi ROOT=$(dirname "$0") ROOT=$(cd "$ROOT"; pwd) -export DORIS_HOME=${ROOT}/../../ -export PATH=${DORIS_THIRDPARTY}/installed/bin:$PATH +export DORIS_HOME=${ROOT}/../ . "${DORIS_HOME}"/env.sh @@ -53,21 +52,8 @@ if [[ -f ${DORIS_HOME}/custom_env.sh ]]; then . "${DORIS_HOME}"/custom_env.sh fi -# check maven -MVN_CMD=mvn -if [[ -n ${CUSTOM_MVN} ]]; then - MVN_CMD=${CUSTOM_MVN} -fi -if ! ${MVN_CMD} --version; then - echo "Error: mvn is not found" - exit 1 -fi -export MVN_CMD - -rm -rf output/ - -${MVN_CMD} clean package -Dscala.version=$2 -Dspark.version=$1 +${MVN_BIN} clean package -Dscala.version=$2 -Dspark.version=$1 mkdir -p output/ cp target/doris-spark-*.jar ./output/ @@ -77,3 +63,4 @@ echo "Successfully build Spark-Doris-Connector" echo "*****************************************" exit 0 + diff --git a/spark-doris-connector/pom.xml b/spark-doris-connector/pom.xml index cfa2c5d..26d8337 100644 --- a/spark-doris-connector/pom.xml +++ b/spark-doris-connector/pom.xml @@ -70,7 +70,7 @@ <maven-javadoc-plugin.version>3.3.0</maven-javadoc-plugin.version> <maven-source-plugin.version>3.2.1</maven-source-plugin.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <doris.thirdparty>${env.DORIS_THIRDPARTY}</doris.thirdparty> + <thrift.binary>${env.THRIFT_BIN}</thrift.binary> <project.scm.id>github</project.scm.id> </properties> <profiles> @@ -241,7 +241,7 @@ <artifactId>maven-thrift-plugin</artifactId> <version>0.1.11</version> <configuration> - <thriftExecutable>${doris.thirdparty}/installed/bin/thrift</thriftExecutable> + <thriftExecutable>${thrift.binary}</thriftExecutable> <generator>java:fullcamel</generator> </configuration> <executions> @@ -370,6 +370,19 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>license-maven-plugin</artifactId> + <version>2.0.0</version> + <executions> + <execution> + <id>add-third-party</id> + <goals> + <goal>add-third-party</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> </project> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
