[couchdb] branch prototype/fdb-layer updated: Don't advertise unimplemented features

[ja...@apache.org]

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

jaydoane pushed a commit to branch prototype/fdb-layer
in repository https://gitbox.apache.org/repos/asf/couchdb.git


The following commit(s) were added to refs/heads/prototype/fdb-layer by this push:
     new 7ca2ca5  Don't advertise unimplemented features
7ca2ca5 is described below

commit 7ca2ca5e87d18cb3d9a3f0568e545e8219cd3d0c
Author: Jay Doane <ja...@apache.org>
AuthorDate: Sat Mar 28 15:52:29 2020 -0700

    Don't advertise unimplemented features
    
    Removes the following features from the welcome message:
    - reshard
    - partitioned
    - pluggable-storage-engines
    - scheduler
    
    Although `scheduler` at least will presumably be returned once that
    feature is complete.
---
 src/couch/src/couch_server.erl                          | 6 ------
 src/couch_replicator/src/couch_replicator_scheduler.erl | 3 ++-
 src/mem3/src/mem3_reshard.erl                           | 5 -----
 3 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/couch/src/couch_server.erl b/src/couch/src/couch_server.erl
index 909e238..18fa3fe 100644
--- a/src/couch/src/couch_server.erl
+++ b/src/couch/src/couch_server.erl
@@ -237,12 +237,6 @@ init([]) ->
     couch_util:set_mqd_off_heap(?MODULE),
     couch_util:set_process_priority(?MODULE, high),
 
-    % Mark pluggable storage engines as a supported feature
-    config:enable_feature('pluggable-storage-engines'),
-
-    % Mark partitioned databases as a supported feature
-    config:enable_feature(partitioned),
-
     % Mark being able to receive documents with an _access property as a supported feature
     config:enable_feature('access-ready'),
 
diff --git a/src/couch_replicator/src/couch_replicator_scheduler.erl b/src/couch_replicator/src/couch_replicator_scheduler.erl
index 53c040e..00a352b 100644
--- a/src/couch_replicator/src/couch_replicator_scheduler.erl
+++ b/src/couch_replicator/src/couch_replicator_scheduler.erl
@@ -225,7 +225,8 @@ update_job_stats(JobId, Stats) ->
 %% gen_server functions
 
 init(_) ->
-    config:enable_feature('scheduler'),
+    % Temporarily disable on FDB, as it's not fully implemented yet
+    % config:enable_feature('scheduler'),
     EtsOpts = [named_table, {keypos, #job.id}, {read_concurrency, true},
         {write_concurrency, true}],
     ?MODULE = ets:new(?MODULE, EtsOpts),
diff --git a/src/mem3/src/mem3_reshard.erl b/src/mem3/src/mem3_reshard.erl
index 620b1bc..234670c 100644
--- a/src/mem3/src/mem3_reshard.erl
+++ b/src/mem3/src/mem3_reshard.erl
@@ -213,11 +213,6 @@ reset_state() ->
 % Gen server functions
 
 init(_) ->
-    % Advertise resharding API feature only if it is not disabled
-    case is_disabled() of
-        true -> ok;
-        false -> config:enable_feature('reshard')
-    end,
     couch_log:notice("~p start init()", [?MODULE]),
     EtsOpts = [named_table, {keypos, #job.id}, {read_concurrency, true}],
     ?MODULE = ets:new(?MODULE, EtsOpts),