Skip to content
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

Remove inline comments from DDL files via ScriptRunner #159

Merged
merged 13 commits into from
Apr 26, 2022
Merged

Remove inline comments from DDL files via ScriptRunner #159

Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
6006ab8
Add TPC-H support for SQL Server
jcamachor Nov 24, 2021
ce05a7e
Merge branch 'main' into tpch_sqlserver
apavlo Apr 8, 2022
823ee1b
Addressing review comments
jcamachor Apr 8, 2022
a2b505f
Adding tests for MSSQL in Github actions (TPC-C and TPC-H)
bpkroth Apr 15, 2022
a8f71e8
Merge branch 'main' into tpch_sqlserver
apavlo Apr 19, 2022
b6efa53
Merge branch 'main' into tpch_sqlserver
apavlo Apr 20, 2022
8b1d836
addressing comments in <https://github.com/cmu-db/benchbase/pull/147>
bpkroth Apr 20, 2022
7919afc
switch to row store by default
bpkroth Apr 20, 2022
1f2d647
fixup
bpkroth Apr 22, 2022
6f74e0b
workaround a bug where benchbase doesn't parse trailing comments corr…
bpkroth Apr 22, 2022
141fc70
backout a local testing change
bpkroth Apr 22, 2022
d24d380
remove inline comments from the sql
dbanda Apr 25, 2022
b918bca
Merge branch 'main' into tpch_sqlserver
apavlo Apr 25, 2022
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
4 changes: 2 additions & 2 deletions src/main/java/com/oltpbenchmark/util/ScriptRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,8 @@ private void runScript(Connection conn, Reader reader) throws IOException, SQLEx
command = new StringBuffer();
}
String trimmedLine = line.trim();
line = line.replaceAll("\\-\\-.*$", ""); // remove comments in line;

if (trimmedLine.startsWith("--") || trimmedLine.startsWith("//")) {
LOG.debug(trimmedLine);
} else if (trimmedLine.length() < 1) {
Expand All @@ -103,8 +105,6 @@ private void runScript(Connection conn, Reader reader) throws IOException, SQLEx

try (Statement statement = conn.createStatement()) {

// println(command);

boolean hasResults = false;
final String sql = command.toString().trim();
if (stopOnError) {
Expand Down