mbien commented on code in PR #4095:
URL: https://github.com/apache/netbeans/pull/4095#discussion_r869969952
##########
java/maven.indexer/src/org/netbeans/modules/maven/indexer/ClassDependencyIndexCreator.java:
##########
@@ -256,34 +256,36 @@ private static Set<String> parseField(String refereeCRC,
String field, String re
"org/omg/CosNaming", "org/omg/Dynamic", "org/omg/DynamicAny",
"org/omg/IOP", "org/omg/Messaging",
"org/omg/PortableInterceptor", "org/omg/PortableServer",
"org/omg/SendingContext", "org/omg/stub",
"org/w3c/dom", "org/xml/sax"
- });
+ };
/**
* @param referrer a referring class, as {@code pkg/Outer$Inner}
- * @param data its bytecode
+ * @param classData its bytecode
* @param depsMap map from referring outer classes (as {@code pkg/Outer})
to referred-to classes (as {@code pkg/Outer$Inner})
* @param siblings other referring classes in the same artifact (including
this one), as {@code pkg/Outer$Inner}
*/
- private static void addDependenciesToMap(String referrer, InputStream
data, Map<String, Set<String>> depsMap, Set<String> siblings) throws
IOException {
+ private static void addDependenciesToMap(String referrer, InputStream
classData, Map<String, Set<String>> depsMap, Set<String> siblings) throws
IOException {
+
int shell = referrer.indexOf('$', referrer.lastIndexOf('/') + 1);
String referrerTopLevel = shell == -1 ? referrer :
referrer.substring(0, shell);
- for (String referee : dependencies(data)) {
- if (referrer.equals(referee)) {
- continue;
- }
- if (siblings.contains(referee)) {
- continue; // in same JAR, not interesting
- }
- if (JDK_CLASS_TEST.test(referee)) {
- continue;
- }
- Set<String> referees = depsMap.get(referrerTopLevel);
- if (referees == null) {
- referees = new HashSet<>();
- depsMap.put(referrerTopLevel, referees);
- }
- referees.add(referee);
+
+ Set<String> tmp = depsMap.get(referrerTopLevel);
+ if (tmp == null) {
+ tmp = new HashSet<>();
+ depsMap.put(referrerTopLevel, tmp);
}
+ Set<String> referees = tmp;
+
+ dependenciesOf(classData)
+ .filter((referee) -> !referrer.equals(referee))
+ .filter((referee) -> !siblings.contains(referee)) // in same JAR,
not interesting
+ .filter((referee) -> {
+ for (int i = 0; i < JDK_CLASS_TEST.length; i++)
+ if (referee.startsWith(JDK_CLASS_TEST[i]))
+ return false;
Review Comment:
@vieiro prefix tree, thats the name, now I remember! I might give it a try
but I am skeptical that the results will impress :)
- even if we make this method a no-op, it won't help a lot performance
wise. There is a lot more going on, the screenshots don't show the full graph,
it is zoomed into a particular method.
- string ops like startWith are super fast, they are all intrinsified and
can be compiled to vector operations
- the list is likely not big enough to justify the overhead of a more
sophisticated data structure with HasMap lookups and object trees
here is the full tree for the thread, marked in red is post-optimization,
even if the marked segment wouldn't be there, it would maybe only reduce it
down to 50s or so. My hope is multithreading on a higher level to do the rest.
This PR is a complete accident btw, I actually wanted to optimize the remote
repo indexing which takes significantly longer.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
