MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

update jackon, caffeine

Browse Source 
GitOrigin-RevId: d7eb2583aed4730e4339cc41901daa9420902995
This commit is contained in:
Vladimir Krivosheev
2021-03-10 19:15:15 +00:00
committed by intellij-monorepo-bot
parent 2e6c1049dc
commit 1eb69fff90
11 changed files with 35 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/libraries/caffeine.xml
Generated
+3 -3
View File
@@ -1,12 +1,12 @@
<component name="libraryTable">
<library name="caffeine" type="repository">
<properties include-transitive-deps="false" maven-id="com.github.ben-manes.caffeine:caffeine:2.8.8" />
<properties include-transitive-deps="false" maven-id="com.github.ben-manes.caffeine:caffeine:3.0.0" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/github/ben-manes/caffeine/caffeine/2.8.8/caffeine-2.8.8.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/com/github/ben-manes/caffeine/caffeine/3.0.0/caffeine-3.0.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/github/ben-manes/caffeine/caffeine/2.8.8/caffeine-2.8.8-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/com/github/ben-manes/caffeine/caffeine/3.0.0/caffeine-3.0.0-sources.jar!/" />
</SOURCES>
</library>
</component>
.idea/libraries/commons_net.xml
Generated
+3 -3
View File
@@ -1,12 +1,12 @@
<component name="libraryTable">
<library name="commons-net" type="repository">
<properties maven-id="commons-net:commons-net:3.6" />
<properties maven-id="commons-net:commons-net:3.8.0" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/commons-net/commons-net/3.6/commons-net-3.6.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/commons-net/commons-net/3.8.0/commons-net-3.8.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/commons-net/commons-net/3.6/commons-net-3.6-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/commons-net/commons-net/3.8.0/commons-net-3.8.0-sources.jar!/" />
</SOURCES>
</library>
</component>
.idea/libraries/jackson.xml
Generated
+3 -3
View File
@@ -1,15 +1,15 @@
<component name="libraryTable">
<library name="jackson" type="repository">
<properties maven-id="com.fasterxml.jackson.core:jackson-core:2.12.0" />
<properties maven-id="com.fasterxml.jackson.core:jackson-core:2.12.2" />
<ANNOTATIONS>
<root url="file://$PROJECT_DIR$/lib/annotations/jackson" />
</ANNOTATIONS>
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.12.0/jackson-core-2.12.0.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.12.2/jackson-core-2.12.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.12.0/jackson-core-2.12.0-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.12.2/jackson-core-2.12.2-sources.jar!/" />
</SOURCES>
</library>
</component>
.idea/libraries/jackson_databind.xml
Generated
+5 -5
View File
@@ -1,18 +1,18 @@
<component name="libraryTable">
<library name="jackson-databind" type="repository">
<properties maven-id="com.fasterxml.jackson.core:jackson-databind:2.12.0">
<properties maven-id="com.fasterxml.jackson.core:jackson-databind:2.12.2">
<exclude>
<dependency maven-id="com.fasterxml.jackson.core:jackson-core" />
</exclude>
</properties>
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.12.0/jackson-databind-2.12.0.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.12.0/jackson-annotations-2.12.0.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.12.2/jackson-databind-2.12.2.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.12.2/jackson-annotations-2.12.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.12.0/jackson-databind-2.12.0-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.12.0/jackson-annotations-2.12.0-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.12.2/jackson-databind-2.12.2-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.12.2/jackson-annotations-2.12.2-sources.jar!/" />
</SOURCES>
</library>
</component>
.idea/libraries/jackson_datatype_joda.xml
Generated
+2 -2
View File
@@ -1,6 +1,6 @@
<component name="libraryTable">
<library name="jackson-datatype-joda" type="repository">
<properties maven-id="com.fasterxml.jackson.datatype:jackson-datatype-joda:2.12.0">
<properties maven-id="com.fasterxml.jackson.datatype:jackson-datatype-joda:2.12.2">
<exclude>
<dependency maven-id="com.fasterxml.jackson.core:jackson-annotations" />
<dependency maven-id="com.fasterxml.jackson.core:jackson-core" />
@@ -8,7 +8,7 @@
</exclude>
</properties>
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-joda/2.12.0/jackson-datatype-joda-2.12.0.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-joda/2.12.2/jackson-datatype-joda-2.12.2.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/joda-time/joda-time/2.10.8/joda-time-2.10.8.jar!/" />
</CLASSES>
<JAVADOC />
.idea/libraries/jackson_module_kotlin.xml
Generated
+3 -3
View File
@@ -1,12 +1,12 @@
<component name="libraryTable">
<library name="jackson-module-kotlin" type="repository">
<properties include-transitive-deps="false" maven-id="com.fasterxml.jackson.module:jackson-module-kotlin:2.12.0" />
<properties include-transitive-deps="false" maven-id="com.fasterxml.jackson.module:jackson-module-kotlin:2.12.2" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/module/jackson-module-kotlin/2.12.0/jackson-module-kotlin-2.12.0.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/module/jackson-module-kotlin/2.12.2/jackson-module-kotlin-2.12.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/module/jackson-module-kotlin/2.12.0/jackson-module-kotlin-2.12.0-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/module/jackson-module-kotlin/2.12.2/jackson-module-kotlin-2.12.2-sources.jar!/" />
</SOURCES>
</library>
</component>
.idea/libraries/snakeyaml.xml
Generated
+3 -3
View File
@@ -1,12 +1,12 @@
<component name="libraryTable">
<library name="snakeyaml" type="repository">
<properties maven-id="org.yaml:snakeyaml:1.27" />
<properties maven-id="org.yaml:snakeyaml:1.28" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.27/snakeyaml-1.27.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.28/snakeyaml-1.28.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.27/snakeyaml-1.27-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.28/snakeyaml-1.28-sources.jar!/" />
</SOURCES>
</library>
</component>
.idea/libraries/zip_signer.xml
Generated
+1 -12
View File
@@ -1,23 +1,12 @@
<component name="libraryTable">
<library name="zip-signer" type="repository">
<properties maven-id="org.jetbrains.marketplace:zip-signer:0.8">
<exclude>
<dependency maven-id="org.jetbrains.kotlin:kotlin-stdlib-common" />
<dependency maven-id="org.jetbrains.kotlin:kotlin-stdlib" />
<dependency maven-id="org.bouncycastle:bcpkix-jdk15on" />
<dependency maven-id="org.bouncycastle:bcprov-jdk15on" />
<dependency maven-id="org.jetbrains:annotations" />
<dependency maven-id="org.slf4j:slf4j-api" />
</exclude>
</properties>
<properties include-transitive-deps="false" maven-id="org.jetbrains.marketplace:zip-signer:0.8" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/marketplace/zip-signer/0.8/zip-signer-0.8.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/com/google/protobuf/protobuf-java/3.11.4/protobuf-java-3.11.4.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/marketplace/zip-signer/0.8/zip-signer-0.8-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/com/google/protobuf/protobuf-java/3.11.4/protobuf-java-3.11.4-sources.jar!/" />
</SOURCES>
</library>
</component>
platform/util-ex/src/org/jetbrains/mvstore/MVStore.java
+8 -57
View File
@@ -214,7 +214,7 @@ public final class MVStore implements AutoCloseable {
* sequential number within containing chunk into byte position
* within chunk's image. Cache keyed by chunk id.
*/
private final Cache<Integer, LongArrayList> chunksToC;
private final Cache<Integer, LongArrayList> chunkIdToToC;
/**
* The newest chunk. If nothing was stored yet, this field is not set.
@@ -415,7 +415,7 @@ public final class MVStore implements AutoCloseable {
if (config.recordCacheStats) {
chunksToCacheBuilder.recordStats();
}
chunksToC = chunksToCacheBuilder.build();
chunkIdToToC = chunksToCacheBuilder.build();
// make sure pages will fit into cache
nonLeafPageSplitSize = Math.min(maxNonLeafWeight, config.pageSplitSize);
@@ -424,7 +424,7 @@ public final class MVStore implements AutoCloseable {
else {
nonLeafPageCache = null;
leafPageCache = null;
chunksToC = null;
chunkIdToToC = null;
nonLeafPageSplitSize = Long.MAX_VALUE;
leafPageSplitSize = Long.MAX_VALUE;
}
@@ -1759,7 +1759,7 @@ public final class MVStore implements AutoCloseable {
++nonLeafCount;
}
}
chunksToC.put(chunk.id, toc);
chunkIdToToC.put(chunk.id, toc);
}
private void storeBuffer(Chunk chunk, ByteBuf buf, Collection<Page<?, ?>> changed) {
@@ -2059,9 +2059,6 @@ public final class MVStore implements AutoCloseable {
// similarly, all task submissions to bufferSaveExecutor
// are done under serializationLock, and upon waitAllTasksExecuted()
// it will be no pending / in-progress task here
//if (bufferSaveExecutor != null) {
// bufferSaveExecutor.waitAllTasksExecuted(10, TimeUnit.MINUTES);
//}
saveChunkLock.lock();
try {
if (lastChunk != null && reuseSpace && getFillRate() <= targetFillRate) {
@@ -2644,8 +2641,7 @@ public final class MVStore implements AutoCloseable {
private @NotNull LongArrayList getToC(Chunk chunk) {
assert chunk.tocPos != 0;
LongArrayList toc = chunksToC.get(chunk.id, __ -> chunk.readToC(fileStore));
assert toc != null;
LongArrayList toc = chunkIdToToC.get(chunk.id, __ -> chunk.readToC(fileStore));
assert toc.size() == chunk.pageCount : toc.size() + " != " + chunk.pageCount;
return toc;
}
@@ -3086,7 +3082,7 @@ public final class MVStore implements AutoCloseable {
if (nonLeafPageCache != null) {
nonLeafPageCache.invalidateAll();
leafPageCache.invalidateAll();
chunksToC.invalidateAll();
chunkIdToToC.invalidateAll();
}
}
@@ -3253,11 +3249,6 @@ public final class MVStore implements AutoCloseable {
return null;
}
//private int getMapId(String name) {
// Integer m = mapNameToMetadata.get(name);
// return m == null ? -1 : m;
//}
public void triggerAutoSave() {
triggerAutoSave(false);
}
@@ -3448,34 +3439,6 @@ public final class MVStore implements AutoCloseable {
}
}
///**
// * Get the amount of memory used for caching, in MB.
// * Note that this does not include the page chunk references cache, which is
// * 25% of the size of the page cache.
// *
// * @return the amount of memory used for caching
// */
//public int getCacheSizeUsed() {
// if (cache == null) {
// return 0;
// }
// return (int) (cache.stats().>> 20);
//}
///**
// * Get the maximum cache size, in MB.
// * Note that this does not include the page chunk references cache, which is
// * 25% of the size of the page cache.
// *
// * @return the cache size
// */
//public int getCacheSize() {
// if (cache == null) {
// return 0;
// }
// return (int) (cache.getMaxMemory() >> 20);
//}
/**
* Get the cache.
*
@@ -3494,18 +3457,6 @@ public final class MVStore implements AutoCloseable {
return fileStore != null && fileStore.isReadOnly();
}
//public int getTocCacheHitRatio() {
// return getCacheHitRatio(chunksToC);
//}
//private static int getCacheHitRatio(CacheLongKeyLIRS<?> cache) {
// if (cache == null) {
// return 0;
// }
// long hits = cache.getHits();
// return (int) (100 * hits / (hits + cache.getMisses() + 1));
//}
public int getLeafRatio() {
return (int)(leafCount * 100 / Math.max(1, leafCount + nonLeafCount));
}
@@ -3617,9 +3568,9 @@ public final class MVStore implements AutoCloseable {
continue;
}
// purge dead pages from cache
LongArrayList toc = chunksToC == null ? null : chunksToC.getIfPresent(chunk.id);
LongArrayList toc = chunkIdToToC == null ? null : chunkIdToToC.getIfPresent(chunk.id);
if (toc != null) {
chunksToC.invalidate(chunk);
chunkIdToToC.invalidate(chunk.id);
for (LongListIterator iterator = toc.iterator(); iterator.hasNext(); ) {
long tocElement = iterator.nextLong();
long pagePos = DataUtil.getPageInfo(chunk.id, tocElement);
platform/util/ui/src/com/intellij/ui/svg/SvgCacheManager.java
+2 -2
View File
@@ -43,10 +43,10 @@ public final class SvgCacheManager {
public void accept(Throwable e, MVStore store) {
Logger logger = getLogger();
if (isStoreOpened) {
logger.error("Icon Cache Error, (db=" + store.getFileStore() + ')');
logger.error("Icon cache error (db=" + store.getFileStore() + ')');
}
else {
logger.warn("Icon Cache will be recreated or previous version of data reused, (db=" + store.getFileStore() + ')');
logger.warn("Icon cache will be recreated or previous version of data reused, (db=" + store.getFileStore() + ')');
}
logger.debug(e);
}
platform/util/ui/src/com/intellij/ui/svg/SvgPrebuiltCacheManager.java
+2 -2
View File
@@ -1,4 +1,4 @@
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
// Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.ui.svg;
import com.intellij.diagnostic.StartUpMeasurer;
@@ -27,7 +27,7 @@ public final class SvgPrebuiltCacheManager {
MVStore.Builder storeBuilder = new MVStore.Builder()
.readOnly()
.backgroundExceptionHandler((e, store) -> {
SvgCacheManager.getLogger().error("Icon Cache Error (db=" + store.getFileStore() + ")", e);
SvgCacheManager.getLogger().error("Icon cache error (db=" + store.getFileStore() + ")", e);
})
.autoCommitDelay(60_000)
.compressHigh();