Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
caosdb-server
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
caosdb
Software
caosdb-server
Commits
abbe3cbc
Commit
abbe3cbc
authored
2 years ago
by
Henrik tom Wörden
Browse files
Options
Downloads
Patches
Plain Diff
FIX: query with no index
parent
1ad05902
No related branches found
No related tags found
2 merge requests
!96
DOC: Added CITATION.cff to the list of files in the release guide where the...
,
!81
ENH: apply paging such that no unwanted jobs are being triggered
Pipeline
#33094
passed
2 years ago
Stage: info
Stage: test
Stage: deploy
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/java/org/caosdb/server/jobs/core/ExecuteQuery.java
+3
-1
3 additions, 1 deletion
src/main/java/org/caosdb/server/jobs/core/ExecuteQuery.java
src/main/java/org/caosdb/server/transaction/Transaction.java
+6
-0
6 additions, 0 deletions
src/main/java/org/caosdb/server/transaction/Transaction.java
with
9 additions
and
1 deletion
src/main/java/org/caosdb/server/jobs/core/ExecuteQuery.java
+
3
−
1
View file @
abbe3cbc
...
...
@@ -59,7 +59,9 @@ public class ExecuteQuery extends FlagJob {
int
index2
=
getTransaction
().
getPagingIndex2
();
int
ii
=
0
;
for
(
final
EntityInterface
entity
:
getContainer
())
{
if
(!(
getTransaction
()
instanceof
Retrieve
)
||
(
ii
>=
index1
&&
ii
<
index2
))
{
if
(!(
getTransaction
()
instanceof
Retrieve
)
||
!
getTransaction
().
hasPaging
()
||
(
ii
>=
index1
&&
ii
<
index2
))
{
getTransaction
().
getSchedule
().
addAll
(
loadJobs
(
entity
,
getTransaction
()));
}
else
{
entity
.
setEntityStatus
(
EntityStatus
.
IGNORE
);
...
...
This diff is collapsed.
Click to expand it.
src/main/java/org/caosdb/server/transaction/Transaction.java
+
6
−
0
View file @
abbe3cbc
...
...
@@ -62,6 +62,7 @@ public abstract class Transaction<C extends TransactionContainer> extends Abstra
private
final
C
container
;
private
int
pagingIndex1
;
private
int
pagingIndex2
;
private
boolean
ThasPaging
=
false
;
private
Access
access
=
null
;
private
final
Schedule
schedule
=
new
Schedule
();
...
...
@@ -84,7 +85,12 @@ public abstract class Transaction<C extends TransactionContainer> extends Abstra
return
this
.
container
;
}
public
boolean
hasPaging
()
{
return
ThasPaging
;
}
public
void
setPagingIndices
(
int
index1
,
int
index2
)
{
ThasPaging
=
true
;
pagingIndex1
=
index1
;
pagingIndex2
=
index2
;
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment