Skip to content

Commit 502ad27

Browse files
committed
Merge branch 'refs/heads/main' into flink-support-patition-pushdown
# Conflicts: # fluss-common/src/main/java/com/alibaba/fluss/predicate/And.java # fluss-common/src/main/java/com/alibaba/fluss/predicate/CompareUtils.java # fluss-common/src/main/java/com/alibaba/fluss/predicate/CompoundPredicate.java # fluss-common/src/main/java/com/alibaba/fluss/predicate/Contains.java # fluss-common/src/main/java/com/alibaba/fluss/predicate/EndsWith.java # fluss-common/src/main/java/com/alibaba/fluss/predicate/Equal.java # fluss-common/src/main/java/com/alibaba/fluss/predicate/GreaterOrEqual.java # fluss-common/src/main/java/com/alibaba/fluss/predicate/GreaterThan.java # fluss-common/src/main/java/com/alibaba/fluss/predicate/IsNotNull.java # fluss-common/src/main/java/com/alibaba/fluss/predicate/IsNull.java # fluss-common/src/main/java/com/alibaba/fluss/predicate/LeafFunction.java # fluss-common/src/main/java/com/alibaba/fluss/predicate/LeafPredicate.java # fluss-common/src/main/java/com/alibaba/fluss/predicate/LessOrEqual.java # fluss-common/src/main/java/com/alibaba/fluss/predicate/LessThan.java # fluss-common/src/main/java/com/alibaba/fluss/predicate/NotEqual.java # fluss-common/src/main/java/com/alibaba/fluss/predicate/NotIn.java # fluss-common/src/main/java/com/alibaba/fluss/predicate/Or.java # fluss-common/src/main/java/com/alibaba/fluss/predicate/Predicate.java # fluss-common/src/main/java/com/alibaba/fluss/predicate/PredicateBuilder.java # fluss-common/src/main/java/com/alibaba/fluss/predicate/PredicateVisitor.java # fluss-common/src/main/java/com/alibaba/fluss/predicate/StartsWith.java # fluss-common/src/main/java/com/alibaba/fluss/predicate/UnsupportedExpression.java # fluss-common/src/main/java/com/alibaba/fluss/utils/BinaryStringUtils.java # fluss-common/src/test/java/com/alibaba/fluss/predicate/PredicateBuilderTest.java # fluss-common/src/test/java/com/alibaba/fluss/predicate/PredicateTest.java # fluss-flink/fluss-flink-common/src/test/java/com/alibaba/fluss/flink/source/FlinkTableSourceITCase.java
2 parents f733d42 + 74ab1f1 commit 502ad27

File tree

304 files changed

+8104
-2430
lines changed

Some content is hidden

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

304 files changed

+8104
-2430
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

.github/workflows/stage.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ fluss-flink/fluss-flink-1.20,\
2727
fluss-flink/fluss-flink-1.19,\
2828
fluss-flink/fluss-flink-1.18,\
2929
fluss-lake,\
30-
fluss-lake/fluss-lake-paimon
30+
fluss-lake/fluss-lake-paimon,\
31+
fluss-lake/fluss-lake-iceberg,\
32+
fluss-lake/fluss-lake-lance
3133
"
3234

3335
function get_test_modules_for_stage() {

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

LICENSE

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -359,6 +359,33 @@ Apache Kafka
359359
./fluss-server/src/main/java/com/alibaba/fluss/server/utils/timer/TimingWheel.java
360360

361361
Apache Paimon
362+
./fluss-common/src/main/java/com/alibaba/fluss/predicate/And.java
363+
./fluss-common/src/main/java/com/alibaba/fluss/predicate/CompareUtils.java
364+
./fluss-common/src/main/java/com/alibaba/fluss/predicate/CompoundPredicate.java
365+
./fluss-common/src/main/java/com/alibaba/fluss/predicate/Contains.java
366+
./fluss-common/src/main/java/com/alibaba/fluss/predicate/EndsWith.java
367+
./fluss-common/src/main/java/com/alibaba/fluss/predicate/Equal.java
368+
./fluss-common/src/main/java/com/alibaba/fluss/predicate/FieldRef.java
369+
./fluss-common/src/main/java/com/alibaba/fluss/predicate/FunctionVisitor.java
370+
./fluss-common/src/main/java/com/alibaba/fluss/predicate/GreaterOrEqual.java
371+
./fluss-common/src/main/java/com/alibaba/fluss/predicate/GreaterThan.java
372+
./fluss-common/src/main/java/com/alibaba/fluss/predicate/In.java
373+
./fluss-common/src/main/java/com/alibaba/fluss/predicate/IsNotNull.java
374+
./fluss-common/src/main/java/com/alibaba/fluss/predicate/IsNull.java
375+
./fluss-common/src/main/java/com/alibaba/fluss/predicate/LeafFunction.java
376+
./fluss-common/src/main/java/com/alibaba/fluss/predicate/LeafPredicate.java
377+
./fluss-common/src/main/java/com/alibaba/fluss/predicate/LeafUnaryFunction.java
378+
./fluss-common/src/main/java/com/alibaba/fluss/predicate/LessOrEqual.java
379+
./fluss-common/src/main/java/com/alibaba/fluss/predicate/LessThan.java
380+
./fluss-common/src/main/java/com/alibaba/fluss/predicate/NotEqual.java
381+
./fluss-common/src/main/java/com/alibaba/fluss/predicate/NotIn.java
382+
./fluss-common/src/main/java/com/alibaba/fluss/predicate/NullFalseLeafBinaryFunction.java
383+
./fluss-common/src/main/java/com/alibaba/fluss/predicate/Or.java
384+
./fluss-common/src/main/java/com/alibaba/fluss/predicate/PartitionPredicateVisitor.java
385+
./fluss-common/src/main/java/com/alibaba/fluss/predicate/Predicate.java
386+
./fluss-common/src/main/java/com/alibaba/fluss/predicate/PredicateBuilder.java
387+
./fluss-common/src/main/java/com/alibaba/fluss/predicate/PredicateVisitor.java
388+
./fluss-common/src/main/java/com/alibaba/fluss/predicate/StartsWith.java
362389
./fluss-common/src/main/java/com/alibaba/fluss/row/encode/paimon/PaimonBinaryRowWriter.java
363390
./fluss-flink/fluss-flink-common/src/main/java/com/alibaba/fluss/flink/lakehouse/paimon/reader/PaimonSnapshotScanner.java
364391

README.md

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,26 @@
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

1010
<p align="center">
11-
<a href="https://alibaba.github.io/fluss-docs/docs/intro/">Documentation</a> | <a href="https://alibaba.github.io/fluss-docs/docs/quickstart/flink/">QuickStart</a> | <a href="https://alibaba.github.io/fluss-docs/community/dev/ide-setup/">Development</a>
11+
<a href="https://fluss.apache.org/docs/">Documentation</a> | <a href="https://fluss.apache.org/docs/quickstart/flink/">QuickStart</a> | <a href="https://fluss.apache.org/community/dev/ide-setup/">Development</a>
1212
</p>
1313

1414
<p align="center">
15-
<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>
16-
<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>
15+
<a href="https://github.com/apache/fluss/actions/workflows/ci.yaml"><img src="https://github.com/apache/fluss/actions/workflows/ci.yaml/badge.svg?branch=main" alt="CI"></a>
16+
<a href="https://github.com/apache/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/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

24-
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.
24+
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
25+
Apache Spark, and StarRocks are coming soon.
2526

2627
**Fluss (German: river, pronounced `/flus/`)** enables streaming data continuously converging, distributing and flowing into lakes, like a river 🌊
2728

@@ -36,27 +37,27 @@ It bridges the gap between **data streaming** and **data Lakehouse** by enabling
3637

3738
## Building
3839

39-
Prerequisites for building Fluss:
40+
Prerequisites for building Apache Fluss:
4041

4142
- Unix-like environment (we use Linux, Mac OS X, Cygwin, WSL)
4243
- Git
4344
- Maven (we require version >= 3.8.6)
4445
- Java 8 or 11
4546

4647
```bash
47-
git clone https://github.com/alibaba/fluss.git
48+
git clone https://github.com/apache/fluss.git
4849
cd fluss
4950
./mvnw clean package -DskipTests
5051
```
5152

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

5455
## Contributing
5556

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

6061
## License
6162

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

0 commit comments

Comments
 (0)