Merge branch 'main' into upgrade-rocksdb

Author: platinumhamburg

.github/workflows/docs-check.yaml

@@ -18,11 +18,17 @@
 
 # This workflow is meant for checking broken links in the documentation.
 name: Check Documentation
+permissions:
+  contents: read
 on:
   pull_request:
     branches: [main, release-*, ci-*]
     paths:
       - 'website/**'
+  push:
+    branches: [main, release-*, ci-*]
+    paths:
+      - 'website/**'
 
 jobs:
   test-deploy:

.github/workflows/docs-deploy.yaml

@@ -16,39 +16,27 @@
 # limitations under the License.
 ################################################################################
 name: Deploy Documentation
+permissions:
+  contents: read
 on:
   push:
     branches: [main, release-*]
     paths:
       - 'website/**'
 
+# We use `repository_dispatch` to trigger the deployment job on the apache/fluss-website repository.
+# https://github.com/apache/fluss-website/blob/main/.github/workflows/website-deploy.yaml
+# https://docs.github.com/en/actions/reference/events-that-trigger-workflows#repository_dispatch
 jobs:
   deploy:
     runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: ./website
     steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: main
-          fetch-depth: 0
-      - name: Generate versioned docs
-        run: ./build_versioned_docs.sh
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 18
-      - name: Install dependencies
-        run: npm install
-      - name: Build website
-        run: npm run build
-      - uses: webfactory/[email protected]
-        with:
-          ssh-private-key: ${{ secrets.GH_PAGES_DEPLOY }}
-      - name: Deploy website
-        env:
-          USE_SSH: true
+      - name: Send Event to Trigger Deploy
         run: |
-          git config --global user.email "[email protected]"
-          git config --global user.name "gh-actions"
-          npm run deploy -- --skip-build
+          curl -L \
+            -X POST \
+            -H "Accept: application/vnd.github+json" \
+            -H "Authorization: Bearer ${{ secrets.GH_TOKEN }}" \
+            -H "X-GitHub-Api-Version: 2022-11-28" \
+            https://api.github.com/repos/apache/fluss-website/dispatches \
+            -d '{"event_type":"website-deploy","client_payload":{"repository": "apache/fluss"}}'

.github/workflows/license-check.yml

@@ -14,6 +14,8 @@
 # limitations under the License.
 
 name: Check License
+permissions:
+  contents: read
 
 on: [push, pull_request]
 

.idea/vcs.xml

@@ -3,7 +3,7 @@
       <source media="(prefers-color-scheme: dark)" srcset="website/static/img/logo/svg/white_color_logo.svg">
       <source media="(prefers-color-scheme: light)" srcset="website/static/img/logo/svg/colored_logo.svg">
       <!-- Fall back to version that works for dark and light mode -->
-      <img alt="Fluss logo" src="website/static/img/logo/svg/white_filled.svg">
+      <img alt="Apache Fluss logo" src="website/static/img/logo/svg/white_filled.svg">
     </picture>
 </p>
 
@@ -17,9 +17,9 @@
   <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>
 </p>
 
-## What is Fluss?
+## What is Apache Fluss (Incubating)?
 
-Fluss is a streaming storage built for real-time analytics which can serve as the real-time data layer for Lakehouse architectures.
+Apache Fluss (Incubating) is a streaming storage built for real-time analytics which can serve as the real-time data layer for Lakehouse architectures.
 
 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.
 
@@ -36,7 +36,7 @@ It bridges the gap between **data streaming** and **data Lakehouse** by enabling
 
 ## Building
 
-Prerequisites for building Fluss:
+Prerequisites for building Apache Fluss:
 
 - Unix-like environment (we use Linux, Mac OS X, Cygwin, WSL)
 - Git
@@ -49,14 +49,14 @@ cd fluss
 ./mvnw clean package -DskipTests
 ```
 
-Fluss is now installed in `build-target`. The build command uses Maven Wrapper (`mvnw`) which ensures the correct Maven version is used.
+Apache Fluss is now installed in `build-target`. The build command uses Maven Wrapper (`mvnw`) which ensures the correct Maven version is used.
 
 ## Contributing
 
-Fluss is open-source, and we’d love your help to keep it growing! Join the [discussions](https://github.com/alibaba/fluss/discussions),
+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),
 open [issues](https://github.com/alibaba/fluss/issues) if you find a bug or request features, contribute code and documentation,
  or help us improve the project in any way. All contributions are welcome!
 
 ## License
 
-Fluss project is licensed under the [Apache License 2.0](https://github.com/alibaba/fluss/blob/main/LICENSE).
+Apache Fluss (Incubating) project is licensed under the [Apache License 2.0](https://github.com/alibaba/fluss/blob/main/LICENSE).

README.md

@@ -7,7 +7,7 @@ The Apache Software Foundation (http://www.apache.org/).
 This project bundles the following dependencies under the Apache Software License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
 
 - com.google.code.findbugs:jsr305:1.3.9
-- org.apache.commons:commons-lang3:3.12.0
+- org.apache.commons:commons-lang3:3.18.0
 - org.apache.commons:commons-math3:3.6.1
 - org.rocksdb:rocksdbjni:10.2.1
 - org.lz4:lz4-java:1.8.0

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

@@ -42,7 +42,7 @@ public interface LakeCommitter<WriteResult, CommittableT> extends AutoCloseable
      * @return the committable object
      * @throws IOException if an I/O error occurs
      */
-    CommittableT toCommitable(List<WriteResult> writeResults) throws IOException;
+    CommittableT toCommittable(List<WriteResult> writeResults) throws IOException;
 
     /**
      * Commits the given committable object.

fluss-common/src/main/java/com/alibaba/fluss/lake/committer/LakeCommitter.java

@@ -31,11 +31,11 @@
  * serializers for write results and committable objects.
  *
  * @param <WriteResult> the type of the write result
- * @param <CommitableT> the type of the committable object
+ * @param <CommittableT> the type of the committable object
  * @since 0.7
  */
 @PublicEvolving
-public interface LakeTieringFactory<WriteResult, CommitableT> extends Serializable {
+public interface LakeTieringFactory<WriteResult, CommittableT> extends Serializable {
 
     /**
      * Creates a lake writer to write Fluss's rows to Paimon/Iceberg rows.
@@ -60,13 +60,13 @@ LakeWriter<WriteResult> createLakeWriter(WriterInitContext writerInitContext)
      * @return the lake committer
      * @throws IOException if an I/O error occurs
      */
-    LakeCommitter<WriteResult, CommitableT> createLakeCommitter(
+    LakeCommitter<WriteResult, CommittableT> createLakeCommitter(
             CommitterInitContext committerInitContext) throws IOException;
 
     /**
      * Returns the serializer for committable objects.
      *
      * @return the serializer for committable objects
      */
-    SimpleVersionedSerializer<CommitableT> getCommitableSerializer();
+    SimpleVersionedSerializer<CommittableT> getCommittableSerializer();
 }

fluss-common/src/main/java/com/alibaba/fluss/lake/writer/LakeTieringFactory.java

@@ -44,8 +44,8 @@ public class MetricNames {
 
     // for coordinator event processor
     public static final String EVENT_QUEUE_SIZE = "eventQueueSize";
-    public static final String EVENT_PROCESS_TIME_MS = "eventProcessTimeMs";
     public static final String EVENT_QUEUE_TIME_MS = "eventQueueTimeMs";
+    public static final String EVENT_PROCESSING_TIME_MS = "eventProcessingTimeMs";
 
     // --------------------------------------------------------------------------------------------
     // metrics for tablet server

fluss-common/src/main/java/com/alibaba/fluss/metrics/MetricNames.java

@@ -116,7 +116,7 @@ public static TimestampNtz fromLocalDateTime(LocalDateTime dateTime) {
     /** Converts this {@link TimestampNtz} object to a {@link LocalDateTime}. */
     public LocalDateTime toLocalDateTime() {
         int date = (int) (millisecond / MILLIS_PER_DAY);
-        int time = (int) (millisecond % MILLIS_PER_DAY);
+        long time = millisecond % MILLIS_PER_DAY;
         if (time < 0) {
             --date;
             time += MILLIS_PER_DAY;