Skip to content

Commit 7e3293b

Browse files
authored
Merge branch 'apache:main' into main
2 parents 756937e + 61d82a1 commit 7e3293b

File tree

116 files changed

+3527
-346
lines changed

Some content is hidden

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

116 files changed

+3527
-346
lines changed

.asf.yaml

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
18+
# See: https://cwiki.apache.org/confluence/display/INFRA/git+-+.asf.yaml+features
19+
20+
github:
21+
description: "Apache Fluss is a streaming storage built for real-time analytics."
22+
homepage: https://fluss.apache.org/
23+
features:
24+
issues: true
25+
projects: true
26+
discussions: true
27+
wiki: false
28+
labels:
29+
- fluss
30+
- streaming
31+
- real-time-analytics
32+
- lakehouse
33+
enabled_merge_buttons:
34+
squash: true
35+
merge: false
36+
rebase: true
37+
38+
notifications:
39+
40+
41+
pullrequests: [email protected]
42+
43+
discussions: [email protected]

.github/workflows/docs-check.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,17 @@
1818

1919
# This workflow is meant for checking broken links in the documentation.
2020
name: Check Documentation
21+
permissions:
22+
contents: read
2123
on:
2224
pull_request:
2325
branches: [main, release-*, ci-*]
2426
paths:
2527
- 'website/**'
28+
push:
29+
branches: [main, release-*, ci-*]
30+
paths:
31+
- 'website/**'
2632

2733
jobs:
2834
test-deploy:

.github/workflows/docs-deploy.yaml

Lines changed: 13 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -16,39 +16,27 @@
1616
# limitations under the License.
1717
################################################################################
1818
name: Deploy Documentation
19+
permissions:
20+
contents: read
1921
on:
2022
push:
2123
branches: [main, release-*]
2224
paths:
2325
- 'website/**'
2426

27+
# We use `repository_dispatch` to trigger the deployment job on the apache/fluss-website repository.
28+
# https://github.com/apache/fluss-website/blob/main/.github/workflows/website-deploy.yaml
29+
# https://docs.github.com/en/actions/reference/events-that-trigger-workflows#repository_dispatch
2530
jobs:
2631
deploy:
2732
runs-on: ubuntu-latest
28-
defaults:
29-
run:
30-
working-directory: ./website
3133
steps:
32-
- uses: actions/checkout@v4
33-
with:
34-
ref: main
35-
fetch-depth: 0
36-
- name: Generate versioned docs
37-
run: ./build_versioned_docs.sh
38-
- uses: actions/setup-node@v4
39-
with:
40-
node-version: 18
41-
- name: Install dependencies
42-
run: npm install
43-
- name: Build website
44-
run: npm run build
45-
- uses: webfactory/[email protected]
46-
with:
47-
ssh-private-key: ${{ secrets.GH_PAGES_DEPLOY }}
48-
- name: Deploy website
49-
env:
50-
USE_SSH: true
34+
- name: Send Event to Trigger Deploy
5135
run: |
52-
git config --global user.email "[email protected]"
53-
git config --global user.name "gh-actions"
54-
npm run deploy -- --skip-build
36+
curl -L \
37+
-X POST \
38+
-H "Accept: application/vnd.github+json" \
39+
-H "Authorization: Bearer ${{ secrets.GH_TOKEN }}" \
40+
-H "X-GitHub-Api-Version: 2022-11-28" \
41+
https://api.github.com/repos/apache/fluss-website/dispatches \
42+
-d '{"event_type":"website-deploy","client_payload":{"repository": "apache/fluss"}}'

.github/workflows/license-check.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
# limitations under the License.
1515

1616
name: Check License
17+
permissions:
18+
contents: read
1719

1820
on: [push, pull_request]
1921

@@ -37,6 +39,7 @@ jobs:
3739
with:
3840
java-version: 8
3941
distribution: 'temurin'
42+
4043
- name: Build
4144
run: |
4245
set -o pipefail

.idea/vcs.xml

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<source media="(prefers-color-scheme: dark)" srcset="website/static/img/logo/svg/white_color_logo.svg">
44
<source media="(prefers-color-scheme: light)" srcset="website/static/img/logo/svg/colored_logo.svg">
55
<!-- Fall back to version that works for dark and light mode -->
6-
<img alt="Fluss logo" src="website/static/img/logo/svg/white_filled.svg">
6+
<img alt="Apache Fluss logo" src="website/static/img/logo/svg/white_filled.svg">
77
</picture>
88
</p>
99

@@ -14,12 +14,12 @@
1414
<p align="center">
1515
<a href="https://github.com/alibaba/fluss/actions/workflows/ci.yaml"><img src="https://github.com/alibaba/fluss/actions/workflows/ci.yaml/badge.svg?branch=main" alt="CI"></a>
1616
<a href="https://github.com/alibaba/fluss/blob/main/LICENSE"><img src="https://img.shields.io/badge/license-Apache%202-4EB1BA.svg" alt="License"></a>
17-
<a href="https://join.slack.com/t/fluss-hq/shared_invite/zt-33wlna581-QAooAiCmnYboJS8D_JUcYw"><img src="https://img.shields.io/badge/slack-join_chat-brightgreen.svg?logo=slack" alt="Slack"></a>
17+
<a href="https://join.slack.com/t/apache-fluss/shared_invite/zt-33wlna581-QAooAiCmnYboJS8D_JUcYw"><img src="https://img.shields.io/badge/slack-join_chat-brightgreen.svg?logo=slack" alt="Slack"></a>
1818
</p>
1919

20-
## What is Fluss?
20+
## What is Apache Fluss (Incubating)?
2121

22-
Fluss is a streaming storage built for real-time analytics which can serve as the real-time data layer for Lakehouse architectures.
22+
Apache Fluss (Incubating) is a streaming storage built for real-time analytics which can serve as the real-time data layer for Lakehouse architectures.
2323

2424
It bridges the gap between **data streaming** and **data Lakehouse** by enabling low-latency, high-throughput data ingestion and processing while seamlessly integrating with popular compute engines like **Apache Flink**, while Apache Spark, and StarRocks are coming soon.
2525

@@ -36,7 +36,7 @@ It bridges the gap between **data streaming** and **data Lakehouse** by enabling
3636

3737
## Building
3838

39-
Prerequisites for building Fluss:
39+
Prerequisites for building Apache Fluss:
4040

4141
- Unix-like environment (we use Linux, Mac OS X, Cygwin, WSL)
4242
- Git
@@ -49,14 +49,14 @@ cd fluss
4949
./mvnw clean package -DskipTests
5050
```
5151

52-
Fluss is now installed in `build-target`. The build command uses Maven Wrapper (`mvnw`) which ensures the correct Maven version is used.
52+
Apache Fluss is now installed in `build-target`. The build command uses Maven Wrapper (`mvnw`) which ensures the correct Maven version is used.
5353

5454
## Contributing
5555

56-
Fluss is open-source, and we’d love your help to keep it growing! Join the [discussions](https://github.com/alibaba/fluss/discussions),
56+
Apache Fluss (Incubating) is open-source, and we’d love your help to keep it growing! Join the [discussions](https://github.com/alibaba/fluss/discussions),
5757
open [issues](https://github.com/alibaba/fluss/issues) if you find a bug or request features, contribute code and documentation,
5858
or help us improve the project in any way. All contributions are welcome!
5959

6060
## License
6161

62-
Fluss project is licensed under the [Apache License 2.0](https://github.com/alibaba/fluss/blob/main/LICENSE).
62+
Apache Fluss (Incubating) project is licensed under the [Apache License 2.0](https://github.com/alibaba/fluss/blob/main/LICENSE).

fluss-client/src/main/java/com/alibaba/fluss/client/admin/FlussAdmin.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -377,12 +377,11 @@ private ListOffsetsResult listOffsets(
377377
Collection<Integer> buckets,
378378
OffsetSpec offsetSpec) {
379379
Long partitionId = null;
380-
metadataUpdater.checkAndUpdateTableMetadata(
381-
Collections.singleton(physicalTablePath.getTablePath()));
380+
metadataUpdater.updateTableOrPartitionMetadata(physicalTablePath.getTablePath(), null);
382381
long tableId = metadataUpdater.getTableId(physicalTablePath.getTablePath());
383382
// if partition name is not null, we need to check and update partition metadata
384383
if (physicalTablePath.getPartitionName() != null) {
385-
metadataUpdater.checkAndUpdatePartitionMetadata(physicalTablePath);
384+
metadataUpdater.updatePhysicalTableMetadata(Collections.singleton(physicalTablePath));
386385
partitionId = metadataUpdater.getPartitionIdOrElseThrow(physicalTablePath);
387386
}
388387
Map<Integer, ListOffsetsRequest> requestMap =

fluss-client/src/main/java/com/alibaba/fluss/client/token/SecurityTokenReceiverRepository.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,10 @@ private Map<String, SecurityTokenReceiver> loadReceivers() {
6161
receiver.scheme());
6262
};
6363

64-
ServiceLoader.load(SecurityTokenReceiver.class).iterator().forEachRemaining(loadReceiver);
64+
ServiceLoader.load(
65+
SecurityTokenReceiver.class, SecurityTokenReceiver.class.getClassLoader())
66+
.iterator()
67+
.forEachRemaining(loadReceiver);
6568

6669
LOG.info("Security token receivers loaded successfully");
6770
return receivers;

fluss-client/src/main/resources/META-INF/NOTICE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ This project bundles the following dependencies under the Apache Software Licens
88

99
- com.google.code.findbugs:jsr305:1.3.9
1010
- com.ververica:frocksdbjni:6.20.3-ververica-2.0
11-
- org.apache.commons:commons-lang3:3.12.0
11+
- org.apache.commons:commons-lang3:3.18.0
1212
- org.apache.commons:commons-math3:3.6.1
1313
- org.lz4:lz4-java:1.8.0
1414

fluss-common/src/main/java/com/alibaba/fluss/fs/FileSystem.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,11 @@ public static void initialize(Configuration config, @Nullable PluginManager plug
266266
Collection<Supplier<Iterator<FileSystemPlugin>>> pluginSuppliers =
267267
new ArrayList<>(2);
268268
pluginSuppliers.add(
269-
() -> ServiceLoader.load(FileSystemPlugin.class).iterator());
269+
() ->
270+
ServiceLoader.load(
271+
FileSystemPlugin.class,
272+
FileSystem.class.getClassLoader())
273+
.iterator());
270274

271275
if (pluginManager != null) {
272276
pluginSuppliers.add(

0 commit comments

Comments
 (0)