hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-05-01 19:55:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6681 from hvitved/java/files-folders-drop-columns

Browse Source 
Java: Drop redundant columns from `files` and `folders` relations
This commit is contained in:
Tom Hvitved
2021-09-13 17:43:31 +02:00
committed by GitHub
parent 122ffca049 b60f1cd531
commit 3bdc92ba8e
7 changed files with 1979 additions and 482 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
java/ql/lib/config/semmlecode.dbscheme
View File

@@ -231,16 +231,12 @@ numlines(
files(
unique int id: @file,
string name: string ref,
string simple: string ref,
string ext: string ref,
int fromSource: int ref // deprecated
string name: string ref
);
folders(
unique int id: @folder,
string name: string ref,
string simple: string ref
string name: string ref
);
@container = @folder | @file

473
java/ql/lib/config/semmlecode.dbscheme.stats
View File

@@ -9434,18 +9434,6 @@
<k>name</k>
<v>176620</v>
</e>
<e>
<k>simple</k>
<v>145537</v>
</e>
<e>
<k>ext</k>
<v>1161</v>
</e>
<e>
<k>fromSource</k>
<v>580</v>
</e>
</columnsizes>
<dependencies>
<dep>
@@ -9465,54 +9453,6 @@
</val>
</dep>
<dep>
<src>id</src>
<trg>simple</trg>
<val>
<hist>
<budget>12</budget>
<bs>
<b>
<a>1</a>
<b>2</b>
<v>176620</v>
</b>
</bs>
</hist>
</val>
</dep>
<dep>
<src>id</src>
<trg>ext</trg>
<val>
<hist>
<budget>12</budget>
<bs>
<b>
<a>1</a>
<b>2</b>
<v>176620</v>
</b>
</bs>
</hist>
</val>
</dep>
<dep>
<src>id</src>
<trg>fromSource</trg>
<val>
<hist>
<budget>12</budget>
<bs>
<b>
<a>1</a>
<b>2</b>
<v>176620</v>
</b>
</bs>
</hist>
</val>
</dep>
<dep>
<src>name</src>
<trg>id</trg>
<val>
@@ -9528,331 +9468,6 @@
</hist>
</val>
</dep>
<dep>
<src>name</src>
<trg>simple</trg>
<val>
<hist>
<budget>12</budget>
<bs>
<b>
<a>1</a>
<b>2</b>
<v>176620</v>
</b>
</bs>
</hist>
</val>
</dep>
<dep>
<src>name</src>
<trg>ext</trg>
<val>
<hist>
<budget>12</budget>
<bs>
<b>
<a>1</a>
<b>2</b>
<v>176620</v>
</b>
</bs>
</hist>
</val>
</dep>
<dep>
<src>name</src>
<trg>fromSource</trg>
<val>
<hist>
<budget>12</budget>
<bs>
<b>
<a>1</a>
<b>2</b>
<v>176620</v>
</b>
</bs>
</hist>
</val>
</dep>
<dep>
<src>simple</src>
<trg>id</trg>
<val>
<hist>
<budget>12</budget>
<bs>
<b>
<a>1</a>
<b>2</b>
<v>114745</v>
</b>
<b>
<a>2</a>
<b>3</b>
<v>30501</v>
</b>
<b>
<a>3</a>
<b>4</b>
<v>290</v>
</b>
</bs>
</hist>
</val>
</dep>
<dep>
<src>simple</src>
<trg>name</trg>
<val>
<hist>
<budget>12</budget>
<bs>
<b>
<a>1</a>
<b>2</b>
<v>114745</v>
</b>
<b>
<a>2</a>
<b>3</b>
<v>30501</v>
</b>
<b>
<a>3</a>
<b>4</b>
<v>290</v>
</b>
</bs>
</hist>
</val>
</dep>
<dep>
<src>simple</src>
<trg>ext</trg>
<val>
<hist>
<budget>12</budget>
<bs>
<b>
<a>1</a>
<b>2</b>
<v>115035</v>
</b>
<b>
<a>2</a>
<b>3</b>
<v>30501</v>
</b>
</bs>
</hist>
</val>
</dep>
<dep>
<src>simple</src>
<trg>fromSource</trg>
<val>
<hist>
<budget>12</budget>
<bs>
<b>
<a>1</a>
<b>2</b>
<v>145247</v>
</b>
<b>
<a>2</a>
<b>3</b>
<v>290</v>
</b>
</bs>
</hist>
</val>
</dep>
<dep>
<src>ext</src>
<trg>id</trg>
<val>
<hist>
<budget>12</budget>
<bs>
<b>
<a>1</a>
<b>2</b>
<v>580</v>
</b>
<b>
<a>105</a>
<b>106</b>
<v>290</v>
</b>
<b>
<a>501</a>
<b>502</b>
<v>290</v>
</b>
</bs>
</hist>
</val>
</dep>
<dep>
<src>ext</src>
<trg>name</trg>
<val>
<hist>
<budget>12</budget>
<bs>
<b>
<a>1</a>
<b>2</b>
<v>580</v>
</b>
<b>
<a>105</a>
<b>106</b>
<v>290</v>
</b>
<b>
<a>501</a>
<b>502</b>
<v>290</v>
</b>
</bs>
</hist>
</val>
</dep>
<dep>
<src>ext</src>
<trg>simple</trg>
<val>
<hist>
<budget>12</budget>
<bs>
<b>
<a>1</a>
<b>2</b>
<v>580</v>
</b>
<b>
<a>105</a>
<b>106</b>
<v>290</v>
</b>
<b>
<a>499</a>
<b>500</b>
<v>290</v>
</b>
</bs>
</hist>
</val>
</dep>
<dep>
<src>ext</src>
<trg>fromSource</trg>
<val>
<hist>
<budget>12</budget>
<bs>
<b>
<a>1</a>
<b>2</b>
<v>871</v>
</b>
<b>
<a>2</a>
<b>3</b>
<v>290</v>
</b>
</bs>
</hist>
</val>
</dep>
<dep>
<src>fromSource</src>
<trg>id</trg>
<val>
<hist>
<budget>12</budget>
<bs>
<b>
<a>218</a>
<b>219</b>
<v>290</v>
</b>
<b>
<a>390</a>
<b>391</b>
<v>290</v>
</b>
</bs>
</hist>
</val>
</dep>
<dep>
<src>fromSource</src>
<trg>name</trg>
<val>
<hist>
<budget>12</budget>
<bs>
<b>
<a>218</a>
<b>219</b>
<v>290</v>
</b>
<b>
<a>390</a>
<b>391</b>
<v>290</v>
</b>
</bs>
</hist>
</val>
</dep>
<dep>
<src>fromSource</src>
<trg>simple</trg>
<val>
<hist>
<budget>12</budget>
<bs>
<b>
<a>113</a>
<b>114</b>
<v>290</v>
</b>
<b>
<a>389</a>
<b>390</b>
<v>290</v>
</b>
</bs>
</hist>
</val>
</dep>
<dep>
<src>fromSource</src>
<trg>ext</trg>
<val>
<hist>
<budget>12</budget>
<bs>
<b>
<a>1</a>
<b>2</b>
<v>290</v>
</b>
<b>
<a>4</a>
<b>5</b>
<v>290</v>
</b>
</bs>
</hist>
</val>
</dep>
</dependencies>
</relation>
<relation>
@@ -9867,10 +9482,6 @@
<k>name</k>
<v>19172</v>
</e>
<e>
<k>simple</k>
<v>13362</v>
</e>
</columnsizes>
<dependencies>
<dep>
@@ -9890,22 +9501,6 @@
</val>
</dep>
<dep>
<src>id</src>
<trg>simple</trg>
<val>
<hist>
<budget>12</budget>
<bs>
<b>
<a>1</a>
<b>2</b>
<v>19172</v>
</b>
</bs>
</hist>
</val>
</dep>
<dep>
<src>name</src>
<trg>id</trg>
<val>
@@ -9921,74 +9516,6 @@
</hist>
</val>
</dep>
<dep>
<src>name</src>
<trg>simple</trg>
<val>
<hist>
<budget>12</budget>
<bs>
<b>
<a>1</a>
<b>2</b>
<v>19172</v>
</b>
</bs>
</hist>
</val>
</dep>
<dep>
<src>simple</src>
<trg>id</trg>
<val>
<hist>
<budget>12</budget>
<bs>
<b>
<a>1</a>
<b>2</b>
<v>8133</v>
</b>
<b>
<a>2</a>
<b>3</b>
<v>4647</v>
</b>
<b>
<a>3</a>
<b>4</b>
<v>580</v>
</b>
</bs>
</hist>
</val>
</dep>
<dep>
<src>simple</src>
<trg>name</trg>
<val>
<hist>
<budget>12</budget>
<bs>
<b>
<a>1</a>
<b>2</b>
<v>8133</v>
</b>
<b>
<a>2</a>
<b>3</b>
<v>4647</v>
</b>
<b>
<a>3</a>
<b>4</b>
<v>580</v>
</b>
</bs>
</hist>
</val>
</dep>
</dependencies>
</relation>
<relation>

4
java/ql/lib/semmle/code/FileSystem.qll
View File

@@ -157,7 +157,7 @@ class Container extends @container, Top {
/** A folder. */
class Folder extends Container, @folder {
override string getAbsolutePath() { folders(this, result, _) }
override string getAbsolutePath() { folders(this, result) }
/** Gets the URL of this folder. */
override string getURL() { result = "folder://" + getAbsolutePath() }
@@ -171,7 +171,7 @@ class Folder extends Container, @folder {
* Note that `File` extends `Container` as it may be a `jar` file.
*/
class File extends Container, @file {
override string getAbsolutePath() { files(this, result, _, _, _) }
override string getAbsolutePath() { files(this, result) }
/** Gets the URL of this file. */
override string getURL() { result = "file://" + this.getAbsolutePath() + ":0:0:0:0" }

2
java/ql/lib/semmle/code/Location.qll
View File

@@ -24,7 +24,7 @@ predicate hasName(Element e, string name) {
or
packages(e, name)
or
files(e, _, name, _, _)
name = e.(File).getStem()
or
paramName(e, name)
or