This is an automated email from the ASF dual-hosted git repository.
francischuang pushed a commit to branch site
in repository https://gitbox.apache.org/repos/asf/calcite.git
The following commit(s) were added to refs/heads/site by this push:
new 5e63ba3a6d [CALCITE-4147] Rename master branch to main
5e63ba3a6d is described below
commit 5e63ba3a6ddd6c01ad86b992c2bc30ba1b97d33f
Author: Michael Mior <[email protected]>
AuthorDate: Wed Feb 17 09:20:33 2021 -0500
[CALCITE-4147] Rename master branch to main
---
.github/workflows/buildcache.yml | 6 +-
.github/workflows/main.yml | 18 ++---
.../publish-non-release-website-updates.yml | 77 ++++++++++++++++++++++
.github/workflows/publish-website-on-release.yml | 71 ++++++++++++++++++++
.travis.yml | 3 +-
README.md | 6 +-
appveyor.yml | 3 +-
build.gradle.kts | 3 +
settings.gradle.kts | 3 +-
site/.asf.yaml | 2 +-
site/README.md | 12 ++--
site/_config.yml | 2 +-
site/_docs/howto.md | 12 ++--
site/_docs/powered_by.md | 2 +-
site/_docs/redis_adapter.md | 2 +-
site/_posts/2021-10-19-release-1.28.0.md | 4 +-
site/community/index.md | 22 +++----
site/develop/index.md | 6 +-
18 files changed, 201 insertions(+), 53 deletions(-)
diff --git a/.github/workflows/buildcache.yml b/.github/workflows/buildcache.yml
index fa70c0719b..10c921f0cb 100644
--- a/.github/workflows/buildcache.yml
+++ b/.github/workflows/buildcache.yml
@@ -3,13 +3,13 @@ name: Seed build cache
on:
push:
branches:
- - master
+ - main
concurrency:
- # On master/release, we don't want any jobs cancelled so the sha is used to
name the group
+ # On main/release, we don't want any jobs cancelled so the sha is used to
name the group
# On PR branches, we cancel the job if new commits are pushed
# More info: https://stackoverflow.com/a/68422069/253468
- group: ${{ (github.ref == 'refs/heads/master' || github.ref ==
'refs/heads/release' ) && format('ci-buildcache-{0}', github.sha) ||
format('ci-buildcache-{0}', github.ref) }}
+ group: ${{ (github.ref == 'refs/heads/main' || github.ref ==
'refs/heads/release' ) && format('ci-buildcache-{0}', github.sha) ||
format('ci-buildcache-{0}', github.ref) }}
cancel-in-progress: true
jobs:
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 2c12402f09..ca52eb5322 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -35,10 +35,10 @@ on:
- '*'
concurrency:
- # On master/release, we don't want any jobs cancelled so the sha is used to
name the group
+ # On main/release, we don't want any jobs cancelled so the sha is used to
name the group
# On PR branches, we cancel the job if new commits are pushed
# More info: https://stackoverflow.com/a/68422069/253468
- group: ${{ (github.ref == 'refs/heads/master' || github.ref ==
'refs/heads/release' ) && format('ci-main-{0}', github.sha) ||
format('ci-main-{0}', github.ref) }}
+ group: ${{ (github.ref == 'refs/heads/main' || github.ref ==
'refs/heads/release' ) && format('ci-main-{0}', github.sha) ||
format('ci-main-{0}', github.ref) }}
cancel-in-progress: true
# Throw OutOfMemoryError in case less than 35% is free after full GC
@@ -81,7 +81,7 @@ jobs:
linux-avatica:
if: github.event.action != 'labeled'
- name: 'Linux (JDK 11), Avatica master'
+ name: 'Linux (JDK 11), Avatica main'
runs-on: ubuntu-latest
steps:
- name: 'Set up JDK 11'
@@ -90,7 +90,7 @@ jobs:
java-version: 11
- name: 'Clone Avatica to Maven Local repository'
run: |
- git clone --branch master --depth 100
https://github.com/apache/calcite-avatica.git ../calcite-avatica
+ git clone --branch main --depth 100
https://github.com/apache/calcite-avatica.git ../calcite-avatica
- uses: burrunan/gradle-cache-action@v1
name: Build Avatica
env:
@@ -102,7 +102,7 @@ jobs:
build-root-directory: ../calcite-avatica
arguments: publishToMavenLocal
properties: |
- calcite.avatica.version=1.0.0-dev-master
+ calcite.avatica.version=1.0.0-dev-main
skipJavadoc=
- uses: actions/checkout@v2
with:
@@ -118,7 +118,7 @@ jobs:
execution-only-caches: true
arguments: --scan --no-parallel --no-daemon build javadoc
properties: |
- calcite.avatica.version=1.0.0-dev-master-SNAPSHOT
+ calcite.avatica.version=1.0.0-dev-main-SNAPSHOT
enableMavenLocal=
linux-openj9:
@@ -228,9 +228,9 @@ jobs:
arguments: --scan --no-parallel --no-daemon -PenableCheckerframework
:linq4j:classes :core:classes
linux-slow:
- # Run slow tests when the commit is on master or it is requested
explicitly by adding an
+ # Run slow tests when the commit is on main or it is requested explicitly
by adding an
# appropriate label in the PR
- if: github.ref == 'refs/heads/master' ||
contains(github.event.pull_request.labels.*.name, 'slow-tests-needed')
+ if: github.ref == 'refs/heads/main' ||
contains(github.event.pull_request.labels.*.name, 'slow-tests-needed')
name: 'Linux (JDK 8) Slow Tests'
runs-on: ubuntu-latest
steps:
@@ -261,7 +261,7 @@ jobs:
with:
java-version: 8
- name: 'Checkout Druid dataset'
- uses: actions/checkout@master
+ uses: actions/checkout@v3
with:
repository: zabetak/calcite-druid-dataset
fetch-depth: 1
diff --git a/.github/workflows/publish-non-release-website-updates.yml
b/.github/workflows/publish-non-release-website-updates.yml
new file mode 100644
index 0000000000..97b8bd6518
--- /dev/null
+++ b/.github/workflows/publish-non-release-website-updates.yml
@@ -0,0 +1,77 @@
+#
+# 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: Publish non-release website updates
+
+on:
+ push:
+ branches:
+ - main
+ paths:
+ - 'site/**' # Trigger only for changes to files in
the site/ folder
+ - '!site/_docs/**' # except for files in the site/_docs/
folder
+ - 'site/_docs/history.md' # unless the file is
site/_docs/history.md
+ - 'site/_docs/howto.md' # or site/_docs/howto.md
+ - 'site/_docs/powered_by.md' # or site/_docs/powered_by.md
+
+jobs:
+ cherry-pick-to-site:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v3
+ with:
+ fetch-depth: 0
+ ref: site
+ - name: Cherry pick the commit to site
+ run: |
+ git config user.email ${{ github.actor }}@users.noreply.github.com
+ git config user.name ${{ github.actor }}
+ git cherry-pick $GITHUB_SHA
+ git push origin site
+
+ publish-website:
+ runs-on: ubuntu-latest
+ needs: cherry-pick-to-site
+ steps:
+ - uses: actions/checkout@v3
+ with:
+ ref: site
+ - name: Build site
+ working-directory: site
+ run: |
+ docker-compose run -e JEKYLL_UID=$(id -u) -e JEKYLL_GID=$(id -g)
build-site
+ - name: Push site
+ working-directory: site/target
+ env:
+ CALCITE_WEBSITE_BUILD: ${{ secrets.CALCITE_WEBSITE_BUILD }}
+ run: |
+ git config --global init.defaultBranch main
+ git init # Turn the folder into a git repo
+ git config
url."https://asf-ci-deploy:[email protected]/".insteadOf
"https://github.com/";
+ git config user.email ${{ github.actor }}@users.noreply.github.com
+ git config user.name ${{ github.actor }}
+ git remote add origin https://github.com/apache/calcite-site
+ git fetch # Pull from the calcite-site repo
+ git reset origin/main --soft # Bring in changes from the
calcite-site repo, but keep our local changes
+ git reset -- javadocAggregate/ # Restore the javadoc
+ git checkout -- javadocAggregate/
+ git reset -- avatica/ # Restore the avatica site
+ git checkout -- avatica/
+ git add .
+ if ! git diff-index --quiet HEAD; then
+ git commit -m "Website deployed from calcite@$GITHUB_SHA"
+ git push origin main
+ fi
diff --git a/.github/workflows/publish-website-on-release.yml
b/.github/workflows/publish-website-on-release.yml
new file mode 100644
index 0000000000..416edbc4c4
--- /dev/null
+++ b/.github/workflows/publish-website-on-release.yml
@@ -0,0 +1,71 @@
+#
+# 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: Publish website on release
+
+on:
+ push:
+ tags:
+ - calcite-[0-9]+.[0-9]+.[0-9]+ # Trigger only when a tag that matches
calcite-X.Y.Z is pushed
+
+jobs:
+ sync-main-site:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v3
+ with:
+ fetch-depth: 0
+ ref: site
+ - name: Sync main and site branches
+ run: |
+ git reset --hard origin/main
+ git push --force origin site
+
+ publish-website:
+ runs-on: ubuntu-latest
+ needs: sync-main-site
+ steps:
+ - uses: actions/checkout@v3
+ with:
+ ref: site
+ - name: Build site
+ working-directory: site
+ run: |
+ docker-compose run -e JEKYLL_UID=$(id -u) -e JEKYLL_GID=$(id -g)
build-site
+ - name: Build javadoc
+ working-directory: site
+ run: |
+ docker-compose run generate-javadoc
+ - name: Push site
+ working-directory: site/target
+ env:
+ CALCITE_WEBSITE_BUILD: ${{ secrets.CALCITE_WEBSITE_BUILD }}
+ run: |
+ git config --global init.defaultBranch main
+ git init # Turn the folder into a git repo
+ git config
url."https://asf-ci-deploy:[email protected]/".insteadOf
"https://github.com/";
+ git config user.email ${{ github.actor }}@users.noreply.github.com
+ git config user.name ${{ github.actor }}
+ git remote add origin https://github.com/apache/calcite-site
+ git fetch # Pull from the calcite-site repo
+ git reset origin/main --soft # Bring in changes from the
calcite-site repo, but keep our local changes
+ git reset -- avatica/ # Restore the avatica site
+ git checkout -- avatica/
+ git add .
+ if ! git diff-index --quiet HEAD; then
+ git commit -m "Website deployed from calcite@$GITHUB_SHA"
+ git push origin main
+ fi
diff --git a/.travis.yml b/.travis.yml
index a54c89fedc..1a2c85c99c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -52,8 +52,7 @@ matrix:
- GUAVA=31.0.1-jre
branches:
only:
- - master
- - new-master
+ - main
- javadoc
- /^branch-.*$/
- /^[0-9]+-.*$/
diff --git a/README.md b/README.md
index 6caaf0873f..d927704370 100644
--- a/README.md
+++ b/README.md
@@ -18,9 +18,9 @@ limitations under the License.
-->
[](https://maven-badges.herokuapp.com/maven-central/org.apache.calcite/calcite-core)
-[](https://app.travis-ci.com/github/apache/calcite)
-[](https://github.com/apache/calcite/actions?query=branch%3Amaster)
-[](https://ci.appveyor.com/project/ApacheSoftwareFoundation/calcite)
+[](https://app.travis-ci.com/github/apache/calcite)
+[](https://github.com/apache/calcite/actions?query=branch%3Amain)
+[](https://ci.appveyor.com/project/ApacheSoftwareFoundation/calcite)
# Apache Calcite
diff --git a/appveyor.yml b/appveyor.yml
index 492090df57..206abeebc4 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -29,8 +29,7 @@ init:
branches:
# whitelist
only:
- - master
- - new-master
+ - main
- javadoc
- /^branch-.*$/
- /^[0-9]+-.*$/
diff --git a/build.gradle.kts b/build.gradle.kts
index 4c2e80570d..c8dbf5250b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -139,6 +139,9 @@ releaseParams {
releaseTag.set("calcite-$buildVersion")
rcTag.set(rc.map { "calcite-$buildVersion-rc$it" })
sitePreviewEnabled.set(false)
+ source {
+ branch.set("main")
+ }
nexus {
// https://github.com/marcphilipp/nexus-publish-plugin/issues/35
packageGroup.set("org.apache.calcite")
diff --git a/settings.gradle.kts b/settings.gradle.kts
index bd21e678b8..ad956b868b 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -110,7 +110,8 @@ if (isCiServer) {
// Cache build artifacts, so expensive operations do not need to be re-computed
// The logic is as follows:
-// 1. Cache is populated only in CI that has S3_BUILD_CACHE_ACCESS_KEY_ID and
S3_BUILD_CACHE_SECRET_KEY (GitHub Actions in master branch)
+// 1. Cache is populated only in CI that has S3_BUILD_CACHE_ACCESS_KEY_ID and
+// S3_BUILD_CACHE_SECRET_KEY (GitHub Actions in main branch)
// 2. Otherwise the cache is read-only (e.g. everyday builds and PR builds)
buildCache {
local {
diff --git a/site/.asf.yaml b/site/.asf.yaml
index 5e818ba9b5..49a7af4f55 100644
--- a/site/.asf.yaml
+++ b/site/.asf.yaml
@@ -15,4 +15,4 @@
# limitations under the License.
#
publish:
- whoami: master
+ whoami: main
diff --git a/site/README.md b/site/README.md
index ec9c092415..d04cf5f16d 100644
--- a/site/README.md
+++ b/site/README.md
@@ -27,13 +27,11 @@ We want to deploy project changes (for example, new
committers, PMC members or u
immediately, but we want to deploy documentation of project features only when
that feature appears
in a release.
-The procedure for deploying changes to the website is outlined below:
-1. Push the commit with the changes to the `master` branch of this repository.
-2. Cherry-pick the commit from the `master` branch to the `site` branch of
this repository.
-3. Checkout the `site` branch and build the website either
[manually](#manually) or using
-[docker-compose](#using-docker) (preferred).
-4. Commit the generated content to the `master` branch of the `calcite-site`
repository following
-the [Pushing to site](#pushing-to-site) instructions.
+The building and publishing of the website is completely automated using
Github actions, so you should simply commit
+your changes to main. If you are committing a change to the website that needs
to be published immediately, the
+Github action uses these
[rules](../.github/workflows/publish-non-release-website-updates.yml#L7).
+
+# Previewing the website locally
## Manually
diff --git a/site/_config.yml b/site/_config.yml
index e3ae6a79d8..4641ac5e05 100644
--- a/site/_config.yml
+++ b/site/_config.yml
@@ -29,7 +29,7 @@ collections:
output: true
# The URL where the code can be found
-sourceRoot: https://github.com/apache/calcite/blob/master
+sourceRoot: https://github.com/apache/calcite/blob/main
# The URL where Javadocs are located
apiRoot: /javadocAggregate
diff --git a/site/_docs/howto.md b/site/_docs/howto.md
index 61a2035779..dd5f477be3 100644
--- a/site/_docs/howto.md
+++ b/site/_docs/howto.md
@@ -579,7 +579,7 @@ protocol that you are using (HTTPS vs. SSH).
## Merging pull requests
These are instructions for a Calcite committer who has reviewed a pull request
-from a contributor, found it satisfactory, and is about to merge it to master.
+from a contributor, found it satisfactory, and is about to merge it to main.
Usually the contributor is not a committer (otherwise they would be committing
it themselves, after you gave approval in a review).
@@ -690,7 +690,7 @@ Note: release artifacts (dist.apache.org and
repository.apache.org) are managed
Before you start:
* Send an email to [[email protected]](mailto:[email protected])
notifying that RC build process
- is starting and therefore `master` branch is in code freeze until further
notice.
+ is starting and therefore `main` branch is in code freeze until further
notice.
* Set up signing keys as described above.
* Make sure you are using JDK 8 (not 9 or 10).
* Check that `README` and `site/_docs/howto.md` have the correct version
number.
@@ -948,8 +948,8 @@ Add a release announcement by copying
Generate the javadoc, and [preview](http://localhost:4000/news/) the site by
following the
instructions in [site/README.md]({{ site.sourceRoot }}/site/README.md). Ensure
the announcement,
javadoc, and release note appear correctly and then publish the site following
the instructions
-in the same file. Rebase the `site` branch with `master` (e.g., `git checkout
site && git rebase master`);
-at this point there shouldn't be any commits in `site` that are not in
`master`, so the rebase is
+in the same file. Rebase the `site` branch with `main` (e.g., `git checkout
site && git rebase main`);
+at this point there shouldn't be any commits in `site` that are not in `main`,
so the rebase is
essentially a noop.
In JIRA, search for
@@ -972,8 +972,8 @@ Increase the `calcite.version` value in
`/gradle.properties`, commit and push
the change with the message "Prepare for next development iteration"
(see
[ed1470a](https://github.com/apache/calcite/commit/ed1470a3ea53a78c667354a5ec066425364eca73)
as a reference)
-Re-open the `master` branch. Send an email to
[[email protected]](mailto:[email protected]) notifying
-that `master` code freeze is over and commits can resume.
+Re-open the `main` branch. Send an email to
[[email protected]](mailto:[email protected]) notifying
+that `main` code freeze is over and commits can resume.
## Publishing the web site
{: #publish-the-web-site}
diff --git a/site/_docs/powered_by.md b/site/_docs/powered_by.md
index 11c7e9781e..b9721c1d0f 100644
--- a/site/_docs/powered_by.md
+++ b/site/_docs/powered_by.md
@@ -30,7 +30,7 @@ The following companies and projects are powered by Apache
Calcite.
{:toc}
Is your company or project powered by Calcite?
-[Add it to this
page](https://github.com/apache/calcite/blob/master/site/_docs/powered_by.md)
+[Add it to this
page](https://github.com/apache/calcite/blob/main/site/_docs/powered_by.md)
and then use the "powered by Apache Calcite" logo
([140 px]({{ site.baseurl }}/img/pb-calcite-140.png)
or [240 px]({{ site.baseurl }}/img/pb-calcite-240.png))
diff --git a/site/_docs/redis_adapter.md b/site/_docs/redis_adapter.md
index cc9e06dd8c..1a52f68fed 100644
--- a/site/_docs/redis_adapter.md
+++ b/site/_docs/redis_adapter.md
@@ -121,7 +121,7 @@ A basic example of a model file is given below:
}
{% endhighlight %}
-This file is stored as
[`redis/src/test/resources/redis-mix-model.json`](https://github.com/apache/calcite/blob/master/redis/src/test/resources/redis-mix-model.json),
+This file is stored as
[`redis/src/test/resources/redis-mix-model.json`](https://github.com/apache/calcite/blob/main/redis/src/test/resources/redis-mix-model.json),
so you can connect to Redis via
[`sqlline`](https://github.com/julianhyde/sqlline)
as follows:
diff --git a/site/_posts/2021-10-19-release-1.28.0.md
b/site/_posts/2021-10-19-release-1.28.0.md
index a6308f720e..ca62f2fdc0 100644
--- a/site/_posts/2021-10-19-release-1.28.0.md
+++ b/site/_posts/2021-10-19-release-1.28.0.md
@@ -55,7 +55,7 @@ Two APIs are deprecated and will be
In 1.28, Calcite converted the recently introduced
[configuration system](https://issues.apache.org/jira/browse/CALCITE-3328)
from an internal system based on
-[ImmutableBeans](https://github.com/apache/calcite/blob/master/core/src/main/java/org/apache/calcite/util/ImmutableBeans.java)
+[ImmutableBeans](https://github.com/apache/calcite/blob/main/core/src/main/java/org/apache/calcite/util/ImmutableBeans.java)
to instead use the [Immutables](https://immutables.github.io/)
annotation processor. This library brings a large number of additional
features that should make value-type classes in Calcite easier to
@@ -68,7 +68,7 @@ and classes have been deprecated. The change was designed to
minimize
disruption to existing consumers of Calcite but the following minor
changes needed to be made:
* The
-
[RelRule.Config.EMPTY](https://github.com/apache/calcite/blob/master/core/src/main/java/org/apache/calcite/plan/RelRule.java#L125)
+
[RelRule.Config.EMPTY](https://github.com/apache/calcite/blob/main/core/src/main/java/org/apache/calcite/plan/RelRule.java#L125)
field is now deprecated. To create a new configuration subclass, you
can either use your preferred interface-implementation based
construction or you can leverage Immutables. To do the latter,
diff --git a/site/community/index.md b/site/community/index.md
index 36853540ec..f4b78acf9c 100644
--- a/site/community/index.md
+++ b/site/community/index.md
@@ -78,7 +78,7 @@ Need help with Calcite? Try these resources:
your question.
* **Browse the code**.
One of the advantages of open source software is that you can browse the
code.
- The code is available on
[github](https://github.com/apache/calcite/tree/master).
+ The code is available on
[GitHub](https://github.com/apache/calcite/tree/main).
# Talks
@@ -146,7 +146,7 @@ At [SIGMOD/PODS
2019](https://sigmod2019.org/sigmod_industry_list), Amsterdam, N
and [Beam Summit Europe 2019](https://beam-summit.firebaseapp.com/schedule/);
[[paper](https://arxiv.org/abs/1905.12133)],
[[review](https://blog.acolyer.org/2019/07/03/one-sql-to-rule-them-all/)],
-[[pdf](https://github.com/julianhyde/share/blob/master/slides/one-sql-to-rule-them-all-beam-summit-2019.pdf?raw=true)],
+[[pdf](https://github.com/julianhyde/share/blob/main/slides/one-sql-to-rule-them-all-beam-summit-2019.pdf?raw=true)],
[[video](https://www.youtube.com/watch?v=9f4igtyNseo)].
## Apache Calcite: A Foundational Framework for Optimized Query Processing
Over Heterogeneous Data Sources
@@ -154,13 +154,13 @@ and [Beam Summit Europe
2019](https://beam-summit.firebaseapp.com/schedule/);
At [SIGMOD/PODS 2018](https://sigmod2018.org/index.shtml), Houston, TX, 2018;
[[paper](https://arxiv.org/pdf/1802.10233)],
[[slides](https://www.slideshare.net/julianhyde/apache-calcite-a-foundational-framework-for-optimized-query-processing-over-heterogeneous-data-sources)],
-[[pdf](https://github.com/julianhyde/share/blob/master/slides/calcite-sigmod-2018.pdf?raw=true)].
+[[pdf](https://github.com/julianhyde/share/blob/main/slides/calcite-sigmod-2018.pdf?raw=true)].
## Spatial query on vanilla databases
At ApacheCon North America, 2018;
[[slides](https://www.slideshare.net/julianhyde/spatial-query-on-vanilla-databases)],
-[[pdf](https://github.com/julianhyde/share/blob/master/slides/calcite-spatial-apache-con-2018.pdf?raw=true).
+[[pdf](https://github.com/julianhyde/share/blob/main/slides/calcite-spatial-apache-con-2018.pdf?raw=true).
## Apache Calcite: One planner fits all
@@ -173,14 +173,14 @@ Voted [Best Lightning Talk at
XLDB-2015](https://www.xldb.org/archives/2015/05/b
At Hadoop Summit, San Jose, CA, 2016
[[video](https://www.youtube.com/watch?v=b7HENkvd1uU)],
[[slides](https://www.slideshare.net/julianhyde/streaming-sql-63554778)],
-[[pdf](https://github.com/julianhyde/share/blob/master/slides/calcite-streaming-sql-san-jose-2016.pdf?raw=true)].
+[[pdf](https://github.com/julianhyde/share/blob/main/slides/calcite-streaming-sql-san-jose-2016.pdf?raw=true)].
## Cost-based Query Optimization in Apache Phoenix using Apache Calcite
At Hadoop Summit, San Jose, CA, 2016
[[video](https://www.youtube.com/watch?v=gz9X7JD8BAU)],
[[slides](https://www.slideshare.net/julianhyde/costbased-query-optimization-in-apache-phoenix-using-apache-calcite)],
-[[pdf](https://github.com/julianhyde/share/blob/master/slides/phoenix-on-calcite-hadoop-summit-2016.pdf?raw=true)].
+[[pdf](https://github.com/julianhyde/share/blob/main/slides/phoenix-on-calcite-hadoop-summit-2016.pdf?raw=true)].
## Planning with Polyalgebra: Bringing together relational, complex and
machine learning algebra
@@ -190,11 +190,11 @@ As Hadoop Summit, Dublin, 2016
## More talks
-* <a
href="https://github.com/julianhyde/share/blob/master/slides/calcite-algebra-edw-2015.pdf?raw=true";>Why
you care about relational algebra (even though you didn't know it)</a>
(Washington DC, 2015)
-* <a
href="https://github.com/julianhyde/share/blob/master/slides/hive-cbo-seattle-2014.pdf?raw=true";>Cost-based
optimization in Hive 0.14</a> (Seattle, 2014)
-* <a
href="https://github.com/julianhyde/share/blob/master/slides/dmmq-summit-2014.pdf?raw=true";>Discardable,
in-memory materialized query for Hadoop</a> (<a
href="https://www.youtube.com/watch?v=CziGOa8GXqI";>video</a>) (Hadoop Summit,
2014)
-* <a
href="https://github.com/julianhyde/share/blob/master/slides/optiq-nosql-now-2013.pdf?raw=true";>SQL
Now!</a> (NoSQL Now! conference, 2013)
-* <a
href="https://github.com/julianhyde/share/blob/master/slides/optiq-drill-user-group-2013.pdf?raw=true";>Drill
/ SQL / Optiq</a> (2013)
+* <a
href="https://github.com/julianhyde/share/blob/main/slides/calcite-algebra-edw-2015.pdf?raw=true";>Why
you care about relational algebra (even though you didn't know it)</a>
(Washington DC, 2015)
+* <a
href="https://github.com/julianhyde/share/blob/main/slides/hive-cbo-seattle-2014.pdf?raw=true";>Cost-based
optimization in Hive 0.14</a> (Seattle, 2014)
+* <a
href="https://github.com/julianhyde/share/blob/main/slides/dmmq-summit-2014.pdf?raw=true";>Discardable,
in-memory materialized query for Hadoop</a> (<a
href="https://www.youtube.com/watch?v=CziGOa8GXqI";>video</a>) (Hadoop Summit,
2014)
+* <a
href="https://github.com/julianhyde/share/blob/main/slides/optiq-nosql-now-2013.pdf?raw=true";>SQL
Now!</a> (NoSQL Now! conference, 2013)
+* <a
href="https://github.com/julianhyde/share/blob/main/slides/optiq-drill-user-group-2013.pdf?raw=true";>Drill
/ SQL / Optiq</a> (2013)
* <a
href="https://www.slideshare.net/julianhyde/how-to-integrate-splunk-with-any-data-solution";>How
to integrate Splunk with any data solution</a> (Splunk User Conference, 2012)
# External resources
diff --git a/site/develop/index.md b/site/develop/index.md
index 29770cdd7f..0a74ce1911 100644
--- a/site/develop/index.md
+++ b/site/develop/index.md
@@ -146,7 +146,7 @@ the JIRA case number, like this:
[CALCITE-345] AssertionError in RexToLixTranslator comparing to date literal
{% endhighlight %}
-If your change had multiple commits, use `git rebase -i master` to
+If your change had multiple commits, use `git rebase -i main` to
squash them into a single commit, and to bring your code up to date
with the latest on the main line.
@@ -171,7 +171,7 @@ the implementation ("Add handler for FileNotFound").
surmise that the purpose of your change is to fix the bug.
Then push your commit(s) to GitHub, and create a pull request from
-your branch to the calcite master branch. Update the JIRA case
+your branch to the calcite main branch. Update the JIRA case
to reference your pull request, and a committer will review your
changes.
@@ -309,7 +309,7 @@ so it is better to stick with
`org.checkerframework.checker.nullness.qual.Nullab
## Continuous Integration Testing
-Calcite exploits [GitHub
actions](https://github.com/apache/calcite/actions?query=branch%3Amaster)
+Calcite exploits [GitHub
actions](https://github.com/apache/calcite/actions?query=branch%3Amain)
and [Travis](https://app.travis-ci.com/github/apache/calcite) for continuous
integration testing.
In the past, there were also Jenkins jobs on the
[ASF-hosted](https://builds.apache.org/)
infrastructure, but they are not maintained anymore.
