Skip to content
This repository has been archived by the owner on Feb 6, 2024. It is now read-only.

Pull main into latest #296

Merged
merged 20 commits into from
Dec 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion docs/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ theme= "iceberg-theme"
search = true
versions.iceberg = "" # This is populated by the github deploy workflow and is equal to the branch name
versions.nessie = "0.71.0"
latestVersions.iceberg = "1.4.1" # This is used for the version badge on the "latest" site version
latestVersions.iceberg = "1.4.2" # This is used for the version badge on the "latest" site version
BookSection='docs' # This determines which directory will inform the left navigation menu
disableHome=true

Expand All @@ -24,6 +24,7 @@ home = [ "HTML", "RSS", "SearchIndex" ]
[menu]
versions = [
{ name = "latest", pre = "relative", url = "../latest", weight = 1 },
{ name = "1.4.2", pre = "relative", url = "../1.4.2", weight = 986 },
{ name = "1.4.1", pre = "relative", url = "../1.4.1", weight = 987 },
{ name = "1.4.0", pre = "relative", url = "../1.4.0", weight = 988 },
{ name = "1.3.1", pre = "relative", url = "../1.3.1", weight = 989 },
Expand Down Expand Up @@ -56,6 +57,8 @@ home = [ "HTML", "RSS", "SearchIndex" ]
{ name = "Multi-Engine Support", parent = "Project", pre = "relative", url = "../../multi-engine-support", weight = 450 },
{ name = "How To Release", parent = "Project", pre = "relative", url = "../../how-to-release", weight = 500 },
{ name = "Terms", parent = "Project", pre = "relative", url = "../../terms", weight = 600 },
{ name = "Concepts", weight = 1150 },
{ name = "Catalogs", parent = "Concepts", pre = "relative", url = "../../catalog" },
{ name = "ASF", weight = 1200 },
{ name = "License", identifier = "_license", parent = "ASF", url = "https://www.apache.org/licenses/" },
{ name = "Security", identifier = "_security", parent = "ASF", url = "https://www.apache.org/security/" },
Expand Down
2 changes: 1 addition & 1 deletion docs/content/spark-ddl.md
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ To migrate from daily to hourly partitioning with transforms, it is not necessar
{{< /hint >}}

{{< hint danger >}}
**Dynamic partition overwrite behavior will change** when partitioning changes
**Dynamic partition overwrite behavior will change** when partitioning changes.
For example, if you partition by days and move to partitioning by hours, overwrites will overwrite hourly partitions but not days anymore.
{{< /hint >}}

Expand Down
2 changes: 1 addition & 1 deletion iceberg-theme/layouts/partials/header.html
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
</a>
</div>
<div class="topnav-page-selection">
<a href="https://join.slack.com/t/apache-iceberg/shared_invite/zt-1znkcg5zm-7_FE~pcox347XwZE3GNfPg" target="_blank">
<a href="https://join.slack.com/t/apache-iceberg/shared_invite/zt-287g3akar-K9Oe_En5j1UL7Y_Ikpai3A" target="_blank">
<img src="{{ $.Site.BaseURL }}/img/Slack_Mark_Web.png" target="_blank" class="top-navbar-logo"/>
</a>
</div>
Expand Down
2 changes: 1 addition & 1 deletion iceberg-theme/static/css/iceberg-theme.css
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,7 @@ i.fa.fa-chevron-down {
.navbar-pages-group {
justify-content: end;
margin-left: auto;
max-width: 720px;
max-width: 1080px;
position: relative;
}

Expand Down
7 changes: 5 additions & 2 deletions landing-page/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ sectionPagesMenu = "main"
siteType = "landing-page"
search = true
description = "The open table format for analytic datasets."
latestVersions.iceberg = "1.4.1"
latestVersions.iceberg = "1.4.2"
docsBaseURL = ""

[[params.social]]
Expand All @@ -22,7 +22,7 @@ sectionPagesMenu = "main"
[[params.social]]
title = "slack"
icon = "slack"
url = "https://join.slack.com/t/apache-iceberg/shared_invite/zt-1jyaasx2a-TxE4z_ubxDkTFS7UFDHnjw"
url = "https://join.slack.com/t/apache-iceberg/shared_invite/zt-287g3akar-K9Oe_En5j1UL7Y_Ikpai3A"

[outputFormats.SearchIndex]
baseName = "landingpagesearch"
Expand All @@ -34,6 +34,7 @@ home = [ "HTML", "RSS", "SearchIndex" ]
[menu]
versions = [
{ name = "latest", url = "/docs/latest", weight = 1 },
{ name = "1.4.2", url = "/docs/1.4.2", weight = 986 },
{ name = "1.4.1", url = "/docs/1.4.1", weight = 987 },
{ name = "1.4.0", url = "/docs/1.4.0", weight = 988 },
{ name = "1.3.1", url = "/docs/1.3.1", weight = 989 },
Expand Down Expand Up @@ -67,6 +68,8 @@ home = [ "HTML", "RSS", "SearchIndex" ]
{ name = "Multi-Engine Support", url = "/multi-engine-support", parent = "Project", weight = 450 },
{ name = "How To Release", parent = "Project", url = "/how-to-release", weight = 500 },
{ name = "Terms", url = "/terms", parent = "Project", weight = 600 },
{ name = "Concepts", weight = 1150 },
{ name = "Catalogs", parent = "Concepts", pre = "relative", url = "/catalog" },
{ name = "ASF", weight = 1200 },
{ name = "License", identifier = "_license", parent = "ASF", url = "https://www.apache.org/licenses/" },
{ name = "Security", identifier = "_security", parent = "ASF", url = "https://www.apache.org/security/" },
Expand Down
9 changes: 9 additions & 0 deletions landing-page/content/common/blogs.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,15 @@ disableSidebar: true

Here is a list of company blogs that talk about Iceberg. The blogs are ordered from most recent to oldest.

### [Apache Hive-4.x with Iceberg Branches & Tags](https://medium.com/@ayushtkn/apache-hive-4-x-with-iceberg-branches-tags-3d52293ac0bf/)
**Date**: October 12th, 2023, **Company**: Cloudera

**Authors**: [Ayush Saxena](https://www.linkedin.com/in/ayush151/)

### [Apache Hive 4.x With Apache Iceberg](https://medium.com/@ayushtkn/apache-hive-4-x-with-apache-iceberg-part-i-355e7a380725/)
**Date**: October 12th, 2023, **Company**: Cloudera

**Authors**: [Ayush Saxena](https://www.linkedin.com/in/ayush151/)

### [From Hive Tables to Iceberg Tables: Hassle-Free](https://blog.cloudera.com/from-hive-tables-to-iceberg-tables-hassle-free/)
**Date**: July 14th, 2023, **Company**: Cloudera
Expand Down
2 changes: 1 addition & 1 deletion landing-page/content/common/catalog.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: "Iceberg Catalogs"
url: concepts/catalog
url: catalog
disableSidebar: true
---
<!--
Expand Down
5 changes: 3 additions & 2 deletions landing-page/content/common/how-to-release.md
Original file line number Diff line number Diff line change
Expand Up @@ -306,9 +306,10 @@ Thanks to everyone for contributing!

Create a PR in the `iceberg` repo to make revapi run on the new release. For an example see [this PR](https://github.com/apache/iceberg/pull/6275).

#### Update github issue template
#### Update Github

Create a PR in the `iceberg` repo to add the new version to the github issue template. For an example see [this PR](https://github.com/apache/iceberg/pull/6287).
- Create a PR in the `iceberg` repository to add the new version to the Github issue template. For an example see [this PR](https://github.com/apache/iceberg/pull/6287).
- Draft [a new release to update Github](https://github.com/apache/iceberg/releases/new) to show the latest release. A changelog can be generated automatically using Github.

### Documentation Release

Expand Down
4 changes: 2 additions & 2 deletions landing-page/content/common/join.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,13 @@ Issues are tracked in GitHub:

## Slack

We use the [Apache Iceberg workspace](https://apache-iceberg.slack.com/) on Slack. To be invited, follow [this invite link](https://join.slack.com/t/apache-iceberg/shared_invite/zt-1znkcg5zm-7_FE~pcox347XwZE3GNfPg).
We use the [Apache Iceberg workspace](https://apache-iceberg.slack.com/) on Slack. To be invited, follow [this invite link](https://join.slack.com/t/apache-iceberg/shared_invite/zt-287g3akar-K9Oe_En5j1UL7Y_Ikpai3A).

Please note that this link may occasionally break when Slack does an upgrade. If you encounter problems using it, please let us know by sending an email to <dev@iceberg.apache.org>.

## Iceberg Community Events

This calendar contians two calendar feeds:
This calendar contains two calendar feeds:

* Iceberg Community Events - Events such as conferences and meetups, aimed to educate and inspire Iceberg users.
* Iceberg Dev Events - Events such as the triweekly Iceberg sync, aimed to discuss the project roadmap and how to implement features.
Expand Down
5 changes: 3 additions & 2 deletions landing-page/content/common/multi-engine-support.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,11 @@ Each engine version undergoes the following lifecycle stages:
| ---------- | ------------------ | ----------------------- |------------------------| ------------------ |
| 2.4 | End of Life | 0.7.0-incubating | 1.2.1 | [iceberg-spark-runtime-2.4](https://search.maven.org/remotecontent?filepath=org/apache/iceberg/iceberg-spark-runtime-2.4/1.2.1/iceberg-spark-runtime-2.4-1.2.1.jar) |
| 3.0 | End of Life | 0.9.0 | 1.0.0 | [iceberg-spark-runtime-3.0_2.12](https://search.maven.org/remotecontent?filepath=org/apache/iceberg/iceberg-spark-runtime-3.0_2.12/1.0.0/iceberg-spark-runtime-3.0_2.12-1.0.0.jar) |
| 3.1 | Deprecated | 0.12.0 | {{% icebergVersion %}} | [iceberg-spark-runtime-3.1_2.12](https://search.maven.org/remotecontent?filepath=org/apache/iceberg/iceberg-spark-runtime-3.1_2.12/{{% icebergVersion %}}/iceberg-spark-runtime-3.1_2.12-{{% icebergVersion %}}.jar) [1] |
| 3.2 | Maintained | 0.13.0 | {{% icebergVersion %}} | [iceberg-spark-runtime-3.2_2.12](https://search.maven.org/remotecontent?filepath=org/apache/iceberg/iceberg-spark-runtime-3.2_2.12/{{% icebergVersion %}}/iceberg-spark-runtime-3.2_2.12-{{% icebergVersion %}}.jar) |
| 3.1 | End of Life | 0.12.0 | 1.3.1 | [iceberg-spark-runtime-3.1_2.12](https://search.maven.org/remotecontent?filepath=org/apache/iceberg/iceberg-spark-runtime-3.1_2.12/1.3.1/iceberg-spark-runtime-3.1_2.12-1.3.1.jar) [1] |
| 3.2 | Deprecated | 0.13.0 | {{% icebergVersion %}} | [iceberg-spark-runtime-3.2_2.12](https://search.maven.org/remotecontent?filepath=org/apache/iceberg/iceberg-spark-runtime-3.2_2.12/{{% icebergVersion %}}/iceberg-spark-runtime-3.2_2.12-{{% icebergVersion %}}.jar) |
| 3.3 | Maintained | 0.14.0 | {{% icebergVersion %}} | [iceberg-spark-runtime-3.3_2.12](https://search.maven.org/remotecontent?filepath=org/apache/iceberg/iceberg-spark-runtime-3.3_2.12/{{% icebergVersion %}}/iceberg-spark-runtime-3.3_2.12-{{% icebergVersion %}}.jar) |
| 3.4 | Maintained | 1.3.0 | {{% icebergVersion %}} | [iceberg-spark-runtime-3.4_2.12](https://search.maven.org/remotecontent?filepath=org/apache/iceberg/iceberg-spark-runtime-3.4_2.12/{{% icebergVersion %}}/iceberg-spark-runtime-3.4_2.12-{{% icebergVersion %}}.jar) |
| 3.5 | Maintained | 1.4.0 | {{% icebergVersion %}} | [iceberg-spark-runtime-3.5_2.12](https://search.maven.org/remotecontent?filepath=org/apache/iceberg/iceberg-spark-runtime-3.5_2.12/{{% icebergVersion %}}/iceberg-spark-runtime-3.5_2.12-{{% icebergVersion %}}.jar) |

* [1] Spark 3.1 shares the same runtime jar `iceberg-spark3-runtime` with Spark 3.0 before Iceberg 0.13.0

Expand Down
Loading
Loading