Merge pull request github#6489 from hvitved/csharp/files-folders-drop-columns

hvitved · web-flow · commit 4628f880b479 · 2021-09-13T11:02:13.000+02:00
C#: Drop redundant columns from `files` and `folders` relations
diff --git a/csharp/autobuilder/Semmle.Autobuild.Shared/BuildActions.cs b/csharp/autobuilder/Semmle.Autobuild.Shared/BuildActions.cs
@@ -161,8 +161,12 @@ private static ProcessStartInfo GetProcessStartInfo(string exe, string arguments
                 pi.WorkingDirectory = workingDirectory;
 
             // Environment variables can only be used when not redirecting stdout
-            if (!redirectStandardOutput && environment is not null)
-                environment.ForEach(kvp => pi.Environment[kvp.Key] = kvp.Value);
+            if (!redirectStandardOutput)
+            {
+                if (environment is not null)
+                    environment.ForEach(kvp => pi.Environment[kvp.Key] = kvp.Value);
+                pi.Environment["CODEQL_REDUCE_FILES_FOLDERS_RELATIONS"] = "true";
+            }
             return pi;
         }
 
diff --git a/csharp/codeql-extractor.yml b/csharp/codeql-extractor.yml
@@ -10,6 +10,7 @@ extra_env_vars:
   CORECLR_ENABLE_PROFILING: "1"
   CORECLR_PROFILER: "{A3C70A64-7D41-4A94-A3F6-FD47D9259997}"
   CORECLR_PROFILER_PATH_64: "${env.CODEQL_EXTRACTOR_CSHARP_ROOT}/tools/${env.CODEQL_PLATFORM}/clrtracer64${env.CODEQL_PLATFORM_DLL_EXTENSION}"
+  CODEQL_REDUCE_FILES_FOLDERS_RELATIONS: "true"
 file_types:
   - name: cs
     display_name: C# sources
diff --git a/csharp/extractor/Semmle.Extraction.CIL/Entities/File.cs b/csharp/extractor/Semmle.Extraction.CIL/Entities/File.cs
@@ -37,7 +37,7 @@ public override IEnumerable<IExtractionProduct> Contents
                     yield return parent;
                     yield return Tuples.containerparent(parent, this);
                 }
-                yield return Tuples.files(this, TransformedPath.Value, TransformedPath.NameWithoutExtension, TransformedPath.Extension);
+                yield return Tuples.files(this, TransformedPath.Value);
             }
         }
     }
diff --git a/csharp/extractor/Semmle.Extraction.CIL/Entities/Folder.cs b/csharp/extractor/Semmle.Extraction.CIL/Entities/Folder.cs
@@ -28,7 +28,7 @@ public override IEnumerable<IExtractionProduct> Contents
                     yield return parentFolder;
                     yield return Tuples.containerparent(parentFolder, this);
                 }
-                yield return Tuples.folders(this, transformedPath.Value, transformedPath.NameWithoutExtension);
+                yield return Tuples.folders(this, transformedPath.Value);
             }
         }
 
diff --git a/csharp/extractor/Semmle.Extraction.CIL/Tuples.cs b/csharp/extractor/Semmle.Extraction.CIL/Tuples.cs
@@ -203,14 +203,14 @@ internal static Tuple cil_type_annotation(IExtractedEntity receiver, TypeAnnotat
         internal static Tuple containerparent(Folder parent, IFileOrFolder child) =>
             new Tuple("containerparent", parent, child);
 
-        internal static Tuple files(File file, string fullName, string name, string extension) =>
-            new Tuple("files", file, fullName, name, extension, 0);
+        internal static Tuple files(File file, string fullName) =>
+            new Tuple("files", file, fullName);
 
         internal static Tuple file_extraction_mode(File file, int mode) =>
             new Tuple("file_extraction_mode", file, mode);
 
-        internal static Tuple folders(Folder folder, string path, string name) =>
-            new Tuple("folders", folder, path, name);
+        internal static Tuple folders(Folder folder, string path) =>
+            new Tuple("folders", folder, path);
 
         internal static Tuple locations_default(PdbSourceLocation label, File file, int startLine, int startCol, int endLine, int endCol) =>
             new Tuple("locations_default", label, file, startLine, startCol, endLine, endCol);
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/File.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/File.cs
@@ -17,7 +17,7 @@ protected File(Context cx, string path)
 
         public override void Populate(TextWriter trapFile)
         {
-            trapFile.files(this, TransformedPath.Value, TransformedPath.NameWithoutExtension, TransformedPath.Extension);
+            trapFile.files(this, TransformedPath.Value);
 
             if (TransformedPath.ParentDirectory is PathTransformer.ITransformedPath dir)
                 trapFile.containerparent(Extraction.Entities.Folder.Create(Context, dir), this);
diff --git a/csharp/extractor/Semmle.Extraction/Entities/Folder.cs b/csharp/extractor/Semmle.Extraction/Entities/Folder.cs
@@ -8,7 +8,7 @@ private Folder(Context cx, PathTransformer.ITransformedPath init) : base(cx, ini
 
         public override void Populate(TextWriter trapFile)
         {
-            trapFile.folders(this, Symbol.Value, Symbol.NameWithoutExtension);
+            trapFile.folders(this, Symbol.Value);
             if (Symbol.ParentDirectory is PathTransformer.ITransformedPath parent)
                 trapFile.containerparent(Create(Context, parent), this);
         }
diff --git a/csharp/extractor/Semmle.Extraction/Entities/GeneratedFile.cs b/csharp/extractor/Semmle.Extraction/Entities/GeneratedFile.cs
@@ -10,7 +10,7 @@ private GeneratedFile(Context cx) : base(cx, "") { }
 
         public override void Populate(TextWriter trapFile)
         {
-            trapFile.files(this, "", "", "");
+            trapFile.files(this, "");
         }
 
         public override void WriteId(EscapingTextWriter trapFile)
diff --git a/csharp/extractor/Semmle.Extraction/Tuples.cs b/csharp/extractor/Semmle.Extraction/Tuples.cs
@@ -18,14 +18,14 @@ internal static void extractor_messages(this System.IO.TextWriter trapFile, Extr
             trapFile.WriteTuple("extractor_messages", error, (int)severity, origin, errorMessage, entityText, ___location, stackTrace);
         }
 
-        public static void files(this System.IO.TextWriter trapFile, File file, string fullName, string name, string extension)
+        public static void files(this System.IO.TextWriter trapFile, File file, string fullName)
         {
-            trapFile.WriteTuple("files", file, fullName, name, extension, 0);
+            trapFile.WriteTuple("files", file, fullName);
         }
 
-        internal static void folders(this System.IO.TextWriter trapFile, Folder folder, string path, string name)
+        internal static void folders(this System.IO.TextWriter trapFile, Folder folder, string path)
         {
-            trapFile.WriteTuple("folders", folder, path, name);
+            trapFile.WriteTuple("folders", folder, path);
         }
 
         public static void locations_default(this System.IO.TextWriter trapFile, SourceLocation label, Entities.File file, int startLine, int startCol, int endLine, int endCol)
diff --git a/csharp/ql/lib/semmle/code/csharp/File.qll b/csharp/ql/lib/semmle/code/csharp/File.qll
@@ -171,14 +171,14 @@ class Container extends @container {
 
 /** A folder. */
 class Folder extends Container, @folder {
-  override string getAbsolutePath() { folders(this, result, _) }
+  override string getAbsolutePath() { folders(this, result) }
 
   override string getURL() { result = "folder://" + getAbsolutePath() }
 }
 
 /** A file. */
 class File extends Container, @file {
-  override string getAbsolutePath() { files(this, result, _, _, _) }
+  override string getAbsolutePath() { files(this, result) }
 
   /** Gets the number of lines in this file. */
   int getNumberOfLines() { numlines(this, result, _, _) }
@@ -192,7 +192,7 @@ class File extends Container, @file {
   override string getURL() { result = "file://" + this.getAbsolutePath() + ":0:0:0:0" }
 
   /** Holds if this file contains source code. */
-  predicate fromSource() { files(this, _, _, "cs", _) }
+  predicate fromSource() { this.getExtension() = "cs" }
 
   /** Holds if this file is a library. */
   predicate fromLibrary() {
diff --git a/csharp/ql/lib/semmlecode.csharp.dbscheme b/csharp/ql/lib/semmlecode.csharp.dbscheme
@@ -276,22 +276,13 @@ assemblies(
   string name: string ref,
   string version: string ref);
 
-/*
-  fromSource(0) = unknown,
-  fromSource(1) = from source,
-  fromSource(2) = from library
-*/
 files(
   unique int id: @file,
-  string name: string ref,
-  string simple: string ref,
-  string ext: string ref,
-  int fromSource: int ref);
+  string name: string ref);
 
 folders(
   unique int id: @folder,
-  string name: string ref,
-  string simple: string ref);
+  string name: string ref);
 
 @container = @folder | @file ;
 
diff --git a/csharp/ql/lib/semmlecode.csharp.dbscheme.stats b/csharp/ql/lib/semmlecode.csharp.dbscheme.stats
diff --git a/csharp/upgrades/0f562410898f4d4afab2da91f5aaece660ebfa88/old.dbscheme b/csharp/upgrades/0f562410898f4d4afab2da91f5aaece660ebfa88/old.dbscheme
diff --git a/csharp/upgrades/0f562410898f4d4afab2da91f5aaece660ebfa88/semmlecode.csharp.dbscheme b/csharp/upgrades/0f562410898f4d4afab2da91f5aaece660ebfa88/semmlecode.csharp.dbscheme
diff --git a/csharp/upgrades/0f562410898f4d4afab2da91f5aaece660ebfa88/upgrade.properties b/csharp/upgrades/0f562410898f4d4afab2da91f5aaece660ebfa88/upgrade.properties

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public override IEnumerable<IExtractionProduct> Contents`
`37`	`37`	`yield return parent;`
`38`	`38`	`yield return Tuples.containerparent(parent, this);`
`39`	`39`	`}`
`40`		`- yield return Tuples.files(this, TransformedPath.Value, TransformedPath.NameWithoutExtension, TransformedPath.Extension);`
	`40`	`+ yield return Tuples.files(this, TransformedPath.Value);`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public override IEnumerable<IExtractionProduct> Contents`
`28`	`28`	`yield return parentFolder;`
`29`	`29`	`yield return Tuples.containerparent(parentFolder, this);`
`30`	`30`	`}`
`31`		`- yield return Tuples.folders(this, transformedPath.Value, transformedPath.NameWithoutExtension);`
	`31`	`+ yield return Tuples.folders(this, transformedPath.Value);`
`32`	`32`	`}`
`33`	`33`	`}`
`34`	`34`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ protected File(Context cx, string path)`
`17`	`17`
`18`	`18`	`public override void Populate(TextWriter trapFile)`
`19`	`19`	`{`
`20`		`- trapFile.files(this, TransformedPath.Value, TransformedPath.NameWithoutExtension, TransformedPath.Extension);`
	`20`	`+ trapFile.files(this, TransformedPath.Value);`
`21`	`21`
`22`	`22`	`if (TransformedPath.ParentDirectory is PathTransformer.ITransformedPath dir)`
`23`	`23`	`trapFile.containerparent(Extraction.Entities.Folder.Create(Context, dir), this);`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ private Folder(Context cx, PathTransformer.ITransformedPath init) : base(cx, ini`
`8`	`8`
`9`	`9`	`public override void Populate(TextWriter trapFile)`
`10`	`10`	`{`
`11`		`- trapFile.folders(this, Symbol.Value, Symbol.NameWithoutExtension);`
	`11`	`+ trapFile.folders(this, Symbol.Value);`
`12`	`12`	`if (Symbol.ParentDirectory is PathTransformer.ITransformedPath parent)`
`13`	`13`	`trapFile.containerparent(Create(Context, parent), this);`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ private GeneratedFile(Context cx) : base(cx, "") { }`
`10`	`10`
`11`	`11`	`public override void Populate(TextWriter trapFile)`
`12`	`12`	`{`
`13`		`- trapFile.files(this, "", "", "");`
	`13`	`+ trapFile.files(this, "");`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`public override void WriteId(EscapingTextWriter trapFile)`
Original file line number	Diff line number	Diff line change
`@@ -18,14 +18,14 @@ internal static void extractor_messages(this System.IO.TextWriter trapFile, Extr`
`18`	`18`	`trapFile.WriteTuple("extractor_messages", error, (int)severity, origin, errorMessage, entityText, ___location, stackTrace);`
`19`	`19`	`}`
`20`	`20`
`21`		`- public static void files(this System.IO.TextWriter trapFile, File file, string fullName, string name, string extension)`
	`21`	`+ public static void files(this System.IO.TextWriter trapFile, File file, string fullName)`
`22`	`22`	`{`
`23`		`- trapFile.WriteTuple("files", file, fullName, name, extension, 0);`
	`23`	`+ trapFile.WriteTuple("files", file, fullName);`
`24`	`24`	`}`
`25`	`25`
`26`		`- internal static void folders(this System.IO.TextWriter trapFile, Folder folder, string path, string name)`
	`26`	`+ internal static void folders(this System.IO.TextWriter trapFile, Folder folder, string path)`
`27`	`27`	`{`
`28`		`- trapFile.WriteTuple("folders", folder, path, name);`
	`28`	`+ trapFile.WriteTuple("folders", folder, path);`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`public static void locations_default(this System.IO.TextWriter trapFile, SourceLocation label, Entities.File file, int startLine, int startCol, int endLine, int endCol)`