hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-22 19:56:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Kotlin: Nest TRAP files inside their basename

Browse Source
This commit is contained in:
Ian Lynagh
2022-10-06 15:50:48 +01:00
parent dff1cf4c48
commit c9cf33dd20
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -486,7 +486,11 @@ public class OdasaOutput {
// We encode the metadata into the filename, so that the // We encode the metadata into the filename, so that the
// TRAP filenames for different metadatas don't overlap. // TRAP filenames for different metadatas don't overlap.
trapFileVersion = TrapClassVersion.fromSymbol(sym, log); trapFileVersion = TrapClassVersion.fromSymbol(sym, log);
trapFileBase = new File(normalTrapFile.getParentFile(), normalTrapFile.getName().replace(".trap.gz", "")); String baseName = normalTrapFile.getName().replace(".trap.gz", "");
// If a class has lots of inner classes, then we get lots of files
// in a single directory. This makes our directory listings later slow.
// To avoid this, rather than using files named .../Foo*, we use .../Foo/Foo*.
trapFileBase = new File(new File(normalTrapFile.getParentFile(), baseName), baseName);
trapFile = new File(trapFileBase.getPath() + '#' + trapFileVersion.toString() + ".trap.gz"); trapFile = new File(trapFileBase.getPath() + '#' + trapFileVersion.toString() + ".trap.gz");
} }
} }
@@ -539,9 +543,14 @@ public class OdasaOutput {
for (File f: FileUtil.list(trapFileDir)) { for (File f: FileUtil.list(trapFileDir)) {
String name = f.getName(); String name = f.getName();
Matcher m = selectClassVersionComponents.matcher(name); Matcher m = selectClassVersionComponents.matcher(name);
if (m.matches() && m.group(1).equals(trapFileBaseName)) { if (m.matches()) {
TrapClassVersion v = new TrapClassVersion(Integer.valueOf(m.group(2)), Integer.valueOf(m.group(3)), Long.valueOf(m.group(4)), m.group(5)); if (m.group(1).equals(trapFileBaseName)) {
pairs.add(new Pair<File, TrapClassVersion>(f, v)); TrapClassVersion v = new TrapClassVersion(Integer.valueOf(m.group(2)), Integer.valueOf(m.group(3)), Long.valueOf(m.group(4)), m.group(5));
pairs.add(new Pair<File, TrapClassVersion>(f, v));
} else {
// Everything in this directory should be for the same TRAP file base
log.error("Unexpected sibling " + m.group(1) + " when extracting " + trapFileBaseName);
}
} }
} }
if (pairs.isEmpty()) { if (pairs.isEmpty()) {