Skip to content
Snippets Groups Projects
Verified Commit 0e4aa147 authored by Timm Fitschen's avatar Timm Fitschen
Browse files

Merge branch 'f-grpc-f-query' into f-grpc-f-files

parents 95c551ea ac960cb2
No related branches found
No related tags found
3 merge requests!44Release 0.6,!43Merge f-GRPC-main to dev,!26F grpc f files
Pipeline #11573 failed
......@@ -118,7 +118,7 @@ server:
- `INSERT_FILES_IN_DIR_ALLOWED_DIRS`: add mounted filesystems here that
shall be accessible by CaosDB
* Maybe set another `SESSION_TIMEOUT_MS`.
* See also [README_CONFIGURATION.md](README_CONFIGURATION.md)
* See also [CONFIGURATION.rst](https://gitlab.indiscale.com/caosdb/src/caosdb-server/-/blob/dev/src/doc/administration/configuration.rst)
6. Copy `conf/core/usersources.ini.template` to `conf/ext/usersources.ini`.
* You can skip this if you do not want to use an external authentication.
Local users (CaosDB realm) are always available.
......
......@@ -244,8 +244,8 @@ public class EntityTransactionServiceImpl extends EntityTransactionServiceImplBa
final Retrieve transaction = new Retrieve(container);
transaction.execute();
if (container.getFlags().containsKey("_isCount")) {
final int count = Integer.parseInt(container.getFlags().get("_isCount"));
if (container.getFlags().containsKey("query_count_result")) {
final int count = Integer.parseInt(container.getFlags().get("query_count_result"));
builder
.addResponsesBuilder()
.setRetrieveResponse(RetrieveResponse.newBuilder().setCountResult(count));
......
......@@ -54,7 +54,9 @@ public class ExecuteQuery extends FlagJob {
}
getContainer().addMessage(queryInstance);
if (queryInstance.getQuery().getType() == Type.COUNT) {
getContainer().getFlags().put("count", Integer.toString(queryInstance.getCount()));
getContainer()
.getFlags()
.put("query_count_result", Integer.toString(queryInstance.getCount()));
}
for (final EntityInterface entity : getContainer()) {
getTransaction().getSchedule().addAll(loadJobs(entity, getTransaction()));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment