You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ja...@apache.org on 2024/10/14 20:00:20 UTC
(couchdb) branch dreyfus-cleanup created (now d7ec188f4)
This is an automated email from the ASF dual-hosted git repository.
jaydoane pushed a change to branch dreyfus-cleanup
in repository https://gitbox.apache.org/repos/asf/couchdb.git
at d7ec188f4 Delete redundant `link` to `dreyfus_index`
This branch includes the following new commits:
new b6fc13bf7 Git ignore dev Clouseau artifacts
new 118ea4ce4 Git ignore generated .erl files
new 9a0141688 Remove unused includes and defines
new d7ec188f4 Delete redundant `link` to `dreyfus_index`
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(couchdb) 04/04: Delete redundant `link` to `dreyfus_index`
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jaydoane pushed a commit to branch dreyfus-cleanup
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit d7ec188f4bc9b3a58b3b5e841f938e341918fd62
Author: Jay Doane <ja...@apache.org>
AuthorDate: Mon Oct 14 12:48:36 2024 -0700
Delete redundant `link` to `dreyfus_index`
At the point where this `link` is made, `NewPid` is already linked to
the `dreyfus_index_manager` when it is created via `spawn_link` [1].
Added some logging to confirm they are in fact the same pid:
```
[info] 2024-10-13T00:45:17.005065Z node1@127.0.0.1 <0.132273.0> -------- dreyfus_index_manager:new_index start_link NewPid=<0.132274.0>
[info] 2024-10-13T00:45:17.005084Z node1@127.0.0.1 <0.598.0> -------- dreyfus_index_manager:handle_call linking NewPid=<0.132274.0>
[info] 2024-10-13T00:45:17.005088Z node1@127.0.0.1 <0.132271.0> -------- dreyfus_index_manager:new_index start_link NewPid=<0.132272.0>
[info] 2024-10-13T00:45:17.005105Z node1@127.0.0.1 <0.598.0> -------- dreyfus_index_manager:handle_call linking NewPid=<0.132272.0>
```
[1] https://github.com/apache/couchdb/blob/main/src/dreyfus/src/dreyfus_index_manager.erl#L135-L136
---
src/dreyfus/src/dreyfus_index_manager.erl | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/dreyfus/src/dreyfus_index_manager.erl b/src/dreyfus/src/dreyfus_index_manager.erl
index 6b7649d1b..7f672f4ac 100644
--- a/src/dreyfus/src/dreyfus_index_manager.erl
+++ b/src/dreyfus/src/dreyfus_index_manager.erl
@@ -67,7 +67,6 @@ handle_call({get_index, DbName, #index{sig = Sig} = Index}, From, State) ->
{reply, {ok, ExistingPid}, State}
end;
handle_call({open_ok, DbName, Sig, NewPid}, {OpenerPid, _}, State) ->
- link(NewPid),
[{_, WaitList}] = ets:lookup(?BY_SIG, {DbName, Sig}),
[gen_server:reply(From, {ok, NewPid}) || From <- WaitList],
ets:delete(?BY_PID, OpenerPid),
(couchdb) 03/04: Remove unused includes and defines
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jaydoane pushed a commit to branch dreyfus-cleanup
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 9a0141688180f50e2e406272b71b9848907b8d04
Author: Jay Doane <ja...@apache.org>
AuthorDate: Sat Oct 12 20:09:01 2024 -0700
Remove unused includes and defines
---
src/dreyfus/src/dreyfus_fabric.erl | 1 -
src/dreyfus/src/dreyfus_fabric_group1.erl | 1 -
src/dreyfus/src/dreyfus_fabric_group2.erl | 1 -
src/dreyfus/src/dreyfus_fabric_info.erl | 2 --
src/dreyfus/src/dreyfus_fabric_search.erl | 1 -
src/dreyfus/src/dreyfus_index_manager.erl | 1 -
src/dreyfus/test/eunit/dreyfus_blacklist_await_test.erl | 1 -
src/dreyfus/test/eunit/dreyfus_blacklist_request_test.erl | 3 ---
src/dreyfus/test/eunit/dreyfus_config_test.erl | 3 ---
src/dreyfus/test/eunit/dreyfus_test_util.erl | 2 --
10 files changed, 16 deletions(-)
diff --git a/src/dreyfus/src/dreyfus_fabric.erl b/src/dreyfus/src/dreyfus_fabric.erl
index 6603d05b5..ac22bf9b4 100644
--- a/src/dreyfus/src/dreyfus_fabric.erl
+++ b/src/dreyfus/src/dreyfus_fabric.erl
@@ -15,7 +15,6 @@
-module(dreyfus_fabric).
-export([get_json_docs/2, handle_error_message/7]).
--include_lib("couch/include/couch_db.hrl").
-include_lib("mem3/include/mem3.hrl").
-include("dreyfus.hrl").
diff --git a/src/dreyfus/src/dreyfus_fabric_group1.erl b/src/dreyfus/src/dreyfus_fabric_group1.erl
index 8f26ec4ef..9b08a94eb 100644
--- a/src/dreyfus/src/dreyfus_fabric_group1.erl
+++ b/src/dreyfus/src/dreyfus_fabric_group1.erl
@@ -16,7 +16,6 @@
-include("dreyfus.hrl").
-include_lib("mem3/include/mem3.hrl").
--include_lib("couch/include/couch_db.hrl").
-export([go/4]).
diff --git a/src/dreyfus/src/dreyfus_fabric_group2.erl b/src/dreyfus/src/dreyfus_fabric_group2.erl
index 8385661a5..3059aa30e 100644
--- a/src/dreyfus/src/dreyfus_fabric_group2.erl
+++ b/src/dreyfus/src/dreyfus_fabric_group2.erl
@@ -16,7 +16,6 @@
-include("dreyfus.hrl").
-include_lib("mem3/include/mem3.hrl").
--include_lib("couch/include/couch_db.hrl").
-export([go/4]).
diff --git a/src/dreyfus/src/dreyfus_fabric_info.erl b/src/dreyfus/src/dreyfus_fabric_info.erl
index 8c7ae70c1..2925768b1 100644
--- a/src/dreyfus/src/dreyfus_fabric_info.erl
+++ b/src/dreyfus/src/dreyfus_fabric_info.erl
@@ -14,9 +14,7 @@
-module(dreyfus_fabric_info).
--include("dreyfus.hrl").
-include_lib("mem3/include/mem3.hrl").
--include_lib("couch/include/couch_db.hrl").
-export([go/4]).
diff --git a/src/dreyfus/src/dreyfus_fabric_search.erl b/src/dreyfus/src/dreyfus_fabric_search.erl
index e19d1cd7f..75a2a5a3b 100644
--- a/src/dreyfus/src/dreyfus_fabric_search.erl
+++ b/src/dreyfus/src/dreyfus_fabric_search.erl
@@ -16,7 +16,6 @@
-include("dreyfus.hrl").
-include_lib("mem3/include/mem3.hrl").
--include_lib("couch/include/couch_db.hrl").
-export([go/4]).
diff --git a/src/dreyfus/src/dreyfus_index_manager.erl b/src/dreyfus/src/dreyfus_index_manager.erl
index 046fff68e..6b7649d1b 100644
--- a/src/dreyfus/src/dreyfus_index_manager.erl
+++ b/src/dreyfus/src/dreyfus_index_manager.erl
@@ -14,7 +14,6 @@
-module(dreyfus_index_manager).
-behaviour(gen_server).
--include_lib("couch/include/couch_db.hrl").
-include("dreyfus.hrl").
-define(BY_SIG, dreyfus_by_sig).
diff --git a/src/dreyfus/test/eunit/dreyfus_blacklist_await_test.erl b/src/dreyfus/test/eunit/dreyfus_blacklist_await_test.erl
index de3d629e5..d2f32ce8f 100644
--- a/src/dreyfus/test/eunit/dreyfus_blacklist_await_test.erl
+++ b/src/dreyfus/test/eunit/dreyfus_blacklist_await_test.erl
@@ -19,7 +19,6 @@
-define(DDOC_ID, <<"_design/black_list_doc">>).
-define(INDEX_NAME, <<"my_index">>).
-define(DBNAME, <<"mydb">>).
--define(TIMEOUT, 1000).
start() ->
test_util:start_couch([dreyfus]).
diff --git a/src/dreyfus/test/eunit/dreyfus_blacklist_request_test.erl b/src/dreyfus/test/eunit/dreyfus_blacklist_request_test.erl
index 3e466327d..df08ebedf 100644
--- a/src/dreyfus/test/eunit/dreyfus_blacklist_request_test.erl
+++ b/src/dreyfus/test/eunit/dreyfus_blacklist_request_test.erl
@@ -13,12 +13,9 @@
-module(dreyfus_blacklist_request_test).
-include_lib("couch/include/couch_db.hrl").
--include_lib("couch_log/include/couch_log.hrl").
-include_lib("dreyfus/include/dreyfus.hrl").
-include_lib("eunit/include/eunit.hrl").
--define(TIMEOUT, 1000).
-
start() ->
test_util:start_couch([dreyfus]),
ok = meck:new(fabric, [passthrough]),
diff --git a/src/dreyfus/test/eunit/dreyfus_config_test.erl b/src/dreyfus/test/eunit/dreyfus_config_test.erl
index 9ae0e56e0..73c9def53 100644
--- a/src/dreyfus/test/eunit/dreyfus_config_test.erl
+++ b/src/dreyfus/test/eunit/dreyfus_config_test.erl
@@ -12,11 +12,8 @@
-module(dreyfus_config_test).
--include_lib("couch_log/include/couch_log.hrl").
-include_lib("eunit/include/eunit.hrl").
--define(TIMEOUT, 1000).
-
start() ->
test_util:start_couch([dreyfus]).
diff --git a/src/dreyfus/test/eunit/dreyfus_test_util.erl b/src/dreyfus/test/eunit/dreyfus_test_util.erl
index 79fd9b59d..765631c1a 100644
--- a/src/dreyfus/test/eunit/dreyfus_test_util.erl
+++ b/src/dreyfus/test/eunit/dreyfus_test_util.erl
@@ -4,8 +4,6 @@
wait_config_change/2
]).
--include_lib("couch/include/couch_db.hrl").
-
wait_config_change(Key, Value) ->
test_util:wait(fun() ->
case dreyfus_config:get(Key) of
(couchdb) 02/04: Git ignore generated .erl files
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jaydoane pushed a commit to branch dreyfus-cleanup
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 118ea4ce44e6e215782f92a8aaa1202f34db5e29
Author: Jay Doane <ja...@apache.org>
AuthorDate: Sat Oct 12 20:13:57 2024 -0700
Git ignore generated .erl files
---
.gitignore | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitignore b/.gitignore
index 7059b16ec..080a7dd6f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -78,6 +78,7 @@ src/unicode_util_compat/
src/file_system/
src/rebar3/
src/erlfmt/
+src/*.erl
tmp/
src/couch/*.o
(couchdb) 01/04: Git ignore dev Clouseau artifacts
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jaydoane pushed a commit to branch dreyfus-cleanup
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit b6fc13bf7be35b5aef4082f4776688c06f6b47aa
Author: Jay Doane <ja...@apache.org>
AuthorDate: Sat Oct 12 20:12:53 2024 -0700
Git ignore dev Clouseau artifacts
---
.gitignore | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitignore b/.gitignore
index e6f8d61b9..7059b16ec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,6 +29,7 @@ clouseau/
*.tar.gz
*.tar.bz2
dev/*.beam
+dev/clouseau*
dev/devnode.*
dev/lib/
dev/logs/