Skip to content

Depend on TransactionRegistry interface instead of the implementation #373

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

Closed
loveleif wants to merge 1 commit into from
Closed

Depend on TransactionRegistry interface instead of the implementation #373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions core/src/integrationTest/java/org/neo4j/gds/TerminationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
import org.neo4j.graphdb.TransactionFailureException;
import org.neo4j.kernel.api.exceptions.Status;
import org.neo4j.kernel.api.query.ExecutingQuery;
import org.neo4j.kernel.impl.api.KernelTransactions;
import org.neo4j.kernel.impl.api.TransactionRegistry;

import java.util.ArrayList;
import java.util.HashMap;
Expand All @@ -46,12 +46,12 @@ class TerminationTest extends BaseProcTest {

public static final String QUERY = "CALL test.testProc()";

private KernelTransactions kernelTransactions;
private TransactionRegistry kernelTransactions;

@BeforeEach
void setup() throws Exception {
registerProcedures(TerminateProcedure.class);
kernelTransactions = resolveDependency(KernelTransactions.class);
kernelTransactions = resolveDependency(TransactionRegistry.class);
}

// terminate a transaction by its id
Expand Down
6 changes: 3 additions & 3 deletions ...r-aggregation/src/main/java/org/neo4j/gds/projection/AggregationInitializationHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import org.neo4j.kernel.api.procedure.Context;
import org.neo4j.kernel.database.DatabaseReferenceImpl;
import org.neo4j.kernel.database.DatabaseReferenceRepository;
import org.neo4j.kernel.impl.api.KernelTransactions;
import org.neo4j.kernel.impl.api.TransactionRegistry;

public final class AggregationInitializationHelper {

Expand All @@ -47,8 +47,8 @@ public static ExecutingQueryProvider getQueryProvider(Context ctx, boolean runsO
if (runsOnCompositeDatabase) {
queryProvider = ExecutingQueryProvider.empty();
} else {
assert GraphDatabaseApiProxy.containsDependency(databaseService, KernelTransactions.class);
var ktxs = GraphDatabaseApiProxy.resolveDependency(databaseService, KernelTransactions.class);
assert GraphDatabaseApiProxy.containsDependency(databaseService, TransactionRegistry.class);
var ktxs = GraphDatabaseApiProxy.resolveDependency(databaseService, TransactionRegistry.class);
queryProvider = ExecutingQueryProvider.fromTransaction(ktxs, transaction);
}

Expand Down
4 changes: 2 additions & 2 deletions cypher-aggregation/src/main/java/org/neo4j/gds/projection/AlphaCypherAggregation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
import org.neo4j.kernel.api.procedure.Context;
import org.neo4j.kernel.database.DatabaseReferenceImpl;
import org.neo4j.kernel.database.DatabaseReferenceRepository;
import org.neo4j.kernel.impl.api.KernelTransactions;
import org.neo4j.kernel.impl.api.TransactionRegistry;
import org.neo4j.procedure.Name;
import org.neo4j.values.AnyValue;
import org.neo4j.values.storable.TextValue;
Expand Down Expand Up @@ -92,7 +92,7 @@ public UserAggregationReducer createReducer(Context ctx) throws ProcedureExcepti
var metrics = GraphDatabaseApiProxy.lookupComponentProvider(ctx, Metrics.class, true);
var username = ctx.kernelTransaction().securityContext().subject().executingUser();
var transaction = ctx.transaction();
var ktxs = GraphDatabaseApiProxy.resolveDependency(databaseService, KernelTransactions.class);
var ktxs = GraphDatabaseApiProxy.resolveDependency(databaseService, TransactionRegistry.class);
var queryProvider = ExecutingQueryProvider.fromTransaction(ktxs, transaction);

var databaseId = GraphDatabaseApiProxy.databaseId(databaseService);
Expand Down
8 changes: 4 additions & 4 deletions cypher-aggregation/src/main/java/org/neo4j/gds/projection/ExecutingQueryProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@

import org.neo4j.graphdb.Transaction;
import org.neo4j.kernel.api.KernelTransaction;
import org.neo4j.kernel.impl.api.KernelTransactions;
import org.neo4j.kernel.impl.api.TransactionRegistry;
import org.neo4j.kernel.impl.coreapi.InternalTransaction;

import java.util.Optional;

public interface ExecutingQueryProvider {
Optional<String> executingQuery();

static ExecutingQueryProvider fromTransaction(KernelTransactions ktxs, Transaction transaction) {
static ExecutingQueryProvider fromTransaction(TransactionRegistry ktxs, Transaction transaction) {
return new TxQuery(ktxs, transaction);
}

Expand All @@ -40,10 +40,10 @@ static ExecutingQueryProvider empty() {


final class TxQuery implements ExecutingQueryProvider {
private final KernelTransactions ktxs;
private final TransactionRegistry ktxs;
private final Transaction transaction;

TxQuery(KernelTransactions ktxs, Transaction transaction) {
TxQuery(TransactionRegistry ktxs, Transaction transaction) {
this.ktxs = ktxs;
this.transaction = transaction;
}
Expand Down
Loading