Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: couchbase/couchbase-java-client
...
head fork: couchbase/couchbase-java-client
Commits on Feb 01, 2012
@mikewied mikewied Changed spy jar configuration to default
We changed this in spymemcached during the release so that it would
be added as a normal compile time dependency for users who add the
spy dependency to their pom files. I changed it in the pom config but
not in the project config that we use for development.

Change-Id: I34175919faec283d993a57f9a2b5f15646ccce0b
Reviewed-on: http://review.couchbase.org/12841
Reviewed-by: Raghavan N. Srinivas <raghavan.srinivas@gmail.com>
Tested-by: Michael Wiederhold <mike@couchbase.com>
1a3c1cf
Commits on Feb 06, 2012
@ragsns ragsns Added unlock operation
Based on patch submitted by Brent Ryan.

Change-Id: I9a30f21108fcbbd43add4abd2f16af05a3fbe68b
Reviewed-on: http://review.couchbase.org/12907
Reviewed-by: Michael Wiederhold <mike@couchbase.com>
Tested-by: Raghavan N. Srinivas <raghavan.srinivas@gmail.com>
a606674
Commits on Feb 08, 2012
@ragsns ragsns Fixes for adding only hostname instead of both hostname and ip address
Change-Id: Ieae49545e1c08f2cb9155f926015046a787c0f5b
Reviewed-on: http://review.couchbase.org/13046
Reviewed-by: Matt Ingenthron <matt@couchbase.com>
Tested-by: Matt Ingenthron <matt@couchbase.com>
8ba2619
Commits on Feb 13, 2012
@mikewied mikewied Fixed checkstyle issues.
Change-Id: I767ed66a6c3b36016300448a2075ada7071dfbae
Reviewed-on: http://review.couchbase.org/13082
Reviewed-by: Raghavan N. Srinivas <raghavan.srinivas@gmail.com>
Tested-by: Matt Ingenthron <matt@couchbase.com>
Reviewed-by: Matt Ingenthron <matt@couchbase.com>
b464e08
Commits on Feb 20, 2012
@ingenthr ingenthr Depend on spymemcached 2.8.1-SNAPSHOT.
I've pushed a tag to the first commit on spymemcached after
the last release, verified that it's building/installing
with the snapshot tag.  Then based this on it.  We need
to release them in order, obviously.

Seems like the best flexibility for now with how things are
changing.

Change-Id: I8edc64963b074fe558a8e4cd42b3ff9e0af26dc2
Reviewed-on: http://review.couchbase.org/13372
Tested-by: Matt Ingenthron <matt@couchbase.com>
Reviewed-by: Michael Wiederhold <mike@couchbase.com>
4a38b26
@mikewied mikewied Use TapStream abstraction in spymemcached
This will allow our tap streams to be able to connect to
all node in the cluster.

Change-Id: I233a8fc96bb55cf12e73e40f46281dd3870004b5
Reviewed-on: http://review.couchbase.org/13083
Reviewed-by: Matt Ingenthron <matt@couchbase.com>
Reviewed-by: Raghavan N. Srinivas <raghavan.srinivas@gmail.com>
Tested-by: Matt Ingenthron <matt@couchbase.com>
7d9b64a
@mikewied mikewied Use TapAck from Spymemcached
This change removes duplicate code.

Change-Id: I7cf569e6c96f41af5bab51aabe402662f49282af
Reviewed-on: http://review.couchbase.org/13085
Reviewed-by: Raghavan N. Srinivas <raghavan.srinivas@gmail.com>
Tested-by: Matt Ingenthron <matt@couchbase.com>
b68dc17
@ingenthr ingenthr Added a note about TAP interface stability.
Change-Id: Ida28a8804777fddf0a8e47f7b3adecbdc7b0b633
Reviewed-on: http://review.couchbase.org/13373
Tested-by: Matt Ingenthron <matt@couchbase.com>
Reviewed-by: Michael Wiederhold <mike@couchbase.com>
88bb58b
@ingenthr ingenthr Fixed a number of TAP test issues.
Change-Id: I1193262637596d0576838a67db7a61ff1447ad37
Reviewed-on: http://review.couchbase.org/13394
Reviewed-by: Michael Wiederhold <mike@couchbase.com>
Tested-by: Matt Ingenthron <matt@couchbase.com>
f1d750e
Commits on Mar 12, 2012
@ragsns ragsns Correctly shut down connection from TapClient. JCBC-16
Fix based on http://www.couchbase.com/issues/browse/JCBC-16

Change-Id: Iefa5d36a1263350a5e61f54d2f65796dec9b808f
Reviewed-on: http://review.couchbase.org/13848
Reviewed-by: Matt Ingenthron <matt@couchbase.com>
Tested-by: Raghavan N. Srinivas <raghavan.srinivas@gmail.com>
0d87dd2
@ragsns ragsns Fixed a javadoc issue
Change-Id: Ic6957078afdf56c16f2e44c3a269b3e31a8bb466
Reviewed-on: http://review.couchbase.org/13847
Reviewed-by: Matt Ingenthron <matt@couchbase.com>
Tested-by: Raghavan N. Srinivas <raghavan.srinivas@gmail.com>
97e6276
Commits on Apr 05, 2012
@ragsns ragsns Use the correct default Hashing Algorithm - JCBC-29
Change-Id: Ifb1a9ebcc7ae64a8590f1123ddde9138c17fe23e
Reviewed-on: http://review.couchbase.org/14485
Reviewed-by: Matt Ingenthron <matt@couchbase.com>
Tested-by: Matt Ingenthron <matt@couchbase.com>
ce7a084
@ingenthr ingenthr Reconnect to configuration stream if disconnected. JCBC-19
With this change, a Bucket which is marked as disconnected will be
later reconnected when noticed by a calling thread.

The logic for this is a little convoluted at the moment, but tests
to be correct.  In the future, this whole section should be refactored
to be a better NodeLocator or something similar.  See JCBC-28.

Change-Id: I8541493fdf7e8c504c4cbd512ca43e3416b03829
Reviewed-on: http://review.couchbase.org/14574
Tested-by: Matt Ingenthron <matt@couchbase.com>
Reviewed-by: Matt Ingenthron <matt@couchbase.com>
7c049c5
@ingenthr ingenthr Change back to spymemcached 2.8.0 for this branch.
Change-Id: I38ef9d66544f30f8101ca04889b8042c1abfc177
Reviewed-on: http://review.couchbase.org/14586
Reviewed-by: Sergey Avseyev <sergey.avseyev@gmail.com>
Reviewed-by: Marty Schoch <marty.schoch@gmail.com>
Tested-by: Matt Ingenthron <matt@couchbase.com>
02df7a7
Commits on Apr 30, 2012
@ingenthr ingenthr Missing space added to log message when node is down.
Change-Id: Ifad8da0b4e42f4f58945510de8513e6a7f1424e2
Reviewed-on: http://review.couchbase.org/15462
Tested-by: Michael Wiederhold <mike@couchbase.com>
Reviewed-by: Michael Wiederhold <mike@couchbase.com>
b424ca4
Commits on May 22, 2012
@ingenthr ingenthr Added additional ctor to avoid username. JCBC-38.
Change-Id: If487df95e2974f0a4c60e3c57978a82596967de6
Reviewed-on: http://review.couchbase.org/15435
Reviewed-by: Michael Wiederhold <mike@couchbase.com>
Reviewed-by: Marty Schoch <marty.schoch@gmail.com>
Tested-by: Matt Ingenthron <matt@couchbase.com>
df18fb4
@ingenthr ingenthr Update dependencies to spymemcached 2.8.1. JCBC-39.
Change-Id: I9d4e1099edbe4d32d80af22b19cfd3dad6bde221
Reviewed-on: http://review.couchbase.org/15436
Reviewed-by: Michael Wiederhold <mike@couchbase.com>
Reviewed-by: Marty Schoch <marty.schoch@gmail.com>
Tested-by: Matt Ingenthron <matt@couchbase.com>
0e37394
Commits on Jun 05, 2012
@ingenthr ingenthr Do not override fetching of AuthDescriptor. JCBC-59
Change-Id: Iff02589db6e1a3c3f56108a647e37b821b6cc447
Reviewed-on: http://review.couchbase.org/16765
Reviewed-by: Michael Wiederhold <mike@couchbase.com>
Tested-by: Matt Ingenthron <matt@couchbase.com>
0c9d2d3
Commits on Jul 20, 2012
@mikewied mikewied Fix checkstyle errors
Change-Id: I87007bd428da34badc0d5a10ef17aa50b8132804
Reviewed-on: http://review.couchbase.org/18655
Reviewed-by: Matt Ingenthron <matt@couchbase.com>
Tested-by: Michael Wiederhold <mike@couchbase.com>
98b9d82
Commits on Jul 24, 2012
@ingenthr ingenthr Update deps to spy 2.8.2-SNAPSHOT
This will be replaced before release with the non-snapshot.

Change-Id: Ia9800f9f63279c4716963066dc059e88aa009119
Reviewed-on: http://review.couchbase.org/18755
Reviewed-by: Michael Wiederhold <mike@couchbase.com>
Tested-by: Matt Ingenthron <matt@couchbase.com>
468a425
@ingenthr ingenthr Use the correct Connection type for the config. JCBC-53
In the refactoring of the client into two packages, we lost
the functionality that would handle reconfiguration from
MemcachedConnections.  This change introduces a
CouchbaseMemcachedConnection which extends the MemcachedConnection
and implements reconfiguration.  By doing so, we properly handle
add and remove node events from the cluster.

Change-Id: Ief068cab934542617a11e2f527d98b9c38affd07
Reviewed-on: http://review.couchbase.org/16337
Reviewed-by: Michael Wiederhold <mike@couchbase.com>
Tested-by: Matt Ingenthron <matt@couchbase.com>
5bd2319
@ingenthr ingenthr Ensure config update checks do not overwhelm the system. JCBC-54.
Change-Id: Id0514278608fa1476e21c0f52958860404240561
Reviewed-on: http://review.couchbase.org/16338
Reviewed-by: Michael Wiederhold <mike@couchbase.com>
Tested-by: Matt Ingenthron <matt@couchbase.com>
4c73aa8
Commits on Jul 25, 2012
@ingenthr ingenthr Honor TestConfig in syncGetTimeoutsInitClient().
Change-Id: I6b1d9cba8598799177f686016970ca254e9cec9e
Reviewed-on: http://review.couchbase.org/18758
Reviewed-by: Michael Wiederhold <mike@couchbase.com>
Reviewed-by: Raghavan N. Srinivas <raghavan.srinivas@gmail.com>
Tested-by: Raghavan N. Srinivas <raghavan.srinivas@gmail.com>
5c1d311
@ingenthr ingenthr Workaround NOT_MY_VBUCKET during optimization, and test.
On SPY-91, it was found that receiving a NOT_MY_VBUCKET
response in the middle of an optimized batch of requests
will upset things by causing the optimized operation itself
to be unqueued for reads, rather than retrying the contained
operation.

Since the severity level is high and the workaround is
straightforward (disable optimization) this commit both
disables optimization and introduces the test which helped
find the cause of the issue.

Recommended way of verifying this would be to remove the
two sections related to disabling optimization and then
verify the test fails.

Change-Id: I20aa2945bbbbe9f19a56a41224244fe368d5e34e
Reviewed-on: http://review.couchbase.org/18757
Reviewed-by: Michael Wiederhold <mike@couchbase.com>
Tested-by: Matt Ingenthron <matt@couchbase.com>
36f97dc
Commits on Jul 30, 2012
@ingenthr ingenthr JCBC-88: Fix resubscr by not waiting long and asynch subscribing.
It was found during autofailover testing that the client
did not recover well.  The problem was that we completed the
resubscription on one of the callers threads.  The subscription
can take upward of 700ms, but if the caller adjusts their timeout
for operations to be lower, we don't complete the resubscription.

This change does a couple of things:
1) doesn't allow the connection for any individual HTTP request
   (non-streaming) to take longer than 500ms to establish for
   purposes of faster failover
2) changes resubscription to occur in a thread temporarily
   spawned by the CouchbaseConnectionFactory, so it can complete
   even if the caller's request times out.

This has been tested to show autofailover working correctly.

Change-Id: I87582b99fa872530a62a336b3144fefc60b63f6e
Reviewed-on: http://review.couchbase.org/19008
Tested-by: Matt Ingenthron <matt@couchbase.com>
Reviewed-by: Raghavan N. Srinivas <raghavan.srinivas@gmail.com>
7e4339a
@ingenthr ingenthr Add a few minor override annotations.
Change-Id: I943c6253c55fa96f6a567dacd2598192f512f21b
Reviewed-on: http://review.couchbase.org/19012
Reviewed-by: Michael Wiederhold <mike@couchbase.com>
Tested-by: Matt Ingenthron <matt@couchbase.com>
9952e10
@ingenthr ingenthr Add default test type to ant build.
Change-Id: Ib0cc409a440ff5b485d6a188f77867abc79bc204
Reviewed-on: http://review.couchbase.org/19017
Tested-by: Matt Ingenthron <matt@couchbase.com>
Reviewed-by: Michael Wiederhold <mike@couchbase.com>
d026763
@ingenthr ingenthr Added a simple README.
Change-Id: I71ee47b5f3c3260657ec70644f63d9a58eb73055
Reviewed-on: http://review.couchbase.org/19018
Tested-by: Michael Wiederhold <mike@couchbase.com>
Reviewed-by: Michael Wiederhold <mike@couchbase.com>
f122ff2
Commits on Jul 31, 2012
@ingenthr ingenthr Update spymemcached depedency to 2.8.2 release.
Change-Id: I2f3099dc885de9e78ca67607174408ad5b075d0e
Reviewed-on: http://review.couchbase.org/19051
Tested-by: Matt Ingenthron <matt@couchbase.com>
Reviewed-by: Jasdeep Jaitla <jasdeep@couchbase.com>
5b3f66f