1. 29 6月, 2015 4 次提交
  2. 27 6月, 2015 3 次提交
  3. 26 6月, 2015 1 次提交
    • A
      Geo: from lat,lon API to lon,lat API according to GIS standard · fa9d62d3
      antirez 提交于
      The GIS standard and all the major DBs implementing GIS related
      functions take coordinates as x,y that is longitude,latitude.
      It was a bad start for Redis to do things differently, so even if this
      means that existing users of the Geo module will be required to change
      their code, Redis now conforms to the standard.
      
      Usually Redis is very backward compatible, but this is not an exception
      to this rule, since this is the first Geo implementation entering the
      official Redis source code. It is not wise to try to be backward
      compatible with code forks... :-)
      
      Close #2637.
      fa9d62d3
  4. 24 6月, 2015 5 次提交
    • A
      Geo: explain increment magic in membersOfGeoHashBox(). · 03ce1896
      antirez 提交于
      03ce1896
    • A
      Geo: GEOHASH command test. · 5fd756bf
      antirez 提交于
      5fd756bf
    • A
      87521f44
    • A
      Geo: Fix geohashEstimateStepsByRadius() step underestimation. · 55c4a365
      antirez 提交于
      The returned step was in some case not enough towards normal
      coordinates (for example when our search position was was already near the
      margin of the central area, and we had to match, using the east or west
      neighbor, a very far point). Example:
      
          geoadd points 67.575457940146066 -62.001317572780565 far
          geoadd points 66.685439060295664 -58.925040587282297 center
          georadius points 66.685439060295664 -58.925040587282297 200 km
      
      In the above case the code failed to find a match (happens at smaller
      latitudes too) even if far and center are at less than 200km.
      
      Another fix introduced by this commit is a progressively larger area
      towards the poles, since meridians are a lot less far away, so we need
      to compensate for this.
      
      The current implementation works comparably to the Tcl brute-force
      stress tester implemented in the fuzzy test in the geo.tcl unit for
      latitudes between -70 and 70, and is pretty accurate over +/-80 too,
      with sporadic false negatives.
      
      A more mathematically clean implementation is possible by computing the
      meridian distance at the specified latitude and computing the step
      according to it.
      55c4a365
    • A
      Geo: GEORADIUS fuzzy testing by reimplementing it in Tcl. · cf89a19f
      antirez 提交于
      We set random points in the world, pick a random position, and check if
      the returned points by Redis match the ones computed by Tcl by brute
      forcing all the points using the distance between two points formula.
      
      This approach is sounding since immediately resulted in finding a bug in
      the original implementation.
      cf89a19f
  5. 23 6月, 2015 7 次提交
    • A
      Geo: return REDIS_* where appropriate, improve commenting · 8d5ad19d
      antirez 提交于
      8d5ad19d
    • A
      Geo: test GEOADD with wrong input coordinates · 0425c603
      antirez 提交于
      0425c603
    • A
      Geo: GEOADD implementation improved, replication fixed · bb328456
      antirez 提交于
      1. We no longer use a fake client but just rewriting.
      2. We group all the inserts into a single ZADD dispatch (big speed win).
      3. As a side effect of the correct implementation, replication works.
      4. The return value of the command is now correct.
      bb328456
    • A
      Geo: more x,y renamed lat,lon · ae5fd115
      antirez 提交于
      ae5fd115
    • A
      Geo: rename x,y to lat,lon for clarity · a3018a21
      antirez 提交于
      a3018a21
    • A
      51b4a472
    • A
      Geo: big refactoring of geo.c, zset.[ch] removed. · 0b931390
      antirez 提交于
      This commit simplifies the implementation in a few ways:
      
      1. zsetScore implementation improved a bit and moved into t_zset.c where
         is now also used to implement the ZSCORE command.
      
      2. Range extraction from the sorted set remains a separated
         implementation from the one in t_zset.c, but was hyper-specialized in
         order to avoid accumulating results into a list and remove the ones
         outside the radius.
      
      3. A new type is introduced: geoArray, which can accumulate geoPoint
         structures in a vector with power of two expansion policy. This is
         useful since we have to call qsort() against it before returning the
         result to the user.
      
      4. As a result of 1, 2, 3, the two files zset.c and zset.h are now
         removed, including the function to merge two lists (now handled with
         functions that can add elements to existing geoArray arrays) and
         the machinery used in order to pass zset results.
      
      5. geoPoint structure simplified because of the general code structure
         simplification, so we no longer need to take references to objects.
      
      6. Not counting the JSON removal the refactoring removes 200 lines of
         code for the same functionalities, with a simpler to read
         implementation.
      
      7. GEORADIUS is now 2.5 times faster testing with 10k elements and a
         radius resulting in 124 elements returned. However this is mostly a
         side effect of the refactoring and simplification. More speed gains
         can be achieved by trying to optimize the code.
      0b931390
  6. 22 6月, 2015 10 次提交
    • A
      Geo: compile again with optimizations · 3d9031ed
      antirez 提交于
      For some reason the Geo PR included disabling the fact that Redis is
      compiled with optimizations. Apparently it was just @mattsta attempt to
      speedup the modify-compile-test iteration and there are no other
      reasons.
      3d9031ed
    • A
      Geo: zsetScore refactoring · 9fc47ddf
      antirez 提交于
      Now used both in geo.c and t_zset to provide ZSCORE.
      9fc47ddf
    • A
      Geo: fix tests after distance precision change · 575e247a
      antirez 提交于
      575e247a
    • A
      Geo: Pub/Sub feature removed · 2f665507
      antirez 提交于
      This feature apparently is not going to be very useful, to send a
      GEOADD+PUBLISH combo is exactly the same. One that would make a ton of
      difference is the ability to subscribe to a position and a radius, and
      get the updates in terms of objects entering/exiting the area.
      2f665507
    • A
      Geo: addReplyDoubleDistance() precision set to 4 digits · fc03d08e
      antirez 提交于
      Also:
      1. The function was renamed.
      2. An useless initialization of a buffer was removed.
      fc03d08e
    • A
      Geo: JSON features removed · b18c68aa
      antirez 提交于
      The command can only return data in the normal Redis protocol. It is up
      to the caller to translate to JSON if needed.
      b18c68aa
    • A
      Geo: removed bool usage from Geo code inside Redis · f193b3ca
      antirez 提交于
      f193b3ca
    • A
      Geo: removed JSON failing test (false positive) · 73134f6a
      antirez 提交于
      Server output is matched to a pre-computed output. The last digits
      differ because of rouding errors.
      73134f6a
    • A
      5e46e8a5
    • M
      [In-Progress] Add Geo Commands · 7f4ac3d1
      Matt Stancliff 提交于
      Current todo:
        - replace functions in zset.{c,h} with a new unified Redis
          zset access API.
      
      Once we get the zset interface fixed, we can squash
      relevant commits in this branch and have one nice commit
      to merge into unstable.
      
      This commit adds:
        - Geo commands
        - Tests; runnable with: ./runtest --single unit/geo
        - Geo helpers in deps/geohash-int/
        - src/geo.{c,h} and src/geojson.{c,h} implementing geo commands
        - Updated build configurations to get everything working
        - TEMPORARY: src/zset.{c,h} implementing zset score and zset
          range reading without writing to client output buffers.
        - Modified linkage of one t_zset.c function for use in zset.c
      
      Conflicts:
      	src/Makefile
      	src/redis.c
      7f4ac3d1
  7. 13 6月, 2015 1 次提交
    • A
      Sentinel: fix bug in config rewriting during failover · 821a9866
      antirez 提交于
      We have a check to rewrite the config properly when a failover is in
      progress, in order to add the current (already failed over) master as
      slave, and don't include in the slave list the promoted slave itself.
      
      However there was an issue, the variable with the right address was
      computed but never used when the code was modified, and no tests are
      available for this feature for two reasons:
      
      1. The Sentinel unit test currently does not test Sentinel ability to
      persist its state at all.
      2. It is a very hard to trigger state since it lasts for little time in
      the context of the testing framework.
      
      However this feature should be covered in the test in some way.
      
      The bug was found by @badboy using the clang static analyzer.
      
      Effects of the bug on safety of Sentinel
      ===
      
      This bug results in severe issues in the following case:
      
      1. A Sentinel is elected leader.
      2. During the failover, it persists a wrong config with a known-slave
      entry listing the master address.
      3. The Sentinel crashes and restarts, reading invalid configuration from
      disk.
      4. It sees that the slave now does not obey the logical configuration
      (should replicate from the current master), so it sends a SLAVEOF
      command to the master (since the slave master is the same) creating a
      replication loop (attempt to replicate from itself) which Redis is
      currently unable to detect.
      5. This means that the master is no longer available because of the bug.
      
      However the lack of availability should be only transient (at least
      in my tests, but other states could be possible where the problem
      is not recovered automatically) because:
      
      6. Sentinels treat masters reporting to be slaves as failing.
      7. A new failover is triggered, and a slave is promoted to master.
      
      Bug lifetime
      ===
      
      The bug is there forever. Commit 16237d78 actually tried to fix the bug
      but in the wrong way (the computed variable was never used! My fault).
      So this bug is there basically since the start of Sentinel.
      
      Since the bug is hard to trigger, I remember little reports matching
      this condition, but I remember at least a few. Also in automated tests
      where instances were stopped and restarted multiple times automatically
      I remember hitting this issue, however I was not able to reproduce nor
      to determine with the information I had at the time what was causing the
      issue.
      821a9866
  8. 11 6月, 2015 5 次提交
    • S
      Merge pull request #2614 from linfangrong/patch-1 · 4b5a0f03
      Salvatore Sanfilippo 提交于
      Update t_zset.c
      4b5a0f03
    • A
      Use best effort address binding to connect to the master · 8366907b
      antirez 提交于
      We usually want to reach the master using the address of the interface
      Redis is bound to (via the "bind" config option). That's useful since
      the master will get (and publish) the slave address getting the peer
      name of the incoming socket connection from the slave.
      
      However, when this is not possible, for example because the slave is
      bound to the loopback interface but repliaces from a master accessed via
      an external interface, we want to still connect with the master even
      from a different interface: in this case it is not really important that
      the master will provide any other address, while it is vital to be able
      to replicate correctly.
      
      Related to issues #2609 and #2612.
      8366907b
    • A
      anet.c: new API anetTcpNonBlockBestEffortBindConnect() · a017b7ec
      antirez 提交于
      This performs a best effort source address binding attempt. If it is
      possible to bind the local address and still have a successful
      connect(), then this socket is returned. Otherwise the call is retried
      without source address binding attempt.
      
      Related to issues #2609 and #2612.
      a017b7ec
    • A
      anetTcpGenericConnect(), jump to error not end on error · 8fa8b251
      antirez 提交于
      Two code paths jumped to the "ok, return the socket to the user" code
      path to handle error conditions.
      
      Related to issues #2609 and #2612.
      8fa8b251
    • A
      Don't try to bind the source address for MIGRATE · a401a84e
      antirez 提交于
      Related to issues #2609 and #2612.
      a401a84e
  9. 03 6月, 2015 3 次提交
  10. 02 6月, 2015 1 次提交