fix(jobserver): Simplify and optimize query (spark-jobserver#977)

- If the binary is already available in the
binaries_contents then the select query will load
all the binary content because we have a select *
statement. A map(_.binId) is added to do specific
select
- Since output of first insert statement is not used
anywhere, there is no need to get the binId back. This
avoids the following queries
SELECT SCOPE_IDENTITY() WHERE SCOPE_IDENTITY() IS NOT NULL;
- Remove extra map(bc => bc.*) to simplify the code

Change-Id: I7f8c1372bf8db22dac999a641e9e965f3f0adea0

Author: bsikander

job-server/src/main/scala/spark/jobserver/io/JobSqlDAO.scala

@@ -196,16 +196,13 @@ class JobSqlDAO(config: Config) extends JobDAO with FileCacher {
   // Insert JarInfo and its jar into db and return the primary key associated with that row
   private def insertBinaryInfo(binInfo: BinaryInfo, binBytes: Array[Byte]): Future[Int] = {
     val hash = calculateBinaryHash(binBytes);
-    val dbAction = (for {
-      binId <- binaries.returning(binaries.map(_.binId)) +=
-        (-1, binInfo.appName, binInfo.binaryType.name, convertDateJodaToSql(binInfo.uploadTime), hash)
-      _ <- binariesContents.filter(_.binHash === hash).result.headOption.flatMap{
-            case None =>
-              binariesContents.map(bc => bc.*) += (hash, new SerialBlob(binBytes))
-            case Some(bc) =>
-              DBIO.successful(None) // no-op
-          }
-    } yield binId).transactionally
+    val dbAction = (binaries +=
+        (-1, binInfo.appName, binInfo.binaryType.name, convertDateJodaToSql(binInfo.uploadTime), hash))
+                     .andThen(binariesContents.filter(_.binHash === hash).map(_.binHash)
+                         .result.headOption.flatMap {
+                       case Some(bc) => DBIO.successful(1)
+                       case None => binariesContents += (hash, new SerialBlob(binBytes))
+                     }).transactionally
     db.run(dbAction)
   }