Merge pull request Caltech-IPAC#1701 from Caltech-IPAC/FIREFLY-1649-heatmap-nan

FIREFLY-1649: NaNs values should not show up in Heatmap

Author: loitly

src/firefly/java/edu/caltech/ipac/firefly/server/query/DecimationProcessor.java

@@ -81,16 +81,16 @@ void createDecimateTable(TableServerRequest treq, DbAdapter dbAdapter) throws Da
             String sql = """
                 CREATE TABLE %s as (
                 SELECT %s as "%s", %s as "%s", ROW_NUM as "rowidx", ROW_NUMBER() OVER () AS %s, ROW_NUMBER() OVER () AS %s,
-                FROM %s)
-                """.formatted(tblName, deciInfo.getxExp(), deciKey.getXCol(), deciInfo.getyExp(), deciKey.getYCol(), ROW_NUM, ROW_IDX, dataTbl);
+                FROM %s WHERE "%s" IS NOT NULL AND "%s" IS NOT NULL )
+                """.formatted(tblName, deciInfo.getxExp(), deciKey.getXCol(), deciInfo.getyExp(), deciKey.getYCol(), ROW_NUM, ROW_IDX, dataTbl, deciKey.getXCol(), deciKey.getYCol());
             dbAdapter.execUpdate(sql);
         } else {
             String sql = """
                 CREATE TABLE %s as (
                 SELECT FIRST(%s) as "%s", FIRST(%s) as "%s", FIRST(ROW_NUM) as "rowidx", count(*) as "weight", %s as "dkey", ROW_NUMBER() OVER () AS %s, ROW_NUMBER() OVER () AS %s,
-                FROM %s
+                FROM %s WHERE "%s" IS NOT NULL AND "%s" IS NOT NULL
                 GROUP BY "dkey" )
-                """.formatted(tblName, deciInfo.getxExp(), deciKey.getXCol(), deciInfo.getyExp(), deciKey.getYCol(), deciFunc, ROW_NUM, ROW_IDX, dataTbl);
+                """.formatted(tblName, deciInfo.getxExp(), deciKey.getXCol(), deciInfo.getyExp(), deciKey.getYCol(), deciFunc, ROW_NUM, ROW_IDX, dataTbl, deciKey.getXCol(), deciKey.getYCol());
             dbAdapter.execUpdate(sql);
 
             // add decimation info to the returned table