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 Mar 21, 2012
@mikewied mikewied Added support for views
Change-Id: I67a5912f2b329151c15cff7fc89ab7ef3700503e
Reviewed-on: http://review.couchbase.org/13688
Tested-by: Matt Ingenthron <matt@couchbase.com>
Reviewed-by: Matt Ingenthron <matt@couchbase.com>
beda277
@ragsns ragsns Add support for stale=false which is needed from 2.0 DP4 and later
Change-Id: Id1956b6467ae02c2fae69d7cf252e3c62507cc82
Reviewed-on: http://review.couchbase.org/13849
Reviewed-by: Matt Ingenthron <matt@couchbase.com>
Tested-by: Matt Ingenthron <matt@couchbase.com>
c7410b3
Commits on Mar 22, 2012
@ingenthr ingenthr Add httpcomponents to ivy file for makepom.
Change-Id: I04508e00b77b7b6e6936f43e3d130ad22e5cdf9d
Reviewed-on: http://review.couchbase.org/14157
Reviewed-by: Michael Wiederhold <mike@couchbase.com>
Tested-by: Matt Ingenthron <matt@couchbase.com>
b0cd3ab
@ingenthr ingenthr Update dependencies to spymemcached 2.8.1.
Change-Id: I86e4ee1c29f16eff16c3057db12f190158f5ee30
Reviewed-on: http://review.couchbase.org/14178
Tested-by: Matt Ingenthron <matt@couchbase.com>
Reviewed-by: Michael Wiederhold <mike@couchbase.com>
cf95135
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
@mikewied mikewied Fixed checkstyle errors
Change-Id: I1ae53a088077e098313231f2d044a0ca61c1fd46
Reviewed-on: http://review.couchbase.org/14562
Tested-by: Matt Ingenthron <matt@couchbase.com>
Reviewed-by: Matt Ingenthron <matt@couchbase.com>
4d34594
@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 02, 2012
@mikewied mikewied JCBC-47: Query now copies include_docs correctly
Change-Id: I9a894bb86530f36151c5075d2da814a66e3f4e9f
Reviewed-on: http://review.couchbase.org/15954
Tested-by: Matt Ingenthron <matt@couchbase.com>
Reviewed-by: Matt Ingenthron <matt@couchbase.com>
Tested-by: Michael Wiederhold <mike@couchbase.com>
f660e19
@mikewied mikewied Removed redundent code in setStale() function in Query class
Change-Id: Ie46923fde6ff5bccbf92a9da6af17769b5e44efa
Reviewed-on: http://review.couchbase.org/15955
Reviewed-by: Matt Ingenthron <matt@couchbase.com>
Tested-by: Michael Wiederhold <mike@couchbase.com>
f109007
@mikewied mikewied JCBC-24: Create setGroupLevel() function in Query class
I removed the setGroup(boolean group, int group_level) function
since group overrides group_level making this function useless. I
turned this function into the setGroupLevel() function.

Change-Id: I98ea665c8bae73ae0940863ef84c426cfade01c1
Reviewed-on: http://review.couchbase.org/15956
Reviewed-by: Matt Ingenthron <matt@couchbase.com>
Tested-by: Matt Ingenthron <matt@couchbase.com>
Tested-by: Michael Wiederhold <mike@couchbase.com>
ba75181
Commits on Jun 04, 2012
@mikewied mikewied Support error codes in OperationStatus class
Change-Id: If6bd4c86a28b892018385921b0f7c98172225410
Reviewed-on: http://review.couchbase.org/15953
Reviewed-by: Matt Ingenthron <matt@couchbase.com>
Tested-by: Michael Wiederhold <mike@couchbase.com>
9e72d86
@mikewied mikewied JCBC-44: Check if op is null before checking if it is cancelled
Change-Id: I960a31110484007b9ac6b3735c9cd2ce9ca79e60
Reviewed-on: http://review.couchbase.org/15957
Reviewed-by: Matt Ingenthron <matt@couchbase.com>
Tested-by: Michael Wiederhold <mike@couchbase.com>
a2dcbc0
@mikewied mikewied JCBC-42: Close properties file after using it
Change-Id: I1daa439afd2e88b55f04a63b7c42a9a7f18244e2
Reviewed-on: http://review.couchbase.org/15958
Reviewed-by: Matt Ingenthron <matt@couchbase.com>
Tested-by: Michael Wiederhold <mike@couchbase.com>
0af5374
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 Jun 29, 2012
@mikewied mikewied JCBC-20: ViewConnection blocks when no ops pending
When getting the next op in the queue we were using the poll()
function which immediately returns null if the queue is empty. This
immediate return causes the IO thread to spin and consumes a lot of
cpu. What we really want is to block when getting an item from the
queue until one is available. In order to do this we should be using
the take() function.

Change-Id: I9a5bcb4c3852976b55b3162fad513156e94aaaf6
Reviewed-on: http://review.couchbase.org/14959
Reviewed-by: Matt Ingenthron <matt@couchbase.com>
Tested-by: Michael Wiederhold <mike@couchbase.com>
e39cd76
@mikewied mikewied JCBC-43: Make VBucketNodeLocator nested classes static final
Change-Id: I937829e51621d8ed6a0e54b1b079cc338ffab059
Reviewed-on: http://review.couchbase.org/16703
Reviewed-by: Matt Ingenthron <matt@couchbase.com>
Tested-by: Michael Wiederhold <mike@couchbase.com>
c66354d
@mikewied mikewied JCBC-68: Copy key correctly in query
Change-Id: I26a9470a7a39caf913338126dfb918c8774774cd
Reviewed-on: http://review.couchbase.org/17742
Reviewed-by: Matt Ingenthron <matt@couchbase.com>
Tested-by: Michael Wiederhold <mike@couchbase.com>
e565ba0
Commits on Jul 11, 2012
@mikewied mikewied Change spymemcached dependency to 2.8.2-SNAPSHOT
Change-Id: I0d3968baa57c3736af2c992eaf169ab6e3dabb37
Reviewed-on: http://review.couchbase.org/18194
Reviewed-by: Matt Ingenthron <matt@couchbase.com>
Tested-by: Michael Wiederhold <mike@couchbase.com>
a407211
Commits on Jul 12, 2012
@mikewied mikewied JCBC-72: Throw exception for non-200 http view responses
Change-Id: Iee0b1de24a9ea245b6554aea5a30462cf7b613ef
Reviewed-on: http://review.couchbase.org/18094
Reviewed-by: Matt Ingenthron <matt@couchbase.com>
Tested-by: Michael Wiederhold <mike@couchbase.com>
9a3e207
@mikewied mikewied Fixed incorrect error handling in view parsing
This should call setException because setException set errored
to true. If errored is not set then the Future won't properly
throw and exception.

Change-Id: I71288cda2f6fe27c9dc9ae83968efe81d6fe154d
Reviewed-on: http://review.couchbase.org/18197
Reviewed-by: Matt Ingenthron <matt@couchbase.com>
Tested-by: Michael Wiederhold <mike@couchbase.com>
2390ecc
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
Commits on Aug 08, 2012
@ingenthr ingenthr Add HTTP Basic Authorization for View Requests. JCBC-95
Change-Id: I51dde71b94f99dc0a5db8e9877fa94db45b718f2
Reviewed-on: http://review.couchbase.org/19373
Tested-by: Matt Ingenthron <matt@couchbase.com>
Reviewed-by: Raghavan N. Srinivas <raghavan.srinivas@gmail.com>
3891452
Commits on Aug 11, 2012
@ingenthr ingenthr Make fields of HttpOperation volatile for concurrent access.
Change-Id: Ia55c4a4a3ef30affe9fea5d5f9623a79e4b91a4b
Reviewed-on: http://review.couchbase.org/18807
Reviewed-by: Michael Wiederhold <mike@couchbase.com>
Tested-by: Michael Wiederhold <mike@couchbase.com>
92a87ff
Commits on Aug 14, 2012
@mikewied mikewied Fix checkstyle errors
Change-Id: Id044e448f2ec1b9f83c06bacf21ccdc1f123110b
Reviewed-on: http://review.couchbase.org/19605
Tested-by: Matt Ingenthron <matt@couchbase.com>
Reviewed-by: Matt Ingenthron <matt@couchbase.com>
f8857d6
Commits on Aug 18, 2012
@mikewied mikewied JCBC-96: Remove the queue mechanism in ViewConnection
This change removes the queueing mechanism that hold operations
before being given to an individual ViewNode. The operations are
now passed directly to a ViewNode and if there are too many
operations then they are held as pending requests until the
ViewNode is ready to process them. On node shutdown the pending
ops are requeued through a callback function that redistributes
them equally to the rest of the ViewNodes.

Change-Id: Ieffbb45123cf47153cea662df1a01f5b2266c8d3
Reviewed-on: http://review.couchbase.org/19606
Reviewed-by: Matt Ingenthron <matt@couchbase.com>
Tested-by: Matt Ingenthron <matt@couchbase.com>
0443cd9
@ingenthr ingenthr Depend upon 2.8.3-SNAPSHOT
Change-Id: Idb97b900ec1856b75df631bfe620c73b11bedb1e
Reviewed-on: http://review.couchbase.org/19673
Reviewed-by: Michael Wiederhold <mike@couchbase.com>
Tested-by: Matt Ingenthron <matt@couchbase.com>
113ad2e
Commits on Aug 19, 2012
@mikewied mikewied Remove dependency on ErrorCode, which was revereted in spymemcached.
Change-Id: Ife8c127ad3d0e9bfc7648f2f8e87e62a5ec4e0f9
Reviewed-on: http://review.couchbase.org/19674
Reviewed-by: Raghavan N. Srinivas <raghavan.srinivas@gmail.com>
Tested-by: Matt Ingenthron <matt@couchbase.com>
d6100b2
@ingenthr ingenthr Added better debug logging on ViewNode error handling.
Change-Id: Ic1ee33df0a95ce285143269b9cc1246cc8be0913
Reviewed-on: http://review.couchbase.org/18808
Reviewed-by: Matt Ingenthron <matt@couchbase.com>
Tested-by: Matt Ingenthron <matt@couchbase.com>
228b3cd
@ingenthr ingenthr Make diagnosis of HTTP connection startup better.
Change-Id: I49d9f44aca5adad8f070cca661c990c9de306853
Reviewed-on: http://review.couchbase.org/19675
Reviewed-by: Michael Wiederhold <mike@couchbase.com>
Tested-by: Matt Ingenthron <matt@couchbase.com>
5502ef8
@ingenthr ingenthr Added asserts to ensure expected view handling.
Change-Id: I191ff4bfdd61aec26afb146aa3aa9de4d315f9c0
Reviewed-on: http://review.couchbase.org/19676
Reviewed-by: Matt Ingenthron <matt@couchbase.com>
Tested-by: Matt Ingenthron <matt@couchbase.com>
d9ae5a9
@ingenthr ingenthr Change tests to use bucket delete/create instead of flush_all.
Recent changes of Couchbase Server 2.0 have flush_all disabled
by default. It's also not correct to re-enable flush_all
(though possible) as it won't really behave correctly.

This change shifts to a bucket delete followed by a bucket create.
It's not the best change in that it introduces a lot of sleep time
instead of checking for bucket availability with some other poll,
but does appear to be reliable.

After the integration of RESTful flush in MB-5170, we should be
able to trim some of the time of running tests again and remove
the sleeps in here.

Change-Id: I80ed8bb311afc8dde3970db0cbad6687f58c0048
Reviewed-on: http://review.couchbase.org/19677
Tested-by: Matt Ingenthron <matt@couchbase.com>
Reviewed-by: Matt Ingenthron <matt@couchbase.com>
b9aa7c1
@ingenthr ingenthr Merge branch 'release10'
By Matt Ingenthron (16) and others

* gerrit/release10:
  Added a simple README.
  Add default test type to ant build.
  Add a few minor override annotations.
  JCBC-88: Fix resubscr by not waiting long and asynch subscribing.
  Workaround NOT_MY_VBUCKET during optimization, and test.
  Honor TestConfig in syncGetTimeoutsInitClient().
  Ensure config update checks do not overwhelm the system.  JCBC-54.
  Use the correct Connection type for the config.  JCBC-53
  Update deps to spy 2.8.2-SNAPSHOT
  Fix checkstyle errors
  Do not override fetching of AuthDescriptor.  JCBC-59
  Added additional ctor to avoid username. JCBC-38.
  Missing space added to log message when node is down.
  Reconnect to configuration stream if disconnected. JCBC-19
  Use the correct default Hashing Algorithm - JCBC-29

Conflicts:
	ivy/libraries.properties
	src/main/java/com/couchbase/client/CouchbaseClient.java
	src/main/java/com/couchbase/client/CouchbaseConnection.java
	src/main/java/com/couchbase/client/CouchbaseConnectionFactory.java

Change-Id: Idefa785503f0dae99624af7172ba38f54087a45e
924d301
@ingenthr ingenthr Disable tests related to flush after change to test fixtures.
Change-Id: I0225828c83cd70ee3ae9fdea66f226a22c183e32
Reviewed-on: http://review.couchbase.org/19691
Reviewed-by: Matt Ingenthron <matt@couchbase.com>
Tested-by: Matt Ingenthron <matt@couchbase.com>
d0dd7f9
@ingenthr ingenthr Better logging on testGetAvailableServers in failure case.
Change-Id: Id14c724e9a6ea40f10e4691f09f3bca4f4f8f821
Reviewed-on: http://review.couchbase.org/19692
Reviewed-by: Michael Wiederhold <mike@couchbase.com>
Reviewed-by: Matt Ingenthron <matt@couchbase.com>
Tested-by: Matt Ingenthron <matt@couchbase.com>
b6df3e4
@ingenthr ingenthr Fixes for TapTest based on new flush.
Change-Id: Ib8be84252cc34eb3c5ec12b039abbcb410cd6a54
Reviewed-on: http://review.couchbase.org/19693
Reviewed-by: Matt Ingenthron <matt@couchbase.com>
Tested-by: Matt Ingenthron <matt@couchbase.com>
b0e561a
@ingenthr ingenthr Adapt OptimizedStoreVbucketTest to new test fixtures.
Change-Id: Id4a3268f42124ace70531f10674b817b7464c15c
Reviewed-on: http://review.couchbase.org/19694
Reviewed-by: Matt Ingenthron <matt@couchbase.com>
Tested-by: Matt Ingenthron <matt@couchbase.com>
7a6976c
@ingenthr ingenthr Fixes for view authentication when adding design docs.
Change-Id: I78fd48c5fb18a2622ed0a9f0aa80f317537e70a3
Reviewed-on: http://review.couchbase.org/19758
Reviewed-by: Michael Wiederhold <mike@couchbase.com>
Reviewed-by: Matt Ingenthron <matt@couchbase.com>
Tested-by: Matt Ingenthron <matt@couchbase.com>
93e59f0
@ragsns ragsns Add support for synchronous set via Observe operation.
This change introduces a simple synchronous set which
uses the underlying observe command introduced in
spymemcached 2.8.3.  This command is a binary command only
and is in Couchbase Server 2.0 (approx. build 1495) only.

Conflicts:
	src/test/java/com/couchbase/client/CouchbaseClientTest.java

Change-Id: I6a1e8af54ef13d4a40a5dcc21bb7a939fb63499f
Reviewed-on: http://review.couchbase.org/19068
Reviewed-by: Matt Ingenthron <matt@couchbase.com>
Tested-by: Matt Ingenthron <matt@couchbase.com>
4460d26
@ragsns ragsns Add support for a synchronous delete, via observe operation.
This change adds support for a synchronous delete, including
detection of full delete versus logical delete.

The main use case behind this feature is that if using
Couchbase Server 2.0, and wanting to query views, one may
wish to ensure a delete has been persisted to know that
a subsequent query with .setStale(false) will take the
deletion into account when generating the index.

Change-Id: I99ad5b5089992a7df2c2ab12e487d043265df21f
Reviewed-on: http://review.couchbase.org/19778
Reviewed-by: Matt Ingenthron <matt@couchbase.com>
Tested-by: Matt Ingenthron <matt@couchbase.com>
47bc98a
@ingenthr ingenthr Rename README since ant clean kept removing it.
Change-Id: I2eada518c22bc345c113c0b786e200fd931e0567
Reviewed-on: http://review.couchbase.org/19838
Reviewed-by: Matt Ingenthron <matt@couchbase.com>
Tested-by: Matt Ingenthron <matt@couchbase.com>
bbbeb76
@ingenthr ingenthr Checkstyle fixes from merge commit.
Initially, I tried to rebase this to be the first commit after
the merge, but git would keep losing it even when using -p during
rebase.

Change-Id: If9c79e0139ab60261e67195037686de3a446a373
Reviewed-on: http://review.couchbase.org/19839
Reviewed-by: Matt Ingenthron <matt@couchbase.com>
Tested-by: Matt Ingenthron <matt@couchbase.com>
66115ce
@ingenthr ingenthr Checkstyle misc. fixes.
This fixes a number of checkstyle issues which have been
around for a while.  Some are still in code review, but a merge
commit is a bit in the way of putting things in the right order.

Change-Id: Icd79b614ef53840130abd8ec8adf1ebdb8fccdb4
Reviewed-on: http://review.couchbase.org/19840
Reviewed-by: Matt Ingenthron <matt@couchbase.com>
Tested-by: Matt Ingenthron <matt@couchbase.com>
4e05917
Commits on Aug 20, 2012
@ingenthr ingenthr Minor typo in test log message.
Change-Id: Id0713e7df30b0a828af3122ad9623c3e9240c245
Reviewed-on: http://review.couchbase.org/19860
Reviewed-by: Raghavan N. Srinivas <raghavan.srinivas@gmail.com>
Tested-by: Matt Ingenthron <matt@couchbase.com>
5bb4b36
@ingenthr ingenthr Update to depend on released spymemcached 2.8.3
Change-Id: I20765441809571c2660b661032ba3bc4a681165f
Reviewed-on: http://review.couchbase.org/19861
Reviewed-by: Raghavan N. Srinivas <raghavan.srinivas@gmail.com>
Tested-by: Matt Ingenthron <matt@couchbase.com>
e8ff311
@ingenthr ingenthr Updated README to map up to the 1.1 DP state.
Change-Id: Ia810d5b6f1418476fc2118e3501e0c69f2d6da79
Reviewed-on: http://review.couchbase.org/19862
Reviewed-by: Raghavan N. Srinivas <raghavan.srinivas@gmail.com>
Tested-by: Matt Ingenthron <matt@couchbase.com>
0b92ee2
Commits on Aug 21, 2012
@ragsns ragsns Observe/Delete related changes
Properly return OperationFuture from delete().
Ignore the cas values if set to zero.

Change-Id: I7f9b4a9149f1a952f5a2354f223223d02144da43
Reviewed-on: http://review.couchbase.org/19920
Reviewed-by: Matt Ingenthron <matt@couchbase.com>
Tested-by: Raghavan N. Srinivas <raghavan.srinivas@gmail.com>
7e5d17d
Commits on Aug 22, 2012
@ingenthr ingenthr Updated spy dependency to 2.8.4-SNAPSHOT.
Change-Id: I27be57d44302248d27059b213a3dcc2364131a34
Reviewed-on: http://review.couchbase.org/19997
Tested-by: Matt Ingenthron <matt@couchbase.com>
Reviewed-by: Raghavan N. Srinivas <raghavan.srinivas@gmail.com>
1840d0f
@ingenthr ingenthr Remove design docs without the _rev.
As of build 15xx, design documents no longer have a _rev and thus
there is no reason to retrieve them to remove them with _rev.

Technically speaking, we could probably get rid of this whole
section, but there's no harm in just making it work.

Change-Id: I6373dbab78ed7f3c02e57c2a4dcf734285b45ee8
Reviewed-on: http://review.couchbase.org/19998
Tested-by: Matt Ingenthron <matt@couchbase.com>
Reviewed-by: Raghavan N. Srinivas <raghavan.srinivas@gmail.com>
0967d51
@ingenthr ingenthr Update spymemcached dependency to 2.8.4.
Change-Id: I3a92bb4efde4cda95fd8bd0b63976f6a76fd3da1
Reviewed-on: http://review.couchbase.org/20008
Reviewed-by: Raghavan N. Srinivas <raghavan.srinivas@gmail.com>
Tested-by: Matt Ingenthron <matt@couchbase.com>
12dffd5
@ingenthr ingenthr Remove jettison import from ViewTest.
Change-Id: I72f49c842272ee06b39df38d6501aceaee7da7dc
Reviewed-on: http://review.couchbase.org/20010
Reviewed-by: Matt Ingenthron <matt@couchbase.com>
Tested-by: Matt Ingenthron <matt@couchbase.com>
4a5b5cb
Commits on Aug 31, 2012
@ingenthr ingenthr Update to spymemcached 2.8.5.
Change-Id: I754b08c9f1151bd739a89b8aeac3c0a4d102fa07
Reviewed-on: http://review.couchbase.org/20398
Reviewed-by: Matt Ingenthron <matt@couchbase.com>
Tested-by: Matt Ingenthron <matt@couchbase.com>
710f398
@ragsns ragsns Enhanced observe and added observe support for other mutation ops
Throw ObservedException, ObservedTimeoutException
and ObservedModifiedException
Added support for add, replace, cas
Updated Tests for observing the mutation operations

Change-Id: Ifa9accbe8056f28ecfefaac19a9d5bdf34fb9951
Reviewed-on: http://review.couchbase.org/20329
Reviewed-by: Matt Ingenthron <matt@couchbase.com>
Tested-by: Matt Ingenthron <matt@couchbase.com>
4b300b2
@ingenthr ingenthr Make observe poll loop parameters tuneable.
Change-Id: Iaf8c8a22119066d04869e30d657bde157a7f4dfd
Reviewed-on: http://review.couchbase.org/20399
Reviewed-by: Matt Ingenthron <matt@couchbase.com>
Tested-by: Matt Ingenthron <matt@couchbase.com>
21db5dd
Commits on Sep 09, 2012
@mikewied mikewied Remove unused variables in observe implementation
Change-Id: I38c8aaf59f1d01390e8f60bc96f21d6e4ede0881
Reviewed-on: http://review.couchbase.org/20654
Reviewed-by: Matt Ingenthron <matt@couchbase.com>
Tested-by: Matt Ingenthron <matt@couchbase.com>
2ec3bca
Commits on Sep 12, 2012
@ingenthr ingenthr Update to spy 2.8.6-SNAPSHOT for development.
Change-Id: Ie46913976b2a24197410cb7d57a6c35b5a76b3ed
Reviewed-on: http://review.couchbase.org/20711
Reviewed-by: Michael Wiederhold <mike@couchbase.com>
Tested-by: Matt Ingenthron <matt@couchbase.com>
49fe212
@ingenthr ingenthr JCBC-107: Correct OperationStatus message when observe poll is tuned.
Change-Id: Icf02c8d2f597a821869f77a79e38eb5cfb584a47
Reviewed-on: http://review.couchbase.org/20712
Reviewed-by: Michael Wiederhold <mike@couchbase.com>
Tested-by: Matt Ingenthron <matt@couchbase.com>
dd5e34e
@ingenthr ingenthr JCBC-109: Reduce observe poll interval latency.
A 100ms interval was chosen after some discussion.  It's
not optimal, and JCBC-108 tracks getting this to an adaptive
algorithm.

The reason for 100ms is that with real disks, chances are
fast IOs will happen in 60-120ms.  Only with caching or SSDs
will it likely be lower.  This means that with most checks
it'll happen in a handful of checks.

Change-Id: Ia6e14ee32ba6d6fc57608ffb44dbb9611e3401a5
Reviewed-on: http://review.couchbase.org/20760
Reviewed-by: Michael Wiederhold <mike@couchbase.com>
Tested-by: Matt Ingenthron <matt@couchbase.com>
f96138f
@ingenthr ingenthr Fix minor checkstyle issues.
Change-Id: I19ceb6459e61d0d5e53981267d6e58fcf99b784c
Reviewed-on: http://review.couchbase.org/20779
Reviewed-by: Matt Ingenthron <matt@couchbase.com>
Tested-by: Matt Ingenthron <matt@couchbase.com>
ce74eb6
@ingenthr ingenthr Update to released spymemcached 2.8.6.
Change-Id: I7803440f9ba5a88c3758fe10c49ab5c50532e0fd
Reviewed-on: http://review.couchbase.org/20780
Reviewed-by: Matt Ingenthron <matt@couchbase.com>
Tested-by: Matt Ingenthron <matt@couchbase.com>
e65942d
Commits on Oct 24, 2012
@daschl daschl JCBC-100: [Backport] Add better error handling on view fetches.
This changeset adds better error handling for synchronous
view fetches (getView and getViews) and adds documentation
to the asynchronous methods to remind the developer that
he has to check on the future object himself.

Change-Id: Ic1a74310f1f789b7b83bfae09496526b27ee7247
Reviewed-on: http://review.couchbase.org/21338
Reviewed-by: Matt Ingenthron <matt@couchbase.com>
Reviewed-by: Michael Nitschinger <michael.nitschinger@couchbase.com>
Tested-by: Michael Nitschinger <michael.nitschinger@couchbase.com>
Reviewed-on: http://review.couchbase.org/21738
eb439b7
@daschl daschl [Backport] Cancel view requests when the operation is cancelled.
This changeset makes sure that the corresponding http
requests are cancelled as well when the operation is
cancelled. This prevents a possible issue on blocking
the caller thread when the connection can't be
established.

This addresses JCBC-130.

Change-Id: I4c62eb8196a098ab5215e09659765fbd95010e1a
Reviewed-on: http://review.couchbase.org/21743
Reviewed-by: Matt Ingenthron <matt@couchbase.com>
Tested-by: Matt Ingenthron <matt@couchbase.com>
6876ee6
@daschl daschl Correcting view tests with wrong exception handling.
This changeset corrects the tests and makes sure the correct exceptions
are thrown. This is different than on master because the view tests
changed and the original changeset referred to those changes.

Change-Id: Id96b611105d7b3566eab2e6e3d81bb949c1a5ee3
Reviewed-on: http://review.couchbase.org/21924
Reviewed-by: Matt Ingenthron <matt@couchbase.com>
Tested-by: Matt Ingenthron <matt@couchbase.com>
f40b3f7
Commits on Nov 01, 2012
@daschl daschl JCBC-130: Add a timeout for unresponsive http connection fetches.
This adds a hardcoded timeout and a test to make sure that after
a certain time it is guaranteed that the thread waiting for the
connection initialization returns eventually.

The timeout is set to 30 seconds. Note that this is not the
timeout for the actual view response to receive, but for the
connection initialization.

Change-Id: Icb1138803d7914853b4e0f69b5a8a0443e4170c0
Reviewed-on: http://review.couchbase.org/22206
Reviewed-by: Matt Ingenthron <matt@couchbase.com>
Tested-by: Michael Nitschinger <michael.nitschinger@couchbase.com>
b8eda75