Skip to content

Commit 579ab1f

Browse files
authored
Merge pull request #2 from trxcllnt/js-cpp-refactor
fix perf tests + lint
2 parents 016ba78 + f3cde1a commit 579ab1f

File tree

2 files changed

+12
-13
lines changed

2 files changed

+12
-13
lines changed

js/perf/index.js

+8-8
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ for (let { name, buffers } of require('./table_config')) {
3333
const sliceToArraySuiteName = `Slice toArray "${name}" vectors`;
3434
suites.push(createTestSuite(parseSuiteName, createFromTableTest(name, buffers)));
3535
suites.push(createTestSuite(parseSuiteName, createReadBatchesTest(name, buffers)));
36-
const table = Table.from(buffers);
37-
suites.push(...table.columns.map((vector, i) => createTestSuite(getByIndexSuiteName, createGetByIndexTest(vector, table.schema.fields[i].name))));
38-
suites.push(...table.columns.map((vector, i) => createTestSuite(iterateSuiteName, createIterateTest(vector, table.schema.fields[i].name))));
39-
suites.push(...table.columns.map((vector, i) => createTestSuite(sliceToArraySuiteName, createSliceToArrayTest(vector, table.schema.fields[i].name))));
40-
suites.push(...table.columns.map((vector, i) => createTestSuite(sliceSuiteName, createSliceTest(vector, table.schema.fields[i].name))));
36+
const table = Table.from(buffers), schema = table.schema;
37+
suites.push(...schema.fields.map((f, i) => createTestSuite(getByIndexSuiteName, createGetByIndexTest(table.getColumnAt(i), f.name))));
38+
suites.push(...schema.fields.map((f, i) => createTestSuite(iterateSuiteName, createIterateTest(table.getColumnAt(i), f.name))));
39+
suites.push(...schema.fields.map((f, i) => createTestSuite(sliceToArraySuiteName, createSliceToArrayTest(table.getColumnAt(i), f.name))));
40+
suites.push(...schema.fields.map((f, i) => createTestSuite(sliceSuiteName, createSliceTest(table.getColumnAt(i), f.name))));
4141
}
4242

4343
for (let {name, buffers, countBys, counts} of require('./table_config')) {
@@ -173,7 +173,7 @@ function createDataFrameDirectCountTest(table, column, test, value) {
173173

174174
return {
175175
async: true,
176-
name: `name: '${column}', length: ${table.numRows}, type: ${table.getColumnAt(colidx).type}, test: ${test}, value: ${value}\n`,
176+
name: `name: '${column}', length: ${table.length}, type: ${table.getColumnAt(colidx).type}, test: ${test}, value: ${value}\n`,
177177
fn: op
178178
};
179179
}
@@ -183,7 +183,7 @@ function createDataFrameCountByTest(table, column) {
183183

184184
return {
185185
async: true,
186-
name: `name: '${column}', length: ${table.numRows}, type: ${table.getColumnAt(colidx).type}\n`,
186+
name: `name: '${column}', length: ${table.length}, type: ${table.getColumnAt(colidx).type}\n`,
187187
fn() {
188188
table.countBy(column);
189189
}
@@ -204,7 +204,7 @@ function createDataFrameFilterCountTest(table, column, test, value) {
204204

205205
return {
206206
async: true,
207-
name: `name: '${column}', length: ${table.numRows}, type: ${table.getColumnAt(colidx).type}, test: ${test}, value: ${value}\n`,
207+
name: `name: '${column}', length: ${table.length}, type: ${table.getColumnAt(colidx).type}, test: ${test}, value: ${value}\n`,
208208
fn() {
209209
df.count();
210210
}

js/test/unit/table-tests.ts

+4-5
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18-
import Arrow, {
19-
} from '../Arrow';
18+
import Arrow from '../Arrow';
2019

2120
const {
2221
col,
@@ -25,7 +24,7 @@ const {
2524

2625
describe(`Table`, () => {
2726
test(`can create an empty table`, () => {
28-
expect(Table.empty().length).toEqual(0)
27+
expect(Table.empty().length).toEqual(0);
2928
});
3029

3130
describe(`single record batch`, () => {
@@ -147,7 +146,7 @@ describe(`Table`, () => {
147146
test(`scans expected values`, () => {
148147
let expected_idx = 0;
149148
table.scan((idx, batch) => {
150-
const columns = batch.schema.fields.map((_, i) => batch.getChildAt(i));
149+
const columns = batch.schema.fields.map((_, i) => batch.getChildAt(i)!);
151150
expect(columns.map((c) => c.get(idx))).toEqual(values[expected_idx++]);
152151
});
153152
});
@@ -353,7 +352,7 @@ describe(`Table`, () => {
353352
test(`scans expected values`, () => {
354353
let expected_idx = 0;
355354
table.scan((idx, batch) => {
356-
const columns = batch.schema.fields.map((_, i) => batch.getChildAt(i));
355+
const columns = batch.schema.fields.map((_, i) => batch.getChildAt(i)!);
357356
expect(columns.map((c) => c.get(idx))).toEqual(values[expected_idx++]);
358357
});
359358
});

0 commit comments

Comments
 (0)