Skip to content

Commit 2627e78

Browse files
weiting-chenCopilot
andcommitted
Update repository references from incubator-gluten to gluten after TLP graduation
Replace all references to the old incubator repository paths: - apache/incubator-gluten -> apache/gluten - apache/incubator-gluten-site -> apache/gluten-site - incubator-gluten directory/path references -> gluten This covers pom.xml, CI workflows, documentation, Docker files, build scripts, source code comments, and configuration files. Part of: #11713 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent a024fc8 commit 2627e78

File tree

93 files changed

+190
-174
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

93 files changed

+190
-174
lines changed

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@
1616
blank_issues_enabled: false
1717
contact_links:
1818
- name: Gluten Discussions
19-
url: https://github.com/apache/incubator-gluten/discussions
19+
url: https://github.com/apache/gluten/discussions
2020
about: Ask questions or discuss new feature ideas here.

.github/PULL_REQUEST_TEMPLATE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Thank you for submitting a pull request! Here are some tips:
33

44
1. For first-time contributors, please read our contributing guide:
5-
https://github.com/apache/incubator-gluten/blob/main/CONTRIBUTING.md
5+
https://github.com/apache/gluten/blob/main/CONTRIBUTING.md
66
2. If necessary, create a GitHub issue for discussion beforehand to avoid duplicate work.
77
3. If the PR is specific to a single backend, include [VL] or [CH] in the PR title to indicate the
88
Velox or ClickHouse backend, respectively.

.github/workflows/dev_cron/pr_issue_linker.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ function detectIssueID(title) {
2929
}
3030

3131
async function appendToPRDescription(github, context, pullRequestNumber, issuesID) {
32-
const issueURL = `https://github.com/apache/incubator-gluten/issues/${issuesID}`;
32+
const issueURL = `https://github.com/apache/gluten/issues/${issuesID}`;
3333
const issueReference = `#${issuesID}`
3434

3535
// Fetch the current PR description.

.github/workflows/velox_weekly.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
export PATH=$JAVA_HOME/bin:$PATH
6363
6464
# action/checkout does not work centos7 anymore, so we clone the branch instead.
65-
git clone -b main --depth=1 https://github.com/apache/incubator-gluten.git && cd incubator-gluten/
65+
git clone -b main --depth=1 https://github.com/apache/gluten.git && cd gluten/
6666
if [ ${{ github.event_name }} = "pull_request" ]; then
6767
git fetch origin ${{ github.ref }}:pr_branch && git checkout pr_branch
6868
fi

.idea/vcs.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

CONTRIBUTING.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,15 @@ please add at least one UT to ensure code quality and reduce regression issues f
4444

4545
Please update document for your proposed code change if necessary.
4646

47-
If a new config property is being introduced, please update [Configuration.md](https://github.com/apache/incubator-gluten/blob/main/docs/Configuration.md).
47+
If a new config property is being introduced, please update [Configuration.md](https://github.com/apache/gluten/blob/main/docs/Configuration.md).
4848

4949
### Code Style
5050

5151
##### Java/Scala code style
52-
Developer can import the code style setting to IDE and format Java/Scala code with spotless maven plugin. See [Java/Scala code style](https://github.com/apache/incubator-gluten/blob/main/docs/developers/NewToGluten.md#javascala-code-style).
52+
Developer can import the code style setting to IDE and format Java/Scala code with spotless maven plugin. See [Java/Scala code style](https://github.com/apache/gluten/blob/main/docs/developers/NewToGluten.md#javascala-code-style).
5353

5454
##### C/C++ code style
55-
There are some code style conventions need to comply. See [CppCodingStyle.md](https://github.com/apache/incubator-gluten/blob/main/docs/developers/CppCodingStyle.md).
55+
There are some code style conventions need to comply. See [CppCodingStyle.md](https://github.com/apache/gluten/blob/main/docs/developers/CppCodingStyle.md).
5656

5757
For Velox backend, developer can just execute `dev/formatcppcode.sh` to format C/C++ code. It requires `clang-format-15`
5858
installed in your development env.
@@ -68,7 +68,7 @@ You can execute a script to fix license header issue, as the following shows.
6868
### Gluten CI
6969

7070
##### ClickHouse Backend CI
71-
To check CI failure for CH backend, please log in with the public account/password provided [here](https://github.com/apache/incubator-gluten/blob/main/docs/get-started/ClickHouse.md#new-ci-system).
71+
To check CI failure for CH backend, please log in with the public account/password provided [here](https://github.com/apache/gluten/blob/main/docs/get-started/ClickHouse.md#new-ci-system).
7272
To re-trigger CH CI, please post the below comment on PR page:
7373

7474
`Run Gluten Clickhouse CI`
@@ -79,7 +79,7 @@ To check CI failure for Velox backend, please go into the GitHub action page fro
7979
To see the perf. impact on Velox backend, you can comment `/Benchmark Velox` on PR page to trigger a pretest. The benchmark
8080
(currently TPC-H) result will be posted after completed.
8181

82-
If some new dependency is required to be installed, you may need to do some change for CI docker at [this folder](https://github.com/apache/incubator-gluten/tree/main/tools/gluten-te).
82+
If some new dependency is required to be installed, you may need to do some change for CI docker at [this folder](https://github.com/apache/gluten/tree/main/tools/gluten-te).
8383

8484
### Code Review
8585

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ to view past discussions, or [subscribe to the mailing list](mailto:dev-subscrib
126126

127127
### Slack Channel (English)
128128

129-
Request an invitation to the ASF Slack workspace via [this page](https://github.com/apache/incubator-gluten/discussions/8429). Once invited, you can join the **incubator-gluten** channel.
129+
Request an invitation to the ASF Slack workspace via [this page](https://github.com/apache/gluten/discussions/8429). Once invited, you can join the **gluten** channel.
130130

131131
The ASF Slack login entry: https://the-asf.slack.com/.
132132

@@ -166,6 +166,6 @@ Gluten is licensed under [Apache License Version 2.0](https://www.apache.org/lic
166166

167167
Gluten was initiated by Intel and Kyligence in 2022. Several other companies are also actively contributing to its development, including BIGO, Meituan, Alibaba Cloud, NetEase, Baidu, Microsoft, IBM, Google, etc.
168168

169-
<a href="https://github.com/apache/incubator-gluten/graphs/contributors">
170-
<img src="https://contrib.rocks/image?repo=apache/incubator-gluten&columns=25" />
169+
<a href="https://github.com/apache/gluten/graphs/contributors">
170+
<img src="https://contrib.rocks/image?repo=apache/gluten&columns=25" />
171171
</a>

backends-clickhouse/src/main/scala/org/apache/gluten/backendsapi/clickhouse/CHRuleApi.scala

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,23 @@ object CHRuleApi {
164164
}
165165

166166
/**
167-
* Since https://github.com/apache/incubator-gluten/pull/883.
167+
* Registers Gluten's columnar rules. These rules will be executed only when RAS (relational
168+
* algebra selector) is enabled by spark.gluten.ras.enabled=true.
169+
*
170+
* These rules are covered by CI test job spark-test-spark35-ras.
171+
*/
172+
private def injectRas(injector: RasInjector): Unit = {
173+
// CH backend doesn't work with RAS at the moment. Inject a rule that aborts any
174+
// execution calls.
175+
injector.injectPreTransform(
176+
_ =>
177+
new SparkPlanRules.AbortRule(
178+
"Clickhouse backend doesn't yet have RAS support, please try disabling RAS and" +
179+
" rerunning the application"))
180+
}
181+
182+
/**
183+
* Since https://github.com/apache/gluten/pull/883.
168184
*
169185
* TODO: Remove this since tricky to maintain.
170186
*/

backends-clickhouse/src/main/scala/org/apache/gluten/backendsapi/clickhouse/CHValidatorApi.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ object CHValidatorApi {
114114
* and make it into a new column which the shuffle will refer to. But we need to remove it from
115115
* the result columns from the shuffle.
116116
*
117-
* Since https://github.com/apache/incubator-gluten/pull/1071.
117+
* Since https://github.com/apache/gluten/pull/1071.
118118
*/
119119
def supportShuffleWithProject(outputPartitioning: Partitioning, child: SparkPlan): Boolean = {
120120
child match {

backends-clickhouse/src/main/scala/org/apache/gluten/execution/CHColumnarToCarrierRowExec.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ case class CHColumnarToCarrierRowExec(override val child: SparkPlan)
2929
override def rowType(): Convention.RowType = CHCarrierRowType
3030
override protected def withNewChildInternal(newChild: SparkPlan): SparkPlan =
3131
copy(child = newChild)
32-
// Since https://github.com/apache/incubator-gluten/pull/1595.
32+
// Since https://github.com/apache/gluten/pull/1595.
3333
override protected def doExecuteColumnar(): RDD[ColumnarBatch] = {
3434
if (child.supportsColumnar) {
3535
child.executeColumnar()

0 commit comments

Comments
 (0)