Skip to content

fix(sql-execution): can not set a delimiter longer than 2 #1414

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yhilmare merged 2 commits into from
Jan 17, 2024
Merged

fix(sql-execution): can not set a delimiter longer than 2 #1414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ac04eb5
fix delimiter setting error
yhilmare Jan 17, 2024
17b0afe
resolve conflict
yhilmare Jan 17, 2024
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: 1 addition & 1 deletion client
Open in desktop
Submodule client updated 166 files
11 changes: 5 additions & 6 deletions server/odc-core/src/main/java/com/oceanbase/odc/core/sql/split/SqlCommentProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import java.util.stream.IntStream;

import com.oceanbase.odc.common.lang.Holder;
import com.oceanbase.odc.common.util.StringUtils;
Expand Down Expand Up @@ -633,11 +632,11 @@ private boolean equalsIgnoreCase(char[] src, OrderChar[] dest, int begin, int co
* 当前SQL是否是以分隔符开头
*/
private boolean isPrefix(OrderChar[] line, int pos, String delim) {
boolean res = IntStream.range(pos, pos + delim.length())
.mapToObj(i -> line[i].getCh())
.collect(StringBuilder::new, StringBuilder::append, StringBuilder::append)
.toString().startsWith(delim);

StringBuilder builder = new StringBuilder();
for (int i = 0; i < line.length - pos; i++) {
builder.append(line[pos + i].getCh());
}
boolean res = builder.toString().startsWith(delim);
if (!res || !"/".equals(delim) || line.length <= 1) {
return res;
}
Expand Down