-
Notifications
You must be signed in to change notification settings - Fork 1.3k
[core] Introduce ClearConsumersProcedure to clear consumers #4893
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
JingsongLi
merged 10 commits into
apache:master
from
chenxinwei:master_add_clear_consumers_procedure
Feb 12, 2025
Merged
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
33f2677
Merge pull request #4 from chenxinwei/rebase_master
chenxinwei 3b8f0d4
Merge pull request #6 from chenxinwei/rebase_master
chenxinwei 020ce6d
[core] Introduce ClearConsumersProcedure to clear consumers
chenxinwei ffed21c
Correct incorrect code comments
chenxinwei 89a9e08
Fix comments
chenxinwei 985da36
Fix comments
chenxinwei 9bb47a9
Fix comment
chenxinwei 92da574
Fix comments
chenxinwei 257bb7a
Fix comments
chenxinwei 247d1a7
Fix bugs
chenxinwei File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
93 changes: 93 additions & 0 deletions
93
...n-flink-1.18/src/main/java/org/apache/paimon/flink/procedure/ClearConsumersProcedure.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,93 @@ | ||
| /* | ||
| * 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.flink.procedure; | ||
|
|
||
| import org.apache.paimon.catalog.Catalog; | ||
| import org.apache.paimon.catalog.Identifier; | ||
| import org.apache.paimon.consumer.ConsumerManager; | ||
| import org.apache.paimon.table.FileStoreTable; | ||
| import org.apache.paimon.utils.StringUtils; | ||
|
|
||
| import org.apache.flink.table.procedure.ProcedureContext; | ||
|
|
||
| import java.util.regex.Pattern; | ||
|
|
||
| /** | ||
| * Clear consumers procedure. Usage: | ||
| * | ||
| * <pre><code> | ||
| * -- NOTE: use '' as placeholder for optional arguments | ||
| * | ||
| * -- clear all consumers in the table | ||
| * CALL sys.clear_consumers('tableId') | ||
| * | ||
| * -- clear some consumers in the table (accept regular expression) | ||
| * CALL sys.clear_consumers('tableId', 'includingConsumers') | ||
| * | ||
| * -- exclude some consumers (accept regular expression) | ||
| * CALL sys.clear_consumers('tableId', 'includingConsumers', 'excludingConsumers') | ||
| * </code></pre> | ||
| */ | ||
| public class ClearConsumersProcedure extends ProcedureBase { | ||
chenxinwei marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| public static final String IDENTIFIER = "clear_consumers"; | ||
|
|
||
| public String[] call( | ||
| ProcedureContext procedureContext, | ||
| String tableId, | ||
| String includingConsumers, | ||
| String excludingConsumers) | ||
| throws Catalog.TableNotExistException { | ||
| FileStoreTable fileStoreTable = | ||
| (FileStoreTable) catalog.getTable(Identifier.fromString(tableId)); | ||
| ConsumerManager consumerManager = | ||
| new ConsumerManager( | ||
| fileStoreTable.fileIO(), | ||
| fileStoreTable.location(), | ||
| fileStoreTable.snapshotManager().branch()); | ||
|
|
||
| Pattern includingPattern = | ||
| StringUtils.isNullOrWhitespaceOnly(includingConsumers) | ||
| ? Pattern.compile(".*") | ||
| : Pattern.compile(includingConsumers); | ||
| Pattern excludingPattern = | ||
| StringUtils.isNullOrWhitespaceOnly(excludingConsumers) | ||
| ? null | ||
| : Pattern.compile(excludingConsumers); | ||
| consumerManager.clearConsumers(includingPattern, excludingPattern); | ||
|
|
||
| return new String[] {"Success"}; | ||
| } | ||
|
|
||
| public String[] call( | ||
| ProcedureContext procedureContext, String tableId, String includingConsumers) | ||
| throws Catalog.TableNotExistException { | ||
| return call(procedureContext, tableId, includingConsumers, null); | ||
| } | ||
|
|
||
| public String[] call(ProcedureContext procedureContext, String tableId) | ||
| throws Catalog.TableNotExistException { | ||
| return call(procedureContext, tableId, null, null); | ||
| } | ||
|
|
||
| @Override | ||
| public String identifier() { | ||
| return IDENTIFIER; | ||
| } | ||
| } | ||
70 changes: 70 additions & 0 deletions
70
...paimon-flink-common/src/main/java/org/apache/paimon/flink/action/ClearConsumerAction.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| /* | ||
| * 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.flink.action; | ||
|
|
||
| import org.apache.paimon.consumer.ConsumerManager; | ||
| import org.apache.paimon.table.FileStoreTable; | ||
| import org.apache.paimon.utils.StringUtils; | ||
|
|
||
| import javax.annotation.Nullable; | ||
|
|
||
| import java.util.Map; | ||
| import java.util.regex.Pattern; | ||
|
|
||
| /** Clear consumers action for Flink. */ | ||
| public class ClearConsumerAction extends TableActionBase { | ||
|
|
||
| private String includingConsumers; | ||
| private String excludingConsumers; | ||
|
|
||
| protected ClearConsumerAction( | ||
| String databaseName, String tableName, Map<String, String> catalogConfig) { | ||
| super(databaseName, tableName, catalogConfig); | ||
| } | ||
|
|
||
| public ClearConsumerAction withIncludingConsumers(@Nullable String includingConsumers) { | ||
| this.includingConsumers = includingConsumers; | ||
| return this; | ||
| } | ||
|
|
||
| public ClearConsumerAction withExcludingConsumers(@Nullable String excludingConsumers) { | ||
| this.excludingConsumers = excludingConsumers; | ||
| return this; | ||
| } | ||
|
|
||
| @Override | ||
| public void run() throws Exception { | ||
| FileStoreTable dataTable = (FileStoreTable) table; | ||
| ConsumerManager consumerManager = | ||
| new ConsumerManager( | ||
| dataTable.fileIO(), | ||
| dataTable.location(), | ||
| dataTable.snapshotManager().branch()); | ||
|
|
||
| Pattern includingPattern = | ||
| StringUtils.isNullOrWhitespaceOnly(includingConsumers) | ||
| ? Pattern.compile(".*") | ||
| : Pattern.compile(includingConsumers); | ||
| Pattern excludingPattern = | ||
| StringUtils.isNullOrWhitespaceOnly(excludingConsumers) | ||
| ? null | ||
| : Pattern.compile(excludingConsumers); | ||
| consumerManager.clearConsumers(includingPattern, excludingPattern); | ||
| } | ||
| } |
72 changes: 72 additions & 0 deletions
72
...flink-common/src/main/java/org/apache/paimon/flink/action/ClearConsumerActionFactory.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| /* | ||
| * 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.flink.action; | ||
|
|
||
| import java.util.Optional; | ||
|
|
||
| /** Factory to create {@link ClearConsumerAction}. */ | ||
| public class ClearConsumerActionFactory implements ActionFactory { | ||
|
|
||
| public static final String IDENTIFIER = "clear_consumers"; | ||
|
|
||
| private static final String INCLUDING_CONSUMERS = "including_consumers"; | ||
| private static final String EXCLUDING_CONSUMERS = "excluding_consumers"; | ||
|
|
||
| @Override | ||
| public String identifier() { | ||
| return IDENTIFIER; | ||
| } | ||
|
|
||
| @Override | ||
| public Optional<Action> create(MultipleParameterToolAdapter params) { | ||
| ClearConsumerAction action = | ||
| new ClearConsumerAction( | ||
| params.getRequired(DATABASE), | ||
| params.getRequired(TABLE), | ||
| catalogConfigMap(params)); | ||
|
|
||
| if (params.has(INCLUDING_CONSUMERS)) { | ||
| action.withIncludingConsumers(params.get(INCLUDING_CONSUMERS)); | ||
| } | ||
|
|
||
| if (params.has(EXCLUDING_CONSUMERS)) { | ||
| action.withExcludingConsumers(params.get(EXCLUDING_CONSUMERS)); | ||
| } | ||
|
|
||
| return Optional.of(action); | ||
| } | ||
|
|
||
| @Override | ||
| public void printHelp() { | ||
| System.out.println( | ||
| "Action \"clear_consumers\" clear consumers with including consumers and excluding consumers."); | ||
| System.out.println(); | ||
|
|
||
| System.out.println("Syntax:"); | ||
| System.out.println( | ||
| " clear_consumers --warehouse <warehouse_path> --database <database_name> " | ||
| + "--table <table_name> [--including_consumers <including_pattern> --excluding_consumers <excluding_pattern>]"); | ||
|
|
||
| System.out.println(); | ||
| System.out.println("Note:"); | ||
| System.out.println( | ||
| " use '' as placeholder for including_consumers if you want to clear all consumers except excludingConsumers in the table."); | ||
| System.out.println(); | ||
| } | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.