Skip to content

Commit cbf8804

Browse files
authored
Merge pull request #2037 from kocolosk/dreyfus-by-default
Add "Dreyfus" (Erlang side of Search) to CouchDB
2 parents 6e75355 + c517618 commit cbf8804

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+4995
-5
lines changed

rebar.config.script

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ SubDirs = [
8383
"src/couch_peruser",
8484
"src/couch_tests",
8585
"src/ddoc_cache",
86+
"src/dreyfus",
8687
"src/fabric",
8788
"src/global_changes",
8889
"src/mango",

rel/apps/couch_epi.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
couch_db_epi,
1515
chttpd_epi,
1616
couch_index_epi,
17+
dreyfus_epi,
1718
global_changes_epi,
1819
mango_epi,
1920
mem3_epi,

rel/overlay/etc/default.ini

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -481,3 +481,32 @@ min_priority = 2.0
481481

482482
[smoosh.ratio_views]
483483
min_priority = 2.0
484+
485+
[dreyfus]
486+
; The name and location of the Clouseau Java service required to
487+
; enable Search functionality.
488+
; name = clouseau@127.0.0.1
489+
490+
; CouchDB will try to re-connect to Clouseau using a bounded
491+
; exponential backoff with the following number of iterations.
492+
; retry_limit = 5
493+
494+
; The default number of results returned from a global search query.
495+
; limit = 25
496+
497+
; The default number of results returned from a search on a partition
498+
; of a database.
499+
; limit_partitions = 2000
500+
501+
; The maximum number of results that can be returned from a global
502+
; search query (or any search query on a database without user-defined
503+
; partitions). Attempts to set ?limit=N higher than this value will
504+
; be rejected.
505+
; max_limit = 200
506+
507+
; The maximum number of results that can be returned when searching
508+
; a partition of a database. Attempts to set ?limit=N higher than this
509+
; value will be rejected. If this config setting is not defined,
510+
; CouchDB will use the value of `max_limit` instead. If neither is
511+
; defined, the default is 2000 as stated here.
512+
; max_limit_partitions = 2000

rel/reltool.config

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
couch_event,
4343
couch_peruser,
4444
ddoc_cache,
45+
dreyfus,
4546
ets_lru,
4647
fabric,
4748
folsom,
@@ -99,6 +100,7 @@
99100
{app, couch_event, [{incl_cond, include}]},
100101
{app, couch_peruser, [{incl_cond, include}]},
101102
{app, ddoc_cache, [{incl_cond, include}]},
103+
{app, dreyfus, [{incl_cond, include}]},
102104
{app, ets_lru, [{incl_cond, include}]},
103105
{app, fabric, [{incl_cond, include}]},
104106
{app, folsom, [{incl_cond, include}]},

share/server/dreyfus.js

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
// Licensed under the Apache License, Version 2.0 (the "License"); you may not
2+
// use this file except in compliance with the License. You may obtain a copy of
3+
// the License at
4+
//
5+
// http://www.apache.org/licenses/LICENSE-2.0
6+
//
7+
// Unless required by applicable law or agreed to in writing, software
8+
// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
9+
// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
10+
// License for the specific language governing permissions and limitations under
11+
// the License.
12+
13+
var Dreyfus = (function() {
14+
15+
var index_results = []; // holds temporary emitted values during index
16+
17+
function handleIndexError(err, doc) {
18+
if (err == "fatal_error") {
19+
throw(["error", "map_runtime_error", "function raised 'fatal_error'"]);
20+
} else if (err[0] == "fatal") {
21+
throw(err);
22+
}
23+
var message = "function raised exception " + err.toSource();
24+
if (doc) message += " with doc._id " + doc._id;
25+
log(message);
26+
};
27+
28+
return {
29+
index: function(name, value, options) {
30+
if (typeof name !== 'string') {
31+
throw({name: 'TypeError', message: 'name must be a string not ' + typeof name});
32+
}
33+
if (name.substring(0, 1) === '_') {
34+
throw({name: 'ReservedName', message: 'name must not start with an underscore'});
35+
}
36+
if (typeof value !== 'string' && typeof value !== 'number' && typeof value !== 'boolean') {
37+
throw({name: 'TypeError', message: 'value must be a string, a number or boolean not ' + typeof value});
38+
}
39+
if (options && typeof options !== 'object') {
40+
throw({name: 'TypeError', message: 'options must be an object not ' + typeof options});
41+
}
42+
index_results.push([name, value, options || {}]);
43+
},
44+
45+
indexDoc: function(doc) {
46+
Couch.recursivelySeal(doc);
47+
var buf = [];
48+
for each (fun in State.funs) {
49+
index_results = [];
50+
try {
51+
fun(doc);
52+
buf.push(index_results);
53+
} catch (err) {
54+
handleIndexError(err, doc);
55+
buf.push([]);
56+
}
57+
}
58+
print(JSON.stringify(buf));
59+
}
60+
61+
}
62+
})();

share/server/loop.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ function create_sandbox() {
2525
sandbox.send = Render.send;
2626
sandbox.getRow = Render.getRow;
2727
sandbox.isArray = isArray;
28+
sandbox.index = Dreyfus.index;
2829
} catch (e) {
2930
var sandbox = {};
3031
}
@@ -114,6 +115,7 @@ var Loop = function() {
114115
"add_fun" : State.addFun,
115116
"add_lib" : State.addLib,
116117
"map_doc" : Views.mapDoc,
118+
"index_doc": Dreyfus.indexDoc,
117119
"reduce" : Views.reduce,
118120
"rereduce" : Views.rereduce
119121
};

src/dreyfus/.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
ebin/
2+
.*.sw?
3+
test/elixir/_build
4+
test/elixir/deps

src/dreyfus/LICENSE.txt

Lines changed: 202 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,202 @@
1+
2+
Apache License
3+
Version 2.0, January 2004
4+
http://www.apache.org/licenses/
5+
6+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
7+
8+
1. Definitions.
9+
10+
"License" shall mean the terms and conditions for use, reproduction,
11+
and distribution as defined by Sections 1 through 9 of this document.
12+
13+
"Licensor" shall mean the copyright owner or entity authorized by
14+
the copyright owner that is granting the License.
15+
16+
"Legal Entity" shall mean the union of the acting entity and all
17+
other entities that control, are controlled by, or are under common
18+
control with that entity. For the purposes of this definition,
19+
"control" means (i) the power, direct or indirect, to cause the
20+
direction or management of such entity, whether by contract or
21+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
22+
outstanding shares, or (iii) beneficial ownership of such entity.
23+
24+
"You" (or "Your") shall mean an individual or Legal Entity
25+
exercising permissions granted by this License.
26+
27+
"Source" form shall mean the preferred form for making modifications,
28+
including but not limited to software source code, documentation
29+
source, and configuration files.
30+
31+
"Object" form shall mean any form resulting from mechanical
32+
transformation or translation of a Source form, including but
33+
not limited to compiled object code, generated documentation,
34+
and conversions to other media types.
35+
36+
"Work" shall mean the work of authorship, whether in Source or
37+
Object form, made available under the License, as indicated by a
38+
copyright notice that is included in or attached to the work
39+
(an example is provided in the Appendix below).
40+
41+
"Derivative Works" shall mean any work, whether in Source or Object
42+
form, that is based on (or derived from) the Work and for which the
43+
editorial revisions, annotations, elaborations, or other modifications
44+
represent, as a whole, an original work of authorship. For the purposes
45+
of this License, Derivative Works shall not include works that remain
46+
separable from, or merely link (or bind by name) to the interfaces of,
47+
the Work and Derivative Works thereof.
48+
49+
"Contribution" shall mean any work of authorship, including
50+
the original version of the Work and any modifications or additions
51+
to that Work or Derivative Works thereof, that is intentionally
52+
submitted to Licensor for inclusion in the Work by the copyright owner
53+
or by an individual or Legal Entity authorized to submit on behalf of
54+
the copyright owner. For the purposes of this definition, "submitted"
55+
means any form of electronic, verbal, or written communication sent
56+
to the Licensor or its representatives, including but not limited to
57+
communication on electronic mailing lists, source code control systems,
58+
and issue tracking systems that are managed by, or on behalf of, the
59+
Licensor for the purpose of discussing and improving the Work, but
60+
excluding communication that is conspicuously marked or otherwise
61+
designated in writing by the copyright owner as "Not a Contribution."
62+
63+
"Contributor" shall mean Licensor and any individual or Legal Entity
64+
on behalf of whom a Contribution has been received by Licensor and
65+
subsequently incorporated within the Work.
66+
67+
2. Grant of Copyright License. Subject to the terms and conditions of
68+
this License, each Contributor hereby grants to You a perpetual,
69+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
70+
copyright license to reproduce, prepare Derivative Works of,
71+
publicly display, publicly perform, sublicense, and distribute the
72+
Work and such Derivative Works in Source or Object form.
73+
74+
3. Grant of Patent License. Subject to the terms and conditions of
75+
this License, each Contributor hereby grants to You a perpetual,
76+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
77+
(except as stated in this section) patent license to make, have made,
78+
use, offer to sell, sell, import, and otherwise transfer the Work,
79+
where such license applies only to those patent claims licensable
80+
by such Contributor that are necessarily infringed by their
81+
Contribution(s) alone or by combination of their Contribution(s)
82+
with the Work to which such Contribution(s) was submitted. If You
83+
institute patent litigation against any entity (including a
84+
cross-claim or counterclaim in a lawsuit) alleging that the Work
85+
or a Contribution incorporated within the Work constitutes direct
86+
or contributory patent infringement, then any patent licenses
87+
granted to You under this License for that Work shall terminate
88+
as of the date such litigation is filed.
89+
90+
4. Redistribution. You may reproduce and distribute copies of the
91+
Work or Derivative Works thereof in any medium, with or without
92+
modifications, and in Source or Object form, provided that You
93+
meet the following conditions:
94+
95+
(a) You must give any other recipients of the Work or
96+
Derivative Works a copy of this License; and
97+
98+
(b) You must cause any modified files to carry prominent notices
99+
stating that You changed the files; and
100+
101+
(c) You must retain, in the Source form of any Derivative Works
102+
that You distribute, all copyright, patent, trademark, and
103+
attribution notices from the Source form of the Work,
104+
excluding those notices that do not pertain to any part of
105+
the Derivative Works; and
106+
107+
(d) If the Work includes a "NOTICE" text file as part of its
108+
distribution, then any Derivative Works that You distribute must
109+
include a readable copy of the attribution notices contained
110+
within such NOTICE file, excluding those notices that do not
111+
pertain to any part of the Derivative Works, in at least one
112+
of the following places: within a NOTICE text file distributed
113+
as part of the Derivative Works; within the Source form or
114+
documentation, if provided along with the Derivative Works; or,
115+
within a display generated by the Derivative Works, if and
116+
wherever such third-party notices normally appear. The contents
117+
of the NOTICE file are for informational purposes only and
118+
do not modify the License. You may add Your own attribution
119+
notices within Derivative Works that You distribute, alongside
120+
or as an addendum to the NOTICE text from the Work, provided
121+
that such additional attribution notices cannot be construed
122+
as modifying the License.
123+
124+
You may add Your own copyright statement to Your modifications and
125+
may provide additional or different license terms and conditions
126+
for use, reproduction, or distribution of Your modifications, or
127+
for any such Derivative Works as a whole, provided Your use,
128+
reproduction, and distribution of the Work otherwise complies with
129+
the conditions stated in this License.
130+
131+
5. Submission of Contributions. Unless You explicitly state otherwise,
132+
any Contribution intentionally submitted for inclusion in the Work
133+
by You to the Licensor shall be under the terms and conditions of
134+
this License, without any additional terms or conditions.
135+
Notwithstanding the above, nothing herein shall supersede or modify
136+
the terms of any separate license agreement you may have executed
137+
with Licensor regarding such Contributions.
138+
139+
6. Trademarks. This License does not grant permission to use the trade
140+
names, trademarks, service marks, or product names of the Licensor,
141+
except as required for reasonable and customary use in describing the
142+
origin of the Work and reproducing the content of the NOTICE file.
143+
144+
7. Disclaimer of Warranty. Unless required by applicable law or
145+
agreed to in writing, Licensor provides the Work (and each
146+
Contributor provides its Contributions) on an "AS IS" BASIS,
147+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
148+
implied, including, without limitation, any warranties or conditions
149+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
150+
PARTICULAR PURPOSE. You are solely responsible for determining the
151+
appropriateness of using or redistributing the Work and assume any
152+
risks associated with Your exercise of permissions under this License.
153+
154+
8. Limitation of Liability. In no event and under no legal theory,
155+
whether in tort (including negligence), contract, or otherwise,
156+
unless required by applicable law (such as deliberate and grossly
157+
negligent acts) or agreed to in writing, shall any Contributor be
158+
liable to You for damages, including any direct, indirect, special,
159+
incidental, or consequential damages of any character arising as a
160+
result of this License or out of the use or inability to use the
161+
Work (including but not limited to damages for loss of goodwill,
162+
work stoppage, computer failure or malfunction, or any and all
163+
other commercial damages or losses), even if such Contributor
164+
has been advised of the possibility of such damages.
165+
166+
9. Accepting Warranty or Additional Liability. While redistributing
167+
the Work or Derivative Works thereof, You may choose to offer,
168+
and charge a fee for, acceptance of support, warranty, indemnity,
169+
or other liability obligations and/or rights consistent with this
170+
License. However, in accepting such obligations, You may act only
171+
on Your own behalf and on Your sole responsibility, not on behalf
172+
of any other Contributor, and only if You agree to indemnify,
173+
defend, and hold each Contributor harmless for any liability
174+
incurred by, or claims asserted against, such Contributor by reason
175+
of your accepting any such warranty or additional liability.
176+
177+
END OF TERMS AND CONDITIONS
178+
179+
APPENDIX: How to apply the Apache License to your work.
180+
181+
To apply the Apache License to your work, attach the following
182+
boilerplate notice, with the fields enclosed by brackets "[]"
183+
replaced with your own identifying information. (Don't include
184+
the brackets!) The text should be enclosed in the appropriate
185+
comment syntax for the file format. We also recommend that a
186+
file or class name and description of purpose be included on the
187+
same "printed page" as the copyright notice for easier
188+
identification within third-party archives.
189+
190+
Copyright 2015 IBM Corporation
191+
192+
Licensed under the Apache License, Version 2.0 (the "License");
193+
you may not use this file except in compliance with the License.
194+
You may obtain a copy of the License at
195+
196+
http://www.apache.org/licenses/LICENSE-2.0
197+
198+
Unless required by applicable law or agreed to in writing, software
199+
distributed under the License is distributed on an "AS IS" BASIS,
200+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
201+
See the License for the specific language governing permissions and
202+
limitations under the License.

0 commit comments

Comments
 (0)