Move CallableProcudure behind compat layer

knutwalker · jjaderberg · commit 4abf55febd9a · 2022-11-28T16:40:25.000+01:00
diff --git a/compatibility/4.3/neo4j-kernel-adapter/src/main/java/org/neo4j/gds/compat/_43/CallableProcedureImpl.java b/compatibility/4.3/neo4j-kernel-adapter/src/main/java/org/neo4j/gds/compat/_43/CallableProcedureImpl.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) "Neo4j"
+ * Neo4j Sweden AB [http://neo4j.com]
+ *
+ * This file is part of Neo4j.
+ *
+ * Neo4j is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.neo4j.gds.compat._43;
+
+import org.neo4j.collection.RawIterator;
+import org.neo4j.gds.compat.CompatCallableProcedure;
+import org.neo4j.internal.kernel.api.exceptions.ProcedureException;
+import org.neo4j.internal.kernel.api.procs.ProcedureSignature;
+import org.neo4j.kernel.api.ResourceTracker;
+import org.neo4j.kernel.api.procedure.CallableProcedure;
+import org.neo4j.kernel.api.procedure.Context;
+import org.neo4j.values.AnyValue;
+
+public final class CallableProcedureImpl implements CallableProcedure {
+    private final CompatCallableProcedure procedure;
+
+    CallableProcedureImpl(CompatCallableProcedure procedure) {
+        this.procedure = procedure;
+    }
+
+    @Override
+    public ProcedureSignature signature() {
+        return this.procedure.signature();
+    }
+
+    @Override
+    public RawIterator<AnyValue[], ProcedureException> apply(
+        Context ctx,
+        AnyValue[] input,
+        ResourceTracker resourceTracker
+    ) throws ProcedureException {
+        return this.procedure.apply(ctx, input);
+    }
+}
diff --git a/compatibility/4.3/neo4j-kernel-adapter/src/main/java/org/neo4j/gds/compat/_43/Neo4jProxyImpl.java b/compatibility/4.3/neo4j-kernel-adapter/src/main/java/org/neo4j/gds/compat/_43/Neo4jProxyImpl.java
@@ -31,6 +31,7 @@
 import org.neo4j.exceptions.KernelException;
 import org.neo4j.gds.annotation.SuppressForbidden;
 import org.neo4j.gds.compat.BoltTransactionRunner;
+import org.neo4j.gds.compat.CompatCallableProcedure;
 import org.neo4j.gds.compat.CompatExecutionMonitor;
 import org.neo4j.gds.compat.CompatIndexQuery;
 import org.neo4j.gds.compat.CompatInput;
@@ -100,6 +101,7 @@
 import org.neo4j.io.pagecache.tracing.PageCacheTracer;
 import org.neo4j.kernel.api.KernelTransaction;
 import org.neo4j.kernel.api.KernelTransactionHandle;
+import org.neo4j.kernel.api.procedure.CallableProcedure;
 import org.neo4j.kernel.database.NamedDatabaseId;
 import org.neo4j.kernel.database.TestDatabaseIdRepository;
 import org.neo4j.kernel.impl.index.schema.IndexImporterFactoryImpl;
@@ -749,6 +751,11 @@ public UserFunctionSignature userFunctionSignature(
         );
     }
 
+    @Override
+    public CallableProcedure callableProcedure(CompatCallableProcedure procedure) {
+        return new CallableProcedureImpl(procedure);
+    }
+
     @Override
     public long transactionId(KernelTransactionHandle kernelTransactionHandle) {
         return kernelTransactionHandle.lastTransactionTimestampWhenStarted();
diff --git a/compatibility/4.4/neo4j-kernel-adapter/src/main/java/org/neo4j/gds/compat/_44/CallableProcedureImpl.java b/compatibility/4.4/neo4j-kernel-adapter/src/main/java/org/neo4j/gds/compat/_44/CallableProcedureImpl.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) "Neo4j"
+ * Neo4j Sweden AB [http://neo4j.com]
+ *
+ * This file is part of Neo4j.
+ *
+ * Neo4j is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.neo4j.gds.compat._44;
+
+import org.neo4j.collection.RawIterator;
+import org.neo4j.gds.compat.CompatCallableProcedure;
+import org.neo4j.internal.kernel.api.exceptions.ProcedureException;
+import org.neo4j.internal.kernel.api.procs.ProcedureSignature;
+import org.neo4j.kernel.api.ResourceTracker;
+import org.neo4j.kernel.api.procedure.CallableProcedure;
+import org.neo4j.kernel.api.procedure.Context;
+import org.neo4j.values.AnyValue;
+
+public final class CallableProcedureImpl implements CallableProcedure {
+    private final CompatCallableProcedure procedure;
+
+    CallableProcedureImpl(CompatCallableProcedure procedure) {
+        this.procedure = procedure;
+    }
+
+    @Override
+    public ProcedureSignature signature() {
+        return this.procedure.signature();
+    }
+
+    @Override
+    public RawIterator<AnyValue[], ProcedureException> apply(
+        Context ctx,
+        AnyValue[] input,
+        ResourceTracker resourceTracker
+    ) throws ProcedureException {
+        return this.procedure.apply(ctx, input);
+    }
+}
diff --git a/compatibility/4.4/neo4j-kernel-adapter/src/main/java/org/neo4j/gds/compat/_44/Neo4jProxyImpl.java b/compatibility/4.4/neo4j-kernel-adapter/src/main/java/org/neo4j/gds/compat/_44/Neo4jProxyImpl.java
@@ -30,6 +30,7 @@
 import org.neo4j.exceptions.KernelException;
 import org.neo4j.gds.annotation.SuppressForbidden;
 import org.neo4j.gds.compat.BoltTransactionRunner;
+import org.neo4j.gds.compat.CompatCallableProcedure;
 import org.neo4j.gds.compat.CompatExecutionMonitor;
 import org.neo4j.gds.compat.CompatIndexQuery;
 import org.neo4j.gds.compat.CompatInput;
@@ -101,6 +102,7 @@
 import org.neo4j.io.pagecache.tracing.PageCacheTracer;
 import org.neo4j.kernel.api.KernelTransaction;
 import org.neo4j.kernel.api.KernelTransactionHandle;
+import org.neo4j.kernel.api.procedure.CallableProcedure;
 import org.neo4j.kernel.database.NamedDatabaseId;
 import org.neo4j.kernel.database.NormalizedDatabaseName;
 import org.neo4j.kernel.database.TestDatabaseIdRepository;
@@ -752,6 +754,11 @@ public UserFunctionSignature userFunctionSignature(
         );
     }
 
+    @Override
+    public CallableProcedure callableProcedure(CompatCallableProcedure procedure) {
+        return new CallableProcedureImpl(procedure);
+    }
+
     @Override
     public long transactionId(KernelTransactionHandle kernelTransactionHandle) {
         return kernelTransactionHandle.lastTransactionTimestampWhenStarted();
diff --git a/compatibility/5.1/neo4j-kernel-adapter/src/main/java17/org/neo4j/gds/compat/_51/CallableProcedureImpl.java b/compatibility/5.1/neo4j-kernel-adapter/src/main/java17/org/neo4j/gds/compat/_51/CallableProcedureImpl.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) "Neo4j"
+ * Neo4j Sweden AB [http://neo4j.com]
+ *
+ * This file is part of Neo4j.
+ *
+ * Neo4j is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.neo4j.gds.compat._51;
+
+import org.neo4j.collection.RawIterator;
+import org.neo4j.gds.compat.CompatCallableProcedure;
+import org.neo4j.internal.kernel.api.exceptions.ProcedureException;
+import org.neo4j.internal.kernel.api.procs.ProcedureSignature;
+import org.neo4j.kernel.api.ResourceTracker;
+import org.neo4j.kernel.api.procedure.CallableProcedure;
+import org.neo4j.kernel.api.procedure.Context;
+import org.neo4j.values.AnyValue;
+
+public final class CallableProcedureImpl implements CallableProcedure {
+    private final CompatCallableProcedure procedure;
+
+    CallableProcedureImpl(CompatCallableProcedure procedure) {
+        this.procedure = procedure;
+    }
+
+    @Override
+    public ProcedureSignature signature() {
+        return this.procedure.signature();
+    }
+
+    @Override
+    public RawIterator<AnyValue[], ProcedureException> apply(
+        Context ctx,
+        AnyValue[] input,
+        ResourceTracker resourceTracker
+    ) throws ProcedureException {
+        return this.procedure.apply(ctx, input);
+    }
+}
diff --git a/compatibility/5.1/neo4j-kernel-adapter/src/main/java17/org/neo4j/gds/compat/_51/Neo4jProxyImpl.java b/compatibility/5.1/neo4j-kernel-adapter/src/main/java17/org/neo4j/gds/compat/_51/Neo4jProxyImpl.java
@@ -33,6 +33,7 @@
 import org.neo4j.exceptions.KernelException;
 import org.neo4j.gds.annotation.SuppressForbidden;
 import org.neo4j.gds.compat.BoltTransactionRunner;
+import org.neo4j.gds.compat.CompatCallableProcedure;
 import org.neo4j.gds.compat.CompatExecutionMonitor;
 import org.neo4j.gds.compat.CompatIndexQuery;
 import org.neo4j.gds.compat.CompatInput;
@@ -109,6 +110,7 @@
 import org.neo4j.io.pagecache.tracing.PageCacheTracer;
 import org.neo4j.kernel.api.KernelTransaction;
 import org.neo4j.kernel.api.KernelTransactionHandle;
+import org.neo4j.kernel.api.procedure.CallableProcedure;
 import org.neo4j.kernel.database.NamedDatabaseId;
 import org.neo4j.kernel.database.NormalizedDatabaseName;
 import org.neo4j.kernel.database.TestDatabaseIdRepository;
@@ -879,6 +881,11 @@ public long transactionId(KernelTransactionHandle kernelTransactionHandle) {
         return kernelTransactionHandle.getTransactionSequenceNumber();
     }
 
+    @Override
+    public CallableProcedure callableProcedure(CompatCallableProcedure procedure) {
+        return new CallableProcedureImpl(procedure);
+    }
+
     @Override
     public void reserveNeo4jIds(IdGeneratorFactory generatorFactory, int size, CursorContext cursorContext) {
         IdGenerator idGenerator = generatorFactory.get(RecordIdType.NODE);
diff --git a/compatibility/5.2/neo4j-kernel-adapter/src/main/java17/org/neo4j/gds/compat/_52/CallableProcedureImpl.java b/compatibility/5.2/neo4j-kernel-adapter/src/main/java17/org/neo4j/gds/compat/_52/CallableProcedureImpl.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) "Neo4j"
+ * Neo4j Sweden AB [http://neo4j.com]
+ *
+ * This file is part of Neo4j.
+ *
+ * Neo4j is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.neo4j.gds.compat._52;
+
+import org.neo4j.collection.RawIterator;
+import org.neo4j.gds.compat.CompatCallableProcedure;
+import org.neo4j.internal.kernel.api.exceptions.ProcedureException;
+import org.neo4j.internal.kernel.api.procs.ProcedureSignature;
+import org.neo4j.kernel.api.ResourceTracker;
+import org.neo4j.kernel.api.procedure.CallableProcedure;
+import org.neo4j.kernel.api.procedure.Context;
+import org.neo4j.values.AnyValue;
+
+public final class CallableProcedureImpl implements CallableProcedure {
+    private final CompatCallableProcedure procedure;
+
+    CallableProcedureImpl(CompatCallableProcedure procedure) {
+        this.procedure = procedure;
+    }
+
+    @Override
+    public ProcedureSignature signature() {
+        return this.procedure.signature();
+    }
+
+    @Override
+    public RawIterator<AnyValue[], ProcedureException> apply(
+        Context ctx,
+        AnyValue[] input,
+        ResourceTracker resourceTracker
+    ) throws ProcedureException {
+        return this.procedure.apply(ctx, input);
+    }
+}
diff --git a/compatibility/5.2/neo4j-kernel-adapter/src/main/java17/org/neo4j/gds/compat/_52/Neo4jProxyImpl.java b/compatibility/5.2/neo4j-kernel-adapter/src/main/java17/org/neo4j/gds/compat/_52/Neo4jProxyImpl.java
@@ -33,6 +33,7 @@
 import org.neo4j.exceptions.KernelException;
 import org.neo4j.gds.annotation.SuppressForbidden;
 import org.neo4j.gds.compat.BoltTransactionRunner;
+import org.neo4j.gds.compat.CompatCallableProcedure;
 import org.neo4j.gds.compat.CompatExecutionMonitor;
 import org.neo4j.gds.compat.CompatIndexQuery;
 import org.neo4j.gds.compat.CompatInput;
@@ -109,6 +110,7 @@
 import org.neo4j.io.pagecache.tracing.PageCacheTracer;
 import org.neo4j.kernel.api.KernelTransaction;
 import org.neo4j.kernel.api.KernelTransactionHandle;
+import org.neo4j.kernel.api.procedure.CallableProcedure;
 import org.neo4j.kernel.database.NamedDatabaseId;
 import org.neo4j.kernel.database.NormalizedDatabaseName;
 import org.neo4j.kernel.database.TestDatabaseIdRepository;
@@ -872,6 +874,11 @@ public UserFunctionSignature userFunctionSignature(
         );
     }
 
+    @Override
+    public CallableProcedure callableProcedure(CompatCallableProcedure procedure) {
+        return new CallableProcedureImpl(procedure);
+    }
+
     @Override
     public long transactionId(KernelTransactionHandle kernelTransactionHandle) {
         return kernelTransactionHandle.getTransactionSequenceNumber();
diff --git a/compatibility/api/neo4j-kernel-adapter/src/main/java/org/neo4j/gds/compat/CompatCallableProcedure.java b/compatibility/api/neo4j-kernel-adapter/src/main/java/org/neo4j/gds/compat/CompatCallableProcedure.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) "Neo4j"
+ * Neo4j Sweden AB [http://neo4j.com]
+ *
+ * This file is part of Neo4j.
+ *
+ * Neo4j is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.neo4j.gds.compat;
+
+import org.neo4j.collection.RawIterator;
+import org.neo4j.internal.kernel.api.exceptions.ProcedureException;
+import org.neo4j.internal.kernel.api.procs.ProcedureSignature;
+import org.neo4j.kernel.api.procedure.Context;
+import org.neo4j.values.AnyValue;
+
+public interface CompatCallableProcedure {
+    ProcedureSignature signature();
+
+    RawIterator<AnyValue[], ProcedureException> apply(Context ctx, AnyValue[] input) throws ProcedureException;
+}
diff --git a/compatibility/api/neo4j-kernel-adapter/src/main/java/org/neo4j/gds/compat/Neo4jProxyApi.java b/compatibility/api/neo4j-kernel-adapter/src/main/java/org/neo4j/gds/compat/Neo4jProxyApi.java
@@ -67,6 +67,7 @@
 import org.neo4j.io.pagecache.tracing.PageCacheTracer;
 import org.neo4j.kernel.api.KernelTransaction;
 import org.neo4j.kernel.api.KernelTransactionHandle;
+import org.neo4j.kernel.api.procedure.CallableProcedure;
 import org.neo4j.kernel.database.NamedDatabaseId;
 import org.neo4j.kernel.impl.store.RecordStore;
 import org.neo4j.kernel.impl.store.format.RecordFormats;
@@ -293,6 +294,8 @@ UserFunctionSignature userFunctionSignature(
         boolean threadSafe
     );
 
+    CallableProcedure callableProcedure(CompatCallableProcedure procedure);
+
     long transactionId(KernelTransactionHandle kernelTransactionHandle);
 
     void reserveNeo4jIds(IdGeneratorFactory generatorFactory, int size, CursorContext cursorContext);
diff --git a/compatibility/common/neo4j-kernel-adapter/src/main/java/org/neo4j/gds/compat/Neo4jProxy.java b/compatibility/common/neo4j-kernel-adapter/src/main/java/org/neo4j/gds/compat/Neo4jProxy.java
@@ -67,6 +67,7 @@
 import org.neo4j.io.pagecache.tracing.PageCacheTracer;
 import org.neo4j.kernel.api.KernelTransaction;
 import org.neo4j.kernel.api.KernelTransactionHandle;
+import org.neo4j.kernel.api.procedure.CallableProcedure;
 import org.neo4j.kernel.database.NamedDatabaseId;
 import org.neo4j.kernel.impl.store.RecordStore;
 import org.neo4j.kernel.impl.store.format.RecordFormats;
@@ -441,6 +442,10 @@ public static UserFunctionSignature userFunctionSignature(
         return IMPL.userFunctionSignature(name, inputSignature, type, description, internal, threadSafe);
     }
 
+    public static CallableProcedure callableProcedure(CompatCallableProcedure procedure) {
+        return IMPL.callableProcedure(procedure);
+    }
+
     public static long transactionId(KernelTransactionHandle kernelTransactionHandle) {
         return IMPL.transactionId(kernelTransactionHandle);
     }
