Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: couchbase/couchbase-java-client
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: couchbase/couchbase-java-client
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: release25
Choose a head ref
  • 17 commits
  • 20 files changed
  • 2 contributors

Commits on Mar 6, 2018

  1. Prepare 2.5.6 Release

    Change-Id: Ia4ca391fc9ed660a9783dcb4d3c907f4f334aeb0
    Reviewed-on: http://review.couchbase.org/90498
    Reviewed-by: Michael Nitschinger <[email protected]>
    Tested-by: Michael Nitschinger <[email protected]>
    daschl committed Mar 6, 2018
    Configuration menu
    Copy the full SHA
    932e922 View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2018

  1. Start 2.5.7 development

    Change-Id: I86180c25d0d027dd22acb9d7b8ad6440ef29250b
    Reviewed-on: http://review.couchbase.org/91922
    Reviewed-by: Subhashni Balakrishnan <[email protected]>
    Tested-by: Subhashni Balakrishnan <[email protected]>
    bsubhashni committed Mar 30, 2018
    Configuration menu
    Copy the full SHA
    7fb5fa8 View commit details
    Browse the repository at this point in the history
  2. Change to core 1.5.7 snapshot

    Change-Id: I35e2db38ba01613c445cbbc587d27c63cdda367c
    Reviewed-on: http://review.couchbase.org/91926
    Reviewed-by: Subhashni Balakrishnan <[email protected]>
    Tested-by: Subhashni Balakrishnan <[email protected]>
    bsubhashni committed Mar 30, 2018
    Configuration menu
    Copy the full SHA
    7f97c14 View commit details
    Browse the repository at this point in the history
  3. Integration test for JVMCBC-513

    Change-Id: I74d78f75580e23f8344ce26d8883a52fda939bd8
    Reviewed-on: http://review.couchbase.org/91924
    Tested-by: Subhashni Balakrishnan <[email protected]>
    Reviewed-by: Subhashni Balakrishnan <[email protected]>
    bsubhashni committed Mar 30, 2018
    Configuration menu
    Copy the full SHA
    3f88b9d View commit details
    Browse the repository at this point in the history
  4. JCBC-1175 Fix incorrect mapping of queue subdoc remove

    Motivation
    ----------
    Simulataneuously queue mutation could cause incorrect behavior of queue
    pop
    
    Changes
    -------
    If the recursion returns null, there was a cas mismatch so dont map the
    result as success, instead return cas mismatch exception.
    
    Results
    -------
    Multithreaded queue pop test verifies the change.
    
    Change-Id: I9a9a831c5b5e299e41f59f0b25ad4d45c28165c2
    Reviewed-on: http://review.couchbase.org/91925
    Reviewed-by: Matt Ingenthron <[email protected]>
    Tested-by: Subhashni Balakrishnan <[email protected]>
    bsubhashni committed Mar 30, 2018
    Configuration menu
    Copy the full SHA
    c697818 View commit details
    Browse the repository at this point in the history
  5. JCBC-1179 Add profile option to N1qlParams

    Change-Id: Icbd317c44153b85ab213a42160c1152e4fe89bc9
    Reviewed-on: http://review.couchbase.org/91928
    Reviewed-by: Subhashni Balakrishnan <[email protected]>
    Tested-by: Subhashni Balakrishnan <[email protected]>
    bsubhashni committed Mar 30, 2018
    Configuration menu
    Copy the full SHA
    037f725 View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2018

  1. JCBC-1179: Mark N1qlParams as uncommitted.

    Since new API shouldn't be marked as insta-stable,
    the new n1ql profiling API is marked as uncomitted
    for release25 and will be promoted to stable later.
    
    Change-Id: I3762b2081be658879867e86776367723cf341ca2
    Reviewed-on: http://review.couchbase.org/92028
    Reviewed-by: Michael Nitschinger <[email protected]>
    Tested-by: Michael Nitschinger <[email protected]>
    daschl committed Apr 3, 2018
    Configuration menu
    Copy the full SHA
    9ed9ff5 View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2018

  1. Prepare for 2.5.7 release

    Change-Id: I9722302465a3531f0c3d66389c1f1a831b6ea061
    Reviewed-on: http://review.couchbase.org/92132
    Reviewed-by: Subhashni Balakrishnan <[email protected]>
    Tested-by: Subhashni Balakrishnan <[email protected]>
    bsubhashni committed Apr 4, 2018
    Configuration menu
    Copy the full SHA
    17b4f94 View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2018

  1. JCBC-1194 Enable service on nodes in the bootstrap list in round robin

    Change to select new node from bootstrap list in round robin way for
    retries to enable services on nodes.
    
    Change-Id: I4ea9a61313f8e39eb7167702624458068ba552c6
    Reviewed-on: http://review.couchbase.org/93137
    Reviewed-by: Michael Nitschinger <[email protected]>
    Tested-by: Subhashni Balakrishnan <[email protected]>
    Reviewed-on: http://review.couchbase.org/93505
    Reviewed-by: Subhashni Balakrishnan <[email protected]>
    bsubhashni committed Apr 30, 2018
    Configuration menu
    Copy the full SHA
    b4932a8 View commit details
    Browse the repository at this point in the history
  2. Bump to 2.5.8-SNAPSHOT

    Change-Id: Id78b25a414932c5df4aeb62c474a9fe87c6770d1
    Reviewed-on: http://review.couchbase.org/93512
    Reviewed-by: Michael Nitschinger <[email protected]>
    Tested-by: Michael Nitschinger <[email protected]>
    daschl committed Apr 30, 2018
    Configuration menu
    Copy the full SHA
    bda8801 View commit details
    Browse the repository at this point in the history

Commits on May 1, 2018

  1. Prepare for release 2.5.8

    Change-Id: I5264ba33d02fe0a549db6595c3cb473d9a7cf631
    Reviewed-on: http://review.couchbase.org/93569
    Reviewed-by: Subhashni Balakrishnan <[email protected]>
    Tested-by: Subhashni Balakrishnan <[email protected]>
    bsubhashni committed May 1, 2018
    Configuration menu
    Copy the full SHA
    e84d052 View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2018

  1. JCBC-1158: Support annotations in parent classes

    Motivation
    ----------
    On our experimental repository API, it was reported that if the
    ID (or any other field for that matter) was stored on a parent
    class it is not picked up properly by our mapper.
    
    Modifications
    -------------
    This changeset makes sure that all the fields looked at are
    recursively picked up from parent classes as well so that
    if a child class is passed in all the proper fields from
    parent classes can be used.
    
    Test case has been added to verify this.
    
    Result
    ------
    Support for fields with annotations in parent classes.
    
    Change-Id: I219e1733476d2958699ddec8b4b52eacc6b7f19b
    Reviewed-on: http://review.couchbase.org/94676
    Reviewed-by: Michael Nitschinger <[email protected]>
    Tested-by: Michael Nitschinger <[email protected]>
    Reviewed-on: http://review.couchbase.org/95134
    daschl committed Jun 4, 2018
    Configuration menu
    Copy the full SHA
    ca15876 View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2018

  1. JCBC-1207: Dont do reverse address lookup for DNS SRV bootstrap

    Motivation
    ----------
    Changes for JVMCBC-513 made sure the addresses can be resolved to fix
    unhandled NPE. This check is not necessary for DNS SRV bootstrap.
    
    Changes
    -------
    Use the unresolved hosts from ConnectionString in core. Changed the bad
    ips to x.y.z on the tests as they resolve now.
    
    Change-Id: I0821c247923144c103416d0a43d8ddf6ec2c9b73
    Reviewed-on: http://review.couchbase.org/95228
    Reviewed-by: Michael Nitschinger <[email protected]>
    Tested-by: Michael Nitschinger <[email protected]>
    bsubhashni authored and daschl committed Jun 6, 2018
    Configuration menu
    Copy the full SHA
    4fa5c71 View commit details
    Browse the repository at this point in the history
  2. JCBC-1209: Audit and add explicit subscribers on req creation

    Motivation
    ----------
    In an earlier changeset the explicit subscriber management on
    the request has been added, but some of the APIs have been
    overlooked - this can lead to inconsistent behavior
    in core-io.
    
    Modifications
    -------------
    This changeset audits all calls to core.send(...) and where
    needed adds the explicit subscriber management on the request
    since core-io checks if a subscriber is attached and if not
    it never treats it as non-active. Especially n1ql requests
    in this regard have been treaded differently before this
    changeset compared to kv requests.
    
    Result
    ------
    Complete audit of .send() APIs and every request now properly
    handles it subscriber and can be checked against timeouts in
    core-io.
    
    Change-Id: I71f752384af7ac4fa88534531401901f92a1fb24
    Reviewed-on: http://review.couchbase.org/95227
    Reviewed-by: Michael Nitschinger <[email protected]>
    Tested-by: Michael Nitschinger <[email protected]>
    daschl committed Jun 6, 2018
    Configuration menu
    Copy the full SHA
    d7dcec6 View commit details
    Browse the repository at this point in the history
  3. Fix missing import on backport for JCBC-1207

    Change-Id: Ia72ee684f687b486659de9c0103642ba7768f529
    Reviewed-on: http://review.couchbase.org/95271
    Reviewed-by: Subhashni Balakrishnan <[email protected]>
    Tested-by: Subhashni Balakrishnan <[email protected]>
    bsubhashni committed Jun 6, 2018
    Configuration menu
    Copy the full SHA
    910401d View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2018

  1. Prepare 2.5.9 Release

    Change-Id: I0f3c1e932493bc8ee4fb9a6a3a2b432c227111c0
    Reviewed-on: http://review.couchbase.org/95327
    Reviewed-by: Michael Nitschinger <[email protected]>
    Tested-by: Michael Nitschinger <[email protected]>
    daschl committed Jun 7, 2018
    Configuration menu
    Copy the full SHA
    6d0c16d View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2018

  1. Start 2.5.10 Development

    Change-Id: Ib879e6e983e81db44c939064a5af46839c438eb2
    Reviewed-on: http://review.couchbase.org/99605
    Reviewed-by: Michael Nitschinger <[email protected]>
    Tested-by: Michael Nitschinger <[email protected]>
    daschl committed Sep 14, 2018
    Configuration menu
    Copy the full SHA
    245ca7f View commit details
    Browse the repository at this point in the history
Loading