Allow returning 0 count for nulls in OPTIONAL MATCHes. Add very basis…

… tests #318
ftsrg · Mar 4, 2018 · b071cb5 · b071cb5
1 parent 31814c6
commit b071cb5
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/ire-adapter/src/test/scala/ingraph/ire/TckEngineTest.scala b/ire-adapter/src/test/scala/ingraph/ire/TckEngineTest.scala
@@ -702,6 +702,25 @@ class TckEngineTest extends FunSuite {
     assert(results.size == 1)
   }
 
+  test("count empty on OPTIONAL MATCH") {
+    val results = run("",
+      """OPTIONAL MATCH (n)
+        |RETURN count(n) AS cn
+      """.stripMargin
+    )
+    assert(results.size == 1)
+    assert(results.head == Vector(0L))
+  }
+
+  test("count empty on MATCH") {
+    val results = run("",
+      """MATCH (n)
+        |RETURN count(n) AS cn
+      """.stripMargin
+    )
+    assert(results.isEmpty)
+  }
+
 //  //
 //  test("") {
 //    val results = run(

diff --git a/ire/src/main/scala/hu/bme/mit/ire/nodes/unary/aggregation/AggregationNode.scala b/ire/src/main/scala/hu/bme/mit/ire/nodes/unary/aggregation/AggregationNode.scala
@@ -37,7 +37,7 @@ class AggregationNode(override val next: (ReteMessage) => Unit,
 
     for ((key, (oldValues, oldCount)) <- oldValues) {
       val newValues = data(key).map(_.value())
-      if (oldValues != newValues) {
+      if (oldValues != newValues || oldCount == 0) {
         if (keyCount(key) != 0)
           positive += key ++ newValues
         if (oldCount != 0)