hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-23 04:06:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Kotlin: Don't write TRAP files that are already out-of-date

Browse Source
This commit is contained in:
Ian Lynagh
2022-10-05 17:04:45 +01:00
parent e6e0fe0cd4
commit dff1cf4c48
1 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
java/kotlin-extractor/src/main/java/com/semmle/extractor/java/OdasaOutput.java
View File

@@ -269,7 +269,7 @@ public class OdasaOutput {
* Any unique suffix needed to distinguish `sym` from other declarations with the same name. * Any unique suffix needed to distinguish `sym` from other declarations with the same name.
* For functions for example, this means its parameter signature. * For functions for example, this means its parameter signature.
*/ */
private TrapFileManager getMembersWriterForDecl(File trap, IrDeclaration sym, String signature) { private TrapFileManager getMembersWriterForDecl(File trap, File trapFileBase, TrapClassVersion trapFileVersion, IrDeclaration sym, String signature) {
if (use_trap_locking) { if (use_trap_locking) {
TrapClassVersion currVersion = TrapClassVersion.fromSymbol(sym, log); TrapClassVersion currVersion = TrapClassVersion.fromSymbol(sym, log);
String shortName = sym instanceof IrDeclarationWithName ? ((IrDeclarationWithName)sym).getName().asString() : "(name unknown)"; String shortName = sym instanceof IrDeclarationWithName ? ((IrDeclarationWithName)sym).getName().asString() : "(name unknown)";
@@ -298,11 +298,30 @@ public class OdasaOutput {
// then renamed to its trap-old name, then we // then renamed to its trap-old name, then we
// don't need to rewrite it only to rename it // don't need to rewrite it only to rename it
// again. // again.
File trapOld = new File(trap.getParentFile(), trap.getName().replace(".trap.gz", ".trap-old.gz")); File trapFileDir = trap.getParentFile();
File trapOld = new File(trapFileDir, trap.getName().replace(".trap.gz", ".trap-old.gz"));
if (trapOld.exists()) { if (trapOld.exists()) {
log.warn("Not rewriting trap file for " + trap.toString() + " as the trap-old exists"); log.warn("Not rewriting trap file for " + trap.toString() + " as the trap-old exists");
return null; return null;
} }
// Otherwise, if any newer TRAP file has already
// been written then we don't need to write
// anything.
if (trapFileBase != null && trapFileVersion != null && trapFileDir.exists()) {
String trapFileBaseName = trapFileBase.getName();
for (File f: FileUtil.list(trapFileDir)) {
String name = f.getName();
Matcher m = selectClassVersionComponents.matcher(name);
if (m.matches() && m.group(1).equals(trapFileBaseName)) {
TrapClassVersion v = new TrapClassVersion(Integer.valueOf(m.group(2)), Integer.valueOf(m.group(3)), Long.valueOf(m.group(4)), m.group(5));
if (v.newerThan(trapFileVersion)) {
log.warn("Not rewriting trap file for " + trap.toString() + " as " + f.toString() + " exists");
return null;
}
}
}
}
} }
return trapWriter(trap, sym, signature); return trapWriter(trap, sym, signature);
} }
@@ -390,6 +409,8 @@ public class OdasaOutput {
* Trap file locking. * Trap file locking.
*/ */
private final Pattern selectClassVersionComponents = Pattern.compile("(.*)#(-?[0-9]+)\\.(-?[0-9]+)-(-?[0-9]+)-(.*)\\.trap\\.gz");
/** /**
* <b>CAUTION</b>: to avoid the potential for deadlock between multiple concurrent extractor processes, * <b>CAUTION</b>: to avoid the potential for deadlock between multiple concurrent extractor processes,
* only one source file {@link TrapLocker} may be open at any time, and the lock must be obtained * only one source file {@link TrapLocker} may be open at any time, and the lock must be obtained
@@ -485,14 +506,12 @@ public class OdasaOutput {
if (use_trap_locking) { if (use_trap_locking) {
lockTrapFile(trapFile); lockTrapFile(trapFile);
} }
return getMembersWriterForDecl(trapFile, sym, signature); return getMembersWriterForDecl(trapFile, trapFileBase, trapFileVersion, sym, signature);
} else { } else {
return null; return null;
} }
} }
private final Pattern selectClassVersionComponents = Pattern.compile("(.*)#(-?[0-9]+)\\.(-?[0-9]+)-(-?[0-9]+)-(.*)\\.trap\\.gz");
@Override @Override
public void close() { public void close() {
if (trapFile!=null) { if (trapFile!=null) {