From 246e6f647f9ab2e9151501dd788625e2574c9e9d Mon Sep 17 00:00:00 2001 From: sunxiaojian Date: Thu, 10 Oct 2024 17:23:22 +0800 Subject: [PATCH] fixed --- .../paimon/branch/BranchAutoManager.java | 16 +++----- .../paimon/branch/BranchTimeExpire.java | 38 ------------------- 2 files changed, 6 insertions(+), 48 deletions(-) delete mode 100644 paimon-core/src/main/java/org/apache/paimon/branch/BranchTimeExpire.java diff --git a/paimon-core/src/main/java/org/apache/paimon/branch/BranchAutoManager.java b/paimon-core/src/main/java/org/apache/paimon/branch/BranchAutoManager.java index 1c0b4c410c5f2..f7495d5fb8c6a 100644 --- a/paimon-core/src/main/java/org/apache/paimon/branch/BranchAutoManager.java +++ b/paimon-core/src/main/java/org/apache/paimon/branch/BranchAutoManager.java @@ -23,23 +23,19 @@ /** A manager to create and expire branches. */ public class BranchAutoManager { - private final BranchTimeExpire branchTimeExpire; + private final BranchManager branchManager; - private BranchAutoManager(BranchTimeExpire branchTimeExpire) { - this.branchTimeExpire = branchTimeExpire; + private BranchAutoManager(BranchManager branchManager) { + this.branchManager = branchManager; } public void run() { - if (branchTimeExpire != null) { - branchTimeExpire.run(); + if (branchManager != null) { + branchManager.expireBranches(); } } public static BranchAutoManager create(BranchManager branchManager) { - return new BranchAutoManager(BranchTimeExpire.create(branchManager)); - } - - public BranchTimeExpire getBranchTimeExpire() { - return branchTimeExpire; + return new BranchAutoManager(branchManager); } } diff --git a/paimon-core/src/main/java/org/apache/paimon/branch/BranchTimeExpire.java b/paimon-core/src/main/java/org/apache/paimon/branch/BranchTimeExpire.java deleted file mode 100644 index 9e424317125ed..0000000000000 --- a/paimon-core/src/main/java/org/apache/paimon/branch/BranchTimeExpire.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * 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. - */ - -package org.apache.paimon.branch; - -import org.apache.paimon.utils.BranchManager; - -/** A manager to expire branches by time. */ -public class BranchTimeExpire { - private final BranchManager branchManager; - - private BranchTimeExpire(BranchManager branchManager) { - this.branchManager = branchManager; - } - - public void run() { - branchManager.expireBranches(); - } - - public static BranchTimeExpire create(BranchManager branchManager) { - return new BranchTimeExpire(branchManager); - } -}