stal 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0c73d92dba5eab545ca813c4e47885b77c78e34
-  data.tar.gz: daf465500d116a4ead3f79d5532aabecda8a67d3
+  metadata.gz: 6d5e97a625f23834a34722015dd285abbd3759b2
+  data.tar.gz: 4579c7dc32e11a5be18f0f1e42d405a4c197319b
 SHA512:
-  metadata.gz: 6a656ad854d7bb0027d45988772d3b81dfe49775344301424f4dc876977027d6ec1a207835e9570f8cf15434abf66e402e75e646ec5fdf9ab2ebdce23443911d
-  data.tar.gz: 30851cd6f82f3072f2526359b73608a90dc07d1459944e681591453d02101f37c420feac75879b2dfcdb327bc00c799741a7147c316ed0f3048937953f4042e7
+  metadata.gz: 3bd4c9ce1448d9737fbbf730598facfe4a6119a4e5f2a3a513592a7760364b9eb8fd1a90fad61bfec0030ed2abf9763cf05ab339c12f563bc9d383b8d6d469dd
+  data.tar.gz: 6e8ae54b05c800ae9be844835b48a3c08d396799db7fdf5fe7423200d28fa1790da7d7a0339c776fad52f5c33b1d5c89d3f54a7e84cebd2c730c75138b374a76

data/.gems

@@ -1,2 +1,2 @@
-redic -v 1.3.0
 cutest -v 1.2.2
+redic -v 1.5.0

data/CONTRIBUTING

@@ -0,0 +1,19 @@
+This code tries to solve a particular problem with a very simple
+implementation. We try to keep the code to a minimum while making
+it as clear as possible. The design is very likely finished, and
+if some feature is missing it is possible that it was left out on
+purpose. That said, new usage patterns may arise, and when that
+happens we are ready to adapt if necessary.
+
+A good first step for contributing is to meet us on IRC and discuss
+ideas. We spend a lot of time on #lesscode at freenode, always ready
+to talk about code and simplicity. If connecting to IRC is not an
+option, you can create an issue explaining the proposed change and
+a use case. We pay a lot of attention to use cases, because our
+goal is to keep the code base simple. Usually the result of a
+conversation is the creation of a different tool.
+
+Please don't start the conversation with a pull request. The code
+should come at last, and even though it may help to convey an idea,
+more often than not it draws the attention to a particular
+implementation.

data/README.md

@@ -49,39 +49,19 @@ redis.call("SADD", "qux", "x", "y", "z")
 Now we can perform some set operations with `Stal`:
 
 ```ruby
-expr = [:SUNION, "qux", [:SDIFF, [:SINTER, "foo", "bar"], "baz"]]
+expr = ["SUNION", "qux", ["SDIFF", ["SINTER", "foo", "bar"], "baz"]]
 
 Stal.solve(redis, expr)
 #=> ["b", "x", "y", "z"]
 ```
 
-`Stal` translates the internal calls to  `:SUNION`, `:SDIFF` and
-`:SINTER` into `SDIFFSTORE`, `SINTERSTORE` and `SUNIONSTORE` to
+`Stal` translates the internal calls to  `SUNION`, `SDIFF` and
+`SINTER` into `SDIFFSTORE`, `SINTERSTORE` and `SUNIONSTORE` to
 perform the underlying operations, and it takes care of generating
 and deleting any temporary keys.
 
-Note that the only valid names for the internal commands are
-`:SUNION`, `:SDIFF` and `:SINTER`. Any other internal command will
-raise an error. The outmost command can be any set operation, for
-example:
-
-```ruby
-expr = [:SCARD, [:SINTER, "foo", "bar"]]
-
-Stal.solve(redis, expr)
-#=> 2
-```
-
-If you want to preview the commands `Stal` will send to generate
-the results, you can use `Stal.compile`:
-
-```ruby
-Stal.explain([:SINTER, [:SUNION, "foo", "bar"], "baz"])
-#  [["SUNIONSTORE", "stal:0", "foo", "bar"],
-#   [:SINTER, "stal:0", "baz"]]
-```
-
-All commands are pipelined and wrapped in a `MULTI/EXEC` transaction.
+For more information, refer to the repository of the [Stal][stal]
+script.
 
 Installation
 ------------
@@ -92,3 +72,4 @@ $ gem install stal
 
 [redis]: http://redis.io
 [redic]: https://github.com/amakawa/redic
+[stal]: https://github.com/soveran/stal

data/data/stal.lua

@@ -0,0 +1,88 @@
+-- Copyright (c) 2016 Michel Martens
+
+local expr = cjson.decode(ARGV[1])
+
+local tr = {
+  SDIFF  = "SDIFFSTORE",
+  SINTER = "SINTERSTORE",
+  SUNION = "SUNIONSTORE",
+  ZINTER = "ZINTERSTORE",
+  ZUNION = "ZUNIONSTORE",
+}
+
+local function append(t1, t2)
+  for _, item in ipairs(t2) do
+    table.insert(t1, item)
+  end
+end
+
+local function map(t, f)
+  local nt = {}
+
+  for k, v in pairs(t) do
+    nt[k] = f(v)
+  end
+
+  return nt
+end
+
+local compile, convert
+
+function compile(expr, ids, ops)
+  return map(expr, function(v)
+    if (type(v) == "table") then
+      return convert(v, ids, ops)
+    else
+      return v
+    end
+  end)
+end
+
+function convert(expr, ids, ops)
+  local tail = {unpack(expr)}
+  local head = table.remove(tail, 1)
+
+  -- Key where partial results will be stored
+  local id = "stal:" .. #ids
+
+  -- Keep a reference to clean it up later
+  table.insert(ids, id)
+
+  -- Translate into command and destination key
+  local op = {tr[head] or head, id}
+
+  -- Compile the rest recursively
+  append(op, compile(tail, ids, ops))
+
+  -- Append the outermost operation
+  table.insert(ops, op)
+
+  return id
+end
+
+local function solve(expr)
+  local ids = {}
+  local ops = {}
+  local res = nil
+
+  table.insert(ops, compile(expr, ids, ops))
+
+  if (#ops == 1) then
+    return redis.call(unpack(ops[1]))
+  else
+    for _, op in ipairs(ops) do
+      if (#op > 1) then
+        res = redis.call(unpack(op))
+      end
+    end
+
+    redis.call("DEL", unpack(ids))
+
+    return res
+  end
+end
+
+redis.replicate_commands()
+redis.set_repl(redis.REPL_NONE)
+
+return solve(expr)

data/lib/stal.rb

@@ -1,85 +1,23 @@
 # encoding: UTF-8
 
+require "json"
 require "redic"
 
 module Stal
-  class InvalidCommand < ArgumentError; end
-
-  COMMANDS = {
-    :SDIFF  => 'SDIFFSTORE',
-    :SINTER => 'SINTERSTORE',
-    :SUNION => 'SUNIONSTORE',
-  }
-
-  def self.command(term)
-    COMMANDS.fetch(term) do
-      raise(InvalidCommand, term)
-    end
-  end
-
-  # Compile expression into Redis commands
-  def self.compile(expr, ids, ops)
-    expr.map do |item|
-      if Array === item
-        convert(item, ids, ops)
-      else
-        item
-      end
-    end
-  end
-
-  # Transform :SDIFF, :SINTER and :SUNION commands
-  # into SDIFFSTORE, SINTERSTORE and SUNIONSTORE.
-  def self.convert(expr, ids, ops)
-    head, *tail = expr
-
-    # Key where partial results will be stored
-    id = sprintf("stal:%s", ids.size)
-
-    # Keep a reference to clean it up later
-    ids.push(id)
-
-    # Translate into command and destination key
-    op = [command(head), id]
-
-    # Compile the rest recursively
-    op.concat(compile(tail, ids, ops))
-
-    # Append the outermost operation
-    ops.push(op)
-
-    return id
-  end
-
-  # Return commands without any wrapping added by `solve`
-  def self.explain(expr)
-    ids = []
-    ops = []
-
-    ops.push(compile(expr, ids, ops))
-
-    return ops
-  end
+  LUA = File.expand_path("../../data/stal.lua", __FILE__)
+  SHA = "e98658a3aca397c69e8b452a73c6826cdd9f0577"
 
   # Evaluate expression `expr` in the Redis client `c`.
   def self.solve(c, expr)
-    ids = []
-    ops = []
-
-    ops.push(compile(expr, ids, ops))
-
-    if ops.one?
-      c.call(*ops[0])
-    else
-      c.queue("MULTI")
-
-      ops.each do |op|
-        c.queue(*op)
+    begin
+      c.call!("EVALSHA", SHA, 0, JSON.dump(expr))
+    rescue RuntimeError
+      if $!.message["NOSCRIPT"]
+        c.call!("SCRIPT", "LOAD", File.read(LUA))
+        c.call!("EVALSHA", SHA, 0, JSON.dump(expr))
+      else
+        raise $!
       end
-
-      c.queue("DEL", *ids)
-      c.queue("EXEC")
-      c.commit[-1][-2]
     end
   end
 end

data/stal.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "stal"
-  s.version = "0.1.0"
+  s.version = "0.2.0"
   s.summary = %{Set algebra solver for Redis}
   s.description = %Q{Stal receives s-expressions and resolves the set operations in Redis}
   s.authors = ["Michel Martens"]
@@ -10,6 +10,6 @@ Gem::Specification.new do |s|
 
   s.files = `git ls-files`.split("\n")
 
-  s.add_dependency "redic"
-  s.add_development_dependency "cutest"
+  s.add_dependency "redic", "~> 1.5"
+  s.add_development_dependency "cutest", "~> 0"
 end

data/test/all.rb

@@ -3,6 +3,7 @@ require_relative "helper"
 setup do
   Redic.new.tap do |c|
     c.call("FLUSHDB")
+    c.call("SCRIPT", "FLUSH")
     c.call("SADD", "foo", "a", "b", "c")
     c.call("SADD", "bar", "b", "c", "d")
     c.call("SADD", "baz", "c", "d", "e")
@@ -13,36 +14,17 @@ end
 test do |c|
 
   # Example expression
-  expr = ["SUNION", "qux", [:SDIFF, [:SINTER, "foo", "bar"], "baz"]]
-
-  assert_equal ["b", "x", "y", "z"], Stal.solve(c, expr).sort
-
-  # Commands in sub expressions must be symbols
   expr = ["SUNION", "qux", ["SDIFF", ["SINTER", "foo", "bar"], "baz"]]
 
-  assert_raise(Stal::InvalidCommand) do
-    Stal.solve(c, expr)
-  end
+  assert_equal ["b", "x", "y", "z"], Stal.solve(c, expr).sort
 
   # Commands without sub expressions also work
   expr = ["SINTER", "foo", "bar"]
 
   assert_equal ["b", "c"], Stal.solve(c, expr).sort
 
-  # Only :SUNION, :SDIFF and :SINTER are supported in sub expressions
-  expr = ["SUNION", ["DEL", "foo"]]
-
-  assert_raise(Stal::InvalidCommand) do
-    Stal.solve(c, expr)
-  end
-
   # Verify there's no keyspace pollution
   assert_equal ["bar", "baz", "foo", "qux"], c.call("KEYS", "*").sort
 
-  expr = ["SCARD", [:SINTER, "foo", "bar"]]
-
-  # Explain returns an array of Redis commands
-  expected = [["SINTERSTORE", "stal:0", "foo", "bar"], ["SCARD", "stal:0"]]
-
-  assert_equal expected, Stal.explain(expr)
+  expr = ["SCARD", ["SINTER", "foo", "bar"]]
 end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: stal
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Michel Martens
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-09 00:00:00.000000000 Z
+date: 2016-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: cutest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 description: Stal receives s-expressions and resolves the set operations in Redis
@@ -45,9 +45,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gems
+- ".gems"
+- CONTRIBUTING
 - LICENSE
 - README.md
+- data/stal.lua
 - lib/stal.rb
 - makefile
 - stal.gemspec
@@ -63,17 +65,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Set algebra solver for Redis