Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
bob
bob.db.fv3d
Commits
88ba3eff
Commit
88ba3eff
authored
Jan 16, 2017
by
André Anjos
💬
Browse files
Fix queries and avoid join
parent
7ff05f94
Pipeline
#6624
passed with stages
in 2 minutes and 46 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
bob/db/fv3d/query.py
View file @
88ba3eff
...
...
@@ -218,7 +218,7 @@ class Database(bob.db.base.SQLiteDatabase):
# related to the training_set, models and probes related to both dev and
# eval groups. These file lists don't overlap
retval
=
None
retval
=
set
()
if
'train'
in
purposes
:
q
=
self
.
query
(
File
).
join
(
Protocol
.
training_set
)
...
...
@@ -228,7 +228,7 @@ class Database(bob.db.base.SQLiteDatabase):
q
=
q
.
filter
(
Finger
.
side
.
in_
(
sides
))
q
=
q
.
filter
(
Finger
.
name
.
in_
(
fingers
))
q
=
q
.
filter
(
File
.
session
.
in_
(
sessions
))
retval
=
q
retval
.
update
(
q
)
if
'enroll'
in
purposes
:
q
=
self
.
query
(
File
).
join
(
Model
.
files
)
...
...
@@ -240,7 +240,7 @@ class Database(bob.db.base.SQLiteDatabase):
q
=
q
.
filter
(
Finger
.
side
.
in_
(
sides
))
q
=
q
.
filter
(
Finger
.
name
.
in_
(
fingers
))
q
=
q
.
filter
(
File
.
session
.
in_
(
sessions
))
retval
=
q
if
retval
is
None
else
retval
.
union
(
q
)
retval
.
update
(
q
)
if
'probe'
in
purposes
:
q
=
self
.
query
(
File
).
join
(
Probe
.
file
).
join
(
Protocol
)
...
...
@@ -251,7 +251,7 @@ class Database(bob.db.base.SQLiteDatabase):
q
=
q
.
filter
(
Finger
.
side
.
in_
(
sides
))
q
=
q
.
filter
(
Finger
.
name
.
in_
(
fingers
))
q
=
q
.
filter
(
File
.
session
.
in_
(
sessions
))
retval
=
q
if
retval
is
None
else
retval
.
union
(
q
)
retval
.
update
(
q
)
# combine all queries, sort and uniq'fy
return
list
(
retval
.
distinct
().
order_by
(
'id'
)
)
return
list
(
retval
)
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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