Gh 2552 remove deprecated #2564

t92549 · 2022-01-14T10:29:31Z

As of submitting, this branch is not yet complete, still todo:

Some deprecated code has not been removed in this PR but will be removed under a different PR due to its dependency on the future FederatedStore changes. This is to do with replacing usages of the getTraits function:

Replace getTrait usages with Operation #2581

Related Issue

Resolve Remove Deprecated code #2552

t92549 · 2022-01-14T10:30:17Z

...rialisation/src/main/java/uk/gov/gchq/gaffer/serialisation/ToBytesViaStringDeserialiser.java

+     * It has been marked deprecated but will not be removed as it is needed
+     * in the Serialiser interface.
+     * @see #deserialise(byte[], int, int)
+     */
    @Deprecated
    @Override
    public final T deserialise(final byte[] bytes) throws SerialisationException {


This function, as well as ToBytesSerialiser.deserialise(byte[]), have been left in despite being deprecated. This is because they cannot be removed as they need to have implementations for the Serialiser interface. However, the deprecated tag has been left in to warn people to instead use the more efficient deserialise(byte[], int, int) method instead.

codecov-commenter · 2022-01-14T10:31:17Z

Codecov Report

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

@@             Coverage Diff             @@
##             v2-alpha    #2564   +/-   ##
===========================================
  Coverage            ?   65.28%           
  Complexity          ?     2427           
===========================================
  Files               ?      872           
  Lines               ?    27209           
  Branches            ?     3165           
===========================================
  Hits                ?    17764           
  Misses              ?     8046           
  Partials            ?     1399

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 6c0be90...553412c. Read the comment docs.

t92549 · 2022-01-14T10:32:09Z

The Parquet and HBase store have been removed in this PR as we plan to first release 2.0 without them and add them back in later if there is user demand

* gh-2571: Fixed matchedVertex behaviour and added new ITs * gh-2571: Fixed checkstyle * gh-2571: Updated test name

GCHQDeveloper314

It looks like these files have been left over from the parquet removal:

/example/road-traffic/road-traffic-demo/src/main/resources/parquet/store.properties
/example/road-traffic/road-traffic-rest/src/test/resources/parquet/store.properties
/example/basic/basic-rest/src/main/resources/parquet/store.properties

I went through most of deprecation changes whilst documenting them and it all looked fine to me.

* 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

t11947

Just a single comment regarding reference to a specific store in general store code, all good apart from that.

core/store/src/main/java/uk/gov/gchq/gaffer/store/operation/handler/HasTraitHandler.java

t92549 · 2022-02-03T16:24:01Z

Not to be merged until #2579 is merged into this one

* 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>

...d-store/src/test/java/uk/gov/gchq/gaffer/federatedstore/FederatedGraphStorageTraitsTest.java

...ccumulostore/key/core/impl/bytedEntity/ByteEntityAccumuloElementConverterVisibilityTest.java

...q/gaffer/accumulostore/key/core/impl/bytedEntity/ByteEntityAccumuloElementConverterTest.java

...alisation/src/main/java/uk/gov/gchq/gaffer/serialisation/implementation/MultiSerialiser.java

GCHQDev404

Awaiting last PR "multi serialiser comments"

GCHQDev404 · 2022-02-18T14:00:57Z

integration-test/src/test/java/uk/gov/gchq/gaffer/integration/impl/GetElementsIT.java

-                .view(viewBuilder.build())
-                .seedMatching(seedMatching)
-                .build();
+        if (createChain && includeEntities && includeEdges) {


Notes need to be added to Deprecated documents.

GCHQDev404 · 2022-02-18T14:10:16Z

...src/main/java/uk/gov/gchq/gaffer/accumulostore/retriever/impl/AccumuloElementsRetriever.java

 public class AccumuloElementsRetriever extends AccumuloSingleIDRetriever<GetElements> {
    public AccumuloElementsRetriever(final AccumuloStore store,
                                     final GetElements operation,
                                     final User user)
            throws IteratorSettingException, StoreException {
        super(store, operation, user,
-                SeedMatching.SeedMatchingType.EQUAL != operation.getSeedMatching(),
+                // includeMatchedVertex if input only contains EntityIds
+                StreamSupport.stream(operation.getInput().spliterator(), false).noneMatch(input -> EdgeId.class.isInstance(input)),


Potentially input could be large, but its a simple stream with an end-quick if any is matched.
IF your seed input is massive, you likely to have issues else where in gaffer.

GCHQDev404 · 2022-02-18T14:16:33Z

...tore/src/test/java/uk/gov/gchq/gaffer/accumulostore/integration/AccumuloMatchedVertexIT.java

+            assertThat(edgeResults).hasSize(1);
+            assertThat(edgeResults).doNotHave(matchedVertex);
+        } else if (edge == getEdgeWithDestinationMatch()) {
+            // When the Edge input matches on the dest and the Entity input matches on


Maybe add to documents?

* 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>

GCHQDeveloper314

All looks good to me now. I've also somewhat tested this branch by using it in my own branch.

t92549 added 2 commits January 13, 2022 18:19

gh-2552: Removed deprecated code except getTraits and hasTrait

c7fd1e3

gh-2552: Fix javadoc issue

ab0b66c

t92549 commented Jan 14, 2022

View reviewed changes

t92549 linked an issue Jan 14, 2022 that may be closed by this pull request

Remove Deprecated code #2552

Closed

t92549 added 3 commits January 17, 2022 13:50

Merge branch 'v2-alpha' into gh-2552-remove-deprecated

4ee7645

Merge branch 'v2-alpha' into gh-2552-remove-deprecated

4c257f1

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

d081ca6

* gh-2571: Fixed matchedVertex behaviour and added new ITs * gh-2571: Fixed checkstyle * gh-2571: Updated test name

GCHQDeveloper314 reviewed Jan 19, 2022

View reviewed changes

t92549 mentioned this pull request Jan 28, 2022

gh-2560 GetTraitsHandler is initialised with store traits #2577

Closed

t11947 self-requested a review January 31, 2022 10:01

t11947 reviewed Feb 1, 2022

View reviewed changes

core/store/src/main/java/uk/gov/gchq/gaffer/store/operation/handler/HasTraitHandler.java Show resolved Hide resolved

t11947 self-requested a review February 2, 2022 16:30

t11947 marked this pull request as ready for review February 2, 2022 16:30

t11947 approved these changes Feb 2, 2022

View reviewed changes

p3430233 and others added 2 commits February 4, 2022 11:46

gh-2552: Removed some remaining parquet properties files

cf1d736

GCHQDev404 suggested changes Feb 15, 2022

View reviewed changes

gh-2552: Review comments traits test

495fe80

GCHQDev404 suggested changes Feb 18, 2022

View reviewed changes

GCHQDev404 approved these changes Feb 18, 2022

View reviewed changes

r32575 approved these changes Feb 22, 2022

View reviewed changes

t92549 mentioned this pull request Feb 22, 2022

Improve SeedMatching docs in v1 gchq/gaffer-doc#263

Closed

GCHQDeveloper314 approved these changes Feb 23, 2022

View reviewed changes

t92549 merged commit dd18afb into v2-alpha Feb 23, 2022

t92549 linked an issue Feb 23, 2022 that may be closed by this pull request

Remove Parquet store. #2590

Closed

t92549 linked an issue Feb 23, 2022 that may be closed by this pull request

Remove references to Parquet from examples/demos #2589

Closed

This was referenced Feb 23, 2022

Remove Parquet store. #2590

Closed

Remove references to Parquet from examples/demos #2589

Closed

Remove Deprecated code #2552

Closed

Add matched vertex docs gchq/gaffer-doc#266

Closed

n3101 deleted the gh-2552-remove-deprecated branch March 7, 2023 13:26

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Gh 2552 remove deprecated #2564

Gh 2552 remove deprecated #2564

t92549 commented Jan 14, 2022 •

edited

Loading

t92549 Jan 14, 2022

codecov-commenter commented Jan 14, 2022 •

edited

Loading

t92549 commented Jan 14, 2022

GCHQDeveloper314 left a comment

t11947 left a comment

t92549 commented Feb 3, 2022

GCHQDev404 left a comment

GCHQDev404 Feb 18, 2022

GCHQDev404 Feb 18, 2022

GCHQDev404 Feb 18, 2022

GCHQDeveloper314 left a comment

Gh 2552 remove deprecated #2564

Gh 2552 remove deprecated #2564

Conversation

t92549 commented Jan 14, 2022 • edited Loading

Related Issue

t92549 Jan 14, 2022

Choose a reason for hiding this comment

codecov-commenter commented Jan 14, 2022 • edited Loading

Codecov Report

t92549 commented Jan 14, 2022

GCHQDeveloper314 left a comment

Choose a reason for hiding this comment

t11947 left a comment

Choose a reason for hiding this comment

t92549 commented Feb 3, 2022

GCHQDev404 left a comment

Choose a reason for hiding this comment

GCHQDev404 Feb 18, 2022

Choose a reason for hiding this comment

GCHQDev404 Feb 18, 2022

Choose a reason for hiding this comment

GCHQDev404 Feb 18, 2022

Choose a reason for hiding this comment

GCHQDeveloper314 left a comment

Choose a reason for hiding this comment

t92549 commented Jan 14, 2022 •

edited

Loading

codecov-commenter commented Jan 14, 2022 •

edited

Loading