Skip to content

refactor: replaces job#getQueryResults with table#getRows in query method #454

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

Closed
wants to merge 21 commits into from
Closed

refactor: replaces job#getQueryResults with table#getRows in query method #454

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
51d5cf0
refactor(index): changes query method to use table#getRows
steffnay May 16, 2019
d57d800
cleaned up
steffnay May 16, 2019
a55f5f7
updating tests
steffnay May 17, 2019
bc917b2
refactor: replaces job#getQueryResults with table#getRows in query me…
steffnay May 23, 2019
ae1690c
updates
steffnay May 23, 2019
40cf355
refactor(query): adds polling logic
steffnay May 24, 2019
3381d55
update
steffnay May 24, 2019
3fc5369
refactor(query): adds conditional for query using models
steffnay May 28, 2019
5b24883
adds tests
steffnay May 30, 2019
fe50f03
refactor(tests): updates query method tests
steffnay May 31, 2019
6298efd
linted
steffnay May 31, 2019
283071a
refactor(tests): updates query method tests
steffnay May 31, 2019
b83a84e
refactor(query): updates query method & tests
steffnay May 31, 2019
eb6f5cd
Merge branch 'master' into query-update
steffnay May 31, 2019
3df601a
refactor(query): adds regex match for model queries
steffnay Jun 1, 2019
5358056
update
steffnay Jun 1, 2019
7244427
adds tests
steffnay Jun 2, 2019
80490b5
Merge branch 'master' into query-update
sduskis Jun 13, 2019
0d1a53a
refactor(query): all query jobs call getQueryResults
steffnay Jun 13, 2019
623a5b7
updates samples
steffnay Jun 13, 2019
6fc30ea
update
steffnay Jun 13, 2019
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
25 changes: 14 additions & 11 deletions src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1016,7 +1016,6 @@ export class BigQuery extends common.Service {
if ((!options || !options.query) && !options.pageToken) {
throw new Error('A SQL query string is required.');
}

// tslint:disable-next-line no-any
const query: any = extend(
true,
Expand Down Expand Up @@ -1457,8 +1456,7 @@ export class BigQuery extends common.Service {
return new Job(this, id, options);
}

query(query: string, options?: QueryOptions): Promise<QueryRowsResponse>;
query(query: Query, options?: QueryOptions): Promise<SimpleQueryRowsResponse>;
query(query: string, options?: QueryOptions): Promise<RowsResponse>;
query(
query: string,
options: QueryOptions,
Expand Down Expand Up @@ -1562,12 +1560,9 @@ export class BigQuery extends common.Service {
*/
query(
query: string | Query,
optionsOrCallback?:
| QueryOptions
| SimpleQueryRowsCallback
| QueryRowsCallback,
cb?: SimpleQueryRowsCallback | QueryRowsCallback
): void | Promise<SimpleQueryRowsResponse> | Promise<QueryRowsResponse> {
optionsOrCallback?: QueryOptions | SimpleQueryRowsCallback | RowsCallback,
cb?: SimpleQueryRowsCallback | RowsCallback
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It surprised me that QueryRowsCallback had to change RowsCallback, since in the case of model queries we still return the original response:

 job!.getQueryResults(options, callback as QueryRowsCallback);

☝️ this is the original slow path right? which we returned as a QueryRowsCallback?

Mainly just making sure code-paths return the same shaped object.

): void | Promise<RowsResponse> {
let options =
typeof optionsOrCallback === 'object' ? optionsOrCallback : {};
const callback =
Expand All @@ -1583,8 +1578,16 @@ export class BigQuery extends common.Service {
}
// The Job is important for the `queryAsStream_` method, so a new query
// isn't created each time results are polled for.

options = extend({job}, options);
job!.getQueryResults(options, callback as QueryRowsCallback);
const datasetId = job!.metadata.configuration.query.destinationTable
.datasetId;
const tableId = job!.metadata.configuration.query.destinationTable
.tableId;
const dataset = this.dataset(datasetId);
const table = dataset.table(tableId);

table.getRows(options, callback as RowsCallback);
});
}

Expand All @@ -1596,7 +1599,7 @@ export class BigQuery extends common.Service {
*/
queryAsStream_(query: Query, callback?: SimpleQueryRowsCallback) {
if (query.job) {
query.job.getQueryResults(query, callback as QueryRowsCallback);
query.job.getQueryResults(query, callback as RowsCallback);
return;
}
this.query(query, {autoPaginate: false}, callback);
Expand Down
151 changes: 73 additions & 78 deletions test/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,52 +66,6 @@ const fakeUtil = extend({}, util, {
});
const originalFakeUtil = extend(true, {}, fakeUtil);

class FakeDataset {
calledWith_: IArguments;
constructor() {
this.calledWith_ = arguments;
}
}

class FakeTable extends Table {
constructor(a: Dataset, b: string) {
super(a, b);
}
}

class FakeJob {
calledWith_: IArguments;
constructor() {
this.calledWith_ = arguments;
}
}

let extended = false;
const fakePaginator = {
paginator: {
extend: (c: Function, methods: string[]) => {
if (c.name !== 'BigQuery') {
return;
}
methods = arrify(methods);
assert.strictEqual(c.name, 'BigQuery');
assert.deepStrictEqual(methods, ['getDatasets', 'getJobs']);
extended = true;
},
streamify: (methodName: string) => {
return methodName;
},
},
};

class FakeService extends Service {
calledWith_: IArguments;
constructor(config: ServiceConfig, options: ServiceOptions) {
super(config, options);
this.calledWith_ = arguments;
}
}

const sandbox = sinon.createSandbox();
afterEach(() => sandbox.restore());

Expand All @@ -127,6 +81,57 @@ describe('BigQuery', () => {
// tslint:disable-next-line no-any
let bq: any;

class FakeTable extends Table {
constructor(a: Dataset, b: string) {
super(a, b);
}
}

class FakeDataset extends Dataset {
calledWith_: IArguments;
constructor() {
super(bq, '1');
this.calledWith_ = arguments;
}

table(id: string): FakeTable {
return new FakeTable(this, id);
}
}

class FakeJob {
calledWith_: IArguments;
constructor() {
this.calledWith_ = arguments;
}
}

let extended = false;
const fakePaginator = {
paginator: {
extend: (c: Function, methods: string[]) => {
if (c.name !== 'BigQuery') {
return;
}
methods = arrify(methods);
assert.strictEqual(c.name, 'BigQuery');
assert.deepStrictEqual(methods, ['getDatasets', 'getJobs']);
extended = true;
},
streamify: (methodName: string) => {
return methodName;
},
},
};

class FakeService extends Service {
calledWith_: IArguments;
constructor(config: ServiceConfig, options: ServiceOptions) {
super(config, options);
this.calledWith_ = arguments;
}
}

before(() => {
BigQuery = proxyquire('../src', {
uuid: fakeUuid,
Expand Down Expand Up @@ -1747,8 +1752,7 @@ describe('BigQuery', () => {
const FAKE_ROWS = [{}, {}, {}];
const FAKE_RESPONSE = {};
const QUERY_STRING = 'SELECT * FROM [dataset.table]';

it('should return any errors from createQueryJob', done => {
const FAKE_JOB = it('should return any errors from createQueryJob', done => {
const error = new Error('err');

bq.createQueryJob = (query: {}, callback: Function) => {
Expand Down Expand Up @@ -1782,55 +1786,46 @@ describe('BigQuery', () => {
});
});

it('should call job#getQueryResults', done => {
it('should call table#getRows', done => {
const fakeJob = {
getQueryResults: (options: {}, callback: Function) => {
callback(null, FAKE_ROWS, FAKE_RESPONSE);
metadata: {
configuration: {
query: {
destinationTable: {
datasetId: '1',
tableId: '1',
},
},
},
},
};

bq.createQueryJob = (query: {}, callback: Function) => {
callback(null, fakeJob, FAKE_RESPONSE);
};

bq.query(QUERY_STRING, (err: Error, rows: {}, resp: {}) => {
const finalCallback = (err: Error | null, rows: {}, resp: {}) => {
assert.ifError(err);
assert.strictEqual(rows, FAKE_ROWS);
assert.strictEqual(resp, FAKE_RESPONSE);
done();
});
});
};

it('should assign Job on the options', done => {
const fakeJob = {
getQueryResults: (options: {}, callback: Function) => {
const fakeTable = {
getRows(options: {}, cb: Function) {
assert.deepStrictEqual(options, {job: fakeJob});
done();
assert.strictEqual(cb, finalCallback);
finalCallback(null, FAKE_ROWS, FAKE_RESPONSE);
},
};

bq.createQueryJob = (query: {}, callback: Function) => {
callback(null, fakeJob, FAKE_RESPONSE);
};

bq.query(QUERY_STRING, assert.ifError);
});

it('should optionally accept options', done => {
const fakeOptions = {};
const fakeJob = {
getQueryResults: (options: {}) => {
assert.notStrictEqual(options, fakeOptions);
assert.deepStrictEqual(options, {job: fakeJob});
done();
const fakeDataset = {
table(id: string) {
return fakeTable;
},
};

bq.createQueryJob = (query: {}, callback: Function) => {
callback(null, fakeJob, FAKE_RESPONSE);
};
bq.dataset = (id: string) => fakeDataset;

bq.query(QUERY_STRING, fakeOptions, assert.ifError);
bq.query(QUERY_STRING, finalCallback);
});
});

Expand Down