Commit Graph

1266 Commits

Author SHA1 Message Date
Christoph Strobl
7024ef33e0 DATAREDIS-468 - Guard multi/exec bocks in RedisCache to allow usage with cluster.
We now guard multi/exec blocks by checking the connection type. This allows to skip those commands when running in cluster.

Original pull request: #173.
2016-02-26 09:07:02 +01:00
Christoph Strobl
02742e3b49 DATAREDIS-467 - Fix cluster multi key commands.
We moved away from returning raw map types and now return dedicated objects for command executions in cluster environment. This allows to maintain node information and collecting results from each and every callback. MGET now returns values according to the key position.

Additionally we now prefix info commands in the cluster with the nodes host:port.

Original pull request: #174.
2016-02-26 08:46:05 +01:00
Oliver Gierke
6f26a5a073 DATAREDIS-459 - Updated changelog. 2016-02-23 14:27:25 +01:00
Christoph Strobl
1e5772d00b DATAREDIS-462 - Polishing.
Updated javadoc, fixed indentation, organize imports and some minor refactoring.

Original Pull Request: #169
2016-02-18 07:41:23 +01:00
Mark Paluch
b58c18f85b DATAREDIS-462 - Support lettuce ClientResources.
Add ClientResources to LettuceConnectionFactory. Add TestClientResources for managed resources during tests and reuse ClientResources as much as possible in tests.

Original Pull Request: #169
2016-02-17 17:26:20 +01:00
Christoph Strobl
0fa1319b8f DATAREDIS-465 - Guard lettuce client shutdown during ConnectionFactory.destroy.
We now guard and log errors during lettuce client shutdown when destroying the ConnectionFactory on ApplicationContext shutdown.
2016-02-17 17:26:20 +01:00
Christoph Strobl
30b06a9202 DATAREDIS-463 - Prevent tests cleanup from failing.
Use more general Exception during tearDown to prevent tests from failing.
2016-02-17 17:26:20 +01:00
Mark Paluch
cc6bde665a DATAREDIS-463 - Improve test synchronization.
Several tests rely heavily on time to perform synchronization. Therfore we remove Thread.sleep from tests which do not require a sleep at all, use a condition where possible and increase timeouts on tests known to fail very likely due to a short Thread.sleep.

Original Pull Request: #171
2016-02-17 15:26:46 +01:00
Christoph Strobl
bdea5f6544 DATAREDIS-415 - Polishing.
Update license headers and fix minor code format issues.

Original Pull Request: #168
2016-02-17 10:00:16 +01:00
Mark Paluch
7da09eaa51 DATAREDIS-415 - Handle InterruptedException correctly in RedisMessageListenerContainer.
Set interrupted bit when catching InterruptedException. Exit loops when catching InterruptedException to free resources.

Original Pull Request: #168
2016-02-17 09:59:36 +01:00
Mark Paluch
80f8867763 DATAREDIS-464 - Enhance JavaDoc on RedisStringCommands and StringRedisConnection. 2016-02-16 15:20:54 +01:00
Mark Paluch
1151bcf136 DATAREDIS-316 - Polishing.
Extend JavaDoc documentation. Spelling fixes. Add Expiration.from factory method to create Expiration from all available time units.

Original pull request: #170.
2016-02-16 15:14:26 +01:00
Christoph Strobl
0c6c127b5e DATAREDIS-316 - Add EX/PX, NX/XX options to SET command.
We now support EX/PX and NX/XX arguments along with the SET command for both xetorthio/jedis and mp911de/lettuce.

Jedis 2.8 does not support all combinations of EX/PX and NX/XX. To work around those limitations we delegate to the according set methods to execute related commands or fail fast if there is no way for delegation.

Original pull request: #170.
2016-02-16 15:14:14 +01:00
Oliver Gierke
a02f266fec DATAREDIS-447 - Prepare 1.7 M1 (Hopper). 2016-02-12 15:36:20 +01:00
Oliver Gierke
8b202393ef DATAREDIS-447 - Updated changelog. 2016-02-12 15:36:15 +01:00
Christoph Strobl
32c5512dda DATAREDIS-461 - Deprecate support for org.codehaus.jackson based Serializers and Mappers. 2016-02-12 09:50:18 +01:00
Christoph Strobl
b59c79f20a DATAREDIS-452 - Polishing.
Fix indentation and organized imports.

Original Pull Request: #165
2016-02-10 14:59:26 +01:00
Mark Paluch
be40b0853a DATAREDIS-452 - Improve thread synchronization in RedisCacheTest.testCacheGetSynchronized.
Original Pull Request: #165
2016-02-10 14:57:51 +01:00
youmoo
707005e77b DATAREDIS-457 - Fix typo in reference documentation.
Original Pull Requets: #159
2016-02-10 13:42:12 +01:00
Vladimir Tsanev
1781e80717 DATAREDIS-456 - Fix misleading log message created by RedisMessageListenerContainer.
Original Pull Request: #161 (Vladimir Tsanev)
2016-02-10 13:34:36 +01:00
Christoph Strobl
e0ff8fcf1d DATAREDIS-455 - Increase expire time in RedisTemplateTests.
Increase the expiration time to prevent test from failing randomly when executed in cluster environment. Needs to be done as a cluster refresh on driver level might take longer than the actual expiration, which then causes the key to already be expired when checking the assertion.
2016-02-10 13:07:47 +01:00
Christoph Strobl
97b88979e7 DATAREDIS-407 - Polishing.
Updated license header, added missing Javadoc, fix indentation and organized imports.

Original Pull Request: #166
2016-02-10 11:09:00 +01:00
Mark Paluch
4131f501a6 DATAREDIS-407 - Add zRangeByLex to ZSetOperations.
We now offer methods for ZRANGEBYLEX on ZSetOperations, BoundZSetOperations as well as via RedisZSet.

Original Pull Request: #166
2016-02-10 11:08:51 +01:00
Christoph Strobl
008836066f DATAREDIS-315 - Remove timeout/password from RedisClusterConfiguration.
Removed duplicate configuration options for timeout and password from RedisClusterConfiguration and use the ones provided via the RedisConnectionFactory.

Original pull request: #158.
2016-02-09 15:40:38 +01:00
Mark Paluch
0ac118fcc0 DATAREDIS-315 - Support password protected Redis Cluster.
Add new config property to configure a password for operations with Redis Cluster. The only driver to support Redis Cluster with password is lettuce but 3.4.Final has a blocker bug that prevents the usage

Original pull request: #158.
2016-02-09 15:40:38 +01:00
Mark Paluch
f18def013a DATAREDIS-315 - Support Redis 3.2 CLUSTER NODES output format.
The CLUSTER NODES converter supports the formats for Redis 3.0 and Redis 3.2.

Original pull request: #158.
2016-02-09 15:40:33 +01:00
Mark Paluch
c105cbb7b6 DATAREDIS-315 - Polishing.
Update documentation and fix spelling in JavaDoc and reference documentation.

Allow node lookup by host/port and node Id to enable flexibility when passing references to Redis Cluster nodes. Parse multiple slot ranges for a cluster node and move CLUSTER NODES parser to Converters.

Use fixed line separator instead of OS-specific line separator, consolidate duplicate code, support clusterSetSlotStable with lettuce 3.4 and set lettuce driver shutdown timeout to zero for long running tests.

Original pull request: #158.
2016-02-09 15:38:52 +01:00
Christoph Strobl
c5047f40c6 DATAREDIS-315 - Add initial support for redis cluster (jedis/lettuce).
Cluster support is based on the very same building blocks as non clustered communication. RedisClusterConnection and extension to RedisConnection handles the communication with the Redis Cluster and translates errors into the Spring DAO exception hierarchy.

Redirects for to a specific keys to the corresponding slot serving node are handled by the driver libraries, higher level functions like collecting information accross nodes, or sending commands to all nodes in the cluster that are covered by RedisClusterConnection utilizing a ClusterCommandExecutor distributing commands accross the cluster and collecting results.

RedisTemplate provides access to cluster specific operations via the ClusterOperations interface that can be obtained via RedisTemplate.opsForCluster(). This allows to execute commands explicitly on a single node within the cluster while retaining de-/serialization features configured for the template.

Original pull request: #158.
2016-02-09 14:53:33 +01:00
Christoph Strobl
1f97623a7c DATAREDIS-443 - Add Support for Spring 4.3 synchronized mode to RedisCache.
As of Spring Framework 4.3.RC1, the `Cache` interface has a new `<T> T get(Object key, Callable<T> valueLoader);` method (see SPR-9254).

If no entry for the given key is found, the `Callable` is invoked to compute/load the value that is then put into redis and returned. Additionally concurrent calls get synchronized so that the `Callable` is only called once.

Using Spring Framework 4.3 failures result in `o.s.c.Cache$ValueRetrievalException` prior versions use `RedisSystemException`.

Original pull request: #162.
2016-02-04 09:13:42 +01:00
Christoph Strobl
239d97195a DATAREDIS-405 - Deprecate support for jredis and srp.
Original pull request: #163.
2016-02-03 11:17:07 +01:00
Christoph Strobl
b6e90752e7 DATAREDIS-419 - Move project build to Maven.
- Introduce Maven pom.xml.
- Moved Asciidoctor files to src/main/asciidoc.
- Moved notice.txt etc. to src/main/resources.
- Add logback.xml
- Update Makefile to use maven and pick build profiles.
- Update template.mf to pick up versions in pom.xml
- Add build matrix for spring versions to .travis.yml
- Use container based travis infrastructure.
- Update readme.
2016-01-29 20:09:21 +01:00
Christoph Strobl
a446dd3619 DATAREDIS-448 - Fix DefaultSetOperations.intersectAndStore not returning command result.
We now properly return the number of elements in the destination set, has always been null so far, for DefaultSetOperations.intersectAndStore.
2016-01-28 07:59:32 +01:00
Christoph Strobl
d078a63f4c DATAREDIS-431 - Autoselect database configured in LettuceConnectionFactory.
We now actively select the predefined db set via the dbIndex on LettuceConnectionFactory. Fixed some spelling issues along the way.

Original pull request: #157.
2015-11-15 13:37:24 +01:00
Christoph Strobl
3d7a524474 DATAREDIS-435 - Fix potential NPE in RedisTestProfileValueSource. 2015-10-27 09:30:32 +01:00
欧夺标
130c057acd DATAREDIS-417 - Fix ScanCursor throwing NoSuchElementException for empty scan result.
ScanCursor now retriggers SCAN command for results having a new cursorId but no actual values. This avoids NoSuchElementException for server calls like:

    scan 0 match key*9
      1) 1966080
      2) (empty list or set)

Original Pull Request: #154
CLA Number: 143520151016081625 (Duobiao Ou)
2015-10-16 11:31:36 +02:00
Christoph Strobl
df4ad35057 DATAREDIS-417 - Add failing tests for ScanCursor throwing NoSuchElementException.
Add failing tests for scanning key sets where Redis returns a scan iteration pointing to the next cursor but having no actual values itself like in:

    scan 0 match key*9
      1) 1966080
      2) (empty list or set)
2015-10-16 11:31:28 +02:00
Christoph Strobl
4e7ccc96fe DATAREDIS-424 - Update Reference Documentation.
Updated what’s new section in reference documentation.
Remove outdated version from readme.
Update project team twitter handle on readme.
2015-09-01 07:43:24 +02:00
Christoph Strobl
74ea61c51c DATAREDIS-421 - Fix NPE when using HashMapper implementations.
We now make sure the available HashMapper implementations avoid exposing null values. Prior to this null values would have been added to the converted Hash causing trouble when saving those to redis since hashes are expected to not contain any null values
2015-08-31 14:19:39 +02:00
Christoph Strobl
35424bb9da DATAREDIS-392 - Add Gerneric Jackson2 RedisSerializer.
We introduced GenericJackson2JsonRedisSerializer holding a preconfigured ObjectMapper which writes Class type informations into the JSON structure. This enables polymorphic deserialization and allows RedisCache manager to operate upon a RedisTemplate storing data in JSON format, which had until this only been possible using the Jdk Serializer.
2015-08-31 14:09:22 +02:00
Christoph Strobl
444b290863 DATAREDIS-348 - Polishing.
Fixed connection problems leaving sockets open. Added missing JUnit rules for Sentinels. Added missing author information update, license header and Javadoc.

Upgraded test script to use Redis 3.0.2. Upgrade test script to shut down Redis in case of test errors. Added Redis 3.0 to TestProfileValueSource. Enabled ZRANGEBYLEX tests for lettuce.

Original pull request: #144.
Related pull request: #104.
2015-08-04 10:12:39 +02:00
Mark Paluch
7426b27688 DATAREDIS-348 - Switch to mp911de/lettuce 3.0.
Updated lettuce redis client to latest snapshot, adopt changed API and use API for commands which were emulated using LUA script

Implemente Sentinel support using lettuce library, adopt finer grained exceptions and aligned exception behavior to match other libraries. Added shutdown-timeout property in order to control shutdown duration of the netty framework which reduces test run duration. Documentation updated as well. Contains also a fix to use psetex instead of setex (typo).

Switch to Jedis for Redis Version discovery in tests. Polished documentation. Use LettuceConverter and native time() method.

Original pull request: #144.
Related pull request: #104.
2015-08-04 10:12:39 +02:00
Christoph Strobl
a08e90a1f7 DATAREDIS-414 - Serialization now occurs after pooled connection was released.
Moved key serialization and value deserialization outside of callback so that pooled connections get released more quickly.

Original pull request: #153.
2015-07-28 14:18:26 +02:00
Christoph Strobl
7073502e42 DATAREDIS-416 - RedisCache.putIfAbsent(…) now returns null for first addition.
We now return null for RedisCache.putIfAbesent(…) when value is set to meet the contract defined by org.springframework.cache.Cache.putIfAbsent(…).

Original pull request: #150.
2015-07-28 13:42:10 +02:00
Christoph Strobl
b2bae8f8fb DATAREDIS-412 - Assert compatibility with Jedis 2.7.1, 2.7.2 and 2.7.3.
Bump Jedis version and fix SendCommand class type differences between versions.

We now also lazily init the transaction on first call of multi() since pre initialization causes issues releasing Jedis connections and returning them to pool.

Original pull request: #149.
Related ticket: #139.
2015-07-22 14:39:30 +02:00
Christoph Strobl
1ad3392a72 DATAREDIS-401 - RedisCacheManager should operate on RedisOperations.
We now no longer require RedisCache and RedisCacheManager to be initialized with a RedisTemplate but use RedisOperations instead.

Original pull request: #142.
2015-07-09 19:10:13 +02:00
Christoph Strobl
aa04e73dbd DATAREDIS-402 - RedisCache should not expire known keys in case ttl of element is not set.
We now skip defining expire on known keys set in case element is eternal.

Original pull request: #141.
2015-06-16 09:38:54 +02:00
Thomas Darimont
31351b0463 DATAREDIS-352 - Enhance range options for ZSET.
Raising required redis version for zRangeByLexTest to fix failing test on CI server.
2015-05-22 18:59:54 +02:00
Christoph Strobl
283a9638f2 DATAREDIS-352 - Enhance range options for ZSET.
We now allow usage of Range and Limit types (newly introduced for ZRANGEBYLEX) on mostly all ZSET range operations.
Extracted constants for plus/minus and -inf/+inf expressions.

Original pull request: #138.
2015-05-22 15:16:08 +02:00
Thomas Darimont
3d4f62f5b7 DATAREDIS-396 - Update Jedis driver to version 2.7.2.
Adapted sendCommand lookup in JedisConnection to honor the changed signature of redis.clients.jedis.Connection.sendCommand(Command, String…) to redis.clients.jedis.Connection.sendCommand(ProtocolCommand, String…).

Original pull request: #140.
2015-05-19 13:26:33 +02:00
Christoph Strobl
ff37da5197 DATAREDIS-378 - Add support for ZRANGEBYLEX.
We now support ZRANGEBYLEX on RedisConnection and StringRedisConnection when using the Jedis driver. The upper and lower bounds can be defined using the Range type which will be converted to the according binary representation including prefix and/or infinite operators.

	range().gt("a")          => (a +
	range().gte("a")         => [a +
	range().lt("z")          => - (z
	range().lte("z")         => - [z
	range().gte("a").lt("z") => [a (z
2015-04-13 14:15:10 +02:00