Merge pull request #6690 from hvitved/js/files-folders-drop-columns

JavaScript: Drop redundant columns from `files` and `folders` relations

Author: hvitved

javascript/extractor/src/com/semmle/js/extractor/test/TrapTests.java

@@ -11,6 +11,7 @@
 import com.semmle.util.data.StringUtil;
 import com.semmle.util.extraction.ExtractorOutputConfig;
 import com.semmle.util.io.WholeIO;
+import com.semmle.util.process.Env;
 import com.semmle.util.srcarchive.DummySourceArchive;
 import com.semmle.util.trap.ITrapWriterFactory;
 import com.semmle.util.trap.TrapWriter;
@@ -21,6 +22,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Comparator;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map.Entry;
 import org.junit.AfterClass;
@@ -140,6 +142,10 @@ public void runtest() {
       options.add(inputFile.getAbsolutePath());
     }
 
+    LinkedHashMap<String, String> vars = new LinkedHashMap<>();
+		vars.put("CODEQL_REDUCE_FILES_FOLDERS_RELATIONS", "true");
+    Env.systemEnv().pushEnvironmentContext(vars);
+
     final List<Pair<String, String>> expectedVsActual = new ArrayList<Pair<String, String>>();
     Main main =
         new Main(

javascript/extractor/tests/cfg/output/trap/classexpr1.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/classexpr1.js;sourcefile"
-files(#10000,"/classexpr1.js","classexpr1","js",0)
+files(#10000,"/classexpr1.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/cfg/output/trap/classexpr2.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/classexpr2.js;sourcefile"
-files(#10000,"/classexpr2.js","classexpr2","js",0)
+files(#10000,"/classexpr2.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/cfg/output/trap/classexpr3.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/classexpr3.js;sourcefile"
-files(#10000,"/classexpr3.js","classexpr3","js",0)
+files(#10000,"/classexpr3.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/cfg/output/trap/classexpr4.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/classexpr4.js;sourcefile"
-files(#10000,"/classexpr4.js","classexpr4","js",0)
+files(#10000,"/classexpr4.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/cfg/output/trap/fields.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/fields.js;sourcefile"
-files(#10000,"/fields.js","fields","js",0)
+files(#10000,"/fields.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/cfg/output/trap/seq.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/seq.js;sourcefile"
-files(#10000,"/seq.js","seq","js",0)
+files(#10000,"/seq.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/cfg/output/trap/short-circuit.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/short-circuit.js;sourcefile"
-files(#10000,"/short-circuit.js","short-circuit","js",0)
+files(#10000,"/short-circuit.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/cfg/output/trap/ternary.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/ternary.js;sourcefile"
-files(#10000,"/ternary.js","ternary","js",0)
+files(#10000,"/ternary.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/cfg/output/trap/tst.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/tst.js;sourcefile"
-files(#10000,"/tst.js","tst","js",0)
+files(#10000,"/tst.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)