Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
webservices
cern-search
cern-search-rest-api
Commits
8cdc559c
Commit
8cdc559c
authored
Apr 28, 2020
by
Carina Antunes
Browse files
SEARCH-72
/fix-too_many_clauses-from-es
parent
bc307709
Changes
2
Hide whitespace changes
Inline
Side-by-side
Makefile
View file @
8cdc559c
...
...
@@ -29,7 +29,17 @@ endif
build-env
:
docker-compose
-f
$(DOCKER_FILE)
up
-d
--remove-orphans
.PHONY
:
env
.PHONY
:
build-env
es-setup
:
curl
-XPUT
"http://localhost:9200/_settings"
-H
'Content-Type: application/json'
-d
' \
{\
"index": {\
"search.slowlog.level": "trace",\
"search.slowlog.threshold.query.trace": "0ms"\
}\
}'
.PHONY
:
es-setup
logs
:
docker-compose
-f
$(DOCKER_FILE)
logs
-f
...
...
@@ -38,7 +48,7 @@ logs:
populate-instance
:
docker-compose
-f
$(DOCKER_FILE)
exec
-T
$(SERVICE_NAME)
/bin/bash
-c
\
"sh /opt/invenio/src/scripts/populate-instance.sh"
.PHONY
:
load-fixtures
.PHONY
:
populate-instance
load-fixtures
:
docker-compose
-f
$(DOCKER_FILE)
exec
-T
$(SERVICE_NAME)
/bin/bash
-c
\
...
...
@@ -52,7 +62,7 @@ destroy-env:
stop-env
:
docker-compose
-f
$(DOCKER_FILE)
down
--volumes
.PHONY
:
destroy
-env
.PHONY
:
stop
-env
reload-env
:
destroy-env env
.PHONY
:
reload-env
...
...
@@ -63,9 +73,9 @@ shell-env:
shell-worker
:
docker-compose
-f
$(DOCKER_FILE)
exec
$(WORKER_NAME)
/bin/bash
.PHONY
:
shell-
env
.PHONY
:
shell-
worker
env
:
generate-certificates build-env populate-instance load-fixtures shell-env
env
:
generate-certificates build-env populate-instance
es-setup
load-fixtures shell-env
.PHONY
:
env
generate-certificates
:
...
...
@@ -75,13 +85,13 @@ generate-certificates:
pytest
:
docker-compose
-f
$(DOCKER_FILE)
exec
-T
$(SERVICE_NAME)
/bin/bash
-c
\
"pytest tests -vv;"
.PHONY
:
test
.PHONY
:
py
test
ci-test
:
build-env pytest
.PHONY
:
ci-test
test
:
stop-env build-env pytest
.PHONY
:
local-
test
.PHONY
:
test
lint
:
docker-compose
-f
$(DOCKER_FILE)
exec
-T
$(SERVICE_NAME)
/bin/bash
-c
\
...
...
@@ -157,11 +167,11 @@ reload-local-env: destroy-local-env local-env
local-test
:
@
echo
running tests...
;
pipenv run pytest tests
-v
;
.PHONY
:
test
.PHONY
:
local-
test
local-lint
:
@
echo
running isort...
;
pipenv run isort
-rc
-c
-df
;
@
echo
running flake8...
;
pipenv run flake8
--max-complexity
10
--ignore
E501,D401
.PHONY
:
lint
.PHONY
:
local-
lint
cern_search_rest_api/modules/cernsearch/search.py
View file @
8cdc559c
...
...
@@ -106,7 +106,7 @@ def search_factory(self, search: RecordCERNSearch, query_parser=None):
return
Q
(
'query_string'
,
query
=
qstr
,
rewrite
=
"
scoring_boolean
"
,
# calculates score for wildcards queries
rewrite
=
"
top_terms_1000
"
,
# calculates score for wildcards queries
type
=
multifields_type
)
return
Q
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment