-
Notifications
You must be signed in to change notification settings - Fork 6.6k
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
support information_schema.PARAMETERS query in cluster mod #28620
Open
lujx98
wants to merge
10
commits into
apache:master
Choose a base branch
from
lujx98:dev
base: master
Could not load branches
Branch not found: {{ refName }}
Could not load tags
Nothing to show
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.
Open
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
40501ae
Fix:DataSourcePoolDestroyerTest occasionally fails(#28550)
lujx98 7a0ca9e
fix:remove redundant import
0647d89
Merge branch 'apache:master' into master
lujx98 017f23c
Merge branch 'apache:master' into master
lujx98 a7a55ff
Merge branch 'apache:master' into master
lujx98 02b7b77
feat:support information_schema.PARAMETERS query in cluster mod (#24378)
lujx98 4441e85
fix:fix check style error
lujx98 4f3774b
fix:add license header and fix spotless error
lujx98 c1d8014
fix:fix check style error
lujx98 38180c8
fix:spotless error
lujx98 File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains 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 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
65 changes: 65 additions & 0 deletions
65
...shardingsphere/proxy/backend/collector/MySQLInformationSchemaParameterTableCollector.java
This file contains 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,65 @@ | ||
/* | ||
* 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.shardingsphere.proxy.backend.collector; | ||
|
||
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; | ||
import org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereTable; | ||
import org.apache.shardingsphere.infra.metadata.statistics.ShardingSphereRowData; | ||
import org.apache.shardingsphere.infra.metadata.statistics.ShardingSphereTableData; | ||
import org.apache.shardingsphere.infra.metadata.statistics.collector.ShardingSphereStatisticsCollector; | ||
import org.apache.shardingsphere.infra.metadata.statistics.collector.ShardingSphereTableDataCollectorUtils; | ||
import org.apache.shardingsphere.proxy.backend.context.ProxyContext; | ||
|
||
import java.sql.SQLException; | ||
import java.util.Collection; | ||
import java.util.Map; | ||
import java.util.Optional; | ||
|
||
/** | ||
* MySQLInformationSchemaParameterTableCollector. | ||
*/ | ||
public final class MySQLInformationSchemaParameterTableCollector implements ShardingSphereStatisticsCollector { | ||
|
||
private static final String PARAMETER_TABLE_NAME = "PARAMETERS"; | ||
|
||
private static final String COLLECT_SQL = "select * from information_schema.PARAMETERS"; | ||
|
||
@Override | ||
public Optional<ShardingSphereTableData> collect(final String databaseName, final ShardingSphereTable table, | ||
final Map<String, ShardingSphereDatabase> shardingSphereDatabases) throws SQLException { | ||
Optional<String> databaseWithDatasource = ProxyContext.getInstance().getAllDatabaseNames().stream().filter(MySQLInformationSchemaParameterTableCollector::hasDataSource).findFirst(); | ||
if (databaseWithDatasource.isPresent()) { | ||
Collection<ShardingSphereRowData> rows = ShardingSphereTableDataCollectorUtils.collectRowData(shardingSphereDatabases.get(databaseWithDatasource.get()), | ||
table, table.getColumnNames(), COLLECT_SQL); | ||
ShardingSphereTableData result = new ShardingSphereTableData(PARAMETER_TABLE_NAME); | ||
result.getRows().addAll(rows); | ||
return Optional.of(result); | ||
} | ||
return Optional.empty(); | ||
} | ||
|
||
private static Boolean hasDataSource(final String databaseName) { | ||
return ProxyContext.getInstance().getDatabase(databaseName).containsDataSource(); | ||
} | ||
|
||
@Override | ||
public Object getType() { | ||
return PARAMETER_TABLE_NAME; | ||
} | ||
|
||
} |
18 changes: 18 additions & 0 deletions
18
...ache.shardingsphere.infra.metadata.statistics.collector.ShardingSphereStatisticsCollector
This file contains 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,18 @@ | ||
# | ||
# 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. | ||
# | ||
|
||
org.apache.shardingsphere.proxy.backend.collector.MySQLInformationSchemaParameterTableCollector |
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.
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.
I think
information_schema
should inshardingsphere
database.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.
@tuichenchuxin
are you guys expect that all the metadata table's data should presist in shardingsphere database?
I think if so the databases like information_schema will be totally useless
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.
it'll be like this.