Skip to content

Commit 8f028dd

Browse files
Fix compat issue
Co-Authored-By: Paul Horn <[email protected]>
1 parent e43eed7 commit 8f028dd

File tree

4 files changed

+28
-13
lines changed

4 files changed

+28
-13
lines changed

cypher/5.4/storage-engine-adapter/src/main/java17/org/neo4j/gds/compat/_54/InMemoryCommandCreationContextImpl.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
package org.neo4j.gds.compat._54;
2121

2222
import org.neo4j.io.pagecache.context.CursorContext;
23+
import org.neo4j.kernel.KernelVersion;
24+
import org.neo4j.kernel.KernelVersionProvider;
2325
import org.neo4j.lock.LockTracer;
2426
import org.neo4j.lock.ResourceLocker;
2527
import org.neo4j.storageengine.api.CommandCreationContext;
@@ -86,13 +88,19 @@ public void close() {
8688

8789
@Override
8890
public void initialize(
91+
KernelVersionProvider kernelVersionProvider,
8992
CursorContext cursorContext,
9093
StoreCursors storeCursors,
9194
Supplier<Long> oldestActiveTransactionSequenceNumber,
92-
long currentTransactionSequenceNumber,
9395
ResourceLocker locks,
9496
Supplier<LockTracer> lockTracer
9597
) {
9698

9799
}
100+
101+
@Override
102+
public KernelVersion kernelVersion() {
103+
// NOTE: Double-check if this is still correct when you copy this into a new compat layer
104+
return KernelVersion.LATEST;
105+
}
98106
}

cypher/5.4/storage-engine-adapter/src/main/java17/org/neo4j/gds/compat/_54/InMemoryMetaDataProviderImpl.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121

2222
import org.neo4j.internal.recordstorage.InMemoryLogVersionRepository;
2323
import org.neo4j.io.pagecache.context.CursorContext;
24-
import org.neo4j.kernel.KernelVersion;
2524
import org.neo4j.storageengine.api.ClosedTransactionMetadata;
2625
import org.neo4j.storageengine.api.ExternalStoreId;
2726
import org.neo4j.storageengine.api.MetadataProvider;
@@ -136,10 +135,6 @@ public StoreId getStoreId() {
136135
return StoreId.UNKNOWN;
137136
}
138137

139-
@Override
140-
public void setKernelVersion(KernelVersion kernelVersion) {
141-
}
142-
143138
@Override
144139
public void close() throws IOException {
145140
}
@@ -179,11 +174,6 @@ public long getLastClosedTransactionId() {
179174
return this.transactionIdStore.getLastClosedTransactionId();
180175
}
181176

182-
@Override
183-
public KernelVersion kernelVersion() {
184-
return KernelVersion.LATEST;
185-
}
186-
187177
@Override
188178
public Optional<UUID> getDatabaseIdUuid(CursorContext cursorTracer) {
189179
throw new IllegalStateException("Not supported");

cypher/5.4/storage-engine-adapter/src/main/java17/org/neo4j/gds/compat/_54/InMemoryStorageEngineFactory.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
import org.neo4j.io.pagecache.context.CursorContext;
5656
import org.neo4j.io.pagecache.context.CursorContextFactory;
5757
import org.neo4j.io.pagecache.tracing.PageCacheTracer;
58+
import org.neo4j.kernel.KernelVersionRepository;
5859
import org.neo4j.kernel.api.index.IndexProvidersAccess;
5960
import org.neo4j.kernel.impl.api.index.IndexProviderMap;
6061
import org.neo4j.kernel.impl.locking.Locks;
@@ -101,6 +102,7 @@
101102
import java.io.UncheckedIOException;
102103
import java.nio.file.OpenOption;
103104
import java.nio.file.Path;
105+
import java.time.Clock;
104106
import java.util.Collections;
105107
import java.util.HashSet;
106108
import java.util.List;
@@ -114,6 +116,16 @@ public class InMemoryStorageEngineFactory implements StorageEngineFactory {
114116

115117
static final String IN_MEMORY_STORAGE_ENGINE_NAME = "in-memory-54";
116118

119+
// Record storage = 0, Freki = 1
120+
// Let's leave some room for future storage engines
121+
// This arbitrary seems quite future-proof
122+
123+
public static final byte ID = 42;
124+
@Override
125+
public byte id() {
126+
return ID;
127+
}
128+
117129
@Override
118130
public boolean storageExists(FileSystemAbstraction fileSystem, DatabaseLayout databaseLayout) {
119131
return false;
@@ -122,6 +134,7 @@ public boolean storageExists(FileSystemAbstraction fileSystem, DatabaseLayout da
122134
@Override
123135
public StorageEngine instantiate(
124136
FileSystemAbstraction fs,
137+
Clock clock,
125138
DatabaseLayout databaseLayout,
126139
Config config,
127140
PageCache pageCache,
@@ -136,6 +149,7 @@ public StorageEngine instantiate(
136149
InternalLogProvider userLogProvider,
137150
RecoveryCleanupWorkCollector recoveryCleanupWorkCollector,
138151
LogTailMetadata logTailMetadata,
152+
KernelVersionRepository kernelVersionRepository,
139153
MemoryTracker memoryTracker,
140154
CursorContextFactory cursorContextFactory,
141155
PageCacheTracer pageCacheTracer

cypher/5.4/storage-engine-adapter/src/main/java17/org/neo4j/gds/compat/_54/InMemoryStorageEngineImpl.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,8 +183,11 @@ public void dumpDiagnostics(InternalLog internalLog, DiagnosticsLogger diagnosti
183183
}
184184

185185
@Override
186-
public List<StorageCommand> createUpgradeCommands(KernelVersion kernelVersion) {
187-
return null;
186+
public List<StorageCommand> createUpgradeCommands(
187+
KernelVersion versionToUpgradeFrom,
188+
KernelVersion versionToUpgradeTo
189+
) {
190+
return List.of();
188191
}
189192

190193
@Override

0 commit comments

Comments
 (0)