[shardingsphere] branch master updated: Fix nightly e2e exception caused by line separator (#28758)

[zhaojinchao]

This is an automated email from the ASF dual-hosted git repository.

zhaojinchao 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 5d0e8ca9fc0 Fix nightly e2e exception caused by line separator  
(#28758)
5d0e8ca9fc0 is described below

commit 5d0e8ca9fc06c99a5f0b8ec2db2077834839ead9
Author: Zhengqiang Duan <duanzhengqi...@apache.org>
AuthorDate: Sun Oct 15 08:48:31 2023 +0800

    Fix nightly e2e exception caused by line separator  (#28758)
    
    * Fix nightly e2e exception caused by line separator
    
    * modify ubuntu to windows-latest
    
    * replace \r\n to System.lineseparator in EnumerableScan
    
    * Revert "modify ubuntu to windows-latest"
    
    This reverts commit d8dd66d9aa526a5feda6eda51e1234d4749a1de9.
---
 .../sqlfederation/compiler/operator/physical/EnumerableScan.java        | 2 +-
 .../sqlfederation/compiler/it/SQLStatementCompilerIT.java               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/compiler/operator/physical/EnumerableScan.java
 
b/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/compiler/operator/physical/EnumerableScan.java
index 8cfaf7d4507..2a529435065 100644
--- 
a/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/compiler/operator/physical/EnumerableScan.java
+++ 
b/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/compiler/operator/physical/EnumerableScan.java
@@ -74,7 +74,7 @@ public final class EnumerableScan extends TableScan 
implements EnumerableRel {
     
     @Override
     public RelWriter explainTerms(final RelWriter relWriter) {
-        return super.explainTerms(relWriter).item("sql", 
sqlString.getSql().replaceAll("[\r\n]", " ")).item("dynamicParameters", 
sqlString.getDynamicParameters());
+        return super.explainTerms(relWriter).item("sql", 
sqlString.getSql().replaceAll(System.lineSeparator(), " 
")).item("dynamicParameters", sqlString.getDynamicParameters());
     }
     
     @Override
diff --git 
a/kernel/sql-federation/core/src/test/java/org/apache/shardingsphere/sqlfederation/compiler/it/SQLStatementCompilerIT.java
 
b/kernel/sql-federation/core/src/test/java/org/apache/shardingsphere/sqlfederation/compiler/it/SQLStatementCompilerIT.java
index 4519f48b2b0..d455bca90ad 100644
--- 
a/kernel/sql-federation/core/src/test/java/org/apache/shardingsphere/sqlfederation/compiler/it/SQLStatementCompilerIT.java
+++ 
b/kernel/sql-federation/core/src/test/java/org/apache/shardingsphere/sqlfederation/compiler/it/SQLStatementCompilerIT.java
@@ -246,7 +246,7 @@ class SQLStatementCompilerIT {
     @ArgumentsSource(TestCaseArgumentsProvider.class)
     void assertCompile(final TestCase testcase) {
         SQLStatement sqlStatement = 
sqlParserRule.getSQLParserEngine(TypedSPILoader.getService(DatabaseType.class, 
"MySQL")).parse(testcase.getSql(), false);
-        String actual = sqlStatementCompiler.compile(sqlStatement, 
"MySQL").getPhysicalPlan().explain().replaceAll("[\r\n]", " ");
+        String actual = sqlStatementCompiler.compile(sqlStatement, 
"MySQL").getPhysicalPlan().explain().replaceAll(System.lineSeparator(), " ");
         assertThat(actual, is(testcase.getAssertion().getExpectedResult()));
     }