Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge Release #3650

Merged
merged 45 commits into from
Jan 27, 2025
Merged
Changes from 2 commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
0007d55
untangle commands, use overrides from framework
thoniTUB Nov 7, 2024
472c1e4
Merge branch 'develop' into feature/cleanup-commands
thoniTUB Nov 7, 2024
f8021c2
update to shiro 2
thoniTUB Dec 2, 2024
0884886
Merge branch 'develop' into feature/shiro2
thoniTUB Dec 4, 2024
342cedb
Merge pull request #3629 from ingef/feature/shiro2
thoniTUB Dec 4, 2024
54dd9a7
simplify the mina stack by cumulating IoBuffers until there are enough
thoniTUB Dec 4, 2024
2c73caf
Merge branch 'develop' into feature/simplify-mina-stack
thoniTUB Dec 4, 2024
f952c55
prepare for test
thoniTUB Dec 4, 2024
633a13a
adds test for mina stack
thoniTUB Dec 4, 2024
90766cb
correct comment
thoniTUB Dec 5, 2024
ba93d3a
improve logging
thoniTUB Dec 5, 2024
2a42812
remove write queue
thoniTUB Dec 5, 2024
1cb6704
flush explicitly
thoniTUB Dec 5, 2024
30175bf
do not flush do not awaituninterruptibly
thoniTUB Dec 5, 2024
20a24c0
Merge branch 'develop' into feature/cleanup-commands
thoniTUB Dec 9, 2024
13ed9dd
Merge pull request #3616 from ingef/feature/cleanup-commands
thoniTUB Dec 9, 2024
ece3909
adds chunking filter if send buffer size is set
thoniTUB Dec 9, 2024
b06f30c
adds missing parameter
thoniTUB Dec 10, 2024
18e1f87
Merge pull request #3636 from ingef/fix/log-message
thoniTUB Dec 10, 2024
7a80eba
don'Ãt allocate new buffers in chunking filter
thoniTUB Dec 11, 2024
9b2602c
improve log messages
thoniTUB Dec 12, 2024
2341241
Merge branch 'develop' into reintegrate-main
thoniTUB Dec 12, 2024
2718ab7
Merge pull request #3639 from ingef/reintegrate-main
awildturtok Dec 12, 2024
c29030a
adds mixin to fix configs serdes
thoniTUB Dec 12, 2024
fbcf8d6
add logging and stopwatches
thoniTUB Dec 12, 2024
6fb72a0
Don't wait in the chain for chunks
thoniTUB Dec 12, 2024
3f81ede
throttle cqpp import a bit to prevent excessive memory consuption
thoniTUB Dec 12, 2024
7cae1ef
use bocking queue again to throttle iobuffer allocation
thoniTUB Dec 13, 2024
fed018c
by default set position in finally block to recover from unreadable data
thoniTUB Dec 13, 2024
a49b014
improve log message
thoniTUB Dec 13, 2024
8eaa24e
Merge branch 'develop' into feature/simplify-mina-stack
thoniTUB Dec 13, 2024
1ef6569
Merge remote-tracking branch 'origin/feature/simplify-mina-stack' int…
thoniTUB Dec 13, 2024
ef752fc
Merge pull request #3633 from ingef/feature/simplify-mina-stack
thoniTUB Dec 13, 2024
7f9f72f
use slices for buffer handling in Mina
awildturtok Dec 16, 2024
76f2b39
cleanup chunking, roll-back first iteration of do-while
awildturtok Dec 16, 2024
dc98068
Update backend/src/main/java/com/bakdata/conquery/io/mina/JacksonProt…
awildturtok Dec 16, 2024
85fa37d
Merge pull request #3641 from ingef/feature/simplify-buffer-handling
thoniTUB Dec 17, 2024
bbbcbc3
upgrade to Java 21 JDK
awildturtok Dec 18, 2024
373ee5a
fixes backend Docker version (#3645)
awildturtok Dec 18, 2024
015459c
minor dependency update to mina 2.2.4
thoniTUB Jan 14, 2025
b61bfee
Merge pull request #3649 from ingef/dependency/mina-2.2.4
thoniTUB Jan 14, 2025
0158f76
adds back missing usage of CachedStore for IdMapping
awildturtok Jan 22, 2025
ecfb87e
Merge pull request #3653 from ingef/fix/id-mapping-caching
awildturtok Jan 22, 2025
7d0d23f
rename config property to avoid Exception
thoniTUB Jan 24, 2025
2607360
Merge pull request #3654 from ingef/fix/script-end
thoniTUB Jan 27, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -221,7 +221,7 @@ public SingletonStore<EntityIdMap> createIdMappingStore(String pathName, ObjectM

openStoresInEnv.put(bigStore.getDataXodusStore().getEnvironment(), bigStore.getDataXodusStore());
openStoresInEnv.put(bigStore.getMetaXodusStore().getEnvironment(), bigStore.getMetaXodusStore());
return new SingletonStore<>(bigStore);
return new SingletonStore<>(new CachedStore<>(bigStore));
}
}