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

Improve and test Accumulo matched vertex behaviour #2571

Closed
t92549 opened this issue Jan 17, 2022 · 0 comments · Fixed by #2572
Closed

Improve and test Accumulo matched vertex behaviour #2571

t92549 opened this issue Jan 17, 2022 · 0 comments · Fixed by #2572
Assignees
Labels
enhancement Improvement to existing functionality/feature

Comments

@t92549
Copy link
Contributor

t92549 commented Jan 17, 2022

After removing SeedMatching in #2552, we decided that the includeMatchedVertex flag should be set depending on the operation. It should only be true when there are only EntityIds in the input. As well as this, there should be tests to document the fact that sometimes one Edge can be returned twice depending on how it matches with an Entity and Edge input.

@t92549 t92549 added the enhancement Improvement to existing functionality/feature label Jan 17, 2022
@t92549 t92549 added this to the v2.0.0-alpha-0.1 milestone Jan 17, 2022
@t92549 t92549 self-assigned this Jan 17, 2022
t92549 added a commit that referenced this issue Jan 17, 2022
t92549 added a commit that referenced this issue Jan 17, 2022
t92549 added a commit that referenced this issue Jan 17, 2022
* gh-2571: Fixed matchedVertex behaviour and added new ITs

* gh-2571: Fixed checkstyle

* gh-2571: Updated test name
@t92549 t92549 linked a pull request Jan 17, 2022 that will close this issue
@t92549 t92549 closed this as completed Jan 17, 2022
t92549 added a commit that referenced this issue Feb 23, 2022
* gh-2552: Removed deprecated code except getTraits and hasTrait

* gh-2552: Fix javadoc issue

* gh-2571: Fixed matchedVertex behaviour and added new ITs (#2572)

* gh-2571: Fixed matchedVertex behaviour and added new ITs

* gh-2571: Fixed checkstyle

* gh-2571: Updated test name

* gh-2573: Replace hasTrait usages with Operation (#2574)

* gh-2573: Replace hasTrait usages with Operation

* gh-2573: Fix tests by making exception more explicit

* gh-2573: Fixed exception issues

* gh-2573: Simplified but still failing test

* gh-2573: Changed to user

* gh-2573: Changed FederatedGetTraitsHandler to return DYNAMIC_SCHEMA

* gh-2573: Use old function for FederatedOperationChainValidator

* gh-2573: Fixed FederatedStoreUtil

* gh-2573: Added Deprecation notice

* gh-2573: Cherry pick federated store tests fix from 2553

* Revert "gh-2573: Cherry pick federated store tests fix from 2553"

This reverts commit c367555.

* gh-2573: Manual fix of FederatedStoreGetTraitsTest cache

* gh-2573: Changed HasTraitHandler to not send Federated loop option

* Gh-2560 get traits operation configurable (#2579)

* Update docs links in README

* Revert "Update docs links in README"

This reverts commit 2d87bf3.

* gh-2559 added hasTrait, its handler and corresponding tests (#2561)

* gh-2559 added hasTrait, its handler and corresponding tests

* gh-2559 amended comment in HasTrait, added additional tests for the handler

* gh-2559 null check & tidy test

Co-authored-by: t92549 <80890692+t92549@users.noreply.github.com>

* Update links to Gaffer docs in all files (#2566)

Co-authored-by: t92549 <80890692+t92549@users.noreply.github.com>

* gh-2560 GetTraitsHandler is initalised with traits dependednt on store type

* gh-2560 reviewed comments

* gh-2560 unused imports

* gh-2560 review comments

* checkstyle

* gh-2560 fixed federated test

* gh-2560 fixed GraphTest

* gh-2560 fixed TestStore

* gh-2560-getTraitsOperation (#2582)

Removing redundant adding of GetTraitHandler from addAdditionalOperationHandlers() because it has its own method getGetTraitsHandler().

* gh-2560: Added fix to SingleUseMapStoreWithoutVisibilitySupport

* gh-2560: Fixed Set copy issue in GetTraitsHandler constructor

* gh-2560: Added extra protections to GetTraitsHandler

Co-authored-by: GCHQDeveloper314 <94527357+GCHQDeveloper314@users.noreply.github.com>
Co-authored-by: t92549 <80890692+t92549@users.noreply.github.com>
Co-authored-by: GCHQDev404 <45399082+GCHQDev404@users.noreply.github.com>

* gh-2552: Removed some remaining parquet properties files

* gh-2552: Review comments traits test

* gh-2552-remove-deprecated MultiSerialiser (#2587)

* gh-2552-remove-deprecated MultiSerialiser

update the MultiSerialiser wanting to emphasise the effectiveness of it during the deprecation of serialisers.
8 is the last and best.
24 is not latest regardless of natural-order.
7 is dead.

* gh-2552: MultiSerialiser spelling corrections

* Update core/serialisation/src/main/java/uk/gov/gchq/gaffer/serialisation/implementation/MultiSerialiser.java

Co-authored-by: t92549 <80890692+t92549@users.noreply.github.com>

Co-authored-by: p3430233 <61738524+p3430233@users.noreply.github.com>
Co-authored-by: GCHQDeveloper314 <94527357+GCHQDeveloper314@users.noreply.github.com>
Co-authored-by: GCHQDev404 <45399082+GCHQDev404@users.noreply.github.com>
t92549 added a commit that referenced this issue Apr 14, 2022
…le, iterator and wrapper classes (#2583)

* Transferred ChainedIterable from Koryphe, added existing constructor and added a test for new constructor

* Removed the Closeable and WrappedCloseable classes and refactored the iterables/iterators to use java.io.Closeable and java.lang.Iterable instead. Also amended the tests

* Renamed the CloseableIterableDeserializer to the IterableDeserializer and removed the WrappedCloseableIterable. Tests function

* Renamed CloseableIterable to Iterable and removed the WrappedCloseableIterable and the CloseableIterable types. Tests function

* gh-2552: Removed deprecated code except getTraits and hasTrait

* gh-2552: Fix javadoc issue

* Renamed CloseableIterable to Iterable and removed the WrappedCloseableIterable and the CloseableIterable types. The GraphSerialisableTest test does not function

* Renamed CloseableIterable to Iterable and removed the WrappedCloseableIterable and the CloseableIterable types. Tests function

* Changed to try-with-resources as both io classes are auto-closeable

* The TestStore.mockStore was being set in GraphTest but reset afterwards which was causing GraphSerialisableTest to fail. Reset TestStore.mockStore for both. All Graph test now pass

* Renamed CloseableIterable to Iterable

* gh-2571: Fixed matchedVertex behaviour and added new ITs (#2572)

* gh-2571: Fixed matchedVertex behaviour and added new ITs

* gh-2571: Fixed checkstyle

* gh-2571: Updated test name

* Changed CloseableIterable to Iterable and removed the extends Wrapper, instead implemented Iterable. Fixed tests

* Converted CloseableIterable to Iterable. Fixed AbstractElementFilter bug caused by the introduction of the Koryphe version of ChainedIterable. Fixed tests

* Changed EmptyClosableIterable to EmptyIterable

* Changed the OperationDetailTest name-of-class from CloseableIterable to Iterable

* Changed the the instances and JSON values from CloseableIterable to Iterable. Test pass

* Changed the the instances of CloseableIterable to Iterable. Suppresed test class casts. Test pass

* Changed from CloseableIterable to Iterable. Deleted WrappedCloseableIterable. FederatedStoreGetTraitsTest fails

* FederatedStoreGetTraitsTest did not delete the cache service before carrying out each test causing it to fail when run as part of the maven tests. In isolation it passed. Found that the FederatedGraphStorageTraitsTest was also not clearing the cache. Added the before and after cache clearance and bumped the JUnit version of FederatedStoreGetTraitsTest from 4 to 5. Tests now pass

* Changed from CloseableIterable to Iterable and added finally to the try blocks with a close-if-auto-closeable check

* gh-2573: Replace hasTrait usages with Operation (#2574)

* gh-2573: Replace hasTrait usages with Operation

* gh-2573: Fix tests by making exception more explicit

* gh-2573: Fixed exception issues

* gh-2573: Simplified but still failing test

* gh-2573: Changed to user

* gh-2573: Changed FederatedGetTraitsHandler to return DYNAMIC_SCHEMA

* gh-2573: Use old function for FederatedOperationChainValidator

* gh-2573: Fixed FederatedStoreUtil

* gh-2573: Added Deprecation notice

* gh-2573: Cherry pick federated store tests fix from 2553

* Revert "gh-2573: Cherry pick federated store tests fix from 2553"

This reverts commit c367555.

* gh-2573: Manual fix of FederatedStoreGetTraitsTest cache

* gh-2573: Changed HasTraitHandler to not send Federated loop option

* Gh-2560 get traits operation configurable (#2579)

* Update docs links in README

* Revert "Update docs links in README"

This reverts commit 2d87bf3.

* gh-2559 added hasTrait, its handler and corresponding tests (#2561)

* gh-2559 added hasTrait, its handler and corresponding tests

* gh-2559 amended comment in HasTrait, added additional tests for the handler

* gh-2559 null check & tidy test

Co-authored-by: t92549 <80890692+t92549@users.noreply.github.com>

* Update links to Gaffer docs in all files (#2566)

Co-authored-by: t92549 <80890692+t92549@users.noreply.github.com>

* gh-2560 GetTraitsHandler is initalised with traits dependednt on store type

* gh-2560 reviewed comments

* gh-2560 unused imports

* gh-2560 review comments

* checkstyle

* gh-2560 fixed federated test

* gh-2560 fixed GraphTest

* gh-2560 fixed TestStore

* gh-2560-getTraitsOperation (#2582)

Removing redundant adding of GetTraitHandler from addAdditionalOperationHandlers() because it has its own method getGetTraitsHandler().

* gh-2560: Added fix to SingleUseMapStoreWithoutVisibilitySupport

* gh-2560: Fixed Set copy issue in GetTraitsHandler constructor

* gh-2560: Added extra protections to GetTraitsHandler

Co-authored-by: GCHQDeveloper314 <94527357+GCHQDeveloper314@users.noreply.github.com>
Co-authored-by: t92549 <80890692+t92549@users.noreply.github.com>
Co-authored-by: GCHQDev404 <45399082+GCHQDev404@users.noreply.github.com>

* gh-2552: Removed some remaining parquet properties files

* Added missed iterable try-with-resources block, reformated and tested

* Reformated code. Updated test code. All tests pass

* Reformated code. Updated test code. All tests pass

* Reformatted code. Updated test code. All tests pass

* Reformatted code. All tests pass

* Fixed NamedViewCacheTest bugs and reformatted code. All tests pass

* Reformatted code. All tests pass

* Reformatted code. All tests pass

* Reformatted code. All tests pass

* Reformatted code again. All tests pass

* Reformatted code. Changed the Operation ArrayUtils import to lang3 as accumulo did not have the other apache version. All tests pass

* Reformatted code again. All tests pass

* Reformatted code again. All tests pass

* Reformatted code. All tests pass

* Created Objects.isNull static import

* Created Objects.isNull and Objects.nonNull static imports

* Update the copyright to the correct dates

* Removed unnecessary cast

* Corrected an/a grammar error

* Removed the incorrect spacing in the imports

* Created Objects.isNull and Objects.nonNull static imports for JSONSerialiser

* Removed deleted FederatedGraphStorageTraitsTest

* Re-added incorrectly deleted empty line

* Removed the unnecessary try-finally blocks from the LimitedIterableTest

* Removed the unnecessary try-finally blocks

* Removed the unused imports

* Removed the unnecessary try-finally blocks

Co-authored-by: t92549 <80890692+t92549@users.noreply.github.com>
Co-authored-by: p3430233 <61738524+p3430233@users.noreply.github.com>
Co-authored-by: GCHQDeveloper314 <94527357+GCHQDeveloper314@users.noreply.github.com>
Co-authored-by: GCHQDev404 <45399082+GCHQDev404@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement Improvement to existing functionality/feature
Projects
None yet
Development

Successfully merging a pull request may close this issue.

1 participant