Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions RELEASE-NOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
### API Changes

1. Remove SQL formatting feature [#35390](https://github.com/apache/shardingsphere/pull/35390)
1. Remove logging rule feature [#35458](https://github.com/apache/shardingsphere/pull/35458)
1. Remove configuration property key `system-log-level` [#35493](https://github.com/apache/shardingsphere/pull/35493)

### New Features

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,14 @@
<outputDirectory>conf</outputDirectory>
<fileMode>0644</fileMode>
</fileSet>
<fileSet>
<directory>../../proxy/bootstrap/src/main/resources</directory>
<includes>
<include>logback.xml</include>
</includes>
<outputDirectory>conf</outputDirectory>
<fileMode>0644</fileMode>
</fileSet>
<fileSet>
<directory>../../distribution/proxy/src/main/release-docs</directory>
<includes>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,14 @@
<outputDirectory>conf</outputDirectory>
<fileMode>0644</fileMode>
</fileSet>
<fileSet>
<directory>../../proxy/bootstrap/src/main/resources</directory>
<includes>
<include>logback.xml</include>
</includes>
<outputDirectory>conf</outputDirectory>
<fileMode>0644</fileMode>
</fileSet>
<fileSet>
<directory>src/main/release-docs</directory>
<includes>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ authority:
# port: 6379

props:
system-log-level: INFO
proxy-default-port: 3307 # Proxy default port
cdc-server-port: 33071 # CDC Server 端口,必须配置
proxy-frontend-database-protocol-type: openGauss # 和后端数据库的类型一致
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@ authority:
# port: 6379

props:
system-log-level: INFO
proxy-default-port: 3307 # Proxy default port.
cdc-server-port: 33071 # CDC Server port, must be configured
proxy-frontend-database-protocol-type: openGauss # Consistent with the type of backend database
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@ agentPluginsEnabled ::=

- `agent_plugins_enabled` 为 `agent` 插件的启用状态,默认值 `FALSE`

- `system_log_level` 为 系统日志等级,仅影响 `PROXY` 的日志打印,默认值 `INFO`

### 示例

- 设置 `Proxy` 属性配置
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@ agentPluginsEnabled ::=

- `agent_plugins_enabled` is use to set the `agent` plugins enable status, the default value is `FALSE`

- `system_log_level` is the system log level, only affects the log printing of `PROXY`, the default value is `INFO`

### Example

- Set property configuration of `Proxy`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,31 +48,31 @@ SHOW DIST VARIABLES;

```sql
mysql> SHOW DIST VARIABLES;
+---------------------------------------+-----------------+
| variable_name | variable_value |
+---------------------------------------+-----------------+
| agent_plugins_enabled | true |
| cached_connections | 0 |
| cdc_server_port | 33071 |
| check_table_metadata_enabled | false |
| kernel_executor_size | 0 |
| max_connections_size_per_query | 1 |
| proxy_backend_query_fetch_size | -1 |
| proxy_default_port | 3307 |
| proxy_frontend_database_protocol_type | |
| proxy_frontend_executor_size | 0 |
| proxy_frontend_flush_threshold | 128 |
| proxy_frontend_max_connections | 0 |
| proxy_frontend_ssl_cipher | |
| proxy_frontend_ssl_enabled | false |
| proxy_frontend_ssl_version | TLSv1.2,TLSv1.3 |
| proxy_meta_data_collector_enabled | true |
| proxy_netty_backlog | 1024 |
| sql_federation_type | NONE |
| sql_show | false |
| sql_simple | false |
| system_log_level | INFO |
+---------------------------------------+-----------------+
+-----------------------------------------+-----------------+
| variable_name | variable_value |
+-----------------------------------------+-----------------+
| agent_plugins_enabled | true |
| cached_connections | 0 |
| cdc_server_port | 33071 |
| check_table_metadata_enabled | false |
| kernel_executor_size | 0 |
| load_table_metadata_batch_size | 1000 |
| max_connections_size_per_query | 1 |
| proxy_backend_query_fetch_size | -1 |
| proxy_default_port | 3307 |
| proxy_frontend_database_protocol_type | |
| proxy_frontend_executor_size | 0 |
| proxy_frontend_flush_threshold | 128 |
| proxy_frontend_max_connections | 0 |
| proxy_frontend_ssl_cipher | |
| proxy_frontend_ssl_enabled | false |
| proxy_frontend_ssl_version | TLSv1.2,TLSv1.3 |
| proxy_meta_data_collector_enabled | false |
| proxy_netty_backlog | 1024 |
| sql_show | false |
| sql_simple | false |
| system_schema_metadata_assembly_enabled | true |
+-----------------------------------------+-----------------+
21 rows in set (0.01 sec)
```

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,31 +48,31 @@ SHOW DIST VARIABLES;

```sql
mysql> SHOW DIST VARIABLES;
+---------------------------------------+-----------------+
| variable_name | variable_value |
+---------------------------------------+-----------------+
| agent_plugins_enabled | true |
| cached_connections | 0 |
| cdc_server_port | 33071 |
| check_table_metadata_enabled | false |
| kernel_executor_size | 0 |
| max_connections_size_per_query | 1 |
| proxy_backend_query_fetch_size | -1 |
| proxy_default_port | 3307 |
| proxy_frontend_database_protocol_type | |
| proxy_frontend_executor_size | 0 |
| proxy_frontend_flush_threshold | 128 |
| proxy_frontend_max_connections | 0 |
| proxy_frontend_ssl_cipher | |
| proxy_frontend_ssl_enabled | false |
| proxy_frontend_ssl_version | TLSv1.2,TLSv1.3 |
| proxy_meta_data_collector_enabled | true |
| proxy_netty_backlog | 1024 |
| sql_federation_type | NONE |
| sql_show | false |
| sql_simple | false |
| system_log_level | INFO |
+---------------------------------------+-----------------+
+-----------------------------------------+-----------------+
| variable_name | variable_value |
+-----------------------------------------+-----------------+
| agent_plugins_enabled | true |
| cached_connections | 0 |
| cdc_server_port | 33071 |
| check_table_metadata_enabled | false |
| kernel_executor_size | 0 |
| load_table_metadata_batch_size | 1000 |
| max_connections_size_per_query | 1 |
| proxy_backend_query_fetch_size | -1 |
| proxy_default_port | 3307 |
| proxy_frontend_database_protocol_type | |
| proxy_frontend_executor_size | 0 |
| proxy_frontend_flush_threshold | 128 |
| proxy_frontend_max_connections | 0 |
| proxy_frontend_ssl_cipher | |
| proxy_frontend_ssl_enabled | false |
| proxy_frontend_ssl_version | TLSv1.2,TLSv1.3 |
| proxy_meta_data_collector_enabled | false |
| proxy_netty_backlog | 1024 |
| sql_show | false |
| sql_simple | false |
| system_schema_metadata_assembly_enabled | true |
+-----------------------------------------+-----------------+
21 rows in set (0.01 sec)
```
- Query specified system variable configuration of `PROXY`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ Apache ShardingSphere 提供了丰富的系统配置属性,用户可通过 `gl

| *名称* | *数据类型* | *说明* | *默认值* | *动态生效* |
|-------------------------------------------|---------|----------------------------------------------------------------------------------------------------------------------------------------|-----------------|--------|
| system-log-level (?) | String | 系统日志输出级别,支持 DEBUG、INFO、WARN 和 ERROR,默认级别是 INFO。 | INFO | 是 |
| sql-show (?) | boolean | 是否在日志中打印 SQL。 <br /> 打印 SQL 可以帮助开发者快速定位系统问题。日志内容包含:逻辑 SQL,真实 SQL 和 SQL 解析结果。<br /> 如果开启配置,日志将使用 Topic `ShardingSphere-SQL`,日志级别是 INFO。 | false | 是 |
| sql-simple (?) | boolean | 是否在日志中打印简单风格的 SQL。 | false | 是 |
| kernel-executor-size (?) | int | 用于设置任务处理线程池的大小。每个 ShardingSphereDataSource 使用一个独立的线程池,同一个 JVM 的不同数据源不共享线程池。 | infinite | 否 |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ Apache ShardingSphere provides a wealth of system configuration properties, whic

| *Name* | *Data Type* | *Description* | *Default* | *Dynamic Update* |
|-------------------------------------------|-------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------|------------------|
| system-log-level (?) | String | System log output level, supports DEBUG, INFO, WARN and ERROR, the default level is INFO. | INFO | True |
| sql-show (?) | boolean | Whether to print SQL in logs. <br /> Printing SQL can help developers quickly locate system problems. Logs contain the following contents: logical SQL, authentic SQL and SQL parsing result. <br /> If configuration is enabled, logs will use Topic `ShardingSphere-SQL`, and log level is INFO. | false | True |
| sql-simple (?) | boolean | Whether to print simple SQL in logs. | false | True |
| kernel-executor-size (?) | int | Set the size of the thread pool for task processing. Each ShardingSphereDataSource uses an independent thread pool, and different data sources on the same JVM do not share thread pools. | infinite | False |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import org.apache.shardingsphere.infra.props.TypedPropertyKey;
import org.slf4j.event.Level;

import java.util.Arrays;
import java.util.Collection;
Expand All @@ -34,11 +33,6 @@
@Getter
public enum ConfigurationPropertyKey implements TypedPropertyKey {

/**
* The system log level.
*/
SYSTEM_LOG_LEVEL("system-log-level", Level.INFO.toString(), Level.class, false),

/**
* Whether show SQL in log.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import org.apache.shardingsphere.test.util.PropertiesBuilder;
import org.apache.shardingsphere.test.util.PropertiesBuilder.Property;
import org.junit.jupiter.api.Test;
import org.slf4j.event.Level;

import java.util.Properties;

Expand All @@ -37,7 +36,6 @@ class ConfigurationPropertiesTest {
@Test
void assertGetValue() {
ConfigurationProperties actual = new ConfigurationProperties(createProperties());
assertThat(actual.getValue(ConfigurationPropertyKey.SYSTEM_LOG_LEVEL), is(Level.DEBUG));
assertTrue((Boolean) actual.getValue(ConfigurationPropertyKey.SQL_SHOW));
assertTrue((Boolean) actual.getValue(ConfigurationPropertyKey.SQL_SIMPLE));
assertThat(actual.getValue(ConfigurationPropertyKey.KERNEL_EXECUTOR_SIZE), is(20));
Expand All @@ -55,7 +53,6 @@ void assertGetValue() {

private Properties createProperties() {
return PropertiesBuilder.build(
new Property(ConfigurationPropertyKey.SYSTEM_LOG_LEVEL.getKey(), Level.DEBUG.toString()),
new Property(ConfigurationPropertyKey.SQL_SHOW.getKey(), Boolean.TRUE.toString()),
new Property(ConfigurationPropertyKey.SQL_SIMPLE.getKey(), Boolean.TRUE.toString()),
new Property(ConfigurationPropertyKey.KERNEL_EXECUTOR_SIZE.getKey(), "20"),
Expand All @@ -74,7 +71,6 @@ private Properties createProperties() {
@Test
void assertGetDefaultValue() {
ConfigurationProperties actual = new ConfigurationProperties(new Properties());
assertThat(actual.getValue(ConfigurationPropertyKey.SYSTEM_LOG_LEVEL), is(Level.INFO));
assertFalse((Boolean) actual.getValue(ConfigurationPropertyKey.SQL_SHOW));
assertFalse((Boolean) actual.getValue(ConfigurationPropertyKey.SQL_SIMPLE));
assertThat(actual.getValue(ConfigurationPropertyKey.KERNEL_EXECUTOR_SIZE), is(0));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ private void removeAuthorityRuleConfiguration(final YamlRootConfiguration yamlRo

private void updateConfigurationProperties(final YamlRootConfiguration yamlRootConfig) {
Properties newProps = new Properties();
for (String each : Arrays.asList(ConfigurationPropertyKey.KERNEL_EXECUTOR_SIZE.getKey(), ConfigurationPropertyKey.SYSTEM_LOG_LEVEL.getKey(), ConfigurationPropertyKey.SQL_SHOW.getKey())) {
for (String each : Arrays.asList(ConfigurationPropertyKey.KERNEL_EXECUTOR_SIZE.getKey(), ConfigurationPropertyKey.SQL_SHOW.getKey())) {
Object value = yamlRootConfig.getProps().get(each);
if (null != value) {
newProps.put(each, value);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@

package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable.variable;

import ch.qos.logback.classic.Level;
import ch.qos.logback.classic.Logger;
import ch.qos.logback.classic.LoggerContext;
import org.apache.shardingsphere.distsql.handler.engine.update.DistSQLUpdateExecutor;
import org.apache.shardingsphere.distsql.statement.ral.updatable.SetDistVariableStatement;
import org.apache.shardingsphere.infra.config.props.ConfigurationPropertyKey;
Expand All @@ -33,7 +30,6 @@
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPI;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import org.slf4j.LoggerFactory;

import java.sql.SQLException;
import java.util.Properties;
Expand Down Expand Up @@ -68,7 +64,6 @@ private void handleConfigurationProperty(final ContextManager contextManager, fi
props.putAll(metaDataContexts.getMetaData().getTemporaryProps().getProps());
props.put(propertyKey.getKey(), getValue(propertyKey, value));
contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerService().alterProperties(props);
refreshRootLogger(props);
}

private Object getValue(final TypedPropertyKey propertyKey, final String value) {
Expand All @@ -83,16 +78,6 @@ private Object getValue(final TypedPropertyKey propertyKey, final String value)
}
}

private void refreshRootLogger(final Properties props) {
LoggerContext loggerContext = (LoggerContext) LoggerFactory.getILoggerFactory();
Logger rootLogger = loggerContext.getLogger(Logger.ROOT_LOGGER_NAME);
renewRootLoggerLevel(rootLogger, props);
}

private void renewRootLoggerLevel(final Logger rootLogger, final Properties props) {
rootLogger.setLevel(Level.valueOf(props.getOrDefault(ConfigurationPropertyKey.SYSTEM_LOG_LEVEL.getKey(), ConfigurationPropertyKey.SYSTEM_LOG_LEVEL.getDefaultValue()).toString()));
}

@Override
public Class<SetDistVariableStatement> getType() {
return SetDistVariableStatement.class;
Expand Down
Loading