Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Apr 2, 2014
  1. FIxup path

    authored
    Change-Id: Ic2b6ff2e60042905cab4260b02d3e9cd5e695c17
  2. Chris Hillery

    Converting geocouch to CMake.

    ceejatec authored committed
    The following CMake targets exist:
    
    "geocouch" -just compiles the geocouch source, using rebar as
    always. ("make all" is the default, and "all" depend on "geocouch", so
    "make" by itself will compile the source.)
    
    "geocouch_makecheck" - same as old "compileforcheck" target.
    
    "geocouch_check" - same as old "check" target; cleans, runs
    geocouch_makecheck, and then runs the tests.
    
    "realclean" - same as old "clean".
    
    I specifically did not include .tar.gz or "dist" targets as they
    support the old, undesirable way of creating source tarballs.
    
    Change-Id: I9098c47db8b50fdde760130391b529f987e74d03
Commits on Feb 6, 2014
  1. Volker Mische

    MB-10138: Writing a header now also returns the position

    vmx authored vmx committed
    The function to write a header now also returns the position. This change
    was introduce in commit /79038773b2ed4beaa1e1bf2e889fcff4141ff49e [1][2].
    
    This fixes the testrunner spatialquery.conf tests (tested on single
    and 4 nodes).
    
    [1] couchbase/couchdb@7903877
    [2] http://review.couchbase.org/28816
    
    Change-Id: Ied2f89ff72990e1f93e5eb7cbe91338684e9e06f
    Reviewed-on: http://review.couchbase.org/33284
    Reviewed-by: Filipe David Borba Manana <fdmanana@gmail.com>
    Tested-by: Volker Mische <volker.mische@gmail.com>
Commits on Jul 22, 2013
  1. Volker Mische

    MB-8648: Adapt the spatial merger for the changes

    vmx authored vmx committed
    Change-Id: If45cc878f46d967e32762905a21c4027f5d2ec16
    Reviewed-on: http://review.couchbase.org/27553
    Tested-by: buildbot <build@couchbase.com>
    Reviewed-by: Filipe David Borba Manana <fdmanana@gmail.com>
Commits on Feb 26, 2013
  1. Filipe Manana

    Merge remote-tracking branch 'origin/2.0.2'

    fdmanana authored
    * origin/2.0.2:
      MB-7406: Add updater barrier for spatial indexer
      CBD-829:  create 2.0.2 branch
    
    Change-Id: Icca00c51c3801498a0b6f2ada9d3ac3d74881ad9
Commits on Feb 25, 2013
  1. Volker Mische Filipe Manana

    MB-7406: Add updater barrier for spatial indexer

    vmx authored fdmanana committed
    Currently there's one spatial indexer for every vBucket,
    hence a lot of updaters are running at the same time.
    This commit adds a barrier, so that you can set the
    maximum number of updaters that should run at the same
    time. The default value is 4. The MapReduce indexer
    already uses such a barrier.
    
    Those two commits should me merged at the same time:
    http://review.couchbase.org/24830
    http://review.couchbase.org/24831
    
    Change-Id: Ibcf423073b0e01055f5d8952f4d3656ab8959464
    Reviewed-on: http://review.couchbase.org/24831
    Tested-by: Volker Mische <volker.mische@gmail.com>
    Reviewed-by: Filipe David Borba Manana <fdmanana@gmail.com>
    Tested-by: Filipe David Borba Manana <fdmanana@gmail.com>
Commits on Feb 12, 2013
  1. Phil Labee

    CBD-829: create 2.0.2 branch

    plabee authored
    Change-Id: Id53732ad5b4158ad3a5789c0bb5c4caa65884788
    Reviewed-on: http://review.couchbase.org/24527
    Reviewed-by: Philip Labee <philip@couchbase.com>
    Tested-by: Philip Labee <philip@couchbase.com>
Commits on Jan 28, 2013
  1. Filipe Manana

    Merge remote-tracking branch 'origin/2.0.1'

    fdmanana authored
    * origin/2.0.1:
      MB-6895 Deal with new mapreduce API
    
    Change-Id: I945cd2d7d68b3041c688fd1793d144fe980d994a
  2. Filipe Manana

    MB-6895 Deal with new mapreduce API

    fdmanana authored fdmanana committed
    When a map call succeeds, the returned value is no longer
    only a list of lists of KVs. An outter list element can
    also be an error tuple now, which tells us there was an
    error for a specific map function of a view.
    
    Change-Id: If4a19c0d21e21756f749747841c07ec00b798d85
    Reviewed-on: http://review.couchbase.org/24206
    Tested-by: Filipe David Borba Manana <fdmanana@gmail.com>
    Reviewed-by: Filipe David Borba Manana <fdmanana@gmail.com>
Commits on Jan 18, 2013
  1. Volker Mische

    MB-7084: Pass on limit parameter in spatial merger

    vmx authored vmx committed
    The limit parameter is now passed on to the other nodes when
    the spatial view merger is used. Note that the limit is set
    to the original limit plus the original skip. The reason is
    that you never know which node needs to skip the results to
    which amount (but the maximum number of documents needed is
    definitely <= limit + skip).
    
    Change-Id: I7fa9884ef673bbe88c034353ca418ef6843702ed
    Reviewed-on: http://review.couchbase.org/22228
    Reviewed-by: Filipe David Borba Manana <fdmanana@gmail.com>
    Reviewed-by: Volker Mische <volker.mische@gmail.com>
    Tested-by: Volker Mische <volker.mische@gmail.com>
Commits on Dec 31, 2012
  1. Filipe Manana

    Merge remote-tracking branch 'origin/2.0.1'

    fdmanana authored
    * origin/2.0.1:
      GC-3: Make COUCH_SRC parsing less fragile
    
    Change-Id: I1680f1661a716018a9da2b3963db80e0bdb96af1
Commits on Dec 19, 2012
  1. Volker Mische Bin Cui

    GC-3: Make COUCH_SRC parsing less fragile

    vmx authored bcui6611 committed
    Newer version of rebar support a file called
    rebar.config.script to be run before the
    actual compiling is done. This way we can
    inject the value of COUCH_SRC and the MAKECHECK
    environment variable in a less fragile way.
    
    Change-Id: Ifb0082ac1b1272f590897ab6dacdcbf4a87ca6fd
    Reviewed-on: http://review.couchbase.org/23397
    Reviewed-by: Bin Cui <bin.cui@gmail.com>
    Tested-by: Bin Cui <bin.cui@gmail.com>
Commits on Dec 13, 2012
  1. Filipe Manana

    Merge remote-tracking branch 'couchbase/2.0.1' into HEAD

    fdmanana authored
    * couchbase/2.0.1:
      MB-7193: Make Spatial Views work that contain slashes
    
    Change-Id: I1dff1822ceba6be425b7e78fa2cfed80786c194b
  2. Volker Mische Filipe Manana

    MB-7193: Make Spatial Views work that contain slashes

    vmx authored fdmanana committed
    Spatial Views that contained slashed in either the Design Document
    or the function name didn't work.
    
    Those three commits need to be merged at the same time:
    http://review.couchbase.org/23138
    http://review.couchbase.org/23175
    http://review.couchbase.org/23139
    
    Change-Id: I9142509f8fe9f2afab681f549a145856c065652d
    Reviewed-on: http://review.couchbase.org/23175
    Reviewed-by: Volker Mische <volker.mische@gmail.com>
    Reviewed-by: Filipe David Borba Manana <fdmanana@gmail.com>
    Tested-by: Filipe David Borba Manana <fdmanana@gmail.com>
Commits on Oct 25, 2012
  1. Volker Mische

    MB-7013: There is a branch for Apache CouchDB 1.3.x now

    vmx authored vmx committed
    Change-Id: Ie865dc966db5be59b89138685e67f48017dbe50a
    Reviewed-on: http://review.couchbase.org/21960
    Reviewed-by: Volker Mische <volker.mische@gmail.com>
    Tested-by: Volker Mische <volker.mische@gmail.com>
Commits on Oct 24, 2012
  1. Volker Mische

    MB-6990: Add validation of spatial function

    vmx authored Farshid Ghods committed
    The spatial function in a Design Document now has the same
    validation as the mapreduce funtions in normal views. You'll
    get errors when the spatial function isn't a valid one, or
    the name of the function has leading/trailing whitespace.
    
    This commit needs http://review.couchbase.org/21891
    else the 300-validation.t tests will fail.
    
    Change-Id: I88b7e20ba32ae66058da4d7d122190153f66eeba
    Reviewed-on: http://review.couchbase.org/21890
    Reviewed-by: Filipe David Borba Manana <fdmanana@gmail.com>
    Tested-by: Filipe David Borba Manana <fdmanana@gmail.com>
    Reviewed-by: Farshid Ghods <farshid@couchbase.com>
    Tested-by: Farshid Ghods <farshid@couchbase.com>
Commits on Oct 22, 2012
  1. Volker Mische

    MB-6860: Don't leak spatial file descriptors on DB files

    vmx authored Farshid Ghods committed
    When a database was compacted, there were still file descriptors
    of the spatial indexes still kept open on the old, pre-compaction
    database files.
    
    This commit is based on commits [1][2][3][4] from Apache CouchDB.
    
    [1] apache/couchdb@0ce2c54
    [2] apache/couchdb@c0de37d
    [3] apache/couchdb@152f2b9
    [4] apache/couchdb@12a593c
    
    Change-Id: I2ff9ee18a8ae5d07ddb3ffbdd7f086bfa91a1d65
    Reviewed-on: http://review.couchbase.org/21714
    Tested-by: buildbot <build@couchbase.com>
    Tested-by: Filipe David Borba Manana <fdmanana@gmail.com>
    Reviewed-by: Filipe David Borba Manana <fdmanana@gmail.com>
  2. Volker Mische

    MB-6860: Fix spatial index file descriptors leaks

    vmx authored Farshid Ghods committed
    On the spatial indexes the file descriptors leaked, when a design
    document was updated. The issue (and fix) is similar to the
    Apache CouchDB issue COUCHDB-1309 [1].
    
    In Couchbase the design document only lives in the master database,
    hence the ddoc_updated event is only triggered for that database,
    but we need to clean up the spatial indexes for all vBuckets.
    
    The solution is to save not only a reference of the spatial view
    group but also a reference to the database that contains the
    design document. This way a cleanup on all vBuckets can be done.
    
    [1] https://issues.apache.org/jira/browse/COUCHDB-1309
    
    Change-Id: Ia9fc277f163a7adbce8a47b0a4212d6ec606858c
    Reviewed-on: http://review.couchbase.org/21592
    Tested-by: buildbot <build@couchbase.com>
    Reviewed-by: Filipe David Borba Manana <fdmanana@gmail.com>
    Tested-by: Filipe David Borba Manana <fdmanana@gmail.com>
Commits on Oct 19, 2012
  1. Volker Mische

    MB-6942: Don't return "node": "local"

    vmx authored Farshid Ghods committed
    I don't have an idea why I originally returned "node": "local"
    for every row. It works also without.
    
    Change-Id: If782c19ff6fe1cf40f184f179a3aef876008cc66
    Reviewed-on: http://review.couchbase.org/21717
    Tested-by: buildbot <build@couchbase.com>
    Reviewed-by: Filipe David Borba Manana <fdmanana@gmail.com>
Commits on Oct 15, 2012
  1. Volker Mische

    MB-6860: Don't open group for cleanup

    vmx authored Peter Wansch committed
    In the old code the spatial group was opened to get the
    signature in order to cleanup the files. This meant that
    a spatial group was created although there were no spatial
    views defined in the design document.
    
    The new code doesn't create new spatial groups if there
    aren't eny defined in the design document.
    
    Change-Id: I54f6a3cdfe524c8eeacb88d4bd0d9a87d59985d4
    Reviewed-on: http://review.couchbase.org/21591
    Tested-by: buildbot <build@couchbase.com>
    Reviewed-by: Filipe David Borba Manana <fdmanana@gmail.com>
    Tested-by: Volker Mische <volker.mische@gmail.com>
Commits on Aug 13, 2012
  1. Volker Mische

    MB-6205: Make "updater_after" the default "stale" value

    vmx authored vmx committed
    From now on the default value for "stale" is "updater_after". If
    you want the old behaviour, query with "stale=false".
    
    Change-Id: Ib20099647414a879acc20e5767730ecdb2746875
    Reviewed-on: http://review.couchbase.org/19561
    Tested-by: buildbot <build@couchbase.com>
    Reviewed-by: Filipe David Borba Manana <fdmanana@gmail.com>
Commits on Jul 30, 2012
  1. Volker Mische Chris Anderson

    Changes for the "separate document body and meta" work

    vmx authored jchris committed
    GeoCouch needs slight changes to make it work with the
    new separated documents, where the documents have a
    body and a meta part.
    
    This needs to be merged along with (and all its dependencies):
    http://review.couchbase.org/17590
    
    Change-Id: I5429d0839ab56671ee481e517b6608bf14661e76
    Reviewed-on: http://review.couchbase.org/18412
    Reviewed-by: Chris Anderson <jchris@couchbase.com>
    Tested-by: Chris Anderson <jchris@couchbase.com>
Commits on Jul 20, 2012
  1. Volker Mische

    MB-100: Make GeoCouch safe for future rebar versions

    vmx authored vmx committed
    In newer rebar versions, you need to name the "src" directory
    explicitly in `src_dirs`, else those files won't get compiled.
    
    Change-Id: Iff510a22e6ade20220ceac3b59e4bf0ef2c7a87f
    Reviewed-on: http://review.couchbase.org/18641
    Tested-by: buildbot <build@couchbase.com>
    Reviewed-by: Filipe David Borba Manana <fdmanana@gmail.com>
Commits on Jul 12, 2012
  1. Volker Mische

    Remove unused record

    vmx authored vmx committed
    Remove the record #node{} that wasn't used anymore.
    
    Change-Id: I432747ba22457c2c28dd078deafabbc1ca6713ea
    Reviewed-on: http://review.couchbase.org/10951
    Reviewed-by: Filipe David Borba Manana <fdmanana@gmail.com>
    Reviewed-by: Volker Mische <volker.mische@gmail.com>
    Tested-by: Volker Mische <volker.mische@gmail.com>
  2. Volker Mische

    Make geojson_get_bbox/1 work

    vmx authored vmx committed
    The geojson_get_bbox/1 function didn't actually work. Fix it.
    
    Change-Id: I07124f763f4b473c3eb81e496cfb3d89179d12d0
    Reviewed-on: http://review.couchbase.org/10092
    Reviewed-by: Filipe David Borba Manana <fdmanana@gmail.com>
    Reviewed-by: Volker Mische <volker.mische@gmail.com>
    Tested-by: Volker Mische <volker.mische@gmail.com>
  3. Volker Mische

    Fix spatial design docs test

    vmx authored vmx committed
    The test was too fragile. It tested for a certain file size,
    which can easily change whenever the underlying data storage
    or structure changes.
    
    Change-Id: I79b052f50032a7b5f0c06c59e21e9a2a3374b64d
    Reviewed-on: http://review.couchbase.org/14731
    Reviewed-by: Filipe David Borba Manana <fdmanana@gmail.com>
    Tested-by: Volker Mische <volker.mische@gmail.com>
    Reviewed-by: Volker Mische <volker.mische@gmail.com>
Commits on Jul 6, 2012
  1. Volker Mische

    MB-5820: View merger expects binaries

    vmx authored vmx committed
    The view merger expects the returned rows to be binaries. Comply
    to the requirement with the Spatial Views as well.
    
    Change-Id: I6b146daf0fa1212d49dac43838c5e01d74d47bb7
    Reviewed-on: http://review.couchbase.org/17985
    Tested-by: buildbot <build@couchbase.com>
    Reviewed-by: Filipe David Borba Manana <fdmanana@gmail.com>
    Tested-by: Volker Mische <volker.mische@gmail.com>
    Reviewed-by: Volker Mische <volker.mische@gmail.com>
Commits on Jun 5, 2012
  1. Filipe Manana Aliaksey Kandratsenka (aka Aliaksei Kandratsenka)

    CBD-312 Index merger is now a separate OTP application

    fdmanana authored alk committed
    Change-Id: I618c9e8a45f65f1d6ade48ba6b027355fe9c4ff3
    Reviewed-on: http://review.couchbase.org/16589
    Reviewed-by: Damien Katz <damien@couchbase.com>
    Tested-by: Volker Mische <volker.mische@gmail.com>
    Reviewed-by: Volker Mische <volker.mische@gmail.com>
    Tested-by: Filipe David Borba Manana <fdmanana@gmail.com>
    Reviewed-by: Aliaksey Kandratsenka <alkondratenko@gmail.com>
Commits on Apr 12, 2012
  1. Filipe Manana

    Revert "Geometry search for GeoCouch"

    fdmanana authored fdmanana committed
    This reverts commit 5f6e9f1.
    
    Change-Id: I78d57e28b8e7c6f54c5d9d5102b324893363ff46
    Reviewed-on: http://review.couchbase.org/14785
    Reviewed-by: Filipe David Borba Manana <fdmanana@gmail.com>
    Tested-by: Filipe David Borba Manana <fdmanana@gmail.com>
  2. Filipe Manana

    Revert "Pull in dependencies for geometry search"

    fdmanana authored fdmanana committed
    This reverts commit b090085.
    
    Change-Id: Iae434720b2a80ac17260347df85803fe3a87bcaa
    Reviewed-on: http://review.couchbase.org/14786
    Reviewed-by: Filipe David Borba Manana <fdmanana@gmail.com>
    Tested-by: Filipe David Borba Manana <fdmanana@gmail.com>
  3. Filipe Manana

    Revert "Make geometry search work with spatial merging"

    fdmanana authored fdmanana committed
    This reverts commit dc9864e.
    
    Change-Id: Ibdce766381b96f66194bcdf7bc5f4d9bedb87254
    Reviewed-on: http://review.couchbase.org/14784
    Reviewed-by: Filipe David Borba Manana <fdmanana@gmail.com>
    Tested-by: Filipe David Borba Manana <fdmanana@gmail.com>
Commits on Apr 11, 2012
  1. Volker Mische Filipe Manana

    Make geometry search work with spatial merging

    vmx authored fdmanana committed
    Geometry search wasn't working with spatial merging. This
    fixes it and it also adds a test, to prevent future regression.
    
    Change-Id: Ib0de1f5acb03ef4252f4dcff01a6d87e67f835dd
    Reviewed-on: http://review.couchbase.org/13827
    Reviewed-by: Filipe David Borba Manana <fdmanana@gmail.com>
    Tested-by: Filipe David Borba Manana <fdmanana@gmail.com>
  2. Volker Mische Filipe Manana

    Geometry search for GeoCouch

    vmx authored fdmanana committed
    Spatial indexes can now be searched with a geometry,
    e.g. a polygon. The query parameter is "geometry"
    the value needs to be URL encoded Well-Known Text.
    Supported geometry types are (Multi)Point, (Multi)LineString,
    (Multi)Polygon.
    
    Example:
    curl -X GET 'http://localhost:5984/places/_design/main/_spatial/points?geometry=POLYGON((-21.0+58.9,+21.0+-61.1,+113.9+-54.3,+150.4+72.289067198883,+-21.0+58.9))'
    
    Change-Id: I7b3b6fc8e6f8e2109e61a77834cfad1ec0ae28df
    Reviewed-on: http://review.couchbase.org/10095
    Reviewed-by: Filipe David Borba Manana <fdmanana@gmail.com>
    Tested-by: Filipe David Borba Manana <fdmanana@gmail.com>
  3. Volker Mische Filipe Manana

    Pull in dependencies for geometry search

    vmx authored fdmanana committed
    Geometry search needs a WKT parser as well
    as Erlgeom to calculate the intersections.
    
    To checkout the dependencies use ./rebar get-deps
    
    Change-Id: I6b7109f5ffe70723a175816de997a96fa7ed8e0a
    Reviewed-on: http://review.couchbase.org/13786
    Reviewed-by: Filipe David Borba Manana <fdmanana@gmail.com>
    Tested-by: Filipe David Borba Manana <fdmanana@gmail.com>
  4. Volker Mische Filipe Manana

    Prepare for polygon search

    vmx authored fdmanana committed
    Internal functions can be re-used for the polygon search if
    the geometry types are converted to atoms, which is the way
    they are stored in the Erlang term representation.
    
    Change-Id: I0b946648976938bc875ac1970731afe9c48c7c66
    Reviewed-on: http://review.couchbase.org/10093
    Reviewed-by: Filipe David Borba Manana <fdmanana@gmail.com>
    Tested-by: Filipe David Borba Manana <fdmanana@gmail.com>
Something went wrong with that request. Please try again.