Skip to content

Commit 8b04f51

Browse files
Update repository references from incubator-gluten to gluten after TLP graduation (#11735)
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 75db057 commit 8b04f51

File tree

89 files changed

+186
-170
lines changed

Some content is hidden

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

89 files changed

+186
-170
lines changed

.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()

backends-clickhouse/src/main/scala/org/apache/gluten/expression/CHExpressions.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import org.apache.spark.sql.catalyst.expressions.aggregate.AggregateFunction
2424

2525
// Static helper object for handling expressions that are specifically used in CH backend.
2626
object CHExpressions {
27-
// Since https://github.com/apache/incubator-gluten/pull/1937.
27+
// Since https://github.com/apache/gluten/pull/1937.
2828
def createAggregateFunction(context: SubstraitContext, aggregateFunc: AggregateFunction): Long = {
2929
val expressionExtensionTransformer =
3030
ExpressionExtensionTrait.findExpressionExtension(aggregateFunc.getClass)

backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenFunctionValidateSuite.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -861,7 +861,7 @@ class GlutenFunctionValidateSuite extends GlutenClickHouseWholeStageTransformerS
861861
}
862862

863863
test("test parse string with blank to integer") {
864-
// issue https://github.com/apache/incubator-gluten/issues/4956
864+
// issue https://github.com/apache/gluten/issues/4956
865865
val sql = "select cast(concat(' ', cast(id as string)) as bigint) from range(10)"
866866
runQueryAndCompare(sql)(checkGlutenPlan[ProjectExecTransformer])
867867
}
@@ -915,7 +915,7 @@ class GlutenFunctionValidateSuite extends GlutenClickHouseWholeStageTransformerS
915915
}
916916
}
917917

918-
test("test issue: https://github.com/apache/incubator-gluten/issues/6561") {
918+
test("test issue: https://github.com/apache/gluten/issues/6561") {
919919
val sql =
920920
"""
921921
|select

backends-clickhouse/src/test/scala/org/apache/gluten/execution/compatibility/GlutenClickhouseFunctionSuite.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ class GlutenClickhouseFunctionSuite extends ParquetSuite {
7272
}
7373
}
7474

75-
test("https://github.com/apache/incubator-gluten/issues/6938") {
75+
test("https://github.com/apache/gluten/issues/6938") {
7676
val testSQL =
7777
s"""
7878
|select * from (
@@ -372,7 +372,7 @@ class GlutenClickhouseFunctionSuite extends ParquetSuite {
372372
}
373373
}
374374

375-
test("GLUTEN-7545: https://github.com/apache/incubator-gluten/issues/7545") {
375+
test("GLUTEN-7545: https://github.com/apache/gluten/issues/7545") {
376376
withTable("regexp_test") {
377377
sql("create table if not exists regexp_test (id string) using parquet")
378378
sql("insert into regexp_test values('1999-6-1')")

backends-clickhouse/src/test/scala/org/apache/gluten/execution/hive/GlutenClickHouseNativeWriteTableSuite.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,7 @@ class GlutenClickHouseNativeWriteTableSuite
514514
("decimal_field", "decimal(23,12)"),
515515
("date_field", "date")
516516
// ("timestamp_field", "timestamp")
517-
// FIXME https://github.com/apache/incubator-gluten/issues/8053
517+
// FIXME https://github.com/apache/gluten/issues/8053
518518
)
519519
val origin_table = "origin_table"
520520
withSource(genTestData(), origin_table) {

0 commit comments

Comments
 (0)