Skip to content

Fix BigQuery parameter names #1290

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
mziccard merged 1 commit into from
Sep 29, 2016
Merged

Fix BigQuery parameter names #1290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 7 additions & 7 deletions google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQuery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,7 @@ public static QueryResultsOption maxWaitTime(long maxWaitTime) {
*
* @throws BigQueryException upon failure
*/
Dataset create(DatasetInfo dataset, DatasetOption... options);
Dataset create(DatasetInfo datasetInfo, DatasetOption... options);

/**
* Creates a new table.
Expand All @@ -476,7 +476,7 @@ public static QueryResultsOption maxWaitTime(long maxWaitTime) {
*
* @throws BigQueryException upon failure
*/
Table create(TableInfo table, TableOption... options);
Table create(TableInfo tableInfo, TableOption... options);

/**
* Creates a new job.
Expand All @@ -496,7 +496,7 @@ public static QueryResultsOption maxWaitTime(long maxWaitTime) {
*
* @throws BigQueryException upon failure
*/
Job create(JobInfo job, JobOption... options);
Job create(JobInfo jobInfo, JobOption... options);

/**
* Returns the requested dataset or {@code null} if not found.
Expand Down Expand Up @@ -665,7 +665,7 @@ public static QueryResultsOption maxWaitTime(long maxWaitTime) {
*
* @throws BigQueryException upon failure
*/
Dataset update(DatasetInfo dataset, DatasetOption... options);
Dataset update(DatasetInfo datasetInfo, DatasetOption... options);

/**
* Updates table information.
Expand All @@ -682,7 +682,7 @@ public static QueryResultsOption maxWaitTime(long maxWaitTime) {
*
* @throws BigQueryException upon failure
*/
Table update(TableInfo table, TableOption... options);
Table update(TableInfo tableInfo, TableOption... options);

/**
* Returns the requested table or {@code null} if not found.
Expand Down Expand Up @@ -924,7 +924,7 @@ Page<List<FieldValue>> listTableData(String datasetId, String tableId,
* found
* @throws BigQueryException upon failure
*/
boolean cancel(JobId tableId);
boolean cancel(JobId jobId);

/**
* Runs the query associated with the request.
Expand Down Expand Up @@ -980,7 +980,7 @@ Page<List<FieldValue>> listTableData(String datasetId, String tableId,
*
* @throws BigQueryException upon failure
*/
QueryResponse getQueryResults(JobId job, QueryResultsOption... options);
QueryResponse getQueryResults(JobId jobId, QueryResultsOption... options);

/**
* Returns a channel to write data to be inserted into a BigQuery table. Data format and other
Expand Down
24 changes: 12 additions & 12 deletions google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,9 +155,9 @@ public QueryResult nextPage() {
}

@Override
public Dataset create(DatasetInfo dataset, DatasetOption... options) {
public Dataset create(DatasetInfo datasetInfo, DatasetOption... options) {
final com.google.api.services.bigquery.model.Dataset datasetPb =
dataset.setProjectId(options().projectId()).toPb();
datasetInfo.setProjectId(options().projectId()).toPb();
final Map<BigQueryRpc.Option, ?> optionsMap = optionMap(options);
try {
return Dataset.fromPb(this,
Expand All @@ -173,9 +173,9 @@ public com.google.api.services.bigquery.model.Dataset call() {
}

@Override
public Table create(TableInfo table, TableOption... options) {
public Table create(TableInfo tableInfo, TableOption... options) {
final com.google.api.services.bigquery.model.Table tablePb =
table.setProjectId(options().projectId()).toPb();
tableInfo.setProjectId(options().projectId()).toPb();
final Map<BigQueryRpc.Option, ?> optionsMap = optionMap(options);
try {
return Table.fromPb(this,
Expand All @@ -191,9 +191,9 @@ public com.google.api.services.bigquery.model.Table call() {
}

@Override
public Job create(JobInfo job, JobOption... options) {
public Job create(JobInfo jobInfo, JobOption... options) {
final com.google.api.services.bigquery.model.Job jobPb =
job.setProjectId(options().projectId()).toPb();
jobInfo.setProjectId(options().projectId()).toPb();
final Map<BigQueryRpc.Option, ?> optionsMap = optionMap(options);
try {
return Job.fromPb(this,
Expand Down Expand Up @@ -312,9 +312,9 @@ public Boolean call() {
}

@Override
public Dataset update(DatasetInfo dataset, DatasetOption... options) {
public Dataset update(DatasetInfo datasetInfo, DatasetOption... options) {
final com.google.api.services.bigquery.model.Dataset datasetPb =
dataset.setProjectId(options().projectId()).toPb();
datasetInfo.setProjectId(options().projectId()).toPb();
final Map<BigQueryRpc.Option, ?> optionsMap = optionMap(options);
try {
return Dataset.fromPb(this,
Expand All @@ -330,9 +330,9 @@ public com.google.api.services.bigquery.model.Dataset call() {
}

@Override
public Table update(TableInfo table, TableOption... options) {
public Table update(TableInfo tableInfo, TableOption... options) {
final com.google.api.services.bigquery.model.Table tablePb =
table.setProjectId(options().projectId()).toPb();
tableInfo.setProjectId(options().projectId()).toPb();
final Map<BigQueryRpc.Option, ?> optionsMap = optionMap(options);
try {
return Table.fromPb(this,
Expand Down Expand Up @@ -582,9 +582,9 @@ public com.google.api.services.bigquery.model.QueryResponse call() {
}

@Override
public QueryResponse getQueryResults(JobId job, QueryResultsOption... options) {
public QueryResponse getQueryResults(JobId jobId, QueryResultsOption... options) {
Map<BigQueryRpc.Option, ?> optionsMap = optionMap(options);
return getQueryResults(job, options(), optionsMap);
return getQueryResults(jobId, options(), optionsMap);
}

private static QueryResponse getQueryResults(JobId jobId,
Expand Down
12 changes: 6 additions & 6 deletions google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/Dataset.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,12 +251,12 @@ public Page<Table> list(TableListOption... options) {
* Table table = dataset.get(tableName);
* }</pre>
*
* @param table user-defined id of the requested table
* @param tableId user-defined id of the requested table
* @param options table options
* @throws BigQueryException upon failure
*/
public Table get(String table, TableOption... options) {
return bigquery.getTable(TableId.of(datasetId().dataset(), table), options);
public Table get(String tableId, TableOption... options) {
return bigquery.getTable(TableId.of(datasetId().dataset(), tableId), options);
}

/**
Expand All @@ -274,14 +274,14 @@ public Table get(String table, TableOption... options) {
* Table table = dataset.create(tableName, definition);
* }</pre>
*
* @param table the table's user-defined id
* @param tableId the table's user-defined id
* @param definition the table's definition
* @param options options for table creation
* @return a {@code Table} object for the created table
* @throws BigQueryException upon failure
*/
public Table create(String table, TableDefinition definition, TableOption... options) {
TableInfo tableInfo = TableInfo.of(TableId.of(datasetId().dataset(), table), definition);
public Table create(String tableId, TableDefinition definition, TableOption... options) {
TableInfo tableInfo = TableInfo.of(TableId.of(datasetId().dataset(), tableId), definition);
return bigquery.create(tableInfo, options);
}

Expand Down