mohair 0.0.3 → 0.0.5

data/README.md

@@ -45,9 +45,10 @@ $ bundle exec bin/mohair -q "select * from sometable"
 
 ## TODO
 
-- group by
 - limit 10
 - asc/desc
+- types: timestamp, float
+- recursive representation of json with dot notation
 - 2i
 - query optimization
 
@@ -60,5 +61,5 @@ $ bundle exec bin/mohair -q "select * from sometable"
 5. Create new Pull Request
 
 ```
-$ bundle exec rake release
+$ rake release
 ```

data/lib/mohair.rb

@@ -10,14 +10,14 @@ require "optparse"
 require "logger"
 
 LOG = Logger.new(STDERR)
-LOG.level = Logger::DEBUG # WARN, INFO, DEBUG, ...
+LOG.level = Logger::INFO # WARN, INFO, DEBUG, ...
 
 module Mohair
   
   def self.usage
     print <<EOS
 usage:
- $ mohair -q "select foo, bar from bucket_name" [-i INDEX]
+ $ mohair -q "select foo, bar from bucket_name" [-i INDEX] [-s SERVER]
  $ mohair_dump <bucket_name> < sample_data.json
 
 insert, delete sentence is future work
@@ -30,13 +30,24 @@ EOS
 
     q = nil #query!!
     index = nil
+    host = 'localhost'
+    port = 8098
 
     opt = OptionParser.new
+    opt.on('-h', '--help'){ usage }
+    opt.on('-d', '--debug'){
+      LOG.level = Logger::DEBUG
+    }
+    opt.on('-v', '--version'){ usage }
     opt.on('-q Q'){|v| q = v}
     opt.on('-i INDEX'){|v| index = v}
-    opt.on('-h', '--help'){ usage }
+    opt.on('-s SERVER'){|v|
+      host, port = v.split(':')
+    }
 
     opt.parse!(ARGV)
+    
+    LOG.info("connecting #{host}:#{port}")
 
     parser = Sql::Parser.new
     sql_syntax_tree =  parser.parse (q.strip)
@@ -52,7 +63,8 @@ EOS
       LOG.debug "reducer->\n"
       LOG.debug s.reducer
       
-      client = Riak::Client.new(:protocol => "http")
+      client = Riak::Client.new(:protocol => "http",
+                                :nodes => [{:host => host, :http_port => port}])
       bucket = Riak::MapReduce.new(client)
         .add(client.bucket(s.bucket))## keyfilsters and so on here
       

data/lib/mohair/inserter.rb

@@ -7,7 +7,9 @@ module Mohair
       @bucket_name = bucket_name
     end
     def insert_all objs
-      @client = Riak::Client.new(:protocol => "http")
+      @client = Riak::Client.new(:protocol => "http",
+                                :nodes => [
+                                           {:http_port => 10018}])
       bucket = @client.bucket(@bucket_name)
       if bucket.props["allow_mult"] then
         $stderr.puts "allow_mult should be false (how to handle siblilngs?)"

data/lib/mohair/selector.rb

@@ -48,6 +48,7 @@ function(v){
     ret.__key = key;
     <%= where %>
   };
+  //ejsLog('/tmp/map_reduce.log', JSON.stringify(v))
   var raw_obj = JSON.parse(v.values[0].data);
   if(raw_obj instanceof Array){
     var ret0 = [];

data/lib/mohair/sql/parser.rb

@@ -6,7 +6,8 @@ module Mohair
   module Sql
     class Parser < Parslet::Parser
       rule(:integer)    { match('[0-9]').repeat(1) }
-      #rule(:float)      { integer.repeat >> str('.') >> integer.maybe }
+      rule(:float)      { integer.repeat >> str('.') >> integer.maybe }
+      #rule(:numeric)    { integer | float | (str('-') >> numeric) }
 
       rule(:space)      { match('\s').repeat(1) }
       rule(:space?)     { space.maybe }
@@ -25,10 +26,17 @@ module Mohair
       #rule(:like)       { str('like') >> space? }
       rule(:binop)      { eq | neq | gt | lt | geq | leq | btw}
 
-      rule(:string)     { str('"') >> match('[a-zA-Z0-9]').repeat >> str('"') }
+      rule(:string)     {
+        str('"') >> 
+        (
+         str('\\') >> any |
+         str('"').absent? >> any
+         ).repeat >> 
+        str('"')
+      }
 
       rule(:const)      {
-        integer | string
+        integer | float | string
       }
       rule(:term)       { const | item }
 

data/lib/mohair/sql/select.rb

@@ -6,7 +6,9 @@ module Mohair
       @select = build_columns tree[:select]
       @from   = From.new tree[:from]
       @where  = Where.new tree[:where]
-      @group_by = Group.new tree[:group_by]
+      if tree[:group_by] then
+        @group_by = Group.new tree[:group_by]
+      end
       @agg = false
     end
 

data/lib/mohair/sql/tree.rb

@@ -110,43 +110,35 @@ module Mohair
       rhs = tree[:rhs]
       @op  = tree[:op].to_s
 
-      if lhs.class == Hash then
-        @lhs = Condition.new lhs
-      elsif (lhs.to_s =~ /^[0-9]+$/).nil? then
-        @lhs = lhs.to_s
+      @lhs = objectize lhs
+      @rhs = objectize rhs
+    end
+
+    def objectize s
+      if s.class == Hash then
+        Condition.new s
+      elsif (s.to_s =~ /^[0-9]+$/).nil? then
+        s.to_s
       else
-        @lhs = lhs.to_i
+        s.to_i
       end
+    end
 
-      if rhs.class == Hash then
-        @rhs = Condition.new rhs
-      elsif (rhs.to_s =~ /^[0-9]+$/).nil? then
-        @rhs = rhs.to_s
+    def jstify o
+      if o.class == Fixnum then
+        o
+      elsif o.class == Condition then
+        "( #{o.to_js} )"
+      elsif (o[0] == "\"" and o[-1] == "\"") then
+        o
       else
-        @rhs = rhs.to_i
+        "obj.#{o}"
       end
     end
 
     def to_js
-      lhs = rhs = nil
-      if @rhs.class == Fixnum then
-        rhs = @rhs
-      elsif @rhs.class == Condition then
-        rhs = "( #{@rhs.to_js} )"
-      elsif (@rhs[0] == "\"" and @rhs[-1] == "\"") then
-        rhs = @rhs
-      else
-        rhs = "obj.#{@rhs}"
-      end
-      if @lhs.class == Fixnum then
-        lhs = @lhs
-      elsif @lhs.class == Condition then
-        lhs = "( #{@lhs.to_js} )"
-      elsif (@lhs[0] == "\"" and @lhs[-1] == "\"") then
-        lhs = @lhs
-      else
-        lhs = "obj.#{@lhs}"
-      end
+      lhs = jstify @lhs
+      rhs = jstify @rhs
       " (#{lhs}) #{operator2str(@op)} (#{rhs}) "
     end
 

data/lib/mohair/version.rb

@@ -1,3 +1,3 @@
 module Mohair
-  VERSION = "0.0.3"
+  VERSION = "0.0.5"
 end

data/test/plugin/sql.rb

@@ -30,6 +30,7 @@ class ParserTest < MiniTest::Unit::TestCase
     [
      'select',
      ' select a from b',
+     'select a, b from c where a = "120.0, ~!@#$%^&*+_\}{\" asdfa"sf"',
      ].each do |bad_sql|
       assert_raises Parslet::ParseFailed do
         @parser.parse bad_sql
@@ -45,6 +46,10 @@ class ParserTest < MiniTest::Unit::TestCase
      'select a,b from c where 20 < a or b = 234',
      'select a, b from c where a = "oo"',
      'select a, b from c where a = "oo" and c > 235',
+     'select a, b from c where a = "120.0, ~!@#$%^&*+_\}{\" asdfasf"',
+     #'select a from b where a > 20.0',
+     #'select a from b where a > 0.0',
+     #'select a from b where a > -0',
     ].each do |where_sql|
       s = @parser.parse where_sql
       assert_equal(expected = "select", actual = s[:op])

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mohair
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - UENISHI Kota
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-05-25 00:00:00 Z
+date: 2013-06-01 00:00:00 Z
 dependencies: []
 
 description: a new type of Riak client