-
Notifications
You must be signed in to change notification settings - Fork 2.2k
[FLINK-39824][mysql] Cache table filter results to reduce regex matching #4422
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
Open
taoran92
wants to merge
2
commits into
apache:master
Choose a base branch
from
taoran92:cache-mysql-table-filter
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+110
−5
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
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
78 changes: 78 additions & 0 deletions
78
.../test/java/org/apache/flink/cdc/connectors/mysql/source/config/MySqlSourceConfigTest.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,78 @@ | ||
| /* | ||
| * 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.flink.cdc.connectors.mysql.source.config; | ||
|
|
||
| import io.debezium.relational.TableId; | ||
| import io.debezium.relational.Tables; | ||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| import java.util.concurrent.atomic.AtomicInteger; | ||
| import java.util.function.Predicate; | ||
|
|
||
| import static org.assertj.core.api.Assertions.assertThat; | ||
|
|
||
| /** Tests for {@link MySqlSourceConfig}. */ | ||
| class MySqlSourceConfigTest { | ||
|
|
||
| @Test | ||
| void testCachesTableFilterResults() { | ||
| AtomicInteger filterInvocationCount = new AtomicInteger(); | ||
| Tables.TableFilter cachedTableFilter = | ||
| MySqlSourceConfig.createCachedTableFilter( | ||
| tableId -> { | ||
| filterInvocationCount.incrementAndGet(); | ||
| return tableId.table().startsWith("orders"); | ||
| }, | ||
| null); | ||
|
|
||
| TableId includedTable = new TableId("test_db", null, "orders_1"); | ||
| TableId sameIncludedTable = new TableId("test_db", null, "orders_1"); | ||
| TableId unmatchedTable = new TableId("test_db", null, "customers"); | ||
| TableId sameUnmatchedTable = new TableId("test_db", null, "customers"); | ||
|
|
||
| assertThat(cachedTableFilter.isIncluded(includedTable)).isTrue(); | ||
| assertThat(cachedTableFilter.isIncluded(includedTable)).isTrue(); | ||
| assertThat(cachedTableFilter.isIncluded(sameIncludedTable)).isTrue(); | ||
| assertThat(cachedTableFilter.isIncluded(unmatchedTable)).isFalse(); | ||
| assertThat(cachedTableFilter.isIncluded(unmatchedTable)).isFalse(); | ||
| assertThat(cachedTableFilter.isIncluded(sameUnmatchedTable)).isFalse(); | ||
| assertThat(filterInvocationCount).hasValue(2); | ||
|
taoran92 marked this conversation as resolved.
|
||
| } | ||
|
|
||
| @Test | ||
| void testTableFilterWithExcludeTableList() { | ||
| MySqlSourceConfig config = | ||
| new MySqlSourceConfigFactory() | ||
| .hostname("localhost") | ||
| .username("user") | ||
| .password("password") | ||
| .databaseList("test_db") | ||
| .tableList("test_db\\.orders_.*") | ||
| .excludeTableList("test_db.orders_skip") | ||
|
taoran92 marked this conversation as resolved.
|
||
| .createConfig(0); | ||
|
|
||
| Predicate<TableId> tableFilter = config.getTableFilter(); | ||
| TableId includedTable = new TableId("test_db", null, "orders_1"); | ||
| TableId excludedTable = new TableId("test_db", null, "orders_skip"); | ||
| TableId unmatchedTable = new TableId("test_db", null, "customers"); | ||
|
|
||
| assertThat(tableFilter.test(includedTable)).isTrue(); | ||
| assertThat(tableFilter.test(excludedTable)).isFalse(); | ||
| assertThat(tableFilter.test(unmatchedTable)).isFalse(); | ||
| } | ||
| } | ||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good point. I replaced the unbounded ConcurrentHashMap with a bounded LoadingCache (max 1024 entries, expire after 1h access), so hot TableIds are still cached while long-running jobs won't retain unlimited dynamic table keys.
BTW, I kept the cache bounds as internal constants instead of adding new connector options. This cache is only an internal optimization: eviction may cause the table filter to be evaluated again, but it does not affect correctness. Exposing these values would expand the public connector API without a clear user-facing semantic need.
The default maximum size follows the existing selector cache convention in the codebase, and we can still expose/tune it later if real workloads show the defaults are insufficient.