This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang 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 8eafaa52619 replace stream with for each (#20560)
8eafaa52619 is described below
commit 8eafaa52619dfd9a79f0b99d497a1cecbcd45efa
Author: Chuxin Chen <[email protected]>
AuthorDate: Fri Aug 26 19:23:24 2022 +0800
replace stream with for each (#20560)
---
.../apache/shardingsphere/sql/parser/api/SQLVisitorEngine.java | 9 ++++-----
.../apache/shardingsphere/sql/parser/core/ParseASTNode.java | 10 ++++++++--
2 files changed, 12 insertions(+), 7 deletions(-)
diff --git
a/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/api/SQLVisitorEngine.java
b/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/api/SQLVisitorEngine.java
index 13b0ac97951..55c08e92a74 100644
---
a/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/api/SQLVisitorEngine.java
+++
b/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/api/SQLVisitorEngine.java
@@ -18,6 +18,7 @@
package org.apache.shardingsphere.sql.parser.api;
import lombok.RequiredArgsConstructor;
+import org.antlr.v4.runtime.Token;
import org.antlr.v4.runtime.tree.ParseTreeVisitor;
import org.apache.shardingsphere.sql.parser.core.ParseASTNode;
import
org.apache.shardingsphere.sql.parser.core.database.visitor.SQLVisitorFactory;
@@ -25,9 +26,7 @@ import
org.apache.shardingsphere.sql.parser.core.database.visitor.SQLVisitorRule
import
org.apache.shardingsphere.sql.parser.sql.common.segment.generic.CommentSegment;
import
org.apache.shardingsphere.sql.parser.sql.common.statement.AbstractSQLStatement;
-import java.util.Collection;
import java.util.Properties;
-import java.util.stream.Collectors;
/**
* SQL visitor engine.
@@ -61,9 +60,9 @@ public final class SQLVisitorEngine {
private <T> void appendSQLComments(final ParseASTNode parseASTNode, final
T visitResult) {
if (visitResult instanceof AbstractSQLStatement) {
- Collection<CommentSegment> commentSegments =
parseASTNode.getHiddenTokens().stream()
- .map(each -> new CommentSegment(each.getText(),
each.getStartIndex(), each.getStopIndex())).collect(Collectors.toList());
- ((AbstractSQLStatement)
visitResult).getCommentSegments().addAll(commentSegments);
+ for (Token each : parseASTNode.getHiddenTokens()) {
+ ((AbstractSQLStatement)
visitResult).getCommentSegments().add(new CommentSegment(each.getText(),
each.getStartIndex(), each.getStopIndex()));
+ }
}
}
}
diff --git
a/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/core/ParseASTNode.java
b/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/core/ParseASTNode.java
index c27567e2329..89c0a56985a 100644
---
a/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/core/ParseASTNode.java
+++
b/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/core/ParseASTNode.java
@@ -24,7 +24,7 @@ import org.antlr.v4.runtime.tree.ParseTree;
import org.apache.shardingsphere.sql.parser.api.visitor.ASTNode;
import java.util.Collection;
-import java.util.stream.Collectors;
+import java.util.LinkedList;
/**
* Parse AST node.
@@ -51,6 +51,12 @@ public final class ParseASTNode implements ASTNode {
* @return hidden tokens
*/
public Collection<Token> getHiddenTokens() {
- return tokenStream.getTokens().stream().filter(each ->
Token.HIDDEN_CHANNEL == each.getChannel()).collect(Collectors.toList());
+ Collection<Token> result = new LinkedList<>();
+ for (Token each : tokenStream.getTokens()) {
+ if (Token.HIDDEN_CHANNEL == each.getChannel()) {
+ result.add(each);
+ }
+ }
+ return result;
}
}