Skip to content
This repository was archived by the owner on Jun 6, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
237 changes: 0 additions & 237 deletions docs/administration-guide/delete-elements.md

This file was deleted.

5 changes: 3 additions & 2 deletions docs/administration-guide/gaffer-stores/accumulo-store.md
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,7 @@ The Accumulo Store also provides a utility [AddUpdateTableIterator](https://gith
to help with migrations - updating to new versions of Gaffer or updating your schema.

The following changes to your schema are allowed:

- add new groups
- add new non-groupBy properties (including visibility and timestamp), but they must go after the other properties
- rename properties
Expand All @@ -227,6 +228,7 @@ The following changes to your schema are allowed:
- change descriptions

But, you cannot do the following:

- rename groups
- remove any properties (groupBy, non-groupBy, visibility or timestamp)
- add new groupBy properties
Expand Down Expand Up @@ -332,7 +334,7 @@ setauths -u root -s vis1,vis2,publicVisibility,privateVisibility,public,private

You may notice that sometimes `MatchedVertex` is included on edges when you might not be expecting it.
When you seed with a mixture of EdgeSeeds and EntitySeeds, `MatchedVertex` will always be included on edges whether they were matched by a vertex or not. In this case `MatchedVertex` will always equal `SOURCE`.
This is a peculiarity of the Accumulo store.
This is a peculiarity of the Accumulo store.

!!! example "Example Query"
``` mermaid
Expand Down Expand Up @@ -389,4 +391,3 @@ This is a peculiarity of the Accumulo store.
]
```
The 1 -> 2 edge has MatchedVertex=SOURCE even though the source wasn't matched by an EntitySeed.

1 change: 1 addition & 0 deletions docs/reference/binary-operators-guide/binary-operators.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ Binary Operator | Origin
[`impl.binaryoperator.And`](koryphe-operators.md#and) | Koryphe
[`impl.binaryoperator.CollectionConcat`](koryphe-operators.md#collectionconcat) | Koryphe
[`impl.binaryoperator.CollectionIntersect`](koryphe-operators.md#collectionintersect) | Koryphe
[`impl.binaryoperator.IterableMerge`](koryphe-operators.md#iterablemerge) | Koryphe
[`impl.binaryoperator.First`](koryphe-operators.md#first) | Koryphe
`impl.binaryoperator.Last` | Koryphe
[`impl.binaryoperator.Max`](koryphe-operators.md#max) | Koryphe
Expand Down
35 changes: 35 additions & 0 deletions docs/reference/binary-operators-guide/koryphe-operators.md
Original file line number Diff line number Diff line change
Expand Up @@ -348,6 +348,41 @@ Input type: `java.util.Collection`
java.util.ArrayList | [test1] and null | java.util.ArrayList | [test1]
java.util.HashSet | [a, b] and [b, c] | java.util.HashSet | [b]

## IterableMerge

Returns a ChainedIterable of two Iterables. [Javadoc](https://gchq.github.io/koryphe/uk/gov/gchq/koryphe/impl/binaryoperator/IterableMerge.html)

Input type: `java.lang.Iterable`

??? example "Example IterableMerge"

=== "Java"

``` java
final IterableMerge iterableMerge = new IterableMerge();
```

=== "JSON"

``` json
{
"class" : "uk.gov.gchq.koryphe.impl.binaryoperator.IterableMerge"
}
```

=== "Python"

``` python
g.IterableMerge()
```

Example inputs:

Input Type | Inputs | Result Type | Results
---------- | ------ | ----------- | -------
java.util.ArrayList | [test1] and [test2, test3] | uk.gov.gchq.koryphe.util.ChainedIterable | [test1, test2, test3]
java.util.HashSet | [a, b] and [b, c] | uk.gov.gchq.koryphe.util.ChainedIterable | [a, b, b, c]

## StringConcat

Concatenates 2 strings. [Javadoc](https://gchq.github.io/koryphe/uk/gov/gchq/koryphe/impl/binaryoperator/StringConcat.html)
Expand Down
Loading