You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2023/06/27 07:32:10 UTC
[shardingsphere] branch master updated: Optimizing E2E logs. (#26617)
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 632cb2d9245 Optimizing E2E logs. (#26617)
632cb2d9245 is described below
commit 632cb2d9245e71cc519ccfd770dd5f373700c1da
Author: Cong Hu <ia...@qq.com>
AuthorDate: Tue Jun 27 15:32:00 2023 +0800
Optimizing E2E logs. (#26617)
---
.../test/e2e/framework/E2EExtension.java | 18 +++++++++++++++++-
.../sql/src/test/resources/env/scenario/db/rules.yaml | 4 ++++
.../scenario/dbtbl_with_readwrite_splitting/rules.yaml | 4 ++++
.../rules.yaml | 4 ++++
.../test/resources/env/scenario/empty_rules/rules.yaml | 4 ++++
.../src/test/resources/env/scenario/encrypt/rules.yaml | 4 ++++
.../encrypt_and_readwrite_splitting/rules.yaml | 4 ++++
.../resources/env/scenario/encrypt_shadow/rules.yaml | 4 ++++
.../src/test/resources/env/scenario/mask/rules.yaml | 4 ++++
.../resources/env/scenario/mask_encrypt/rules.yaml | 4 ++++
.../env/scenario/mask_encrypt_sharding/rules.yaml | 4 ++++
.../resources/env/scenario/mask_sharding/rules.yaml | 4 ++++
.../test/resources/env/scenario/passthrough/rules.yaml | 4 ++++
.../resources/env/scenario/rdl_empty_rules/rules.yaml | 4 ++++
.../env/scenario/readwrite_splitting/rules.yaml | 4 ++++
.../scenario/readwrite_splitting_and_shadow/rules.yaml | 4 ++++
.../src/test/resources/env/scenario/shadow/rules.yaml | 4 ++++
.../env/scenario/sharding_and_encrypt/rules.yaml | 4 ++++
.../env/scenario/sharding_and_shadow/rules.yaml | 4 ++++
.../env/scenario/sharding_encrypt_shadow/rules.yaml | 4 ++++
.../sql/src/test/resources/env/scenario/tbl/rules.yaml | 3 +++
test/e2e/sql/src/test/resources/logback-test.xml | 2 +-
22 files changed, 97 insertions(+), 2 deletions(-)
diff --git a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/E2EExtension.java b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/E2EExtension.java
index 6e5a116c5f7..29424062de9 100644
--- a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/E2EExtension.java
+++ b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/E2EExtension.java
@@ -23,6 +23,7 @@ import org.junit.jupiter.api.extension.TestWatcher;
import java.io.ByteArrayOutputStream;
import java.io.PrintStream;
+import java.util.Optional;
/**
* E2E extension.
@@ -32,7 +33,7 @@ public final class E2EExtension implements TestWatcher {
@Override
public void testFailed(final ExtensionContext context, final Throwable cause) {
- log.error("Error case: {}, message: {}", context.getRequiredTestMethod().getName(), getStackTrace(cause));
+ log.error("Error case: {}, message: {}", context.getDisplayName(), getStackTrace(cause));
}
private String getStackTrace(final Throwable cause) {
@@ -51,4 +52,19 @@ public final class E2EExtension implements TestWatcher {
return "";
}
}
+
+ @Override
+ public void testDisabled(final ExtensionContext context, final Optional<String> reason) {
+ log.info("Disable case: {}, reason: {}", context.getDisplayName(), reason.orElse(""));
+ }
+
+ @Override
+ public void testSuccessful(final ExtensionContext context) {
+ log.info("Success case: {}", context.getDisplayName());
+ }
+
+ @Override
+ public void testAborted(final ExtensionContext context, final Throwable cause) {
+ log.info("Abort case: {}, message: {}", context.getDisplayName(), getStackTrace(cause));
+ }
}
diff --git a/test/e2e/sql/src/test/resources/env/scenario/db/rules.yaml b/test/e2e/sql/src/test/resources/env/scenario/db/rules.yaml
index 53f60974681..5a17052ffd2 100644
--- a/test/e2e/sql/src/test/resources/env/scenario/db/rules.yaml
+++ b/test/e2e/sql/src/test/resources/env/scenario/db/rules.yaml
@@ -94,3 +94,7 @@ sqlFederation:
executionPlanCache:
initialCapacity: 2000
maximumSize: 65535
+
+props:
+ sql-show: true
+
diff --git a/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/rules.yaml b/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/rules.yaml
index 965d5f321c9..0f49e15049d 100644
--- a/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/rules.yaml
+++ b/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/rules.yaml
@@ -161,3 +161,7 @@ sqlFederation:
executionPlanCache:
initialCapacity: 2000
maximumSize: 65535
+
+props:
+ sql-show: true
+
diff --git a/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/rules.yaml b/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/rules.yaml
index 3a5a5eeb90d..25ef0b3ccb1 100644
--- a/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/rules.yaml
+++ b/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/rules.yaml
@@ -236,3 +236,7 @@ sqlFederation:
executionPlanCache:
initialCapacity: 2000
maximumSize: 65535
+
+props:
+ sql-show: true
+
diff --git a/test/e2e/sql/src/test/resources/env/scenario/empty_rules/rules.yaml b/test/e2e/sql/src/test/resources/env/scenario/empty_rules/rules.yaml
index 41c90f70ad2..4a9da6a2490 100644
--- a/test/e2e/sql/src/test/resources/env/scenario/empty_rules/rules.yaml
+++ b/test/e2e/sql/src/test/resources/env/scenario/empty_rules/rules.yaml
@@ -19,3 +19,7 @@ rules:
- !SINGLE
tables:
- "*.*"
+
+props:
+ sql-show: true
+
diff --git a/test/e2e/sql/src/test/resources/env/scenario/encrypt/rules.yaml b/test/e2e/sql/src/test/resources/env/scenario/encrypt/rules.yaml
index b0e43b6c09e..07222031cce 100644
--- a/test/e2e/sql/src/test/resources/env/scenario/encrypt/rules.yaml
+++ b/test/e2e/sql/src/test/resources/env/scenario/encrypt/rules.yaml
@@ -80,3 +80,7 @@ rules:
likeQuery:
name: telephone_like
encryptorName: like_encryptor
+
+props:
+ sql-show: true
+
diff --git a/test/e2e/sql/src/test/resources/env/scenario/encrypt_and_readwrite_splitting/rules.yaml b/test/e2e/sql/src/test/resources/env/scenario/encrypt_and_readwrite_splitting/rules.yaml
index b6d7f0424fd..849fbc66e04 100644
--- a/test/e2e/sql/src/test/resources/env/scenario/encrypt_and_readwrite_splitting/rules.yaml
+++ b/test/e2e/sql/src/test/resources/env/scenario/encrypt_and_readwrite_splitting/rules.yaml
@@ -81,3 +81,7 @@ sqlFederation:
executionPlanCache:
initialCapacity: 2000
maximumSize: 65535
+
+props:
+ sql-show: true
+
diff --git a/test/e2e/sql/src/test/resources/env/scenario/encrypt_shadow/rules.yaml b/test/e2e/sql/src/test/resources/env/scenario/encrypt_shadow/rules.yaml
index 226df184483..3027b606fc1 100644
--- a/test/e2e/sql/src/test/resources/env/scenario/encrypt_shadow/rules.yaml
+++ b/test/e2e/sql/src/test/resources/env/scenario/encrypt_shadow/rules.yaml
@@ -120,3 +120,7 @@ rules:
cipher:
name: telephone_cipher
encryptorName: aes_encryptor
+
+props:
+ sql-show: true
+
diff --git a/test/e2e/sql/src/test/resources/env/scenario/mask/rules.yaml b/test/e2e/sql/src/test/resources/env/scenario/mask/rules.yaml
index a77e35944d9..c503bdb47d8 100644
--- a/test/e2e/sql/src/test/resources/env/scenario/mask/rules.yaml
+++ b/test/e2e/sql/src/test/resources/env/scenario/mask/rules.yaml
@@ -43,3 +43,7 @@ rules:
maskAlgorithm: mask_before_special_chars_mask
telephone:
maskAlgorithm: keep_first_n_last_m_mask
+
+props:
+ sql-show: true
+
diff --git a/test/e2e/sql/src/test/resources/env/scenario/mask_encrypt/rules.yaml b/test/e2e/sql/src/test/resources/env/scenario/mask_encrypt/rules.yaml
index 26e64b79fbb..f8135b95679 100644
--- a/test/e2e/sql/src/test/resources/env/scenario/mask_encrypt/rules.yaml
+++ b/test/e2e/sql/src/test/resources/env/scenario/mask_encrypt/rules.yaml
@@ -68,3 +68,7 @@ rules:
cipher:
name: telephone_cipher
encryptorName: aes_encryptor
+
+props:
+ sql-show: true
+
diff --git a/test/e2e/sql/src/test/resources/env/scenario/mask_encrypt_sharding/rules.yaml b/test/e2e/sql/src/test/resources/env/scenario/mask_encrypt_sharding/rules.yaml
index 5bf7b311340..ef8d76e643b 100644
--- a/test/e2e/sql/src/test/resources/env/scenario/mask_encrypt_sharding/rules.yaml
+++ b/test/e2e/sql/src/test/resources/env/scenario/mask_encrypt_sharding/rules.yaml
@@ -83,3 +83,7 @@ rules:
type: INLINE
props:
algorithm-expression: mask_encrypt_ds_${user_id % 10}
+
+props:
+ sql-show: true
+
diff --git a/test/e2e/sql/src/test/resources/env/scenario/mask_sharding/rules.yaml b/test/e2e/sql/src/test/resources/env/scenario/mask_sharding/rules.yaml
index ea1baa0cbf3..42effc8a10c 100644
--- a/test/e2e/sql/src/test/resources/env/scenario/mask_sharding/rules.yaml
+++ b/test/e2e/sql/src/test/resources/env/scenario/mask_sharding/rules.yaml
@@ -58,3 +58,7 @@ rules:
type: INLINE
props:
algorithm-expression: mask_ds_${user_id % 10}
+
+props:
+ sql-show: true
+
diff --git a/test/e2e/sql/src/test/resources/env/scenario/passthrough/rules.yaml b/test/e2e/sql/src/test/resources/env/scenario/passthrough/rules.yaml
index 41c90f70ad2..4a9da6a2490 100644
--- a/test/e2e/sql/src/test/resources/env/scenario/passthrough/rules.yaml
+++ b/test/e2e/sql/src/test/resources/env/scenario/passthrough/rules.yaml
@@ -19,3 +19,7 @@ rules:
- !SINGLE
tables:
- "*.*"
+
+props:
+ sql-show: true
+
diff --git a/test/e2e/sql/src/test/resources/env/scenario/rdl_empty_rules/rules.yaml b/test/e2e/sql/src/test/resources/env/scenario/rdl_empty_rules/rules.yaml
index 41c90f70ad2..4a9da6a2490 100644
--- a/test/e2e/sql/src/test/resources/env/scenario/rdl_empty_rules/rules.yaml
+++ b/test/e2e/sql/src/test/resources/env/scenario/rdl_empty_rules/rules.yaml
@@ -19,3 +19,7 @@ rules:
- !SINGLE
tables:
- "*.*"
+
+props:
+ sql-show: true
+
diff --git a/test/e2e/sql/src/test/resources/env/scenario/readwrite_splitting/rules.yaml b/test/e2e/sql/src/test/resources/env/scenario/readwrite_splitting/rules.yaml
index 474d1ea265e..af1f596b97c 100644
--- a/test/e2e/sql/src/test/resources/env/scenario/readwrite_splitting/rules.yaml
+++ b/test/e2e/sql/src/test/resources/env/scenario/readwrite_splitting/rules.yaml
@@ -47,3 +47,7 @@ rules:
readDataSourceNames:
- read_0
- read_1
+
+props:
+ sql-show: true
+
diff --git a/test/e2e/sql/src/test/resources/env/scenario/readwrite_splitting_and_shadow/rules.yaml b/test/e2e/sql/src/test/resources/env/scenario/readwrite_splitting_and_shadow/rules.yaml
index 4962d360b17..abee8250f43 100644
--- a/test/e2e/sql/src/test/resources/env/scenario/readwrite_splitting_and_shadow/rules.yaml
+++ b/test/e2e/sql/src/test/resources/env/scenario/readwrite_splitting_and_shadow/rules.yaml
@@ -104,3 +104,7 @@ rules:
operation: select
column: merchant_id
value: 0
+
+props:
+ sql-show: true
+
diff --git a/test/e2e/sql/src/test/resources/env/scenario/shadow/rules.yaml b/test/e2e/sql/src/test/resources/env/scenario/shadow/rules.yaml
index 6ea3245119b..ac90202d649 100644
--- a/test/e2e/sql/src/test/resources/env/scenario/shadow/rules.yaml
+++ b/test/e2e/sql/src/test/resources/env/scenario/shadow/rules.yaml
@@ -96,3 +96,7 @@ rules:
operation: select
column: merchant_id
value: 0
+
+props:
+ sql-show: true
+
diff --git a/test/e2e/sql/src/test/resources/env/scenario/sharding_and_encrypt/rules.yaml b/test/e2e/sql/src/test/resources/env/scenario/sharding_and_encrypt/rules.yaml
index 33e321cec7f..05dc9c2af95 100644
--- a/test/e2e/sql/src/test/resources/env/scenario/sharding_and_encrypt/rules.yaml
+++ b/test/e2e/sql/src/test/resources/env/scenario/sharding_and_encrypt/rules.yaml
@@ -195,3 +195,7 @@ sqlFederation:
executionPlanCache:
initialCapacity: 2000
maximumSize: 65535
+
+props:
+ sql-show: true
+
diff --git a/test/e2e/sql/src/test/resources/env/scenario/sharding_and_shadow/rules.yaml b/test/e2e/sql/src/test/resources/env/scenario/sharding_and_shadow/rules.yaml
index 0779254aeb2..ca91d8c86a6 100644
--- a/test/e2e/sql/src/test/resources/env/scenario/sharding_and_shadow/rules.yaml
+++ b/test/e2e/sql/src/test/resources/env/scenario/sharding_and_shadow/rules.yaml
@@ -116,3 +116,7 @@ rules:
type: SQL_HINT
props:
foo: bar
+
+props:
+ sql-show: true
+
diff --git a/test/e2e/sql/src/test/resources/env/scenario/sharding_encrypt_shadow/rules.yaml b/test/e2e/sql/src/test/resources/env/scenario/sharding_encrypt_shadow/rules.yaml
index 6cdefe9747c..670d1f8ee73 100644
--- a/test/e2e/sql/src/test/resources/env/scenario/sharding_encrypt_shadow/rules.yaml
+++ b/test/e2e/sql/src/test/resources/env/scenario/sharding_encrypt_shadow/rules.yaml
@@ -130,3 +130,7 @@ rules:
cipher:
name: order_name_cipher
encryptorName: aes_encryptor
+
+props:
+ sql-show: true
+
diff --git a/test/e2e/sql/src/test/resources/env/scenario/tbl/rules.yaml b/test/e2e/sql/src/test/resources/env/scenario/tbl/rules.yaml
index a68f3785291..4deee42e950 100644
--- a/test/e2e/sql/src/test/resources/env/scenario/tbl/rules.yaml
+++ b/test/e2e/sql/src/test/resources/env/scenario/tbl/rules.yaml
@@ -105,3 +105,6 @@ sqlFederation:
sqlParser:
sqlCommentParseEnabled: true
+props:
+ sql-show: true
+
diff --git a/test/e2e/sql/src/test/resources/logback-test.xml b/test/e2e/sql/src/test/resources/logback-test.xml
index c7fbb061cd7..f966c7b366a 100644
--- a/test/e2e/sql/src/test/resources/logback-test.xml
+++ b/test/e2e/sql/src/test/resources/logback-test.xml
@@ -22,7 +22,7 @@
<pattern>[%-5level] %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %logger{36} - %msg%n</pattern>
</encoder>
</appender>
- <logger name="org.apache.shardingsphere" level="warn" additivity="true">
+ <logger name="org.apache.shardingsphere" level="info" additivity="true">
<appender-ref ref="console" />
</logger>
<logger name="com.zaxxer.hikari" level="warn" />