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.

Sign up for GitHub

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

Jump to bottom

Gh 2903 new proxy it test #2923

Merged
merged 57 commits into from
Apr 12, 2023
Merged

Gh 2903 new proxy it test #2923

merged 57 commits into from
Apr 12, 2023

Conversation

GCHQDev404
Copy link
Contributor

No description provided.

GCHQDev404 and others added 30 commits February 23, 2023 10:57
@GCHQDev404
gh-2886 FederatedStore remove double caching accidental collision.
47baff1
@GCHQDev404
gh-2886 FederatedStore remove double caching accidental collision.
dc2aaa7
@GCHQDev404
gh-2887 Test fixed to user correct cache instance due to suffix/name …
d5d21f8 
…change.
@GCHQDev404
gh-2903 removing 1.12 cache tests and graphStorage zero argument cons…
e0b8e5d 
…tructor.
@GCHQDev404
gh-2903 All Cache requires suffix
6e96b81
@GCHQDev404
gh-2903 Test changes for Cache requiring suffix
d66a24b
@GCHQDev404
gh-2903 spotless
b14e6c1
@GCHQDev404
gh-2903 Cherry Picked, improvements.
1fafffd
@GCHQDev404
gh-2903 test fix
b4c3eb0
@GCHQDev404
gh-2903 test fix
63c239e
@GCHQDev404
gh-2886 PR change
72dfabd
@GCHQDev404
gh-2903 tidy.
0f232cf
@GCHQDev404
Merge remote-tracking branch 'origin/v2-alpha' into gh-2886-Federated…
4a07825 
…Store-Double-cache-removing-accidental-collision
@GCHQDev404
Merge remote-tracking branch 'origin/v2-alpha' into gh-2886-Federated…
4e38dfc 
…Store-Double-cache-removing-accidental-collision
@GCHQDev404
gh-2886 review
cd5d113
@GCHQDev404
Merge branch 'gh-2886-FederatedStore-Double-cache-removing-accidental…
00ed9e6 
…-collision' into gh-2903-all-caches-require-suffix-to-avoid-collisions-within-a-federatedstore-environment

# Conflicts:
#	store-implementation/proxy-store/src/main/java/uk/gov/gchq/gaffer/proxystore/ProxyStore.java
@GCHQDev404
gh-2886 PR request
bf467ff
@GCHQDev404
gh-2886 PR request
9ee98bd
@GCHQDev404
gh-2903 merge conflicts
ce58531
@GCHQDev404
Merge branch 'gh-2886-FederatedStore-Double-cache-removing-accidental…
d98f9eb 
…-collision' into gh-2903-all-caches-require-suffix-to-avoid-collisions-within-a-federatedstore-environment
@GCHQDev404
gh-2903 PR changes.
12817ac
@GCHQDev404
gh-2903 PR changes.
265ffb5
@GCHQDev404
gh-2903 PR changes.
85ef9d3
@GCHQDev404
Merge remote-tracking branch 'origin/v2-alpha' into gh-2903-all-cache…
04cbaf5 
…s-require-suffix-to-avoid-collisions-within-a-federatedstore-environment

# Conflicts:
#	store-implementation/federated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/FederatedStoreCacheTransient.java
@GCHQDev404
gh-2903 PR changes.
44dd867
@GCHQDev404
gh-2903 Cache changes for Score Resolvers.
4e4342e
@GCHQDev404
gh-2903 Cache changes for Score Resolvers.
161ade5
@GCHQDev404
gh-2903 spotless
0ee9ad4
@GCHQDev404
gh-2909 AddGraph with Handlers.
3d92742
@GCHQDev404
gh-2909 merge
a89d778
@GCHQDev404
gh-2903 removed IT test.
1d38b80
@GCHQDev404
gh-2903 removed IT test.
fa36234
@GCHQDev404
gh-2903 IT change
e955179
@GCHQDev404
gh-2903 IT change
6fcf991
@GCHQDev404
Merge remote-tracking branch 'origin/v2-alpha' into gh-2903-return-pr…
bcd57a5 
…oxy-store-to-no-cache-handlers

# Conflicts:
#	core/graph/src/test/java/uk/gov/gchq/gaffer/graph/GraphTest.java
#	store-implementation/proxy-store/src/main/java/uk/gov/gchq/gaffer/proxystore/ProxyStore.java
#	store-implementation/proxy-store/src/test/java/uk/gov/gchq/gaffer/proxystore/integration/ProxyStoreResponseDeserialiserIT.java
@GCHQDev404
gh-2909 duplication
c84b12a
@GCHQDev404
Merge branch 'gh-2903-return-proxy-store-to-no-cache-handlers' into g…
8c33018 
…h-2903-new-proxy-IT-test
@GCHQDev404
gh-2903 expected remote handlers.
f038786
@GCHQDev404
gh-2903 PR changes.
9ee38ac
@GCHQDev404
Merge branch 'gh-2903-return-proxy-store-to-no-cache-handlers' into g…
a3337b7 
…h-2903-new-proxy-IT-test
@codecov-commenter
Copy link

codecov-commenter commented Mar 6, 2023 •
edited
Loading

Codecov Report

❗ No coverage uploaded for pull request base (v2-alpha@72873e1). Click here to learn what that means.
The diff coverage is n/a.

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

@@             Coverage Diff             @@
##             v2-alpha    #2923   +/-   ##
===========================================
  Coverage            ?   55.30%           
  Complexity          ?     2497           
===========================================
  Files               ?      822           
  Lines               ?    28568           
  Branches            ?     2874           
===========================================
  Hits                ?    15800           
  Misses              ?    11532           
  Partials            ?     1236

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@GCHQDev404
Merge remote-tracking branch 'origin/v2-alpha' into gh-2903-return-pr…
77a5a77 
…oxy-store-to-no-cache-handlers

# Conflicts:
#	store-implementation/federated-store/src/test/java/uk/gov/gchq/gaffer/federatedstore/operation/handler/impl/FederatedAddGraphHandlerTest.java
@GCHQDev404
Merge branch 'gh-2903-return-proxy-store-to-no-cache-handlers' into g…
912c4ba 
…h-2903-new-proxy-IT-test
@GCHQDev404
gh-2903 Re-removing handlers.
15dfc6c
@GCHQDev404
Merge branch 'gh-2903-return-proxy-store-to-no-cache-handlers' into g…
60b7733 
…h-2903-new-proxy-IT-test
@GCHQDev404
gh-2903
ca96fd6
@t92549 t92549 linked an issue Mar 7, 2023 that may be closed by this pull request
Fix FederatedStore cache collision #2903
Closed
@t92549 t92549 mentioned this pull request Apr 11, 2023
Closed
@t92549 t92549 removed a link to an issue Apr 11, 2023
Fix FederatedStore cache collision #2903
Closed
@t92549 t92549 linked an issue Apr 11, 2023 that may be closed by this pull request
Remove temporary handlers from ProxyStore and add cache ITs #2936
Closed
@t92549 t92549 marked this pull request as ready for review April 12, 2023 11:46
@t92549 t92549 merged commit 719a307 into v2-alpha Apr 12, 2023
@t92549 t92549 deleted the gh-2903-new-proxy-IT-test branch April 12, 2023 12:34
@t92549 t92549 mentioned this pull request Apr 12, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@t92549 t92549 t92549 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Remove temporary handlers from ProxyStore and add cache ITs
3 participants
@GCHQDev404 @codecov-commenter @t92549