[couchdb] 05/05: expose partitioned flag in GET /dbname info

[rn...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rnewson pushed a commit to branch user-partitioned-dbs-wip
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit 792bedad917ad4bec44132a601f9d5714eb9e357
Author: Robert Newson <rn...@apache.org>
AuthorDate: Mon Jul 16 12:50:20 2018 +0100

    expose partitioned flag in GET /dbname info
---
 src/couch/src/couch_db.erl         |   5 +----
 src/couch/test/fixtures/test.couch | Bin 16482 -> 0 bytes
 src/fabric/src/fabric.erl          |   4 +++-
 src/fabric/src/fabric_db_info.erl  |   3 +++
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/couch/src/couch_db.erl b/src/couch/src/couch_db.erl
index 2b735fd..1a82a99 100644
--- a/src/couch/src/couch_db.erl
+++ b/src/couch/src/couch_db.erl
@@ -449,10 +449,7 @@ get_db_info(Db) ->
         undefined -> null;
         Else1 -> Else1
     end,
-    Partitioned = case get_partitioned(Db) of
-        undefined -> null;
-        Else2 -> Else2
-    end,
+    Partitioned = get_partitioned(Db),
     InfoList = [
         {db_name, Name},
         {engine, couch_db_engine:get_engine(Db)},
diff --git a/src/couch/test/fixtures/test.couch b/src/couch/test/fixtures/test.couch
deleted file mode 100644
index 32c79af..0000000
Binary files a/src/couch/test/fixtures/test.couch and /dev/null differ
diff --git a/src/fabric/src/fabric.erl b/src/fabric/src/fabric.erl
index 00513a7..308de64 100644
--- a/src/fabric/src/fabric.erl
+++ b/src/fabric/src/fabric.erl
@@ -79,7 +79,9 @@ all_dbs(Prefix) when is_list(Prefix) ->
         {purge_seq, non_neg_integer()} |
         {compact_running, boolean()} |
         {disk_size, non_neg_integer()} |
-        {disk_format_version, pos_integer()}
+        {disk_format_version, pos_integer()} |
+        {cluster, any()} |
+        {partitioned, boolean()}
     ]}.
 get_db_info(DbName) ->
     fabric_db_info:go(dbname(DbName)).
diff --git a/src/fabric/src/fabric_db_info.erl b/src/fabric/src/fabric_db_info.erl
index 98e8e52..36abf79 100644
--- a/src/fabric/src/fabric_db_info.erl
+++ b/src/fabric/src/fabric_db_info.erl
@@ -107,6 +107,9 @@ merge_results(Info) ->
             [{disk_format_version, lists:max(X)} | Acc];
         (cluster, [X], Acc) ->
             [{cluster, {X}} | Acc];
+        (partitioned, X, Acc) ->
+            %% require unanimity here
+            [{partitioned, [Y || Y <- X, Y /= true] == []} | Acc];
         (_, _, Acc) ->
             Acc
     end, [{instance_start_time, <<"0">>}], Dict).