Skip to content

Commit ee043e9

Browse files
committed
Merge remote-tracking branch 'origin/master' into dev
# Conflicts: # .github/workflows/release.yml
2 parents a923727 + 5342e16 commit ee043e9

File tree

5 files changed

+19
-10
lines changed

5 files changed

+19
-10
lines changed

.github/release-drafter.yml

-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ autolabeler:
3030
- '/^fix(\(.*\))?:/'
3131
change-template: '- **$TITLE** @$AUTHOR (#$NUMBER)<br/>$BODY'
3232
change-title-escapes: '\<*_&' # You can add # and @ to disable mentions, and add ` to disable code blocks.
33-
filter-by-commitish: true
3433

3534
template: |
3635
## What’s Changed

documentation/user/en/operate/configure.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ transaction: # [see Transaction configurati
6666
flushFrequencyInMillis: 1s
6767

6868
cache: # [see Cache configuration](#cache-configuration)
69-
enabled: true
69+
enabled: false
7070
reflection: CACHE
7171
reevaluateEachSeconds: 60
7272
anteroomRecordCount: 100K
@@ -669,7 +669,7 @@ is resolved.
669669
<dl>
670670
<dt>enabled</dt>
671671
<dd>
672-
<p>**Default:** `true`</p>
672+
<p>**Default:** `false`</p>
673673
<p>This setting enables or disables the use of the cache entirely.</p>
674674
</dd>
675675
<dt>reflection</dt>

evita_engine/src/main/java/io/evitadb/core/query/ReferencedEntityFetcher.java

+14-4
Original file line numberDiff line numberDiff line change
@@ -536,12 +536,22 @@ private static Bitmap getFilteredReferencedEntityIds(
536536
)
537537
),
538538
executionContext.getQueryContext().getScopes(),
539-
(es, eik) -> ReferencedTypeEntityIndex.createThrowingStub(es, eik, allReferencedEntityIds),
539+
(es, eik) -> {
540+
if (referenceSchema.isIndexedInScope(eik.scope())) {
541+
return null;
542+
} else {
543+
return ReferencedTypeEntityIndex.createThrowingStub(es, eik, allReferencedEntityIds);
544+
}
545+
},
540546
(es, eik) -> {
541547
final int[] epks = entityPrimaryKeys.get(eik.scope());
542-
return ReducedEntityIndex.createThrowingStub(
543-
es, eik, epks == null ? ArrayUtils.EMPTY_INT_ARRAY : epks
544-
);
548+
if (referenceSchema.isIndexedInScope(eik.scope())) {
549+
return null;
550+
} else {
551+
return ReducedEntityIndex.createThrowingStub(
552+
es, eik, epks == null ? ArrayUtils.EMPTY_INT_ARRAY : epks
553+
);
554+
}
545555
}
546556
);
547557

evita_functional_tests/src/test/java/io/evitadb/driver/ClientTaskTrackerTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* | __/\ V /| | || (_| | |_| | |_) |
77
* \___| \_/ |_|\__\__,_|____/|____/
88
*
9-
* Copyright (c) 2024
9+
* Copyright (c) 2024-2025
1010
*
1111
* Licensed under the Business Source License, Version 1.1 (the "License");
1212
* you may not use this file except in compliance with the License.
@@ -51,7 +51,7 @@
5151
*/
5252
class ClientTaskTrackerTest implements TestConstants {
5353
final EvitaManagementContract evitaClientMock = Mockito.mock(EvitaManagementContract.class);
54-
private ClientTaskTracker tested = new ClientTaskTracker(evitaClientMock, 100, 1);
54+
private final ClientTaskTracker tested = new ClientTaskTracker(evitaClientMock, 100, 1);
5555

5656
@Test
5757
void shouldTrackTaskUntilFinished() throws ExecutionException, InterruptedException, TimeoutException {

evita_server/src/main/resources/evita-configuration.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ transaction:
5454
flushFrequencyInMillis: ${transaction.flushFrequencyInMillis:1000}
5555

5656
cache:
57-
enabled: ${cache.enabled:true}
57+
enabled: ${cache.enabled:false}
5858
reflection: ${cache.reflection:CACHE}
5959
reevaluateEachSeconds: ${cache.reevaluateEachSeconds:60}
6060
anteroomRecordCount: ${cache.anteroomRecordCount:100K}

0 commit comments

Comments
 (0)