#1654 Fix bug when deleting unused key (#1655)

* 1654 Polish

* #1654 Deleting key not present in table

* #1654 Deleting key not present in table

* #1654 Deleting key not present in table

* #1654 Deleting key not present in table

* #1654 Deleting key not present in table

* #1654 Deleting key not present in table

* #1654 Deleting key not present in table

Author: stonesmi

example/virtualized-table/pom.xml

@@ -275,27 +275,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-javadocs</id>
-                        <goals><goal>jar</goal></goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>compile</phase>
-                        <goals><goal>jar</goal></goals>
-                    </execution>
-                </executions>
-            </plugin>
-
         </plugins>
     </build>
     <reporting>

vuu/pom.xml

@@ -171,6 +171,12 @@
             <artifactId>awaitility-scala</artifactId>
             <version>4.3.0</version>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.scala-lang</groupId>
+                    <artifactId>scala-library</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
     </dependencies>

vuu/src/main/scala/org/finos/vuu/core/table/InMemDataTable.scala

@@ -1,5 +1,6 @@
 package org.finos.vuu.core.table
 
+import com.typesafe.scalalogging.StrictLogging
 import org.finos.vuu.api.TableDef
 import org.finos.vuu.core.index._
 import org.finos.vuu.provider.{JoinTableProvider, Provider}
@@ -219,7 +220,7 @@ case class InMemDataTableData(data: ConcurrentHashMap[String, RowData], private
 }
 
 
-class InMemDataTable(val tableDef: TableDef, val joinProvider: JoinTableProvider)(implicit val metrics: MetricsProvider) extends DataTable with KeyedObservableHelper[RowKeyUpdate] {
+class InMemDataTable(val tableDef: TableDef, val joinProvider: JoinTableProvider)(implicit val metrics: MetricsProvider) extends DataTable with KeyedObservableHelper[RowKeyUpdate] with StrictLogging {
 
   private final val indices = tableDef.indices.indices
     .map(index => tableDef.columnForName(index.column))
@@ -392,12 +393,15 @@ class InMemDataTable(val tableDef: TableDef, val joinProvider: JoinTableProvider
     updateIndices(rowkey, rowUpdate)
   }
 
-  def delete(rowKey: String): Unit = {
+  def delete(rowKey: String): RowData = {
     data.dataByKey(rowKey) match {
-      case EmptyRowData =>
       case x: RowWithData =>
         removeFromIndices(rowKey, x)
         data = data.delete(rowKey)
+        x
+      case _ =>
+        logger.debug(s"Got a delete for key $rowKey, but it has no row data")
+        EmptyRowData
     }
   }
 
@@ -479,14 +483,15 @@ class InMemDataTable(val tableDef: TableDef, val joinProvider: JoinTableProvider
 
     onUpdateCounter.inc()
 
-    val rowData = data.dataByKey(rowKey)
-
-    delete(rowKey)
+    val rowData = delete(rowKey)
 
-    if (rowData != null)
-      sendDeleteToJoinSink(rowKey, rowData)
+    rowData match {
+      case RowWithData(_, _) =>
+        sendDeleteToJoinSink(rowKey, rowData)
+        notifyListeners(rowKey, isDelete = true)
 
-    notifyListeners(rowKey, isDelete = true)
+      case EmptyRowData =>
+    }
 
     incrementUpdateCounter()
   }

vuu/src/test/scala/org/finos/vuu/core/table/RowDeleteTest.scala

@@ -82,14 +82,67 @@ class RowDeleteTest extends AnyFeatureSpec with Matchers with OneInstancePerTest
       assertVpEq(updates2) {
         Table(
           ("ric"     ,"bid"     ,"ask"     ),
-          //("VOD.L"   ,220       ,223       ),
           ("BT.L"    ,220       ,223       ),
           ("TW.L"    ,220       ,223       )
         )
       }
 
     }
 
+    Scenario("check a delete of a key that doesn't exist does nothing"){
+      implicit val clock: Clock = new DefaultClock
+
+      implicit val lifecycle: LifecycleContainer = new LifecycleContainer
+      implicit val metrics: MetricsProviderImpl = new MetricsProviderImpl
+
+      val joinProvider   = JoinTableProviderImpl()
+
+      val tableContainer = new TableContainer(joinProvider)
+
+      val outQueue          = new OutboundRowPublishQueue()
+
+      val providerContainer = new ProviderContainer(joinProvider)
+      val pluginRegistry = new DefaultPluginRegistry
+      pluginRegistry.registerPlugin(new VuuInMemPlugin)
+
+      val viewPortContainer = new ViewPortContainer(tableContainer, providerContainer, pluginRegistry)
+
+      val pricesDef = TableDef("prices", "ric", Columns.fromNames("ric:String", "bid:Double", "ask:Double", "last:Double", "open:Double", "close:Double"), "ric")
+
+      val table = new InMemDataTable(pricesDef, joinProvider)
+
+      val provider = new MockProvider(table)
+
+      val session = ClientSessionId("sess-01", "chris")
+
+      val vpcolumns = ViewPortColumnCreator.create(table, List("ric", "bid", "ask"))
+
+      val viewPort = viewPortContainer.create(RequestId.oneNew(), session, outQueue, table, DefaultRange, vpcolumns)
+
+      provider.tick("VOD.L", Map("ric" -> "VOD.L", "bid" -> 220, "ask" -> 223))
+
+      table.primaryKeys.length should equal (1)
+
+      viewPortContainer.runOnce()
+
+      val updates = combineQs(viewPort)
+
+      assertVpEq(updates) {
+        Table(
+          ("ric", "bid", "ask"),
+          ("VOD.L", 220, 223)
+        )
+      }
+
+      provider.delete("TW.L")
+
+      viewPortContainer.runOnce()
+
+      val updates2 = combineQs(viewPort)
+
+      assert(updates2.isEmpty)
+    }
+
     Scenario("check we correct delete from a primary key join table"){
 
       implicit val clock: Clock = new TestFriendlyClock(1000000)