You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by da...@apache.org on 2017/11/01 19:31:15 UTC
[1/6] jiffy commit: updated refs/heads/master to 02e308c
Repository: couchdb-jiffy
Updated Branches:
refs/heads/master f85e2fc3b -> 02e308c59
Document dedupe_keys option
Project: http://git-wip-us.apache.org/repos/asf/couchdb-jiffy/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-jiffy/commit/6da61bbf
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-jiffy/tree/6da61bbf
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-jiffy/diff/6da61bbf
Branch: refs/heads/master
Commit: 6da61bbfdfb2411a1bf386bf0c704085d20415eb
Parents: 128811a
Author: Paul J. Davis <pa...@gmail.com>
Authored: Tue Oct 31 12:09:56 2017 -0500
Committer: Paul J. Davis <pa...@gmail.com>
Committed: Tue Oct 31 12:09:56 2017 -0500
----------------------------------------------------------------------
README.md | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-jiffy/blob/6da61bbf/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index e291de4..fa20dd6 100644
--- a/README.md
+++ b/README.md
@@ -48,6 +48,10 @@ The options for decode are:
JSON term is decoded the return value of decode/2 becomes
`{has_trailer, FirstTerm, RestData::iodata()}`. This is useful to
decode multiple terms in a single binary.
+* `dedupe_keys` - If a key is repeated in a JSON object this flag
+ will ensure that the parsed object only contains a single entry
+ containing the last value seen. This mirrors the parsing beahvior
+ of virtually every other JSON parser.
* `{bytes_per_red, N}` where N >= 0 - This controls the number of
bytes that Jiffy will process as an equivalent to a reduction. Each
20 reductions we consume 1% of our allocated time slice for the current
[5/6] jiffy commit: updated refs/heads/master to 02e308c
Posted by da...@apache.org.
Bump to 0.14.13
Project: http://git-wip-us.apache.org/repos/asf/couchdb-jiffy/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-jiffy/commit/7602deef
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-jiffy/tree/7602deef
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-jiffy/diff/7602deef
Branch: refs/heads/master
Commit: 7602deef034527c136b3bebc006b91ee87e785b4
Parents: 1c86455
Author: Paul J. Davis <pa...@gmail.com>
Authored: Wed Nov 1 14:30:09 2017 -0500
Committer: Paul J. Davis <pa...@gmail.com>
Committed: Wed Nov 1 14:30:09 2017 -0500
----------------------------------------------------------------------
src/jiffy.app.src | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-jiffy/blob/7602deef/src/jiffy.app.src
----------------------------------------------------------------------
diff --git a/src/jiffy.app.src b/src/jiffy.app.src
index 4bbc3f7..6014d20 100644
--- a/src/jiffy.app.src
+++ b/src/jiffy.app.src
@@ -1,6 +1,6 @@
{application, jiffy, [
{description, "JSON Decoder/Encoder."},
- {vsn, "0.14.12"},
+ {vsn, "0.14.13"},
{registered, []},
{applications, [kernel, stdlib]},
{maintainers, ["Paul J. Davis"]},
[2/6] jiffy commit: updated refs/heads/master to 02e308c
Posted by da...@apache.org.
Add tests for deduplication in child objects
Project: http://git-wip-us.apache.org/repos/asf/couchdb-jiffy/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-jiffy/commit/c6828729
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-jiffy/tree/c6828729
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-jiffy/diff/c6828729
Branch: refs/heads/master
Commit: c68287297b1b78387aa6e5e078c1e5f4766bdb6f
Parents: 6da61bb
Author: Paul J. Davis <pa...@gmail.com>
Authored: Tue Oct 31 12:10:49 2017 -0500
Committer: Paul J. Davis <pa...@gmail.com>
Committed: Tue Oct 31 12:10:49 2017 -0500
----------------------------------------------------------------------
test/jiffy_16_dedupe_keys_tests.erl | 10 ++++++++++
1 file changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-jiffy/blob/c6828729/test/jiffy_16_dedupe_keys_tests.erl
----------------------------------------------------------------------
diff --git a/test/jiffy_16_dedupe_keys_tests.erl b/test/jiffy_16_dedupe_keys_tests.erl
index a17c474..18b5394 100644
--- a/test/jiffy_16_dedupe_keys_tests.erl
+++ b/test/jiffy_16_dedupe_keys_tests.erl
@@ -33,6 +33,16 @@ dedupe_keys_test_() ->
{[{<<"foo">>, 1}, {<<"foo">>, 2}, {<<"foo">>, 3}]},
{[{<<"foo">>, 3}]}
},
+ % Sub-objects are covered
+ {
+ {[{<<"foo">>, {[{<<"bar">>, 1}, {<<"bar">>, 2}]}}]},
+ {[{<<"foo">>, {[{<<"bar">>, 2}]}}]}
+ },
+ % Objets in arrays are handled
+ {
+ [{[{<<"foo">>, 1}, {<<"foo">>, 2}]}],
+ [{[{<<"foo">>, 2}]}]
+ },
% Embedded NULL bytes are handled
{
{[{<<"foo\\u0000bar">>, 1}, {<<"foo\\u0000baz">>, 2}]},
[6/6] jiffy commit: updated refs/heads/master to 02e308c
Posted by da...@apache.org.
Merge remote-tracking branch 'davisp/master'
Project: http://git-wip-us.apache.org/repos/asf/couchdb-jiffy/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-jiffy/commit/02e308c5
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-jiffy/tree/02e308c5
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-jiffy/diff/02e308c5
Branch: refs/heads/master
Commit: 02e308c5941cc14e5d8913b5c9cc821dd9d41862
Parents: f85e2fc 7602dee
Author: Paul J. Davis <pa...@gmail.com>
Authored: Wed Nov 1 14:31:06 2017 -0500
Committer: Paul J. Davis <pa...@gmail.com>
Committed: Wed Nov 1 14:31:06 2017 -0500
----------------------------------------------------------------------
README.md | 4 ++++
src/jiffy.app.src | 2 +-
src/jiffy.erl | 1 +
test/jiffy_16_dedupe_keys_tests.erl | 10 ++++++++++
4 files changed, 16 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[4/6] jiffy commit: updated refs/heads/master to 02e308c
Posted by da...@apache.org.
Fix type spec
Project: http://git-wip-us.apache.org/repos/asf/couchdb-jiffy/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-jiffy/commit/1c86455c
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-jiffy/tree/1c86455c
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-jiffy/diff/1c86455c
Branch: refs/heads/master
Commit: 1c86455c135227f4874dc00b00ea8eea5c662c3f
Parents: 3d73439
Author: Paul J. Davis <pa...@gmail.com>
Authored: Wed Nov 1 14:29:37 2017 -0500
Committer: Paul J. Davis <pa...@gmail.com>
Committed: Wed Nov 1 14:29:37 2017 -0500
----------------------------------------------------------------------
src/jiffy.erl | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-jiffy/blob/1c86455c/src/jiffy.erl
----------------------------------------------------------------------
diff --git a/src/jiffy.erl b/src/jiffy.erl
index 08fa3c0..a116211 100644
--- a/src/jiffy.erl
+++ b/src/jiffy.erl
@@ -39,6 +39,7 @@
-type decode_option() :: return_maps
| use_nil
| return_trailer
+ | dedupe_keys
| {null_term, any()}
| {bytes_per_iter, non_neg_integer()}
| {bytes_per_red, non_neg_integer()}.
[3/6] jiffy commit: updated refs/heads/master to 02e308c
Posted by da...@apache.org.
Bump to 0.14.12
Project: http://git-wip-us.apache.org/repos/asf/couchdb-jiffy/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-jiffy/commit/3d73439f
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-jiffy/tree/3d73439f
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-jiffy/diff/3d73439f
Branch: refs/heads/master
Commit: 3d73439f5e979af825957cb4b033c30779a9c626
Parents: c682872
Author: Paul J. Davis <pa...@gmail.com>
Authored: Tue Oct 31 12:11:18 2017 -0500
Committer: Paul J. Davis <pa...@gmail.com>
Committed: Tue Oct 31 12:11:18 2017 -0500
----------------------------------------------------------------------
src/jiffy.app.src | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-jiffy/blob/3d73439f/src/jiffy.app.src
----------------------------------------------------------------------
diff --git a/src/jiffy.app.src b/src/jiffy.app.src
index 7e08e12..4bbc3f7 100644
--- a/src/jiffy.app.src
+++ b/src/jiffy.app.src
@@ -1,6 +1,6 @@
{application, jiffy, [
{description, "JSON Decoder/Encoder."},
- {vsn, "0.14.11"},
+ {vsn, "0.14.12"},
{registered, []},
{applications, [kernel, stdlib]},
{maintainers, ["Paul J. Davis"]},