This is an automated email from the ASF dual-hosted git repository.
panjuan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 6b44769069b Use unix for every system on Yaml transform (#29590)
6b44769069b is described below
commit 6b44769069b66be4cb7ab0a650fccbcf3845bd86
Author: Liang Zhang <[email protected]>
AuthorDate: Fri Dec 29 11:24:51 2023 +0800
Use unix for every system on Yaml transform (#29590)
---
.../statement/MySQLParserStatementExample.java | 2 +-
.../statement/OpenGaussParserStatementExample.java | 2 +-
.../statement/OracleParserStatementExample.java | 2 +-
.../PostgreSQLParserStatementExample.java | 2 +-
.../statement/SQL92ParserStatementExample.java | 2 +-
.../statement/SQLServerParserStatementExample.java | 2 +-
.../shardingsphere/infra/util/yaml/YamlEngine.java | 3 +-
.../ral/queryable/ExportMetaDataExecutorTest.java | 43 +++++-----------------
.../export-metadata-configuration_for_unix.data | 1 -
.../export-metadata-configuration_for_win.data | 1 -
src/resources/rat.txt | 4 --
11 files changed, 17 insertions(+), 47 deletions(-)
diff --git
a/examples/shardingsphere-parser-example/src/main/java/org/apache/shardingsphere/example/parser/mysql/statement/MySQLParserStatementExample.java
b/examples/shardingsphere-parser-example/src/main/java/org/apache/shardingsphere/example/parser/mysql/statement/MySQLParserStatementExample.java
index 085966dca70..92f130d1aff 100644
---
a/examples/shardingsphere-parser-example/src/main/java/org/apache/shardingsphere/example/parser/mysql/statement/MySQLParserStatementExample.java
+++
b/examples/shardingsphere-parser-example/src/main/java/org/apache/shardingsphere/example/parser/mysql/statement/MySQLParserStatementExample.java
@@ -57,7 +57,7 @@ public final class MySQLParserStatementExample {
CacheOption cacheOption = new CacheOption(128, 1024L);
SQLParserEngine parserEngine = new SQLParserEngine("MySQL",
cacheOption);
ParseASTNode parseASTNode = parserEngine.parse(each, false);
- SQLStatementVisitorEngine visitorEngine = new
SQLStatementVisitorEngine("MySQL", false);
+ SQLStatementVisitorEngine visitorEngine = new
SQLStatementVisitorEngine("MySQL");
SQLStatement sqlStatement = visitorEngine.visit(parseASTNode);
System.out.println(sqlStatement.toString());
});
diff --git
a/examples/shardingsphere-parser-example/src/main/java/org/apache/shardingsphere/example/parser/opengauss/statement/OpenGaussParserStatementExample.java
b/examples/shardingsphere-parser-example/src/main/java/org/apache/shardingsphere/example/parser/opengauss/statement/OpenGaussParserStatementExample.java
index 9111c87bd35..0798a9f6e5e 100644
---
a/examples/shardingsphere-parser-example/src/main/java/org/apache/shardingsphere/example/parser/opengauss/statement/OpenGaussParserStatementExample.java
+++
b/examples/shardingsphere-parser-example/src/main/java/org/apache/shardingsphere/example/parser/opengauss/statement/OpenGaussParserStatementExample.java
@@ -55,7 +55,7 @@ public final class OpenGaussParserStatementExample {
CacheOption cacheOption = new CacheOption(128, 1024L);
SQLParserEngine parserEngine = new SQLParserEngine("openGauss",
cacheOption);
ParseASTNode parseASTNode = parserEngine.parse(sql, false);
- SQLStatementVisitorEngine visitorEngine = new
SQLStatementVisitorEngine("openGauss", false);
+ SQLStatementVisitorEngine visitorEngine = new
SQLStatementVisitorEngine("openGauss");
SQLStatement sqlStatement = visitorEngine.visit(parseASTNode);
System.out.println(sqlStatement.toString());
});
diff --git
a/examples/shardingsphere-parser-example/src/main/java/org/apache/shardingsphere/example/parser/oracle/statement/OracleParserStatementExample.java
b/examples/shardingsphere-parser-example/src/main/java/org/apache/shardingsphere/example/parser/oracle/statement/OracleParserStatementExample.java
index 3a2eaeaa916..6f54c25dd15 100644
---
a/examples/shardingsphere-parser-example/src/main/java/org/apache/shardingsphere/example/parser/oracle/statement/OracleParserStatementExample.java
+++
b/examples/shardingsphere-parser-example/src/main/java/org/apache/shardingsphere/example/parser/oracle/statement/OracleParserStatementExample.java
@@ -55,7 +55,7 @@ public final class OracleParserStatementExample {
CacheOption cacheOption = new CacheOption(128, 1024L);
SQLParserEngine parserEngine = new SQLParserEngine("Oracle",
cacheOption);
ParseASTNode parseASTNode = parserEngine.parse(sql, false);
- SQLStatementVisitorEngine visitorEngine = new
SQLStatementVisitorEngine("Oracle", false);
+ SQLStatementVisitorEngine visitorEngine = new
SQLStatementVisitorEngine("Oracle");
SQLStatement sqlStatement = visitorEngine.visit(parseASTNode);
System.out.println(sqlStatement.toString());
});
diff --git
a/examples/shardingsphere-parser-example/src/main/java/org/apache/shardingsphere/example/parser/postgresql/statement/PostgreSQLParserStatementExample.java
b/examples/shardingsphere-parser-example/src/main/java/org/apache/shardingsphere/example/parser/postgresql/statement/PostgreSQLParserStatementExample.java
index a1d5c7e93e5..bffd252791b 100644
---
a/examples/shardingsphere-parser-example/src/main/java/org/apache/shardingsphere/example/parser/postgresql/statement/PostgreSQLParserStatementExample.java
+++
b/examples/shardingsphere-parser-example/src/main/java/org/apache/shardingsphere/example/parser/postgresql/statement/PostgreSQLParserStatementExample.java
@@ -55,7 +55,7 @@ public final class PostgreSQLParserStatementExample {
CacheOption cacheOption = new CacheOption(128, 1024L);
SQLParserEngine parserEngine = new SQLParserEngine("PostgreSQL",
cacheOption);
ParseASTNode parseASTNode = parserEngine.parse(sql, false);
- SQLStatementVisitorEngine visitorEngine = new
SQLStatementVisitorEngine("PostgreSQL", false);
+ SQLStatementVisitorEngine visitorEngine = new
SQLStatementVisitorEngine("PostgreSQL");
SQLStatement sqlStatement = visitorEngine.visit(parseASTNode);
System.out.println(sqlStatement.toString());
});
diff --git
a/examples/shardingsphere-parser-example/src/main/java/org/apache/shardingsphere/example/parser/sql92/statement/SQL92ParserStatementExample.java
b/examples/shardingsphere-parser-example/src/main/java/org/apache/shardingsphere/example/parser/sql92/statement/SQL92ParserStatementExample.java
index 8e5a2b794b8..4feb2890cf8 100644
---
a/examples/shardingsphere-parser-example/src/main/java/org/apache/shardingsphere/example/parser/sql92/statement/SQL92ParserStatementExample.java
+++
b/examples/shardingsphere-parser-example/src/main/java/org/apache/shardingsphere/example/parser/sql92/statement/SQL92ParserStatementExample.java
@@ -55,7 +55,7 @@ public final class SQL92ParserStatementExample {
CacheOption cacheOption = new CacheOption(128, 1024L);
SQLParserEngine parserEngine = new SQLParserEngine("SQL92",
cacheOption);
ParseASTNode parseASTNode = parserEngine.parse(sql, false);
- SQLStatementVisitorEngine visitorEngine = new
SQLStatementVisitorEngine("SQL92", false);
+ SQLStatementVisitorEngine visitorEngine = new
SQLStatementVisitorEngine("SQL92");
SQLStatement sqlStatement = visitorEngine.visit(parseASTNode);
System.out.println(sqlStatement.toString());
});
diff --git
a/examples/shardingsphere-parser-example/src/main/java/org/apache/shardingsphere/example/parser/sqlserver/statement/SQLServerParserStatementExample.java
b/examples/shardingsphere-parser-example/src/main/java/org/apache/shardingsphere/example/parser/sqlserver/statement/SQLServerParserStatementExample.java
index 9cdab4367be..bdfb88d2c0f 100644
---
a/examples/shardingsphere-parser-example/src/main/java/org/apache/shardingsphere/example/parser/sqlserver/statement/SQLServerParserStatementExample.java
+++
b/examples/shardingsphere-parser-example/src/main/java/org/apache/shardingsphere/example/parser/sqlserver/statement/SQLServerParserStatementExample.java
@@ -57,7 +57,7 @@ public final class SQLServerParserStatementExample {
CacheOption cacheOption = new CacheOption(128, 1024L);
SQLParserEngine parserEngine = new SQLParserEngine("SQLServer",
cacheOption);
ParseASTNode parseASTNode = parserEngine.parse(sql, false);
- SQLStatementVisitorEngine visitorEngine = new
SQLStatementVisitorEngine("SQLServer", false);
+ SQLStatementVisitorEngine visitorEngine = new
SQLStatementVisitorEngine("SQLServer");
SQLStatement sqlStatement = visitorEngine.visit(parseASTNode);
System.out.println(sqlStatement);
});
diff --git
a/infra/util/src/main/java/org/apache/shardingsphere/infra/util/yaml/YamlEngine.java
b/infra/util/src/main/java/org/apache/shardingsphere/infra/util/yaml/YamlEngine.java
index 0c78f1359bf..44f75ebadce 100644
---
a/infra/util/src/main/java/org/apache/shardingsphere/infra/util/yaml/YamlEngine.java
+++
b/infra/util/src/main/java/org/apache/shardingsphere/infra/util/yaml/YamlEngine.java
@@ -22,6 +22,7 @@ import lombok.NoArgsConstructor;
import
org.apache.shardingsphere.infra.util.yaml.constructor.ShardingSphereYamlConstructor;
import
org.apache.shardingsphere.infra.util.yaml.representer.ShardingSphereYamlRepresenter;
import org.yaml.snakeyaml.DumperOptions;
+import org.yaml.snakeyaml.DumperOptions.LineBreak;
import org.yaml.snakeyaml.Yaml;
import org.yaml.snakeyaml.representer.Representer;
@@ -105,7 +106,7 @@ public final class YamlEngine {
*/
public static String marshal(final Object value) {
DumperOptions dumperOptions = new DumperOptions();
-
dumperOptions.setLineBreak(DumperOptions.LineBreak.getPlatformLineBreak());
+ dumperOptions.setLineBreak(LineBreak.UNIX);
if (value instanceof Collection) {
return new Yaml(new ShardingSphereYamlRepresenter(dumperOptions),
dumperOptions).dumpAs(value, null, DumperOptions.FlowStyle.BLOCK);
}
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportMetaDataExecutorTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportMetaDataExecutorTest.java
index ae40c928043..997c06b662d 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportMetaDataExecutorTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportMetaDataExecutorTest.java
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable;
-import lombok.SneakyThrows;
import org.apache.shardingsphere.authority.rule.AuthorityRule;
import
org.apache.shardingsphere.authority.rule.builder.DefaultAuthorityRuleConfigurationBuilder;
import
org.apache.shardingsphere.distsql.statement.ral.queryable.ExportMetaDataStatement;
@@ -59,9 +58,6 @@ import org.mockito.Answers;
import org.mockito.Mock;
import javax.sql.DataSource;
-import java.io.BufferedReader;
-import java.io.FileReader;
-import java.io.IOException;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
@@ -70,7 +66,6 @@ import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Map.Entry;
-import java.util.Objects;
import java.util.Properties;
import java.util.stream.Collectors;
@@ -84,11 +79,15 @@ import static org.mockito.Mockito.when;
@StaticMockSettings(ProxyContext.class)
class ExportMetaDataExecutorTest {
- private static final String METADATA_VALUE_EXPECTED_FOR_UNIX =
"eyJtZXRhX2RhdGEiOnsiZGF0YWJhc2VzIjp7ImVtcHR5X21ldGFkYXRhIjoiZGF0YWJhc2VOYW1lOiBudWxsXG5kYXRhU291cmNlczpcbn"
+ private static final String EXPECTED_METADATA_VALUE =
"eyJtZXRhX2RhdGEiOnsiZGF0YWJhc2VzIjp7ImVtcHR5X21ldGFkYXRhIjoiZGF0YWJhc2VOYW1lOiBudWxsXG5kYXRhU291cmNlczpcbn"
+
"J1bGVzOlxuIn0sInByb3BzIjoiIiwicnVsZXMiOiJydWxlczpcbi0gIUdMT0JBTF9DTE9DS1xuICBlbmFibGVkOiBmYWxzZVxuICBwcm92aWRlcjogbG9jYWxcbiAgdHlwZTogVFNPXG4ifX0=";
- private static final String METADATA_VALUE_EXPECTED_FOR_WIN =
"eyJtZXRhX2RhdGEiOnsiZGF0YWJhc2VzIjp7ImVtcHR5X21ldGFkYXRhIjoiZGF0YWJhc2VOYW1lOiBudWxsXHJcbmRhdGFTb3VyY2VzO"
- +
"lxyXG5ydWxlczpcclxuIn0sInByb3BzIjoiIiwicnVsZXMiOiJydWxlczpcclxuLSAhR0xPQkFMX0NMT0NLXHJcbiAgZW5hYmxlZDogZmFsc2VcclxuICBwcm92aWRlcjogbG9jYWxcclxuICB0eXBlOiBUU09cclxuIn19";
+ private static final String EXPECTED_EXPORT_METADATA_CONFIGURATION =
"eyJtZXRhX2RhdGEiOnsiZGF0YWJhc2VzIjp7Im5vcm1hbF9kYiI6ImRhdGFiYXNlTmFtZTogbm9ybWFsX2RiXG5kYXRhU291cm"
+ +
"NlczpcbiAgZHNfMDpcbiAgICBwYXNzd29yZDogXG4gICAgdXJsOiBqZGJjOm9wZW5nYXVzczovLzEyNy4wLjAuMTo1NDMyL2RlbW9fZHNfMFxuICAgIHVzZXJuYW1lOiByb290XG4gICAgbWluUG9vb"
+ +
"FNpemU6IDFcbiAgICBtYXhQb29sU2l6ZTogNTBcbiAgZHNfMTpcbiAgICBwYXNzd29yZDogXG4gICAgdXJsOiBqZGJjOm9wZW5nYXVzczovLzEyNy4wLjAuMTo1NDMyL2RlbW9fZHNfMVxuICAgIHVzZ"
+ +
"XJuYW1lOiByb290XG4gICAgbWluUG9vbFNpemU6IDFcbiAgICBtYXhQb29sU2l6ZTogNTBcbiJ9LCJwcm9wcyI6InByb3BzOlxuICBzcWwtc2hvdzogdHJ1ZVxuIiwicnVsZXMiOiJydWxlczpcbi0g"
+ +
"IUFVVEhPUklUWVxuICBwcml2aWxlZ2U6XG4gICAgdHlwZTogQUxMX1BFUk1JVFRFRFxuICB1c2VyczpcbiAgLSBhdXRoZW50aWNhdGlvbk1ldGhvZE5hbWU6ICcnXG4gICAgcGFzc3dvcmQ6IHJvb3Rc"
+ +
"biAgICB1c2VyOiByb290QCVcbi0gIUdMT0JBTF9DTE9DS1xuICBlbmFibGVkOiBmYWxzZVxuICBwcm92aWRlcjogbG9jYWxcbiAgdHlwZTogVFNPXG4ifX0=";
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private ShardingSphereDatabase database;
@@ -120,11 +119,7 @@ class ExportMetaDataExecutorTest {
Collection<LocalDataQueryResultRow> actual = new
ExportMetaDataExecutor().getRows(contextManager.getMetaDataContexts().getMetaData(),
sqlStatement);
assertThat(actual.size(), is(1));
LocalDataQueryResultRow row = actual.iterator().next();
- if (System.getProperty("os.name").toLowerCase().contains("windows")) {
- assertThat(row.getCell(3), is(METADATA_VALUE_EXPECTED_FOR_WIN));
- } else {
- assertThat(row.getCell(3), is(METADATA_VALUE_EXPECTED_FOR_UNIX));
- }
+ assertThat(row.getCell(3), is(EXPECTED_METADATA_VALUE));
}
private ContextManager mockEmptyContextManager() {
@@ -151,7 +146,7 @@ class ExportMetaDataExecutorTest {
Collection<LocalDataQueryResultRow> actual = new
ExportMetaDataExecutor().getRows(contextManager.getMetaDataContexts().getMetaData(),
new ExportMetaDataStatement(null));
assertThat(actual.size(), is(1));
LocalDataQueryResultRow row = actual.iterator().next();
- assertThat(row.getCell(3).toString(), is(loadExpectedRow()));
+ assertThat(row.getCell(3).toString(),
is(EXPECTED_EXPORT_METADATA_CONFIGURATION));
}
private Map<String, StorageUnit> createStorageUnits() {
@@ -197,24 +192,4 @@ class ExportMetaDataExecutorTest {
result.setMinPoolSize(1);
return result;
}
-
- @SneakyThrows(IOException.class)
- private String loadExpectedRow() {
- StringBuilder result = new StringBuilder();
- String fileName;
- if (System.getProperty("os.name").toLowerCase().contains("windows")) {
- fileName =
Objects.requireNonNull(ExportMetaDataExecutorTest.class.getResource("/expected/export-metadata-configuration_for_win.data")).getFile();
- } else {
- fileName =
Objects.requireNonNull(ExportMetaDataExecutorTest.class.getResource("/expected/export-metadata-configuration_for_unix.data")).getFile();
- }
- try (
- FileReader fileReader = new FileReader(fileName);
- BufferedReader reader = new BufferedReader(fileReader)) {
- String line;
- while (null != (line = reader.readLine())) {
- result.append(line);
- }
- }
- return result.toString();
- }
}
diff --git
a/proxy/backend/core/src/test/resources/expected/export-metadata-configuration_for_unix.data
b/proxy/backend/core/src/test/resources/expected/export-metadata-configuration_for_unix.data
deleted file mode 100644
index 21f561599b5..00000000000
---
a/proxy/backend/core/src/test/resources/expected/export-metadata-configuration_for_unix.data
+++ /dev/null
@@ -1 +0,0 @@
-eyJtZXRhX2RhdGEiOnsiZGF0YWJhc2VzIjp7Im5vcm1hbF9kYiI6ImRhdGFiYXNlTmFtZTogbm9ybWFsX2RiXG5kYXRhU291cmNlczpcbiAgZHNfMDpcbiAgICBwYXNzd29yZDogXG4gICAgdXJsOiBqZGJjOm9wZW5nYXVzczovLzEyNy4wLjAuMTo1NDMyL2RlbW9fZHNfMFxuICAgIHVzZXJuYW1lOiByb290XG4gICAgbWluUG9vbFNpemU6IDFcbiAgICBtYXhQb29sU2l6ZTogNTBcbiAgZHNfMTpcbiAgICBwYXNzd29yZDogXG4gICAgdXJsOiBqZGJjOm9wZW5nYXVzczovLzEyNy4wLjAuMTo1NDMyL2RlbW9fZHNfMVxuICAgIHVzZXJuYW1lOiByb290XG4gICAgbWluUG9vbFNpemU6IDFcbiAgICBtYXhQb29sU2l6ZTogNTBcbiJ9LCJwcm9wcyI6InBy
[...]
diff --git
a/proxy/backend/core/src/test/resources/expected/export-metadata-configuration_for_win.data
b/proxy/backend/core/src/test/resources/expected/export-metadata-configuration_for_win.data
deleted file mode 100644
index 7c768173bb3..00000000000
---
a/proxy/backend/core/src/test/resources/expected/export-metadata-configuration_for_win.data
+++ /dev/null
@@ -1 +0,0 @@
-eyJtZXRhX2RhdGEiOnsiZGF0YWJhc2VzIjp7Im5vcm1hbF9kYiI6ImRhdGFiYXNlTmFtZTogbm9ybWFsX2RiXHJcbmRhdGFTb3VyY2VzOlxyXG4gIGRzXzA6XHJcbiAgICBwYXNzd29yZDogXHJcbiAgICB1cmw6IGpkYmM6b3BlbmdhdXNzOi8vMTI3LjAuMC4xOjU0MzIvZGVtb19kc18wXHJcbiAgICB1c2VybmFtZTogcm9vdFxyXG4gICAgbWluUG9vbFNpemU6IDFcclxuICAgIG1heFBvb2xTaXplOiA1MFxyXG4gIGRzXzE6XHJcbiAgICBwYXNzd29yZDogXHJcbiAgICB1cmw6IGpkYmM6b3BlbmdhdXNzOi8vMTI3LjAuMC4xOjU0MzIvZGVtb19kc18xXHJcbiAgICB1c2VybmFtZTogcm9vdFxyXG4gICAgbWluUG9vbFNpemU6IDFcclxuICAgIG1heFBv
[...]
diff --git a/src/resources/rat.txt b/src/resources/rat.txt
index 7d3b9c3255e..bf5eb05576f 100644
--- a/src/resources/rat.txt
+++ b/src/resources/rat.txt
@@ -60,7 +60,3 @@
**/_helpers.tpl
# test files
-
-**/export-metadata-configuration_for_unix.data
-**/export-metadata-configuration_for_win.data
-
