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

Fix logic for window’s default as #3810

Merged
merged 6 commits into from
May 24, 2018
Merged

Fix logic for window’s default as #3810

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
684c1c0
Refactor window unit test tabbing
kanitw May 24, 2018
a721829
Fix logic for window’s default as
kanitw May 24, 2018
812e622
Use vgField & make vgField support omitted field (for WindowFieldDef)
kanitw May 24, 2018
3c9f610
Modify vgField to correctly support `op`
kanitw May 24, 2018
577bdca
Correctly use `op` for aggregate.ts too
kanitw May 24, 2018
cfb4a2d
Refactor vgField to support Aggregate/WindowFieldDef, remove the hack…
kanitw May 24, 2018
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 src/compile/data/window.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ export class WindowTransformNode extends DataFlowNode {
}

private getDefaultName(windowFieldDef: WindowFieldDef): string {
return windowFieldDef.as === undefined ? String(windowFieldDef.op) + '_field' : windowFieldDef.as;
const {as, op, field} = windowFieldDef;
return as || (field ? `${op}_${field}` : op);
Copy link
Member

Choose a reason for hiding this comment

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

Does this work with nested fields? Why not use vgField?

}

public assemble(): VgWindowTransform {
Expand Down
194 changes: 115 additions & 79 deletions test/compile/data/window.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,93 +5,129 @@ import {WindowTransformNode} from '../../../src/compile/data/window';
import {Transform} from '../../../src/transform';

describe('compile/data/window', () => {
describe('TestWindowTransform()', () => {
it ('should return a proper vg transform', () => {
const transform: Transform = {
window: [
it('should return a proper vg transform', () => {
const transform: Transform = {
window: [
{
op: 'row_number',
as: 'ordered_row_number',
},
],
ignorePeers: false,
sort:
[
{
op: 'row_number',
as: 'ordered_row_number',
},
field: 'f',
order: 'ascending'
}
],
ignorePeers: false,
sort:
[
{
field:'f',
order:'ascending'
}
],
groupby: ['f'],
frame: [null, 0]
};
const window = new WindowTransformNode(null, transform);
assert.deepEqual(window.assemble(), {
type: 'window',
ops: ['row_number'],
fields: [null],
params: [null],
sort : {
field: ["f"],
order: ["ascending"],
},
ignorePeers: false,
as: ['ordered_row_number'],
frame: [null, 0],
groupby: ['f']
});
groupby: ['f'],
frame: [null, 0]
};
const window = new WindowTransformNode(null, transform);
assert.deepEqual(window.assemble(), {
type: 'window',
ops: ['row_number'],
fields: [null],
params: [null],
sort: {
field: ["f"],
order: ["ascending"],
},
ignorePeers: false,
as: ['ordered_row_number'],
frame: [null, 0],
groupby: ['f']
});
it ('should return a producer proper fields', () => {
const transform: Transform = {
window: [
{
op: 'row_number',
as: 'ordered_row_number',
},
{
op: 'count',
as: 'count_field'
},
});

it('should augment as with default as', () => {
const transform: Transform = {
window: [
{
op: 'row_number',
as: undefined // intentionally omit for testing
},
],
ignorePeers: false,
sort:
[
{
op: 'sum',
as: 'sum_field'
field: 'f',
order: 'ascending'
}
],
ignorePeers: false,
sort:
[
{
field:'f',
order:'ascending'
}
],
groupby: ['f'],
frame: [null, 0]
};
const window = new WindowTransformNode(null, transform);
assert.deepEqual({"count_field": true, "ordered_row_number": true, "sum_field": true}, window.producedFields());
groupby: ['f'],
frame: [null, 0]
};
const window = new WindowTransformNode(null, transform);
assert.deepEqual(window.assemble(), {
type: 'window',
ops: ['row_number'],
fields: [null],
params: [null],
sort: {
field: ["f"],
order: ["ascending"],
},
ignorePeers: false,
as: ['row_number'],
frame: [null, 0],
groupby: ['f']
});
it ('should clone to an equivalent version', () => {
const transform: Transform = {
window: [
});

it('should return a proper produced fields', () => {
const transform: Transform = {
window: [
{
op: 'row_number',
as: 'ordered_row_number',
},
{
op: 'count',
as: 'count_field'
},
{
op: 'sum',
as: 'sum_field'
}
],
ignorePeers: false,
sort:
[
{
op: 'row_number',
as: 'ordered_row_number',
},
field:'f',
order:'ascending'
}
],
ignorePeers: false,
sort:
[
{
field:'f',
order:'ascending'
}
],
groupby: ['f'],
frame: [null, 0]
};
const window = new WindowTransformNode(null, transform);
assert.deepEqual(window, window.clone());
});
groupby: ['f'],
frame: [null, 0]
};
const window = new WindowTransformNode(null, transform);
assert.deepEqual({"count_field": true, "ordered_row_number": true, "sum_field": true}, window.producedFields());
});

it('should clone to an equivalent version', () => {
const transform: Transform = {
window: [
{
op: 'row_number',
as: 'ordered_row_number',
},
],
ignorePeers: false,
sort:
[
{
field:'f',
order:'ascending'
}
],
groupby: ['f'],
frame: [null, 0]
};
const window = new WindowTransformNode(null, transform);
assert.deepEqual(window, window.clone());
});
});