RubyGems - ruby-redis - Versions diffs - 0.0.1 → 0.0.2 - Mend

ruby-redis 0.0.1 → 0.0.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (43) hide show

data/README +16 -15
data/lib/redis.rb +6 -208
data/lib/redis/bin.rb +85 -35
data/lib/redis/bin.rbc +1953 -637
data/lib/redis/client.rb +196 -0
data/lib/redis/client.rbc +3983 -0
data/lib/redis/config.rb +19 -16
data/lib/redis/config.rbc +275 -178
data/lib/redis/connection.rb +9 -48
data/lib/redis/connection.rbc +157 -853
data/lib/redis/database.rb +32 -8
data/lib/redis/database.rbc +952 -381
data/lib/redis/hashes.rb +2 -4
data/lib/redis/hashes.rbc +104 -128
data/lib/redis/keys.rb +3 -6
data/lib/redis/keys.rbc +222 -240
data/lib/redis/lists.rb +4 -6
data/lib/redis/lists.rbc +310 -301
data/lib/redis/logger.rb +4 -16
data/lib/redis/logger.rbc +112 -122
data/lib/redis/protocol.rb +48 -109
data/lib/redis/protocol.rbc +1255 -2974
data/lib/redis/pubsub.rb +1 -4
data/lib/redis/pubsub.rbc +195 -179
data/lib/redis/reader.rb +28 -17
data/lib/redis/reader.rbc +748 -433
data/lib/redis/sender.rb +15 -17
data/lib/redis/sender.rbc +207 -218
data/lib/redis/server.rb +4 -6
data/lib/redis/server.rbc +90 -143
data/lib/redis/sets.rb +1 -2
data/lib/redis/sets.rbc +144 -146
data/lib/redis/strict.rb +1 -3
data/lib/redis/strict.rbc +79 -104
data/lib/redis/strings.rb +4 -6
data/lib/redis/strings.rbc +193 -215
data/lib/redis/synchrony.rb +17 -24
data/lib/redis/version.rb +2 -4
data/lib/redis/version.rbc +18 -63
data/lib/redis/zsets.rb +1 -3
data/lib/redis/zsets.rbc +339 -296
metadata +8 -7
data/bin/ruby-redis.compiled.rbc +0 -243

data/lib/redis/reader.rb CHANGED Viewed

@@ -1,29 +1,39 @@
-require File.expand_path '../redis', File.dirname(__FILE__)
-class Redis
-  # This is almost as fast as hiredis/reader plus it supports servers
+module Redis
   class Reader < Array
     # Minimize the amount of memory copying. The primary
     # performance trick is to String#split and work with that.
+    # This is almost as fast as hiredis/reader plus it supports servers
-    #TODO configurable limits
-    #TODO max buffer size based on limits
-    def initialize
+    def initialize options={}
       super()
+      @multibulk_limit = options[:multibulk_limit] || 1024*1024
+      @bulk_limit = options[:bulk_limit] || 512*1024*1024
+      @buffer_overflow = false
       flush
     end
-    alias :feed :push
+    def feed data
+      return if @buffer_overflow
+      if reduce(0){|t,e|t+e.bytesize} > @bulk_limit + 2
+        @buffer_overflow = true
+        flush
+        return
+      end
+      push data
+    end
     def gets
+      raise 'buffer overflow' if @buffer_overflow
       if @completed.empty?
         unshift_split if @split
         frame do |str|
           @elements << str
-          if @remaining > 0
+          if @remaining != 0
+            if @remaining < 0
+              @remaining = -@remaining
+              @elements = str
+            end
             @remaining -= 1
             if @remaining == 0 and !@stack.empty?
               elements = @elements
@@ -33,8 +43,6 @@ class Redis
             end
             next unless @remaining == 0
             @completed << @elements
-          elsif @remaining < 0
-            @completed << nil
           elsif !@elements.empty?
             @completed << @elements[0]
           end
@@ -85,9 +93,12 @@ class Redis
           when '*'
             prev_remaining = @remaining
             @remaining = line[1..-1].to_i
-            if @remaining == -1
+            if @remaining == 0
+              @remaining = -1
+              yield []
+            elsif @remaining == -1
               yield nil
-            elsif @remaining > 1024*1024
+            elsif @remaining > @multibulk_limit
               flush
               raise 'invalid multibulk length'
             elsif prev_remaining > 0
@@ -99,14 +110,14 @@ class Redis
             if @binary_size == -1
               @binary_size = nil
               yield nil
-            elsif (@binary_size == 0 and line[1..1] != '0') or @binary_size < 0 or @binary_size > 512*1024*1024
+            elsif (@binary_size == 0 and line[1..1] != '0') or @binary_size < 0 or @binary_size > @bulk_limit
               flush
               raise 'invalid bulk length'
             end
           else
             if @remaining > 0
               flush
-              raise "expected '$', got '#{line[0].chr}'"
+              raise "expected \"$\", got #{line[0].chr.dump}"
             end
             parts = line.split(' ')
             @remaining = parts.size

data/lib/redis/reader.rbc CHANGED Viewed

@@ -9,57 +9,31 @@ x
 10
 __script__
 i
-54
-5
-45
-0
-1
+28
+99
 7
-2
-64
-45
 0
-3
 65
 49
-4
-0
-49
-5
 1
-49
-6
 2
-47
-49
-7
-1
-15
-99
-7
-8
-1
-65
-49
-9
-3
 13
 99
 12
 7
-10
+2
 12
 7
-11
+3
 12
 65
 12
 49
-12
+4
 4
 15
 49
-10
+2
 0
 15
 2
@@ -74,36 +48,16 @@ I
 0
 n
 p
-13
-x
-4
-File
-n
-s
-8
-../redis
-n
-x
-11
-active_path
-x
-7
-dirname
-x
-11
-expand_path
-x
-7
-require
+5
 x
 5
 Redis
 x
-10
-open_class
+11
+open_module
 x
-14
-__class_init__
+15
+__module_init__
 M
 1
 n
@@ -317,54 +271,165 @@ x
 10
 initialize
 i
-9
+74
+23
+0
+10
+14
+44
+43
+0
+78
+49
+1
+1
+19
+0
+15
 54
 52
+2
 0
+15
+20
 0
+7
+3
+49
+4
+1
+13
+10
+37
 15
+7
 5
-48
+7
+5
+49
+6
 1
+38
+7
+15
+20
+0
+7
+8
+49
+4
+1
+13
+10
+63
+15
+7
+9
+7
+5
+49
+6
+1
+7
+5
+49
+6
+1
+38
+10
+15
+3
+38
+11
+15
+5
+48
+12
 11
 I
-1
+3
 I
-0
+1
 I
 0
 I
-0
+1
 n
 p
-2
+13
+x
+4
+Hash
+x
+16
+new_from_literal
 x
 10
 initialize
 x
+15
+multibulk_limit
+x
+2
+[]
+I
+400
+x
+1
+*
+x
+16
+@multibulk_limit
+x
+10
+bulk_limit
+I
+200
+x
+11
+@bulk_limit
+x
+16
+@buffer_overflow
+x
 5
 flush
 p
-7
+13
 I
 -1
 I
+8
+I
 e
 I
-0
+9
 I
-f
+13
 I
-5
+a
 I
-10
+28
 I
-9
+b
+I
+42
+I
+c
+I
+46
+I
+d
+I
+4a
 x
 52
 /Users/dturnbull/ruby/ruby-redis/lib/redis/reader.rb
 p
-0
+1
+x
+7
+options
 x
 17
 method_visibility
@@ -382,16 +447,46 @@ x
 4
 feed
 i
-19
+49
 39
 0
 9
+8
+1
+11
+8
 9
+1
+15
+5
+78
+56
+1
+47
+50
+2
+1
+39
+3
+80
+81
+4
+85
+5
+9
+39
+2
+38
+0
+15
 5
 48
+6
+15
 1
+11
 8
-10
+40
 1
 15
 5
@@ -399,11 +494,11 @@ i
 0
 47
 49
-2
+7
 1
 11
 I
-3
+4
 I
 1
 I
@@ -412,36 +507,142 @@ I
 1
 n
 p
+8
+x
+16
+@buffer_overflow
+M
+1
+p
+2
+x
+9
+for_block
+t
+n
+x
+4
+feed
+i
+20
+58
+37
+19
+0
+15
+37
+19
+1
+15
+15
+20
+0
+20
+1
+49
+0
+0
+81
+1
+11
+I
+5
+I
+2
+I
+2
+I
+2
+n
+p
+2
+x
+8
+bytesize
+x
+1
++
+p
 3
+I
+0
+I
+12
+I
+14
+x
+52
+/Users/dturnbull/ruby/ruby-redis/lib/redis/reader.rb
+p
+2
+x
+1
+t
+x
+1
+e
 x
 6
-@split
+reduce
 x
-13
-unshift_split
+11
+@bulk_limit
+x
+1
++
+x
+1
+>
+x
+5
+flush
 x
 4
 push
 p
-9
+21
 I
 -1
 I
-13
+10
 I
 0
 I
-14
+11
 I
-a
+9
 I
 0
 I
-b
+a
 I
-15
+12
+I
+1b
 I
 13
+I
+1f
+I
+14
+I
+23
+I
+15
+I
+27
+I
+12
+I
+28
+I
+0
+I
+29
+I
+17
+I
+31
 x
 52
 /Users/dturnbull/ruby/ruby-redis/lib/redis/reader.rb
@@ -461,32 +662,69 @@ x
 4
 gets
 i
-27
+64
+39
+0
+9
+14
 5
-56
+7
+1
+64
+47
+49
+2
+1
+8
+15
+1
+15
+39
+3
+49
+4
 0
+9
+43
+39
+5
+9
+32
+5
+48
+6
+8
+33
+1
+15
+5
+56
+7
 47
 50
-1
+8
 0
+8
+44
+1
 15
 39
-2
-49
 3
+49
+4
 0
 9
-19
+56
 3
 11
 8
-20
+57
 1
 15
 39
-2
+3
 49
-4
+9
 0
 11
 I
@@ -499,7 +737,28 @@ I
 0
 n
 p
+10
+x
+16
+@buffer_overflow
+s
+15
+buffer overflow
+x
 5
+raise
+x
+10
+@completed
+x
+6
+empty?
+x
+6
+@split
+x
+13
+unshift_split
 M
 1
 p
@@ -513,7 +772,7 @@ x
 4
 gets
 i
-164
+172
 57
 19
 0
@@ -529,15 +788,67 @@ i
 39
 2
 78
-85
+83
 3
 9
-112
+48
+39
+0
+49
+4
+0
+10
+29
+2
+8
+30
+3
+9
+45
+39
+5
+39
+0
+78
+49
+6
+1
+49
+1
+1
+8
+46
+1
+8
+162
+39
+2
+78
+84
+7
+9
+69
+39
+2
+49
+8
+0
+38
+2
+15
+20
+0
+38
+0
+8
+70
+1
+15
 39
 2
 79
 82
-4
+9
 38
 2
 15
@@ -545,33 +856,33 @@ i
 2
 78
 83
-5
+3
 13
 9
-47
+99
 15
 39
-6
+10
 49
-7
+4
 0
 10
-46
+98
 2
 8
-47
+99
 3
 9
-88
+140
 39
 0
 19
 1
 15
 39
-6
+10
 49
-8
+11
 0
 97
 37
@@ -597,77 +908,33 @@ i
 2
 79
 82
-4
+9
 38
 2
 8
-89
+141
 1
 15
 39
 2
 78
 83
-5
+3
 9
-100
+152
 1
 8
-102
+154
 1
 11
 15
 39
-9
-39
-0
-49
-1
-1
-8
-154
-39
-2
-78
-84
-10
-9
-127
-39
-9
-1
-49
-1
-1
-8
-154
-39
-0
-49
-7
-0
-10
-137
-2
-8
-138
-3
-9
-153
-39
-9
+5
 39
 0
-78
-49
-11
-1
 49
 1
 1
-8
-154
-1
 15
 35
 0
@@ -699,110 +966,118 @@ x
 10
 @remaining
 x
-1
->
-x
-1
--
-x
 2
 ==
 x
 6
-@stack
-x
-6
 empty?
 x
-3
-pop
-x
 10
 @completed
 x
+2
+[]
+x
 1
 <
 x
 2
-[]
+-@
+x
+1
+-
+x
+6
+@stack
+x
+3
+pop
 p
-45
+53
 I
 0
 I
-1c
+1e
 I
 4
 I
-1d
+1f
 I
 c
 I
-1e
+20
 I
 13
 I
-1f
-I
-1b
+2e
 I
 20
 I
-31
+2f
+I
+2d
+I
+2e
+I
+2e
+I
+0
+I
+30
 I
 21
 I
-36
+37
 I
 22
 I
-47
+3f
 I
 23
 I
-4f
-I
-24
-I
-58
+45
 I
-20
+21
 I
-59
+46
 I
 0
 I
-5a
+47
 I
-26
+25
 I
-66
+4f
 I
-0
+26
 I
-67
+65
 I
 27
 I
-70
+6a
 I
 28
 I
-77
+7b
 I
 29
 I
-7f
+83
 I
 2a
 I
 8c
 I
-2b
+26
 I
-99
+8d
 I
-2a
+0
+I
+8e
+I
+2c
 I
 9a
 I
@@ -812,11 +1087,19 @@ I
 I
 2d
 I
-a0
+a2
 I
-2e
+0
+I
+a3
+I
+31
 I
-a4
+a8
+I
+32
+I
+ac
 x
 52
 /Users/dturnbull/ruby/ruby-redis/lib/redis/reader.rb
@@ -832,38 +1115,60 @@ x
 5
 frame
 x
-10
-@completed
-x
-6
-empty?
-x
 5
 shift
 p
-11
+25
 I
 -1
 I
+1a
+I
+0
+I
 1b
 I
+f
+I
 0
 I
+10
+I
 1c
 I
-8
+17
 I
-30
+1d
 I
-14
+21
 I
 0
 I
-15
+22
 I
-31
+1e
 I
-1b
+2b
+I
+1c
+I
+2c
+I
+0
+I
+2d
+I
+35
+I
+39
+I
+0
+I
+3a
+I
+36
+I
+40
 x
 52
 /Users/dturnbull/ruby/ruby-redis/lib/redis/reader.rb
@@ -959,39 +1264,39 @@ p
 I
 -1
 I
-36
+3b
 I
 0
 I
-37
+3c
 I
 4
 I
-38
+3d
 I
 8
 I
-39
+3e
 I
 c
 I
-3a
+3f
 I
 10
 I
-3b
+40
 I
 15
 I
-3c
+41
 I
 1a
 I
-3d
+42
 I
 1f
 I
-3e
+43
 I
 23
 x
@@ -1058,15 +1363,15 @@ p
 I
 -1
 I
-41
+46
 I
 0
 I
-42
+47
 I
 e
 I
-43
+48
 I
 12
 x
@@ -1085,10 +1390,10 @@ x
 5
 frame
 i
-492
+495
 2
 9
-490
+493
 39
 0
 9
@@ -1112,7 +1417,7 @@ i
 27
 1
 8
-491
+494
 15
 1
 38
@@ -1123,7 +1428,7 @@ i
 60
 1
 8
-486
+489
 5
 48
 2
@@ -1139,7 +1444,7 @@ i
 54
 1
 8
-491
+494
 15
 20
 1
@@ -1218,7 +1523,7 @@ i
 60
 1
 8
-486
+489
 13
 7
 12
@@ -1246,7 +1551,7 @@ i
 60
 1
 8
-486
+489
 13
 7
 13
@@ -1277,7 +1582,7 @@ i
 60
 1
 8
-486
+489
 13
 7
 15
@@ -1287,7 +1592,7 @@ i
 7
 1
 9
-294
+306
 15
 39
 16
@@ -1315,81 +1620,93 @@ i
 15
 39
 16
+78
+83
+17
+9
+244
+77
+38
+16
+15
+35
+0
+60
+1
+8
+304
+39
+16
 77
 83
 17
 9
-239
+256
 1
 60
 1
 8
-292
+304
 39
 16
-7
-18
-7
+39
 18
-49
-19
-1
 85
-20
+19
 9
-266
+278
 5
 48
-21
+20
 15
 5
 7
-22
+21
 64
 47
 49
-23
+22
 1
 8
-292
+304
 20
 2
 78
 85
-20
+19
 9
-291
+303
 39
-24
+23
 39
-25
+24
 20
 2
 35
 2
 49
-26
+25
 1
 15
 35
 0
 38
-25
+24
 8
-292
+304
 1
 8
-486
+489
 13
 7
-27
+26
 64
 12
 49
 7
 1
 9
-421
+423
 15
 20
 1
@@ -1416,7 +1733,7 @@ i
 83
 17
 9
-340
+352
 1
 38
 0
@@ -1425,7 +1742,7 @@ i
 60
 1
 8
-419
+421
 39
 0
 78
@@ -1433,7 +1750,7 @@ i
 17
 13
 9
-373
+385
 15
 20
 1
@@ -1449,79 +1766,69 @@ i
 5
 1
 7
-28
+27
 64
 83
 17
 10
-372
+384
 2
 8
-373
+385
 3
 13
 10
-402
+404
 15
 39
 0
 78
 84
-29
+28
 13
 10
-402
+404
 15
 39
 0
-7
-30
-7
-18
-49
-19
-1
-7
-18
-49
-19
-1
+39
+29
 85
-20
+19
 9
-418
+420
 5
 48
-21
+20
 15
 5
 7
-31
+30
 64
 47
 49
-23
+22
 1
 8
-419
+421
 1
 8
-486
+489
 15
 39
 16
 78
 85
-20
+19
 9
-458
+461
 5
 48
-21
+20
 15
 5
 7
-32
+31
 20
 1
 78
@@ -1529,30 +1836,31 @@ i
 5
 1
 49
+32
+0
+49
 33
 0
 47
 101
 34
-7
-35
 63
-3
+2
 47
 49
-23
+22
 1
 8
-459
+462
 1
 15
 20
 1
 7
-36
+35
 64
 49
-37
+36
 1
 19
 3
@@ -1560,7 +1868,7 @@ i
 20
 3
 49
-38
+37
 0
 38
 16
@@ -1568,9 +1876,9 @@ i
 20
 3
 56
-39
+38
 50
-40
+39
 0
 15
 68
@@ -1588,7 +1896,7 @@ I
 0
 n
 p
-41
+40
 x
 12
 @binary_size
@@ -1641,11 +1949,9 @@ x
 x
 2
 ==
-I
-400
 x
-1
-*
+16
+@multibulk_limit
 x
 1
 >
@@ -1676,25 +1982,26 @@ s
 x
 1
 <
-I
-200
+x
+11
+@bulk_limit
 s
 19
 invalid bulk length
 s
-19
-expected '$', got '
+18
+expected "$", got
 x
 3
 chr
 x
 4
+dump
+x
+4
 to_s
 s
 1
-'
-s
-1
 x
 5
@@ -1741,7 +2048,7 @@ p
 I
 0
 I
-74
+7c
 I
 9
 x
@@ -1756,27 +2063,27 @@ x
 4
 each
 p
-101
+107
 I
 -1
 I
-47
+4c
 I
 0
 I
-48
+4d
 I
 3
 I
-49
+4e
 I
 7
 I
-4a
+4f
 I
 11
 I
-4b
+50
 I
 1b
 I
@@ -1784,19 +2091,19 @@ I
 I
 1c
 I
-4c
+51
 I
 20
 I
-4d
+52
 I
 26
 I
-4f
+54
 I
 2c
 I
-50
+55
 I
 36
 I
@@ -1804,161 +2111,173 @@ I
 I
 37
 I
-51
+56
 I
 44
 I
-52
+57
 I
 4f
 I
-53
+58
 I
 85
 I
-54
+59
 I
 90
 I
-55
+5a
 I
 a1
 I
-56
+5b
 I
 ac
 I
-57
+5c
 I
 c0
 I
-58
+5d
 I
 cb
 I
-59
+5e
 I
 d0
 I
-5a
+5f
 I
 e3
 I
-5b
+60
 I
 ea
 I
-5c
+61
 I
-ef
+ee
 I
-5d
+62
 I
-fc
+f4
 I
-5e
+63
+I
+fb
+I
+64
 I
 100
 I
-5f
+65
 I
-10a
+108
 I
-60
+66
 I
-111
+10c
 I
-61
+67
+I
+116
+I
+68
 I
 11d
 I
-62
+69
 I
-123
+129
 I
-60
+6a
+I
+12f
 I
-124
+68
+I
+130
 I
 0
 I
-126
+132
 I
-64
+6c
 I
-131
+13d
 I
-65
+6d
 I
-144
+150
 I
-66
+6e
 I
-14b
+157
 I
-67
+6f
 I
-14f
+15b
 I
-68
+70
 I
-154
+160
 I
-69
+71
 I
-194
+196
 I
-6a
+72
 I
-198
+19a
 I
-6b
+73
 I
-1a2
+1a4
 I
-69
+71
 I
-1a3
+1a5
 I
 0
 I
-1a6
+1a8
 I
-6e
+76
 I
-1ad
+1af
 I
-6f
+77
 I
-1b1
+1b3
 I
-70
+78
 I
-1ca
+1cd
 I
-6e
+76
 I
-1cb
+1ce
 I
 0
 I
-1cc
+1cf
 I
-72
+7a
 I
-1d7
+1da
 I
-73
+7b
 I
-1df
+1e2
 I
-74
+7c
 I
-1e6
+1e9
 I
 0
 I
-1ec
+1ef
 x
 52
 /Users/dturnbull/ruby/ruby-redis/lib/redis/reader.rb
@@ -2308,7 +2627,7 @@ p
 I
 0
 I
-85
+8d
 I
 14
 x
@@ -2357,23 +2676,23 @@ p
 I
 -1
 I
-7b
+83
 I
 0
 I
-7c
+84
 I
 4
 I
-7d
+85
 I
 13
 I
-7e
+86
 I
 28
 I
-7f
+87
 I
 38
 I
@@ -2381,11 +2700,11 @@ I
 I
 39
 I
-80
+88
 I
 3e
 I
-7d
+85
 I
 3f
 I
@@ -2393,11 +2712,11 @@ I
 I
 40
 I
-82
+8a
 I
 45
 I
-7c
+84
 I
 46
 I
@@ -2405,15 +2724,15 @@ I
 I
 47
 I
-84
+8c
 I
 4e
 I
-85
+8d
 I
 59
 I
-86
+8e
 I
 67
 I
@@ -2421,35 +2740,35 @@ I
 I
 68
 I
-87
+8f
 I
 6e
 I
-88
+90
 I
 72
 I
-89
+91
 I
 7b
 I
-8a
+92
 I
 82
 I
-8b
+93
 I
 8b
 I
-8c
+94
 I
 a8
 I
-8d
+95
 I
 c0
 I
-8a
+92
 I
 c1
 I
@@ -2457,7 +2776,7 @@ I
 I
 c2
 I
-91
+99
 I
 cc
 I
@@ -2465,15 +2784,15 @@ I
 I
 cd
 I
-92
+9a
 I
 d5
 I
-93
+9b
 I
 d9
 I
-94
+9c
 I
 dc
 x
@@ -2631,19 +2950,19 @@ p
 I
 -1
 I
-98
+a0
 I
 0
 I
-99
+a1
 I
 7
 I
-9a
+a2
 I
 14
 I
-9b
+a3
 I
 17
 I
@@ -2651,15 +2970,15 @@ I
 I
 18
 I
-9d
+a5
 I
 22
 I
-9e
+a6
 I
 31
 I
-a0
+a8
 I
 34
 I
@@ -2667,7 +2986,7 @@ I
 I
 35
 I
-a2
+aa
 I
 45
 I
@@ -2675,7 +2994,7 @@ I
 I
 46
 I
-a3
+ab
 I
 49
 x
@@ -2691,39 +3010,39 @@ p
 I
 2
 I
-e
+8
 I
 10
 I
-13
+10
 I
 1e
 I
-1b
+1a
 I
 2c
 I
-34
+39
 I
 30
 I
-36
+3b
 I
 3e
 I
-41
+46
 I
 4c
 I
-47
+4c
 I
 5a
 I
-7b
+83
 I
 68
 I
-98
+a0
 I
 76
 x
@@ -2739,7 +3058,7 @@ p
 I
 2
 I
-6
+2
 I
 1f
 x
@@ -2751,17 +3070,13 @@ x
 13
 attach_method
 p
-5
+3
 I
 0
 I
 1
 I
-19
-I
-3
-I
-36
+1c
 x
 52
 /Users/dturnbull/ruby/ruby-redis/lib/redis/reader.rb