From abbe3cbc2f28dfbfc4125153829040649bcee4c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <h.tomwoerden@indiscale.com>
Date: Fri, 27 Jan 2023 11:31:32 +0100
Subject: [PATCH] FIX: query with no index
---
src/main/java/org/caosdb/server/jobs/core/ExecuteQuery.java | 4 +++-
.../java/org/caosdb/server/transaction/Transaction.java | 6 ++++++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/caosdb/server/jobs/core/ExecuteQuery.java b/src/main/java/org/caosdb/server/jobs/core/ExecuteQuery.java
index 20a31e3f..758c80f5 100644
--- a/src/main/java/org/caosdb/server/jobs/core/ExecuteQuery.java
+++ b/src/main/java/org/caosdb/server/jobs/core/ExecuteQuery.java
@@ -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);
diff --git a/src/main/java/org/caosdb/server/transaction/Transaction.java b/src/main/java/org/caosdb/server/transaction/Transaction.java
index 2b616e99..a9bac31c 100644
--- a/src/main/java/org/caosdb/server/transaction/Transaction.java
+++ b/src/main/java/org/caosdb/server/transaction/Transaction.java
@@ -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;
}
--
GitLab