Merge branch 'table-scan-perf' of github.com:ccri/arrow into js-cpp-r…

…efactor
apache · Jan 22, 2018 · 87334a5 · 87334a5
2 parents b7f5bfb + 0620cfd
commit 87334a5
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 24 deletions.
diff --git a/js/src/table.ts b/js/src/table.ts
@@ -130,7 +130,7 @@ export class Table implements DataFrame {
             }
         }
     }
-    public count(): number { return this.batchesUnion.length; }
+    public count(): number { return this.length; }
     public countBy(name: Col | string): CountByResult {
         const batches = this.batches, numBatches = batches.length;
         const count_by = typeof name === 'string' ? new Col(name) : name;
@@ -264,7 +264,7 @@ export class CountByResult extends Table implements DataFrame {
             counts.length, [values, counts]
         ));
     }
-    public asJSON(): Object {
+    public toJSON(): Object {
         const [values, counts] = this.columns;
         const result = {} as { [k: string]: number | null };
         for (let i = -1; ++i < this.length;) {

diff --git a/js/test/unit/table-tests.ts b/js/test/unit/table-tests.ts
@@ -118,13 +118,13 @@ describe(`Table`, () => {
         // Wrap floating point values in a Float32Array and take them back out to
         // make sure that equality checks will pass
         const values = [
-            [new Float32Array([-0.3])[0], -1, 'a'],
-            [new Float32Array([-0.2])[0],  1, 'b'],
-            [new Float32Array([-0.1])[0], -1, 'c'],
-            [new Float32Array([ 0  ])[0],  1, 'a'],
-            [new Float32Array([ 0.1])[0], -1, 'b'],
-            [new Float32Array([ 0.2])[0],  1, 'c'],
-            [new Float32Array([ 0.3])[0], -1, 'a']
+            [Math.fround(-0.3), -1, 'a'],
+            [Math.fround(-0.2),  1, 'b'],
+            [Math.fround(-0.1), -1, 'c'],
+            [Math.fround( 0  ),  1, 'a'],
+            [Math.fround( 0.1), -1, 'b'],
+            [Math.fround( 0.2),  1, 'c'],
+            [Math.fround( 0.3), -1, 'a']
         ];
         test(`has the correct length`, () => {
             expect(table.length).toEqual(values.length);
@@ -161,19 +161,19 @@ describe(`Table`, () => {
         test(`countBy on dictionary returns the correct counts`, () => {
             // Make sure countBy works both with and without the Col wrapper
             // class
-            expect(table.countBy(col('dictionary')).asJSON()).toEqual({
+            expect(table.countBy(col('dictionary')).toJSON()).toEqual({
                 'a': 3,
                 'b': 2,
                 'c': 2,
             });
-            expect(table.countBy('dictionary').asJSON()).toEqual({
+            expect(table.countBy('dictionary').toJSON()).toEqual({
                 'a': 3,
                 'b': 2,
                 'c': 2,
             });
         });
         test(`countBy on dictionary with filter returns the correct counts`, () => {
-            expect(table.filter(col('i32').eq(1)).countBy('dictionary').asJSON()).toEqual({
+            expect(table.filter(col('i32').eq(1)).countBy('dictionary').toJSON()).toEqual({
                 'a': 1,
                 'b': 1,
                 'c': 1,
@@ -321,15 +321,15 @@ describe(`Table`, () => {
         // Wrap floating point values in a Float32Array and take them back out to
         // make sure that equality checks will pass
         const values = [
-            [new Float32Array([-0.3])[0], -1, 'a'],
-            [new Float32Array([-0.2])[0],  1, 'b'],
-            [new Float32Array([-0.1])[0], -1, 'c'],
-            [new Float32Array([ 0  ])[0],  1, 'a'],
-            [new Float32Array([ 0.1])[0], -1, 'b'],
-            [new Float32Array([ 0.2])[0],  1, 'c'],
-            [new Float32Array([ 0.3])[0], -1, 'a'],
-            [new Float32Array([ 0.2])[0],  1, 'b'],
-            [new Float32Array([ 0.1])[0], -1, 'c'],
+            [Math.fround(-0.3), -1, 'a'],
+            [Math.fround(-0.2),  1, 'b'],
+            [Math.fround(-0.1), -1, 'c'],
+            [Math.fround( 0  ),  1, 'a'],
+            [Math.fround( 0.1), -1, 'b'],
+            [Math.fround( 0.2),  1, 'c'],
+            [Math.fround( 0.3), -1, 'a'],
+            [Math.fround( 0.2),  1, 'b'],
+            [Math.fround( 0.1), -1, 'c'],
         ];
         test(`has the correct length`, () => {
             expect(table.length).toEqual(values.length);
@@ -366,19 +366,19 @@ describe(`Table`, () => {
         test(`countBy on dictionary returns the correct counts`, () => {
             // Make sure countBy works both with and without the Col wrapper
             // class
-            expect(table.countBy(col('dictionary')).asJSON()).toEqual({
+            expect(table.countBy(col('dictionary')).toJSON()).toEqual({
                 'a': 3,
                 'b': 3,
                 'c': 3,
             });
-            expect(table.countBy('dictionary').asJSON()).toEqual({
+            expect(table.countBy('dictionary').toJSON()).toEqual({
                 'a': 3,
                 'b': 3,
                 'c': 3,
             });
         });
         test(`countBy on dictionary with filter returns the correct counts`, () => {
-            expect(table.filter(col('i32').eq(1)).countBy(col('dictionary')).asJSON()).toEqual({
+            expect(table.filter(col('i32').eq(1)).countBy(col('dictionary')).toJSON()).toEqual({
                 'a': 1,
                 'b': 2,
                 'c': 1,