Fix data removal when group cardinality ≤ 1.

Fixes #90.
square · Sep 10, 2013 · d3b8bb6 · d3b8bb6
1 parent 60169ab
commit d3b8bb6
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 6 deletions.
diff --git a/crossfilter.js b/crossfilter.js
@@ -1,5 +1,5 @@
 (function(exports){
-crossfilter.version = "1.3.1";
+crossfilter.version = "1.3.2";
 function crossfilter_identity(d) {
   return d;
 }
@@ -1008,7 +1008,7 @@ function crossfilter() {
       }
 
       function removeData() {
-        for (var i = 0, j = 0; i < n; ++i) {
+        if (groupIndex) for (var i = 0, j = 0; i < n; ++i) {
           if (filters[i]) {
             if (i !== j) groupIndex[j] = groupIndex[i];
             ++j;

diff --git a/crossfilter.min.js b/crossfilter.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "crossfilter",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "description": "Fast multidimensional filtering for coordinated views.",
   "keywords": [
     "square",

diff --git a/src/crossfilter.js b/src/crossfilter.js
@@ -493,7 +493,7 @@ function crossfilter() {
       }
 
       function removeData() {
-        for (var i = 0, j = 0; i < n; ++i) {
+        if (groupIndex) for (var i = 0, j = 0; i < n; ++i) {
           if (filters[i]) {
             if (i !== j) groupIndex[j] = groupIndex[i];
             ++j;

diff --git a/test/crossfilter-test.js b/test/crossfilter-test.js
@@ -892,6 +892,14 @@ suite.addBatch({
         data.foo.evenOdd = data.foo.group(function(value) { return Math.floor(value / 2); });
         return data;
       },
+      "removing a record works for a group with cardinality one": function(data) {
+        data.add([{foo: 1}, {foo: 1.1}, {foo: 1.2}]);
+        data.foo.filter(1.1);
+        data.remove();
+        data.foo.filterAll();
+        data.remove();
+        assert.deepEqual(data.foo.top(Infinity), []);
+      },
       "removing a record updates dimension": function(data) {
         data.add([{foo: 1}, {foo: 2}]);
         data.foo.filterExact(1);
@@ -918,8 +926,10 @@ suite.addBatch({
         data.add([{foo: 1}, {foo: 2}, {foo: 3}]);
         data.foo.filter(2);
         data.remove();
-        data.foo.filter(null);
+        data.foo.filterAll();
         assert.deepEqual(data.foo.top(Infinity), [{foo: 3}, {foo: 1}]);
+        data.remove();
+        assert.deepEqual(data.foo.top(Infinity), []);
       }
     }
   }