use toolchain

Author: ittaiz

java_stub_template/file/file.txt

@@ -289,7 +289,64 @@ ARGS=(
   "${ARGS[@]}")
 
 
+function run_test_with_large_classpath() {
+  if [ "%use_argument_file_in_runner_for_improved_performance%" == "True" ]; then
+    run_test_with_argument_file "$1"
+  else
+    create_and_run_classpath_jar "$2"
+  fi
+}
+
 function create_and_run_classpath_jar() {
+  # Build class path as one single string separated by spaces
+  MANIFEST_CLASSPATH=""
+  if is_windows; then
+    CLASSPATH_SEPARATOR=";"
+    URI_PREFIX="file:/"  # e.g. "file:/C:/temp/foo.jar"
+  else
+    CLASSPATH_SEPARATOR=":"
+    URI_PREFIX="file:$(pwd)/"  # e.g. "file:/usr/local/foo.jar"
+  fi
+
+  URI_PREFIX=${URI_PREFIX//\//\\/}
+  MANIFEST_CLASSPATH="${CLASSPATH_SEPARATOR}${CLASSPATH}"
+
+  MANIFEST_CLASSPATH=$(sed "s/ /%20/g" <<< "${MANIFEST_CLASSPATH}")
+  MANIFEST_CLASSPATH=$(sed "s/$CLASSPATH_SEPARATOR/ $URI_PREFIX/g" <<< "${MANIFEST_CLASSPATH}")
+
+  # Create manifest file
+  MANIFEST_FILE="$(mktemp -t XXXXXXXX.jar_manifest)"
+
+  (
+    echo "Manifest-Version: 1.0"
+
+    CLASSPATH_LINE="Class-Path:$MANIFEST_CLASSPATH"
+    # No line in the MANIFEST.MF file may be longer than 72 bytes.
+    # A space prefix indicates the line is still the content of the last attribute.
+    CLASSPATH_MANIFEST_LINES=$(sed -E $'s/(.{71})/\\1\\\n /g' <<< "${CLASSPATH_LINE}")
+    echo "$CLASSPATH_MANIFEST_LINES"
+    echo "Created-By: Bazel"
+  ) >$MANIFEST_FILE
+
+  # Create classpath JAR file
+  MANIFEST_JAR_FILE="$(mktemp -t XXXXXXXX-classpath.jar)"
+  if is_windows; then
+    MANIFEST_JAR_FILE="$(cygpath --windows "$MANIFEST_JAR_FILE")"
+    MANIFEST_FILE="$(cygpath --windows "$MANIFEST_FILE")"
+  fi
+  JARBIN="${JARBIN:-$(rlocation "$1")}"
+  $JARBIN cvfm "$MANIFEST_JAR_FILE" "$MANIFEST_FILE" >/dev/null || \
+    die "ERROR: $self failed because $JARBIN failed"
+
+  # Execute JAVA command
+  $JAVABIN -classpath "$MANIFEST_JAR_FILE" "${ARGS[@]}"
+  exit_code=$?
+  rm -f "$MANIFEST_FILE"
+  rm -f "$MANIFEST_JAR_FILE"
+  exit $exit_code
+}
+
+function run_test_with_argument_file() {
   ARGS_FILE="$(mktemp -t XXXXXXXX.args)"
   echo "-cp "$CLASSPATH >> $ARGS_FILE
   $JAVABIN @$ARGS_FILE "${ARGS[@]}"
@@ -317,9 +374,9 @@ fi
 #Difference ends
 
 if is_windows && (("${#CLASSPATH}" > ${CLASSPATH_LIMIT} )); then
-  create_and_run_classpath_jar "${JARBIN}.exe"
+  run_test_with_large_classpath "${JARBIN}.exe"
 elif (("${#CLASSPATH}" > ${CLASSPATH_LIMIT})); then
-  create_and_run_classpath_jar "$JARBIN"
+  run_test_with_large_classpath "$JARBIN"
 else
   exec $JAVABIN -classpath $CLASSPATH "${ARGS[@]}"
 fi

scala/BUILD

@@ -11,6 +11,7 @@ toolchain_type(
 scala_toolchain(
     name = "default_toolchain_impl",
     scalacopts = [],
+    use_argument_file_in_runner_for_improved_performance = True,
     visibility = ["//visibility:public"],
 )
 

scala/private/phases/phase_write_executable.bzl

@@ -108,8 +108,10 @@ def _write_executable_non_windows(ctx, executable, rjars, main_class, jvm_flags,
         wrapper.short_path,
     )
 
+    scala_toolchain = ctx.toolchains["//scala:toolchain_type"]
+
     if use_jacoco and ctx.configuration.coverage_enabled:
-        jacocorunner = ctx.toolchains["@io_bazel_rules_scala//scala:toolchain_type"].jacocorunner
+        jacocorunner = scala_toolchain.jacocorunner
         classpath = ctx.configuration.host_path_separator.join(
             ["${RUNPATH}%s" % (j.short_path) for j in rjars.to_list() + jacocorunner.files.to_list()],
         )
@@ -137,6 +139,7 @@ def _write_executable_non_windows(ctx, executable, rjars, main_class, jvm_flags,
                 "%set_jacoco_main_class%": """export JACOCO_MAIN_CLASS={}""".format(main_class),
                 "%set_jacoco_java_runfiles_root%": """export JACOCO_JAVA_RUNFILES_ROOT=$JAVA_RUNFILES/{}/""".format(ctx.workspace_name),
                 "%set_java_coverage_new_implementation%": """export JAVA_COVERAGE_NEW_IMPLEMENTATION=YES""",
+                "%use_argument_file_in_runner_for_improved_performance%": str(scala_toolchain.use_argument_file_in_runner_for_improved_performance),
             },
             is_executable = True,
         )
@@ -163,6 +166,7 @@ def _write_executable_non_windows(ctx, executable, rjars, main_class, jvm_flags,
                 "%set_jacoco_java_runfiles_root%": "",
                 "%workspace_prefix%": ctx.workspace_name + "/",
                 "%set_java_coverage_new_implementation%": """export JAVA_COVERAGE_NEW_IMPLEMENTATION=NO""",
+                "%use_argument_file_in_runner_for_improved_performance%": str(scala_toolchain.use_argument_file_in_runner_for_improved_performance),
             },
             is_executable = True,
         )

scala/scala_toolchain.bzl

@@ -84,6 +84,7 @@ def _scala_toolchain_impl(ctx):
         enable_diagnostics_report = enable_diagnostics_report,
         jacocorunner = ctx.attr.jacocorunner,
         enable_stats_file = enable_stats_file,
+        use_argument_file_in_runner_for_improved_performance = ctx.attr.use_argument_file_in_runner_for_improved_performance,
     )
     return [toolchain]
 
@@ -137,6 +138,10 @@ scala_toolchain = rule(
             default = True,
             doc = "Enable writing of statsfile",
         ),
+        "use_argument_file_in_runner_for_improved_performance": attr.bool(
+            default = False,
+            doc = "Changes java binaries scripts (including tests) to use argument files and not classpath jars to improve performance, requires java > 8"
+        )
     },
     fragments = ["java"],
 )

test/shell/test_scala_binary.sh

@@ -18,5 +18,12 @@ test_scala_binary_expect_failure_on_missing_direct_deps_located_in_dependency_wh
   test_scala_library_expect_failure_on_missing_direct_deps ${dependency_target} ${test_target}
 }
 
+test_scala_binary_allows_opt_in_to_use_of_argument_file_in_runner_for_improved_performance() {
+
+  bazel test --extra_toolchains="//test/toolchains:use_argument_file_in_runner_for_improved_performance" //test/src/main/scala/scalarules/test/large_classpath:largeClasspath
+
+}
+
 $runner test_scala_binary_expect_failure_on_missing_direct_deps
 $runner test_scala_binary_expect_failure_on_missing_direct_deps_located_in_dependency_which_is_scala_binary
+$runner test_scala_binary_allows_opt_in_to_use_of_argument_file_in_runner_for_improved_performance

test/toolchains/BUILD.bazel

@@ -117,3 +117,16 @@ toolchain(
     toolchain_type = "@io_bazel_rules_scala//scala:toolchain_type",
     visibility = ["//visibility:public"],
 )
+
+scala_toolchain(
+    name = "use_argument_file_in_runner_for_improved_performance_impl",
+    use_argument_file_in_runner_for_improved_performance = True,
+    visibility = ["//visibility:public"],
+)
+
+toolchain(
+    name = "use_argument_file_in_runner_for_improved_performance",
+    toolchain = "use_argument_file_in_runner_for_improved_performance_impl",
+    toolchain_type = "@io_bazel_rules_scala//scala:toolchain_type",
+    visibility = ["//visibility:public"],
+)