From 4e81e6b2307057b9d85af0d7af7e32e253c9e30b Mon Sep 17 00:00:00 2001 From: feiwang Date: Thu, 15 Apr 2021 17:13:02 +0800 Subject: [PATCH] [KYUUBI #531] Refactor repo key words (#531) ### _Why are the changes needed?_ Refactor the key words after repo renamed. ### _How was this patch tested?_ - [ ] Add some test cases that check the changes thoroughly including negative and positive cases if possible - [ ] Add screenshots for manual tests if appropriate - [ ] [Run test](https://kyuubi.readthedocs.io/en/latest/tools/testing.html#running-tests) locally before make a pull request --- .github/PULL_REQUEST_TEMPLATE | 2 +- .github/pr-badge.yml | 2 +- README.md | 20 ++++++------ dev/merge_kyuubi_pr.py | 2 +- docs/community/badges.md | 14 ++++---- docs/community/collaborators.md | 2 +- docs/community/contributions.md | 8 ++--- docs/conf.py | 2 +- docs/deployment/high_availability_guide.md | 9 ------ docs/integrations/kudu.md | 10 +++--- docs/quick_start/quick_start.md | 2 +- docs/security/authorization.md | 32 +++++++++---------- docs/tools/distribution.md | 2 +- .../kyuubi/config/KyuubiConfSuite.scala | 10 +++--- pom.xml | 2 +- 15 files changed, 53 insertions(+), 66 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE b/.github/PULL_REQUEST_TEMPLATE index 90557659c..fd29cd94b 100644 --- a/.github/PULL_REQUEST_TEMPLATE +++ b/.github/PULL_REQUEST_TEMPLATE @@ -3,7 +3,7 @@ Thanks for sending a pull request! Here are some tips for you: 1. If this is your first time, please read our contributor guidelines: https://kyuubi.readthedocs.io/en/latest/community/contributions.html - 2. If the PR is related to an issue in https://github.com/yaooqinn/kyuubi/issues, add '[KYUUBI #XXXX]' in your PR title, e.g., '[KYUUBI #XXXX] Your PR title ...'. + 2. If the PR is related to an issue in https://github.com/NetEase/kyuubi/issues, add '[KYUUBI #XXXX]' in your PR title, e.g., '[KYUUBI #XXXX] Your PR title ...'. 3. If the PR is unfinished, add '[WIP]' in your PR title, e.g., '[WIP][KYUUBI #XXXX] Your PR title ...'. --> diff --git a/.github/pr-badge.yml b/.github/pr-badge.yml index be8acfc02..d2a2a7f40 100644 --- a/.github/pr-badge.yml +++ b/.github/pr-badge.yml @@ -5,7 +5,7 @@ - label: "Preview" message: "Closes #$prNumber" color: "blue" - url: "https://github.com/yaooqinn/kyuubi/pull/$prNumber" + url: "https://github.com/NetEase/kyuubi/pull/$prNumber" - label: "+" message: "$additions" diff --git a/README.md b/README.md index 165da00da..c9b6157f4 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,13 @@ ![](docs/imgs/kyuubi_logo.png) [![License](https://img.shields.io/badge/license-Apache%202-4EB1BA.svg)](https://www.apache.org/licenses/LICENSE-2.0.html) -[![](https://tokei.rs/b1/github/yaooqinn/kyuubi)](https://github.com/yaooqinn/kyuubi) -![GitHub top language](https://img.shields.io/github/languages/top/yaooqinn/kyuubi) -[![GitHub release](https://img.shields.io/github/release/yaooqinn/kyuubi.svg)](https://github.com/yaooqinn/kyuubi/releases) -[![codecov](https://codecov.io/gh/yaooqinn/kyuubi/branch/master/graph/badge.svg)](https://codecov.io/gh/yaooqinn/kyuubi) -[![HitCount](http://hits.dwyl.io/yaooqinn/kyuubi.svg)](http://hits.dwyl.io/yaooqinn/kyuubi) -[![Travis](https://travis-ci.org/yaooqinn/kyuubi.svg?branch=master)](https://travis-ci.org/yaooqinn/kyuubi) -![GitHub Workflow Status](https://img.shields.io/github/workflow/status/yaooqinn/kyuubi/Kyuubi/master?style=plastic) +[![](https://tokei.rs/b1/github/NetEase/kyuubi)](https://github.com/NetEase/kyuubi) +![GitHub top language](https://img.shields.io/github/languages/top/NetEase/kyuubi) +[![GitHub release](https://img.shields.io/github/release/NetEaes/kyuubi.svg)](https://github.com/NetEase/kyuubi/releases) +[![codecov](https://codecov.io/gh/NetEase/kyuubi/branch/master/graph/badge.svg)](https://codecov.io/gh/NetEase/kyuubi) +[![Travis](https://travis-ci.org/NetEase/kyuubi.svg?branch=master)](https://travis-ci.org/NetEase/kyuubi) +![GitHub Workflow Status](https://img.shields.io/github/workflow/status/NetEase/kyuubi/Kyuubi/master?style=plastic) [![Documentation Status](https://readthedocs.org/projects/kyuubi/badge/?version=latest)](https://kyuubi.readthedocs.io/en/latest/?badge=latest) -[![DepShield Badge](https://depshield.sonatype.org/badges/yaooqinn/kyuubi/depshield.svg)](https://depshield.github.io) Kyuubi is a high-performance universal JDBC and SQL execution engine, built on top of [Apache Spark](http://spark.apache.org). The goal of Kyuubi is to facilitate users to handle big data like ordinary data. @@ -45,7 +43,7 @@ You can find the specific version of Kyuubi documentation as listed below. - [v1.0.1](https://kyuubi.readthedocs.io/en/v1.0.1/) - [v1.0.0](https://kyuubi.readthedocs.io/en/v1.0.0/) -For 0.8 and earlier versions, please check the [Github Pages](https://yaooqinn.github.io/kyuubi/) directly. +For 0.8 and earlier versions, please check the [Github Pages](https://NetEase.github.io/kyuubi/) directly. ## Quick Start @@ -57,8 +55,8 @@ All bits of help are welcome. You can make various types of contributions to Kyu - Help new users in chat channel or share your success stories with us - [![Gitter](https://badges.gitter.im/kyuubi-on-spark/Lobby.svg)](https://gitter.im/kyuubi-on-spark/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) - Improve Documentation - [![Documentation Status](https://readthedocs.org/projects/kyuubi/badge/?version=latest)](https://kyuubi.readthedocs.io/en/latest/?badge=latest) -- Test releases - [![GitHub release](https://img.shields.io/github/release/yaooqinn/kyuubi.svg)](https://github.com/yaooqinn/kyuubi/releases) -- Improve test coverage - [![codecov](https://codecov.io/gh/yaooqinn/kyuubi/branch/master/graph/badge.svg)](https://codecov.io/gh/yaooqinn/kyuubi) +- Test releases - [![GitHub release](https://img.shields.io/github/release/NetEase/kyuubi.svg)](https://github.com/NetEase/kyuubi/releases) +- Improve test coverage - [![codecov](https://codecov.io/gh/NetEase/kyuubi/branch/master/graph/badge.svg)](https://codecov.io/gh/NetEase/kyuubi) - Report bugs and better help developers to reproduce - Review changes - Make a pull request diff --git a/dev/merge_kyuubi_pr.py b/dev/merge_kyuubi_pr.py index 2488ac0ad..e7fed2bfe 100755 --- a/dev/merge_kyuubi_pr.py +++ b/dev/merge_kyuubi_pr.py @@ -32,7 +32,7 @@ KYUUBI_HOME = os.environ.get("KYUUBI_HOME", os.getcwd()) PR_REMOTE_NAME = os.environ.get("PR_REMOTE_NAME", "origin") PUSH_REMOTE_NAME = os.environ.get("PUSH_REMOTE_NAME", "origin") GITHUB_OAUTH_KEY = os.environ.get("GITHUB_OAUTH_KEY") -GITHUB_API_BASE = "https://api.github.com/repos/yaooqinn/kyuubi" +GITHUB_API_BASE = "https://api.github.com/repos/NetEase/kyuubi" BRANCH_PREFIX = "PR_TOOL" diff --git a/docs/community/badges.md b/docs/community/badges.md index e738c9e85..63712e45d 100644 --- a/docs/community/badges.md +++ b/docs/community/badges.md @@ -1,10 +1,10 @@ # Community [![Gitter](https://badges.gitter.im/kyuubi-on-spark/Lobby.svg)](https://gitter.im/kyuubi-on-spark/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) -Watch -Star -Fork -Issue -Download -Follow @yaooqinn -Sponsor +Watch +Star +Fork +Issue +Download +Follow @NetEase +Sponsor diff --git a/docs/community/collaborators.md b/docs/community/collaborators.md index 1479ac3a0..e46a3868c 100644 --- a/docs/community/collaborators.md +++ b/docs/community/collaborators.md @@ -7,4 +7,4 @@ ulysses-you | @ulysses-you | NetEase Inc Cheng Pan | @pan3793 | 问卷网 Fei Wang | @turbofei | eBay Inc -See full contributor list at [contributors](https://github.com/yaooqinn/kyuubi/graphs/contributors). +See full contributor list at [contributors](https://github.com/NetEase/kyuubi/graphs/contributors). diff --git a/docs/community/contributions.md b/docs/community/contributions.md index 67a17658a..85160cce4 100644 --- a/docs/community/contributions.md +++ b/docs/community/contributions.md @@ -2,12 +2,12 @@ # Contribution Guidelines -**Kyuubi** is an [Apache License v2.0](https://github.com/yaooqinn/kyuubi/blob/master/LICENSE) open source software. +**Kyuubi** is an [Apache License v2.0](https://github.com/NetEase/kyuubi/blob/master/LICENSE) open source software. Contributing to Kyuubi including source code, documents, tests e.t.c. means that you agree to the Apache License v2.0. -- Better to search the issue history first before reporting an Issue -- Better to create an Issue to describe the feature or bug first before make a pull request. +- Better to search the issue history first before reporting an Issue +- Better to create an Issue to describe the feature or bug first before make a pull request. - Better to use English for world widely understanding. - Ask us anything @@ -31,7 +31,7 @@ Here are some tips for you: ### _Which issue are you going to fix?_ diff --git a/docs/conf.py b/docs/conf.py index 34cfdb890..d01b8edbb 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -102,7 +102,7 @@ pygments_style = 'sphinx' html_static_path = ['_static'] htmlhelp_basename = 'Recommonmarkdoc' -github_doc_root = 'https://github.com/yaooqinn/kyuubi/tree/master/docs/' +github_doc_root = 'https://github.com/NetEase/kyuubi/tree/master/docs/' def setup(app): app.add_config_value('recommonmark_config', { 'url_resolver': lambda url: github_doc_root + url, diff --git a/docs/deployment/high_availability_guide.md b/docs/deployment/high_availability_guide.md index 3c68525b3..c8aa80a9d 100644 --- a/docs/deployment/high_availability_guide.md +++ b/docs/deployment/high_availability_guide.md @@ -51,12 +51,3 @@ kyuubi\.ha\.zookeeper
\.connection\.timeout|
kyuubi
|
The root directory for the service to deploy its instance uri. Additionally, it will creates a -[username] suffixed root directory for each application
|
1.0.0
kyuubi\.ha\.zookeeper
\.quorum|
|
The connection string for the zookeeper ensemble
|
1.0.0
kyuubi\.ha\.zookeeper
\.session\.timeout|
60000
|
The timeout(ms) of a connected session to be idled
|
1.0.0
- -## Additional Documentations -[Building Kyuubi](https://yaooqinn.github.io/kyuubi/docs/building.html) -[Kyuubi Deployment Guide](https://yaooqinn.github.io/kyuubi/docs/deploy.html) -[Kyuubi Containerization Guide](https://yaooqinn.github.io/kyuubi/docs/containerization.html) -[Configuration Guide](https://yaooqinn.github.io/kyuubi/docs/configurations.html) -[Authentication/Security Guide](https://yaooqinn.github.io/kyuubi/docs/authentication.html) -[Kyuubi ACL Management Guide](https://yaooqinn.github.io/kyuubi/docs/authorization.html) -[Kyuubi Architecture](https://yaooqinn.github.io/kyuubi/docs/architecture.html) diff --git a/docs/integrations/kudu.md b/docs/integrations/kudu.md index b76dd1d8f..e45c57783 100644 --- a/docs/integrations/kudu.md +++ b/docs/integrations/kudu.md @@ -125,13 +125,13 @@ java.lang.UnsupportedOperationException: overwrite is not yet supported at org.apache.spark.sql.Dataset.(Dataset.scala:190) at org.apache.spark.sql.Dataset$.ofRows(Dataset.scala:75) at org.apache.spark.sql.SparkSQLUtils$.toDataFrame(SparkSQLUtils.scala:39) - at yaooqinn.kyuubi.operation.statement.ExecuteStatementInClientMode.execute(ExecuteStatementInClientMode.scala:152) - at yaooqinn.kyuubi.operation.statement.ExecuteStatementOperation$$anon$1$$anon$2.run(ExecuteStatementOperation.scala:74) - at yaooqinn.kyuubi.operation.statement.ExecuteStatementOperation$$anon$1$$anon$2.run(ExecuteStatementOperation.scala:70) + at org.apache.kyuubi.operation.statement.ExecuteStatementInClientMode.execute(ExecuteStatementInClientMode.scala:152) + at org.apache.kyuubi.operation.statement.ExecuteStatementOperation$$anon$1$$anon$2.run(ExecuteStatementOperation.scala:74) + at org.apache.kyuubi.operation.statement.ExecuteStatementOperation$$anon$1$$anon$2.run(ExecuteStatementOperation.scala:70) at java.security.AccessController.doPrivileged(Native Method) at javax.security.auth.Subject.doAs(Subject.java:422) at org.apache.hadoop.security.UserGroupInformation.doAs(UserGroupInformation.java:1698) - at yaooqinn.kyuubi.operation.statement.ExecuteStatementOperation$$anon$1.run(ExecuteStatementOperation.scala:70) + at org.apache.kyuubi.operation.statement.ExecuteStatementOperation$$anon$1.run(ExecuteStatementOperation.scala:70) at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:511) at java.util.concurrent.FutureTask.run(FutureTask.java:266) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142) @@ -164,5 +164,5 @@ No rows selected (0.611 seconds) ## References [https://kudu.apache.org/](https://kudu.apache.org/) [https://kudu.apache.org/docs/developing.html#_kudu_integration_with_spark](https://kudu.apache.org/docs/developing.html#_kudu_integration_with_spark) -[https://github.com/yaooqinn/kyuubi](https://github.com/yaooqinn/kyuubi) +[https://github.com/NetEase/kyuubi](https://github.com/NetEase/kyuubi) [https://spark.apache.org/docs/latest/sql-data-sources.html](https://spark.apache.org/docs/latest/sql-data-sources.html) diff --git a/docs/quick_start/quick_start.md b/docs/quick_start/quick_start.md index 11adb3b84..3822a971c 100644 --- a/docs/quick_start/quick_start.md +++ b/docs/quick_start/quick_start.md @@ -12,7 +12,7 @@ Currently, Kyuubi maintains all releases on GitHub directly. You can get the most recent stable release of Kyuubi here: -Download +Download ## Requirements diff --git a/docs/security/authorization.md b/docs/security/authorization.md index 9ec6e7f05..c54a3a801 100644 --- a/docs/security/authorization.md +++ b/docs/security/authorization.md @@ -8,7 +8,7 @@

Authorization Modes

-Three primary modes for Kyuubi authorization are available by [spark-authorizer](https://github.com/yaooqinn/spark-authorizer): +Three primary modes for Kyuubi authorization are available by [Submarine Spark Security](https://github.com/apache/submarine/tree/master/submarine-security/spark-security):

Storage-Based Authorization

@@ -16,30 +16,28 @@ Enabling Storage Based Authorization in the `Hive Metastore Server` uses the HDF Storage-Based Authorization offers users with Database, Table and Partition-level coarse-gained access control. -Please refer to the [Storage-Based Authorization Guide](https://yaooqinn.github.io/spark-authorizer/docs/storage_based_authorization.html) in the online documentation for an overview on how to configure Storage-Based Authorization for Kyuubi. -

SQL-Standard Based Authorization

-Enabling SQL-Standard Based Authorization gives users more fine-gained control over access comparing with Storage Based Authorization. Besides of the ability of Storage Based Authorization, SQL-Standard Based Authorization can improve it to Views and Column-level. Unfortunately, Spark SQL does not support grant/revoke statements which controls access, this might be done only through the HiveServer2. But it's gratifying that [spark-authorizer](https://github.com/yaooqinn/spark-authorizer) makes Spark SQL be able to understand this fine-grain access control granted or revoked by Hive. +Enabling SQL-Standard Based Authorization gives users more fine-gained control over access comparing with Storage Based Authorization. Besides of the ability of Storage Based Authorization, SQL-Standard Based Authorization can improve it to Views and Column-level. Unfortunately, Spark SQL does not support grant/revoke statements which controls access, this might be done only through the HiveServer2. But it's gratifying that [Submarine Spark Security](https://github.com/apache/submarine/tree/master/submarine-security/spark-security) makes Spark SQL be able to understand this fine-grain access control granted or revoked by Hive. -With [Kyuubi](https://github.com/yaooqinn/kyuubi), the SQL-Standard Based Authorization is guaranteed for the security configurations, metadata, and storage information is preserved from end users. +With [Kyuubi](https://github.com/NetEase/kyuubi), the SQL-Standard Based Authorization is guaranteed for the security configurations, metadata, and storage information is preserved from end users. -Please refer to the [SQL-Standard Based Authorization Guide](https://yaooqinn.github.io/spark-authorizer/docs/sql_std_based_authorization.html) in the online documentation for an overview on how to configure SQL-Standard Based Authorization for Spark SQL. +Please refer to the [Submarine Spark Security](https://submarine.apache.org/docs/userDocs/submarine-security/spark-security/README) in the online documentation for an overview on how to configure SQL-Standard Based Authorization for Spark SQL.

Ranger Security Support (Recommended)

-[Apache Ranger](https://ranger.apache.org/) is a framework to enable, monitor and manage comprehensive data security across the Hadoop platform but end before Spark or Spark SQL. The [spark-authorizer](https://github.com/yaooqinn/spark-authorizer) enables Kyuubi with control access ability reusing [Ranger Plugin for Hive MetaStore -](https://cwiki.apache.org/confluence/display/RANGER/Ranger+Plugin+for+Hive+MetaStore). [Apache Ranger](https://ranger.apache.org/) makes the scope of existing SQL-Standard Based Authorization expanded but without supporting Spark SQL. [spark-authorizer](https://github.com/yaooqinn/spark-authorizer) sticks them together. +[Apache Ranger](https://ranger.apache.org/) is a framework to enable, monitor and manage comprehensive data security across the Hadoop platform but end before Spark or Spark SQL. The [Submarine Spark Security](https://github.com/apache/submarine/tree/master/submarine-security/spark-security) enables Kyuubi with control access ability reusing [Ranger Plugin for Hive MetaStore +](https://cwiki.apache.org/confluence/display/RANGER/Ranger+Plugin+for+Hive+MetaStore). [Apache Ranger](https://ranger.apache.org/) makes the scope of existing SQL-Standard Based Authorization expanded but without supporting Spark SQL. [Submarine Spark Security](https://github.com/apache/submarine/tree/master/submarine-security/spark-security) sticks them together. -Please refer to the [Spark SQL Ranger Security Support Guide](https://yaooqinn.github.io/spark-authorizer/docs/ranger_authorization.html) in the online documentation for an overview on how to configure Ranger for Spark SQL. +Please refer to the [Submarine Spark Security](https://submarine.apache.org/docs/userDocs/submarine-security/spark-security/README) in the online documentation for an overview on how to configure Ranger for Spark SQL. ## Additional Documentations -[Building Kyuubi](https://yaooqinn.github.io/kyuubi/docs/building.html) -[Kyuubi Deployment Guide](https://yaooqinn.github.io/kyuubi/docs/deploy.html) -[Kyuubi Containerization Guide](https://yaooqinn.github.io/kyuubi/docs/containerization.html) -[High Availability Guide](https://yaooqinn.github.io/kyuubi/docs/high_availability_guide.html) -[Configuration Guide](https://yaooqinn.github.io/kyuubi/docs/configurations.html) -[Authentication/Security Guide](https://yaooqinn.github.io/kyuubi/docs/authentication.html) -[Kyuubi Architecture](https://yaooqinn.github.io/kyuubi/docs/architecture.html) -[Home Page](https://yaooqinn.github.io/kyuubi/) +[Building Kyuubi](https://NetEase.github.io/kyuubi/docs/building.html) +[Kyuubi Deployment Guide](https://NetEase.github.io/kyuubi/docs/deploy.html) +[Kyuubi Containerization Guide](https://NetEase.github.io/kyuubi/docs/containerization.html) +[High Availability Guide](https://NetEase.github.io/kyuubi/docs/high_availability_guide.html) +[Configuration Guide](https://NetEase.github.io/kyuubi/docs/configurations.html) +[Authentication/Security Guide](https://NetEase.github.io/kyuubi/docs/authentication.html) +[Kyuubi Architecture](https://NetEase.github.io/kyuubi/docs/architecture.html) +[Home Page](https://NetEase.github.io/kyuubi/) diff --git a/docs/tools/distribution.md b/docs/tools/distribution.md index 11fb4bbef..1033756cf 100644 --- a/docs/tools/distribution.md +++ b/docs/tools/distribution.md @@ -6,7 +6,7 @@ # Building a Runnable Distribution -To create a Kyuubi distribution like those distributed by [Kyuubi Release Page](https://github.com/yaooqinn/kyuubi/releases), +To create a Kyuubi distribution like those distributed by [Kyuubi Release Page](https://github.com/NetEase/kyuubi/releases), and that is laid out so as to be runnable, use `./build/dist` in the project root directory. For more information on usage, run `./build/dist --help` diff --git a/kyuubi-common/src/test/scala/org/apache/kyuubi/config/KyuubiConfSuite.scala b/kyuubi-common/src/test/scala/org/apache/kyuubi/config/KyuubiConfSuite.scala index 818f4c3b1..fc7065fca 100644 --- a/kyuubi-common/src/test/scala/org/apache/kyuubi/config/KyuubiConfSuite.scala +++ b/kyuubi-common/src/test/scala/org/apache/kyuubi/config/KyuubiConfSuite.scala @@ -99,16 +99,16 @@ class KyuubiConfSuite extends KyuubiFunSuite { test("get user specific defaults") { val conf = KyuubiConf(false) .set("spark.user.test", "a") - .set("___kent___.spark.user.test", "b") - .set("___yao___.spark.user.test", "c") + .set("___userb___.spark.user.test", "b") + .set("___userc___.spark.user.test", "c") - val all1 = conf.getUserDefaults("yaooqinn").getAll + val all1 = conf.getUserDefaults("kyuubi").getAll assert(all1.size === 1) assert(all1("spark.user.test") === "a") - val all2 = conf.getUserDefaults("kent").getAll + val all2 = conf.getUserDefaults("userb").getAll assert(all2.size === 1) assert(all2("spark.user.test") === "b") - assert(conf.getUserDefaults("yao").getOption("spark.user.test").get === "c") + assert(conf.getUserDefaults("userc").getOption("spark.user.test").get === "c") } test("time config test") { diff --git a/pom.xml b/pom.xml index 00640f655..65fe253c7 100644 --- a/pom.xml +++ b/pom.xml @@ -90,7 +90,7 @@ 3.0.0 3.8.1 - + 4.3.0 2.22.0 2.0.0