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

Jump to bottom

treat query files as entire scripts or multiline queries #246

Open
wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

treat query files as entire scripts or multiline queries #246

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
0262777
fix issue #244
vicenteg May 17, 2020
d07f29d
fix #242
vicenteg May 16, 2020
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
3 changes: 2 additions & 1 deletion BigQueryWorkloadTester/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,14 @@ targetCompatibility = 1.8

repositories {
maven { url "https://repository.apache.org/content/repositories/snapshots/" }
maven { url "http://repo.maven.apache.org/maven2" }
maven { url "https://repo.maven.apache.org/maven2" }
}

dependencies {
compile group: 'com.google.api', name: 'gax-grpc', version: '1.37.0'
compile group: 'com.google.auto.value', name: 'auto-value', version: '1.6.3'
compile group: 'com.google.auto.value', name: 'auto-value-annotations', version: '1.6.3'
annotationProcessor group: 'com.google.auto.value', name: 'auto-value', version: '1.6.3'
compile group: 'com.google.cloud', name: 'google-cloud-bigquery', version:'1.56.0'
compile group: 'com.google.code.gson', name: 'gson', version: '2.8.5'
compile group: 'com.google.guava', name: 'guava', version:'20.0'
Expand Down
10 changes: 5 additions & 5 deletions BigQueryWorkloadTester/src/main/java/com/google/cloud/pontem/config/WorkloadSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,17 +108,17 @@ private List<String> getQueriesFromFiles() {
List<String> queriesFromFiles = new ArrayList<>();

for (String queryFile : queryFiles) {
queriesFromFiles.addAll(readQueryFile(queryFile));
queriesFromFiles.add(readQueryFile(queryFile));
}

return queriesFromFiles;
}

private List<String> readQueryFile(final String queryFile) {
List<String> queries = new ArrayList<>();
private String readQueryFile(final String queryFile) {
List<String> queryLines = new ArrayList<>();

try {
queries =
queryLines =
Resources.readLines(
Resources.getResource(queryFile),
// TODO(ldanielmadariaga): Handle other charsets
Expand All @@ -128,6 +128,6 @@ private List<String> readQueryFile(final String queryFile) {
logger.log(Level.FINE, "Failed to write to query files: ", e);
}

return queries;
return String.join("\n", queryLines);
}
}