Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deprecates JedisPool returnResource and returnBrokenResource #912

Merged
merged 3 commits into from
Mar 10, 2015

Conversation

marcosnils
Copy link
Contributor

Per #909 as we're planning not to support these methods in the future to avoid confusions.

* {@link #persist(byte[]) PERSIST} command.
* <p>
* Time complexity: O(1)
* @deprecated use BinaryJedis.pexpire(byte[], long) or Jedis.pexpire(String,long) Set a timeout
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe it's unintentional. Could you revert it?

@HeartSaVioR
Copy link
Contributor

Some trivial whitespace issues but LGTM overall.

@marcosnils
Copy link
Contributor Author

@HeartSaVioR the format changes are not unintentional i've run make format before commit and it fixed some stuff that wasn't formatted.

@HeartSaVioR
Copy link
Contributor

@marcosnils Oh, OK. Look great!
Btw, Could we apply same rule to JedisSentinelPool and ShardedJedisPool respectively?
Maybe we can unify all returning interface to Jedis.close().

@marcosnils
Copy link
Contributor Author

@HeartSaVioR of course!. I totally forgot about those two Pools. I'll update shortly

@marcosnils
Copy link
Contributor Author

@HeartSaVioR changes have been made. Can you please review?

Thx!.

@@ -38,6 +38,10 @@ public ShardedJedis getResource() {
return jedis;
}

/**
* @deprecated starting from Jedis 3.0 this method won't exist. Resouce cleanup should be done
* using @see {@link redis.clients.jedis.Jedis#close()}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It should be ShardedJedis#close().

@HeartSaVioR
Copy link
Contributor

@marcosnils Added some note, without these looks great to me!

@marcosnils
Copy link
Contributor Author

@HeartSaVioR done!.

@nykolaslima
Copy link
Contributor

Looks good to me. But Travis is failing again :(
We should fix those unstable tests.

@marcosnils
Copy link
Contributor Author

I've re-run the tests again.

@nykolaslima
Copy link
Contributor

👍 Let's merge it

HeartSaVioR added a commit that referenced this pull request Mar 10, 2015
Deprecates JedisPool returnResource and returnBrokenResource
@HeartSaVioR HeartSaVioR merged commit b42a861 into master Mar 10, 2015
@HeartSaVioR
Copy link
Contributor

Merged into master, 2.6, 2.7 branch respectively.
Thanks all!

@nykolaslima
Copy link
Contributor

👍

@marcosnils marcosnils deleted the deprecate_poolreturn branch December 4, 2015 18:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants