Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Silage - db driven search backend #425

Merged
merged 2 commits into from
Oct 18, 2012
Merged

Conversation

ischneider
Copy link
Member

- in addition to url changes, adjust js template to use results
  instead of rows (as per search spec)
- add map changed signal to allow hooking of indexer
- add function to add bbox filter to a query
- implement local_layers
- remove obsolete integration test (covered in unit tests now)
@ingenieroariel
Copy link
Member

When running the tests I got the following logging output. What is generating it? How can we turn it off?

generated combined search results in 0.0534200668335, 0.0307850837708
with 0 db queries
cached search results 5378
generated combined search results in 0.0451128482819, 0.0109648704529
with 0 db queries
cached search results 3750
generated combined search results in 0.0423700809479, 0.00385594367981
with 0 db queries
.cached search results 5329
generated combined search results in 0.0528180599213, 0.0110719203949
with 0 db queries
cached search results 8144
generated combined search results in 0.0431768894196, 0.0252201557159
with 0 db queries
cached search results 6060
generated combined search results in 0.0401799678802, 0.0144789218903
with 0 db queries
..cached search results 9480
generated combined search results in 0.0909020900726, 0.0465979576111
with 0 db queries
cached search results 505
generated combined search results in 0.0718472003937, 0.00830793380737
with 0 db queries
cached search results 3784
generated combined search results in 0.0731530189514, 0.00385499000549
with 0 db queries
cached search results 9480
generated combined search results in 0.109658002853, 0.0503029823303
with 0 db queries
.cached search results 3777
generated combined search results in 0.0382308959961, 0.00601387023926
with 0 db queries
cached search results 71
generated combined search results in 0.037308216095, 0.000111818313599
with 0 db queries
.cached search results 9935
generated combined search results in 0.0835201740265, 0.0037670135498
with 0 db queries
.cached search results 7489
generated combined search results in 0.0829710960388, 0.0588278770447
with 0 db queries
generated combined search results in 0.00258588790894, 0.0326838493347
with 0 db queries
.cached search results 4095
generated combined search results in 0.0972318649292, 0.0200028419495
with 0 db queries
.cached search results 3790
generated combined search results in 0.0749969482422, 0.00380611419678
with 0 db queries
.cached search results 5957
generated combined search results in 0.0844709873199, 0.0403637886047
with 0 db queries
...cached search results 8162
generated combined search results in 0.0357019901276, 0.0256907939911
with 0 db queries
cached search results 8823
generated combined search results in 0.0191040039062, 0.028669834137
with 0 db queries
cached search results 8823
generated combined search results in 0.074630022049, 0.0285761356354
with 0 db queries
.cached search results 5226
generated combined search results in 0.085382938385, 0.0334188938141
with 0 db queries
generated combined search results in 0.00789999961853, 0.0325899124146
with 0 db queries
generated combined search results in 0.00821900367737, 0.0327360630035
with 0 db queries
generated combined search results in 0.00791382789612, 0.0334558486938
with 0 db queries
cached search results 5231
generated combined search results in 0.0810871124268, 0.0413959026337
with 0 db queries
.generated combined search results in 0.00805282592773, 0.0323960781097
with 0 db queries
cached search results 7529
generated combined search results in 0.0808901786804, 0.0590438842773
with 0 db queries
.cached search results 1053
generated combined search results in 0.0186190605164, 0.0731329917908
with 0 db queries
cached search results 6868
generated combined search results in 0.0597321987152, 0.0182418823242
with 0 db queries
cached search results 677
generated combined search results in 0.0133709907532, 0.0171589851379
with 0 db queries
cached search results 6106
generated combined search results in 0.0307281017303, 0.0148389339447
with 0 db queries
cached search results 6111
generated combined search results in 0.0305199623108, 0.0151240825653
with 0 db queries
.cached search results 461
generated combined search results in 0.0731821060181, 0.00432395935059
with 0 db queries
.........cached search results 71
generated combined search results in 0.0125761032104, 0.000143051147461
with 0 db queries

@ingenieroariel
Copy link
Member

There were two tests failing (one unit and one integration) after the merge. Minor things, including #426.

Also I fixed the issue reported above by removing the following line from silage.tests:

-logging.getLogger('geonode.search.backends.silage.views').setLevel(logging.DEBUG)

I also made the rename to geonode.silage in my dev branch:

https://github.com/ingenieroariel/geonode/

Ian, if you agree with these changes let me know I will just push to GeoNode:dev and close this PR.

@jj0hns0n
Copy link
Contributor

I would really prefer to stick with the existing nomenclature of
geonode.search.backends.silage or just geonode.search.silage, top level
geonode.silage makes sense to no-one. Having geonode.search namespace is
important to me for clarity. Below/beyond that, I dont care that much.

On Wed, Oct 17, 2012 at 7:45 PM, Ariel Núñez [email protected]:

There were two tests failing (one unit and one integration) after the
merge. Minor things, including #426#426
.

Also I fixed the issue reported above by removing the following line from
silage.tests:

-logging.getLogger('geonode.search.backends.silage.views').setLevel(logging.DEBUG)

I also made the rename to geonode.silage in my dev branch:

https://github.com/ingenieroariel/geonode/

Ian, if you agree with these changes let me know I will just push to
GeoNode:dev and close this PR.


Reply to this email directly or view it on GitHubhttps://github.com//pull/425#issuecomment-9551582.

@ingenieroariel
Copy link
Member

@jj0hns0n,

Based on your comments, I suggest we rename geonode.search.backends.silage to just geonode.search.

Whatever other plans there are for search, they are beyond 2.0, and the option to not include the geonode.search app but a third party search is still possible:

INSTALLED_APPS=
    ...
    'geonode_haystack',
    ...

 url('/search/, include('geonode_haystack.urls')

@jj0hns0n
Copy link
Contributor

Yep, this proposal is fine for now.

On Wed, Oct 17, 2012 at 8:01 PM, Ariel Núñez [email protected]:

@jj0hns0n https://github.com/jj0hns0n,

Based on your comments, I suggest we rename geonode.search.backends.silage
to just geonode.search.

Whatever other plans there are for search, they are beyond 2.0, and the
option to not include the geonode.search app but a third party search is
still possible:

INSTALLED_APPS=
...
'geonode_haystack',
...

url('/search/, include('geonode_haystack.urls')


Reply to this email directly or view it on GitHubhttps://github.com//pull/425#issuecomment-9551821.

@ingenieroariel
Copy link
Member

Okay, I have renamed to search, verified all tests run and pushed to my dev branch.

@ischneider are you okay with this? If so I can push close this PR later today.

@ingenieroariel ingenieroariel merged commit 751d4d7 into GeoNode:dev Oct 18, 2012
@tomkralidis
Copy link
Member

@ischneider gentle reminder to add source code headers as per https://gist.github.com/3137878

marthamareal pushed a commit to marthamareal/geonode that referenced this pull request Sep 24, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants