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

Valter's work addressing basho/riak_dt#99 #113

Open
wants to merge 34 commits into
base: 2.0
Choose a base branch
from

Commits on Dec 8, 2014

  1. WIP smaller map, maybe

    russelldb committed Dec 8, 2014
    Configuration menu
    Copy the full SHA
    21cd034 View commit details
    Browse the repository at this point in the history
  2. WIP smaller map, doesn't keep duplicate fields (merges on merge)

    Also takes care to not duplicate lots of clocks throughout structure.
    
    Still uses dots at head of field to solve the bottom vs. bottomish thing
    russelldb committed Dec 8, 2014
    Configuration menu
    Copy the full SHA
    1462e3d View commit details
    Browse the repository at this point in the history

Commits on Jan 2, 2015

  1. unit tests

    balegas committed Jan 2, 2015
    Configuration menu
    Copy the full SHA
    3278a6d View commit details
    Browse the repository at this point in the history
  2. Work in progress: remove leaf

    balegas committed Jan 2, 2015
    Configuration menu
    Copy the full SHA
    92a49b1 View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2015

  1. Added remove subtree test

    balegas committed Jan 4, 2015
    Configuration menu
    Copy the full SHA
    fbe2575 View commit details
    Browse the repository at this point in the history
  2. Work in progress:

    Added remove subtree
    
    Missing:
    - Control visibility of elements that have tombstones (recursive function, may be expensive)
    - Add context to remove subtree
    balegas committed Jan 4, 2015
    Configuration menu
    Copy the full SHA
    42ea8c1 View commit details
    Browse the repository at this point in the history
  3. Fixed Map equals

    balegas committed Jan 4, 2015
    Configuration menu
    Copy the full SHA
    92d0538 View commit details
    Browse the repository at this point in the history

Commits on Jan 5, 2015

  1. Stuff not to forget

    balegas committed Jan 5, 2015
    Configuration menu
    Copy the full SHA
    db9d3c6 View commit details
    Browse the repository at this point in the history

Commits on Jan 6, 2015

  1. Tests for field removes in a subtree.

    balegas committed Jan 6, 2015
    Configuration menu
    Copy the full SHA
    5291c07 View commit details
    Browse the repository at this point in the history

Commits on Jan 7, 2015

  1. Tests updated

    balegas committed Jan 7, 2015
    Configuration menu
    Copy the full SHA
    8e3f4e0 View commit details
    Browse the repository at this point in the history

Commits on Jan 8, 2015

  1. WIP - modified merge and a few things to correct some cases that fail…

    …ed in tests.
    balegas committed Jan 8, 2015
    Configuration menu
    Copy the full SHA
    7810b07 View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2015

  1. Added visibility to value(), changed tests accordingly;

    Started refactoring
    balegas committed Jan 9, 2015
    Configuration menu
    Copy the full SHA
    d9f35ed View commit details
    Browse the repository at this point in the history
  2. Continued with refactoring

    Corrected some wrong logic in clear tombstones.
    balegas committed Jan 9, 2015
    Configuration menu
    Copy the full SHA
    dae4417 View commit details
    Browse the repository at this point in the history

Commits on Jan 12, 2015

  1. Added get_deferred operation.

    balegas committed Jan 12, 2015
    Configuration menu
    Copy the full SHA
    f28af34 View commit details
    Browse the repository at this point in the history
  2. Fixed issue with reading from non-lists deferred operations.

    Added new failing test.
    balegas committed Jan 12, 2015
    Configuration menu
    Copy the full SHA
    093689a View commit details
    Browse the repository at this point in the history

Commits on Jan 13, 2015

  1. Added clear operations to some CRDTs.

    Use it on propagate_remove() to fix error in test.
    balegas committed Jan 13, 2015
    Configuration menu
    Copy the full SHA
    ff3f73c View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    a06dad4 View commit details
    Browse the repository at this point in the history
  3. Removed redundant ctx_rem_field operation.

    balegas committed Jan 13, 2015
    Configuration menu
    Copy the full SHA
    f48ea2b View commit details
    Browse the repository at this point in the history
  4. Added transactional tests

    balegas committed Jan 13, 2015
    Configuration menu
    Copy the full SHA
    a594530 View commit details
    Browse the repository at this point in the history

Commits on Jan 23, 2015

  1. Separate meta-data from value

    balegas committed Jan 23, 2015
    Configuration menu
    Copy the full SHA
    3587437 View commit details
    Browse the repository at this point in the history

Commits on Jan 27, 2015

  1. Corrections taken from the delta implementation.

    balegas committed Jan 27, 2015
    Configuration menu
    Copy the full SHA
    d2feb2e View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2015

  1. WIP - Cleaning the code

    balegas committed Jan 31, 2015
    Configuration menu
    Copy the full SHA
    34ae622 View commit details
    Browse the repository at this point in the history

Commits on Feb 3, 2015

  1. Ran Dialyzer

    Removed unnecessary code
    replaced raik_dt_vclock:fresh() by macro
    Removed whitespaces
    balegas committed Feb 3, 2015
    Configuration menu
    Copy the full SHA
    c40b8fc View commit details
    Browse the repository at this point in the history

Commits on Feb 4, 2015

  1. Removed generic riak_dt:get_deferred/1 implementation and removed get…

    …_deferred/2 from the interface.
    
    Fixed some issues with map dialyzer.
    balegas committed Feb 4, 2015
    Configuration menu
    Copy the full SHA
    6b2f238 View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2015

  1. Changed some type names.

    balegas committed Feb 6, 2015
    Configuration menu
    Copy the full SHA
    9d09195 View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2015

  1. Fixed wrong merge - error found by QuickCheck

    balegas committed Feb 10, 2015
    Configuration menu
    Copy the full SHA
    6aea55f View commit details
    Browse the repository at this point in the history
  2. Set entries parent clock.

    russelldb committed Feb 10, 2015
    Configuration menu
    Copy the full SHA
    8756f68 View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2015

  1. Some map fixes.

    balegas committed Feb 11, 2015
    Configuration menu
    Copy the full SHA
    4f14567 View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2015

  1. WIP - Quickcheck Passing; needs cleanup.

    balegas committed Feb 15, 2015
    Configuration menu
    Copy the full SHA
    daf9d60 View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2015

  1. More QuickCheck Fixes.

    balegas committed Feb 18, 2015
    Configuration menu
    Copy the full SHA
    e7af482 View commit details
    Browse the repository at this point in the history
  2. Code indentation.

    balegas committed Feb 18, 2015
    Configuration menu
    Copy the full SHA
    afb03a9 View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2015

  1. Configuration menu
    Copy the full SHA
    3bddd00 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'exper/balegas/issue99' of https://github.com/basho/riak_dt

     into exper/balegas/issue99
    balegas committed Feb 23, 2015
    Configuration menu
    Copy the full SHA
    44b7656 View commit details
    Browse the repository at this point in the history
  3. Fix another quick check error

    balegas committed Feb 23, 2015
    Configuration menu
    Copy the full SHA
    54ab49d View commit details
    Browse the repository at this point in the history