From 7028a06b834e8caedbaf430ca59f71bc79fa5516 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Thu, 25 May 2023 11:38:34 +0200
Subject: [PATCH] MAINT: rename paging variables to startIndex, endIndex
---
.../org/caosdb/server/jobs/core/ExecuteQuery.java | 10 +++++-----
.../java/org/caosdb/server/jobs/core/Paging.java | 12 ++++++------
.../caosdb/server/jobs/core/RetrieveAllJob.java | 12 +++++++-----
.../org/caosdb/server/transaction/Retrieve.java | 14 +++++++-------
4 files changed, 25 insertions(+), 23 deletions(-)
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 5e4d02f7..2d7a45d0 100644
--- a/src/main/java/org/caosdb/server/jobs/core/ExecuteQuery.java
+++ b/src/main/java/org/caosdb/server/jobs/core/ExecuteQuery.java
@@ -59,18 +59,18 @@ public class ExecuteQuery extends FlagJob {
}
getContainer().addMessage(queryInstance);
- int index = 0;
- int length = getContainer().size();
+ int startIndex = 0;
+ int endIndex = getContainer().size();
if (((Retrieve) getTransaction()).hasPaging()) {
Retrieve.Paging paging = ((Retrieve) getTransaction()).getPaging();
- index = Math.min(getContainer().size(), paging.index);
- length = Math.min(getContainer().size(), paging.length);
+ startIndex = Math.min(getContainer().size(), paging.startIndex);
+ endIndex = Math.min(getContainer().size(), paging.endIndex);
}
int ii = 0;
for (final EntityInterface entity : getContainer()) {
- if (ii >= index && ii < length) {
+ if (ii >= startIndex && ii < endIndex) {
getTransaction().getSchedule().addAll(loadJobs(entity, getTransaction()));
} else {
entity.setEntityStatus(EntityStatus.IGNORE);
diff --git a/src/main/java/org/caosdb/server/jobs/core/Paging.java b/src/main/java/org/caosdb/server/jobs/core/Paging.java
index d7814b71..aa918ecf 100644
--- a/src/main/java/org/caosdb/server/jobs/core/Paging.java
+++ b/src/main/java/org/caosdb/server/jobs/core/Paging.java
@@ -42,24 +42,24 @@ public class Paging extends FlagJob {
protected void job(final String value) {
if (getTransaction() instanceof Retrieve) {
if (value != null) {
- int index = DEFAULT_INDEX;
- int length = index + DEFAULT_LENGTH;
+ int startIndex = DEFAULT_INDEX;
+ int endIndex = startIndex + DEFAULT_LENGTH;
final Matcher m = pattern.matcher(value);
if (m.matches()) {
if (m.group(1) != null) {
- index = Integer.parseInt(m.group(1));
+ startIndex = Integer.parseInt(m.group(1));
}
if (m.group(2) != null) {
- length = index + Integer.parseInt(m.group(2));
+ endIndex = startIndex + Integer.parseInt(m.group(2));
}
}
// this info may be used by other jobs
- ((Retrieve) getTransaction()).setPaging(index, length);
+ ((Retrieve) getTransaction()).setPaging(startIndex, endIndex);
int i = 0;
for (final EntityInterface e : getContainer()) {
- if (i >= length || i < index) {
+ if (i >= endIndex || i < startIndex) {
// do not retrieve this entity
e.setEntityStatus(EntityStatus.IGNORE);
}
diff --git a/src/main/java/org/caosdb/server/jobs/core/RetrieveAllJob.java b/src/main/java/org/caosdb/server/jobs/core/RetrieveAllJob.java
index fcd1ee7f..a89385e2 100644
--- a/src/main/java/org/caosdb/server/jobs/core/RetrieveAllJob.java
+++ b/src/main/java/org/caosdb/server/jobs/core/RetrieveAllJob.java
@@ -45,18 +45,20 @@ public class RetrieveAllJob extends FlagJob {
execute(new RetrieveAll(getContainer(), value));
- int index = 0;
- int length = getContainer().size();
+ int startIndex = 0;
+ int endIndex = getContainer().size();
if (((Retrieve) getTransaction()).hasPaging()) {
- index = Math.min(getContainer().size(), ((Retrieve) getTransaction()).getPaging().index);
- length = Math.min(getContainer().size(), ((Retrieve) getTransaction()).getPaging().length);
+ startIndex =
+ Math.min(getContainer().size(), ((Retrieve) getTransaction()).getPaging().startIndex);
+ endIndex =
+ Math.min(getContainer().size(), ((Retrieve) getTransaction()).getPaging().endIndex);
}
// only add jobs for those which are on this page
int ii = 0;
for (EntityInterface entity : getContainer()) {
- if (ii >= index && ii < length) {
+ if (ii >= startIndex && ii < endIndex) {
getTransaction().getSchedule().addAll(loadJobs(entity, getTransaction()));
} else {
entity.setEntityStatus(EntityStatus.IGNORE);
diff --git a/src/main/java/org/caosdb/server/transaction/Retrieve.java b/src/main/java/org/caosdb/server/transaction/Retrieve.java
index 859a6ad6..643c1201 100644
--- a/src/main/java/org/caosdb/server/transaction/Retrieve.java
+++ b/src/main/java/org/caosdb/server/transaction/Retrieve.java
@@ -123,13 +123,13 @@ public class Retrieve extends Transaction<RetrieveContainer> {
}
public static class Paging {
- public Paging(int index, int length) {
- this.index = index;
- this.length = length;
+ public Paging(int startIndex, int endIndex) {
+ this.startIndex = startIndex;
+ this.endIndex = endIndex;
}
- public final int index;
- public final int length;
+ public final int startIndex;
+ public final int endIndex;
}
private Retrieve.Paging paging = null;
@@ -138,8 +138,8 @@ public class Retrieve extends Transaction<RetrieveContainer> {
return this.paging != null;
}
- public void setPaging(int index, int length) {
- this.paging = new Retrieve.Paging(index, length);
+ public void setPaging(int startIndex, int endIndex) {
+ this.paging = new Retrieve.Paging(startIndex, endIndex);
}
public Retrieve.Paging getPaging() {
--
GitLab