Merge pull request #215 from debasishg/fix-eval

Script evaluation fix

Author: debasishg

build.sbt

@@ -5,7 +5,7 @@ lazy val redisClient = (project in file(".")).settings(coreSettings : _*)
 lazy val commonSettings: Seq[Setting[_]] = Seq(
   organization := "net.debasishg",
   version := "3.7",
-  scalaVersion := "2.11.12",
+  scalaVersion := "2.12.6",
   crossScalaVersions := Seq("2.12.6", "2.11.12", "2.10.7", "2.13.0-M4"),
 
   scalacOptions in Compile ++= Seq( "-unchecked", "-feature", "-language:postfixOps", "-deprecation" ),

src/main/scala/com/redis/EvalOperations.scala

@@ -6,12 +6,15 @@ trait EvalOperations { self: Redis =>
 
   // EVAL
   // evaluates lua code on the server.
-  def evalMultiBulk[A](luaCode: String, keys: List[Any], args: List[Any])(implicit format: Format, parse: Parse[A]): Option[List[Option[A]]] =
+  def evalMultiBulk[A](luaCode: String, keys: List[Any], args: List[Any])(implicit format: Format, parse: Parse[A]): Option[List[Option[A]]] = 
     send("EVAL",  argsForEval(luaCode, keys, args))(asList[A])
 
   def evalBulk[A](luaCode: String, keys: List[Any], args: List[Any])(implicit format: Format, parse: Parse[A]): Option[A] =
     send("EVAL", argsForEval(luaCode, keys, args))(asBulk)
 
+  def evalInt(luaCode: String, keys: List[Any], args: List[Any]): Option[Int] = 
+    send("EVAL", argsForEval(luaCode, keys, args))(asInt)
+    
   def evalMultiSHA[A](shahash: String, keys: List[Any], args: List[Any])(implicit format: Format, parse: Parse[A]): Option[List[Option[A]]] =
     send("EVALSHA", argsForEval(shahash, keys, args))(asList[A])
 

src/test/scala/com/redis/EvalOperationsSpec.scala

@@ -130,5 +130,26 @@ class EvalOperationsSpec extends FunSpec
 
       r.scriptExists(shahash.get) should equal (Some(0))
     }
+
+    it("should do stuff") {      
+      r.lpush("content", "{\"source\": \"output1.txt\", \"col1\": \"water_pressure\", \"col2\": \"sunday\", \"col3\": \"december\"}")
+      r.lpush("content", "{\"source\": \"output1.txt\", \"col1\": \"air_pressure\", \"col2\": \"saturday\", \"col3\": \"november\"}")
+      r.lpush("content", "{\"source\": \"output2.txt\", \"col1\": \"air_pressure\", \"col2\": \"saturday\", \"col3\": \"november\"}")
+
+      val luaCode = """
+            if redis.call("EXISTS", KEYS[1]) == 1 then
+              local res = {}
+              local payload = redis.call("LRANGE", KEYS[1], 0, -1)
+              local row = cjson.decode(payload[1])
+              res[1] = row["source"]
+              return #res
+            else
+              return -1
+            end
+	        """
+
+      val res = r.evalInt(luaCode, List("content"), List())
+      res should equal (Some(1))
+    }
   }
 }