MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-16 14:23:28 +07:00
Code Issues Packages Projects Releases Wiki Activity

support old hash as string

Browse Source 
GitOrigin-RevId: 7dfcc89e77908acd6bcd434c17eb102d67eb08cc
This commit is contained in:
Vladimir Krivosheev
2024-08-20 19:41:25 +02:00
committed by intellij-monorepo-bot
parent 79e16c99c7
commit c8c36b0025
3 changed files with 99 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
jps/jps-builders/intellij.platform.jps.build.tests.iml
View File

@@ -20,8 +20,5 @@
<orderEntry type="module" module-name="intellij.platform.ide.util.io" scope="TEST" />
<orderEntry type="library" scope="TEST" name="assertJ" level="project" />
<orderEntry type="library" scope="TEST" name="hash4j" level="project" />
<orderEntry type="library" scope="TEST" name="jackson" level="project" />
<orderEntry type="library" name="kotlinx-serialization-json" level="project" />
<orderEntry type="library" name="kotlinx-serialization-core" level="project" />
</component>
</module>

99
jps/jps-builders/src/org/jetbrains/jps/incremental/storage/BuildTargetSourcesState.java
View File

@@ -3,15 +3,18 @@ package org.jetbrains.jps.incremental.storage;
import com.dynatrace.hash4j.hashing.HashStream64;
import com.dynatrace.hash4j.hashing.Hashing;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import com.google.gson.stream.JsonReader;
import com.google.gson.stream.JsonToken;
import com.google.gson.stream.JsonWriter;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.util.io.FileUtilRt;
import com.intellij.util.ArrayUtilRt;
import com.intellij.util.concurrency.AppExecutorUtil;
import it.unimi.dsi.fastutil.longs.LongArrayList;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Unmodifiable;
import org.jetbrains.annotations.VisibleForTesting;
import org.jetbrains.jps.builders.BuildRootDescriptor;
import org.jetbrains.jps.builders.BuildRootIndex;
import org.jetbrains.jps.builders.BuildTarget;
@@ -34,7 +37,6 @@ import org.jetbrains.jps.util.JpsPathUtil;
import java.io.BufferedReader;
import java.io.File;
import java.io.IOException;
import java.lang.reflect.Type;
import java.nio.file.*;
import java.nio.file.attribute.BasicFileAttributes;
import java.util.*;
@@ -74,7 +76,6 @@ public final class BuildTargetSourcesState implements BuildListener {
private final CompileContext context;
private final String outputFolderPath;
private final Path targetStateStorage;
private final Type tokenType;
public BuildTargetSourcesState(@NotNull CompileContext context) {
this.context = context;
@@ -88,7 +89,6 @@ public final class BuildTargetSourcesState implements BuildListener {
BuildDataPaths dataPaths = pd.getTargetsState().getDataPaths();
targetStateStorage = dataPaths.getDataStorageRoot().toPath().resolve(TARGET_SOURCES_STATE_FILE_NAME);
tokenType = new TypeToken<Map<String, Map<String, BuildTargetState>>>() {}.getType();
// subscribe to events for reporting only changed build targets
context.addBuildListener(this);
@@ -150,7 +150,9 @@ public final class BuildTargetSourcesState implements BuildListener {
clearRemovedBuildTargets(targetTypeHashMap);
try {
Files.createDirectories(targetStateStorage.getParent());
Files.writeString(targetStateStorage, new Gson().toJson(targetTypeHashMap));
try (JsonWriter writer = new JsonWriter(Files.newBufferedWriter(targetStateStorage))) {
writeJson(writer, targetTypeHashMap);
}
}
catch (IOException e) {
LOG.warn("Unable to save sources state", e);
@@ -345,14 +347,11 @@ public final class BuildTargetSourcesState implements BuildListener {
private @NotNull Map<String, Map<String, BuildTargetState>> loadCurrentTargetState() {
try (BufferedReader reader = Files.newBufferedReader(targetStateStorage)) {
Map<String, Map<String, BuildTargetState>> result = new Gson().fromJson(reader, tokenType);
if (result != null) {
return result;
}
return readJson(new JsonReader(reader), false);
}
catch (NoSuchFileException ignore) {
}
catch (IOException e) {
catch (Throwable e) {
LOG.warn("Couldn't parse current build target state", e);
}
return new HashMap<>();
@@ -378,4 +377,82 @@ public final class BuildTargetSourcesState implements BuildListener {
}
return JpsPathUtil.urlToFile(url).getAbsolutePath();
}
@VisibleForTesting
public static @NotNull Map<String, Map<String, BuildTargetState>> readJson(JsonReader reader, boolean stringHashAsHash) throws IOException {
reader.beginObject();
Map<String, Map<String, BuildTargetState>> result = new HashMap<>();
while (reader.hasNext()) {
String category = reader.nextName();
reader.beginObject();
Map<String, BuildTargetState> map = new HashMap<>();
while (reader.hasNext()) {
String moduleName = reader.nextName();
reader.beginObject();
long hash = -1;
boolean hasHash = false;
String relativePath = null;
while (reader.hasNext()) {
String name = reader.nextName();
if (name.equals("hash")) {
if (reader.peek() == JsonToken.NUMBER) {
try {
hash = reader.nextLong();
hasHash = true;
}
catch (NumberFormatException e) {
reader.skipValue();
}
}
else if (stringHashAsHash) {
hash = Hashing.komihash5_0().hashCharsToLong(reader.nextString());
hasHash = true;
}
else {
reader.skipValue();
}
}
else if (name.equals("relativePath")) {
relativePath = reader.nextString();
}
}
if (hasHash && relativePath != null) {
map.put(moduleName, new BuildTargetState(hash, relativePath));
}
reader.endObject();
result.put(category, map);
}
reader.endObject();
}
reader.endObject();
return result;
}
@VisibleForTesting
public static void writeJson(JsonWriter writer, Map<String, Map<String, BuildTargetState>> map) throws IOException {
String[] keys = ArrayUtilRt.toStringArray(map.keySet());
Arrays.sort(keys);
writer.beginObject();
for (String category : keys) {
writer.name(category);
Map<String, BuildTargetState> subMap = map.get(category);
String[] modules = ArrayUtilRt.toStringArray(subMap.keySet());
writer.beginObject();
for (String module : modules) {
writer.name(module);
BuildTargetState state = subMap.get(module);
writer.beginObject();
writer.name("hash").value(state.hash);
writer.name("relativePath").value(state.relativePath);
writer.endObject();
}
writer.endObject();
}
writer.endObject();
}
}

29
jps/jps-builders/testSrc/org/jetbrains/jps/cache/loader/JpsCompilationOutputLoaderTest.kt vendored
View File

@@ -3,17 +3,16 @@
package org.jetbrains.jps.cache.loader
import com.dynatrace.hash4j.hashing.Hashing
import com.google.gson.stream.JsonReader
import com.google.gson.stream.JsonWriter
import com.intellij.openapi.application.ex.PathManagerEx
import com.intellij.testFramework.UsefulTestCase
import com.intellij.testFramework.fixtures.BasePlatformTestCase
import kotlinx.serialization.json.Json
import kotlinx.serialization.json.JsonObject
import kotlinx.serialization.json.jsonObject
import kotlinx.serialization.json.jsonPrimitive
import org.assertj.core.api.Assertions.assertThat
import org.jetbrains.jps.cache.client.JpsServerClient
import org.jetbrains.jps.cache.model.BuildTargetState
import org.jetbrains.jps.incremental.storage.BuildTargetSourcesState
import java.io.StringWriter
import java.nio.file.Files
import java.nio.file.Path
@@ -117,18 +116,12 @@ class JpsCompilationOutputLoaderTest : BasePlatformTestCase() {
}
private fun loadModelFromFile(fileName: String): Map<String, Map<String, BuildTargetState>> {
val map = LinkedHashMap<String, Map<String, BuildTargetState>>()
for ((k, v) in Json.parseToJsonElement(Files.readString(getTestDataFile(fileName))).jsonObject) {
val value = v.jsonObject
.map { (k, v) ->
v as JsonObject
k to BuildTargetState(
hash = Hashing.komihash5_0().hashCharsToLong(v.get("hash")!!.jsonPrimitive.content),
relativePath = v.get("relativePath")!!.jsonPrimitive.content,
)
}
.toMap()
map.put(k, value)
}
val inJson = Files.readString(getTestDataFile(fileName))
val map = BuildTargetSourcesState.readJson(JsonReader(inJson.reader()), true)
val stringWriter = StringWriter()
JsonWriter(stringWriter).use { BuildTargetSourcesState.writeJson(it, map) }
assertThat(BuildTargetSourcesState.readJson(JsonReader(stringWriter.toString().reader()), false))
.isEqualTo(map)
return map
}