Skip to content
This repository has been archived by the owner on Oct 16, 2023. It is now read-only.

gh-969: Remove use of code deprecated in Gaffer #970

Merged
merged 3 commits into from
Feb 24, 2022
Merged

gh-969: Remove use of code deprecated in Gaffer #970

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b618f79
Replace use of SplitStore (which has been removed) with SplitStoreFro…
GCHQDeveloper314 Feb 7, 2022
412904f
Replace use of getTable and graphId (both have been removed) with equ…
GCHQDeveloper314 Feb 7, 2022
a29cd4a
gh-969: Change to GraphConfig Builders
t92549 Feb 24, 2022
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
11 changes: 7 additions & 4 deletions ...uk/gov/gchq/gaffer/accumulostore/performancetesting/ingest/AccumuloElementIngestTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,10 @@
import uk.gov.gchq.gaffer.accumulostore.AccumuloStore;
import uk.gov.gchq.gaffer.data.element.Element;
import uk.gov.gchq.gaffer.graph.Graph;
import uk.gov.gchq.gaffer.graph.GraphConfig;
import uk.gov.gchq.gaffer.hdfs.operation.SampleDataForSplitPoints;
import uk.gov.gchq.gaffer.operation.OperationException;
import uk.gov.gchq.gaffer.operation.impl.SplitStore;
import uk.gov.gchq.gaffer.operation.impl.SplitStoreFromFile;
import uk.gov.gchq.gaffer.performancetesting.ingest.ElementIngestTest;
import uk.gov.gchq.gaffer.randomelementgeneration.generator.ElementGeneratorFromSupplier;
import uk.gov.gchq.gaffer.serialisation.ToBytesSerialiser;
Expand Down Expand Up @@ -139,7 +140,7 @@ protected void run() throws OperationException {
} else {
// Add the splits point to the table
LOGGER.info("Adding split points to table");
final SplitStore splitTable = new SplitStore.Builder()
final SplitStoreFromFile splitTable = new SplitStoreFromFile.Builder()
.inputPath(splitsFile)
.build();
accumuloStore.execute(splitTable, new Context());
Expand All @@ -164,10 +165,12 @@ public static void main(final String[] args) throws StoreException, IOException
accumuloStore.initialise(testProperties.getGraphId(), schema, storeProperties);
LOGGER.info("Initialised Accumulo store (instance name is {}, graph id is {})",
accumuloStore.getProperties().getInstance(),
accumuloStore.getProperties().getTable());
accumuloStore.getTableName());
LOGGER.info("Using test properties of {}", testProperties);
final Graph graph = new Graph.Builder()
.graphId(testProperties.getGraphId())
.config(new GraphConfig.Builder()
.graphId(testProperties.getGraphId())
.build())
.store(accumuloStore)
.addSchema(schema)
.build();
Expand Down
5 changes: 4 additions & 1 deletion ...ng-core/src/main/java/uk/gov/gchq/gaffer/performancetesting/ingest/ElementIngestTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

import uk.gov.gchq.gaffer.data.element.Element;
import uk.gov.gchq.gaffer.graph.Graph;
import uk.gov.gchq.gaffer.graph.GraphConfig;
import uk.gov.gchq.gaffer.operation.OperationException;
import uk.gov.gchq.gaffer.operation.impl.add.AddElements;
import uk.gov.gchq.gaffer.performancetesting.MetricsListener;
Expand Down Expand Up @@ -155,7 +156,9 @@ public static void main(final String[] args) {
final ElementIngestTestProperties testProperties = new ElementIngestTestProperties();
testProperties.loadTestProperties(args[2]);
final Graph graph = new Graph.Builder()
.graphId(testProperties.getGraphId())
.config(new GraphConfig.Builder()
.graphId(testProperties.getGraphId())
.build())
.storeProperties(storeProperties)
.addSchema(schema)
.build();
Expand Down
5 changes: 4 additions & 1 deletion ...nce-testing-core/src/main/java/uk/gov/gchq/gaffer/performancetesting/query/QueryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import uk.gov.gchq.gaffer.commonutil.iterable.CloseableIterable;
import uk.gov.gchq.gaffer.data.element.Element;
import uk.gov.gchq.gaffer.graph.Graph;
import uk.gov.gchq.gaffer.graph.GraphConfig;
import uk.gov.gchq.gaffer.operation.OperationException;
import uk.gov.gchq.gaffer.operation.data.ElementSeed;
import uk.gov.gchq.gaffer.operation.impl.get.GetElements;
Expand Down Expand Up @@ -167,7 +168,9 @@ public static void main(final String[] args) {
final QueryTestProperties testProperties = new QueryTestProperties();
testProperties.loadTestProperties(args[2]);
final Graph graph = new Graph.Builder()
.graphId(testProperties.getGraphId())
.config(new GraphConfig.Builder()
.graphId(testProperties.getGraphId())
.build())
.storeProperties(storeProperties)
.addSchema(schema)
.build();
Expand Down