Fix linting error

apache · Sep 7, 2022 · 6854682 · 6854682
1 parent 2ba3254
commit 6854682
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/...rc/main/java/org/apache/pinot/tools/admin/command/LaunchSparkDataIngestionJobCommand.java b/...rc/main/java/org/apache/pinot/tools/admin/command/LaunchSparkDataIngestionJobCommand.java
@@ -23,13 +23,10 @@
 import java.io.File;
 import java.io.IOException;
 import java.net.URI;
-import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
-import org.apache.calcite.rel.core.Join;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.lang3.JavaVersion;
 import org.apache.commons.lang3.SystemUtils;
@@ -43,7 +40,6 @@
 import org.apache.pinot.spi.plugin.PluginManager;
 import org.apache.pinot.spi.utils.GroovyTemplateUtils;
 import org.apache.pinot.tools.Command;
-import org.apache.spark.launcher.SparkAppHandle;
 import org.apache.spark.launcher.SparkLauncher;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -287,7 +283,8 @@ private void addDepsJarToDistributedCache(SparkLauncher sparkLauncher, String de
   }
 
   private boolean shouldLoadPlugin(String parentDir) {
-    boolean shouldLoadPlugin = _pluginsToLoad == null && !_pluginsToExclude.contains(parentDir);
+    boolean shouldLoadPlugin = _pluginsToLoad == null && !_pluginsToExclude.contains(parentDir)
+        && !parentDir.contains("spark");
     shouldLoadPlugin = shouldLoadPlugin || (_pluginsToLoad != null && _pluginsToLoad.contains(parentDir));
     shouldLoadPlugin = shouldLoadPlugin || _sparkVersion.getPluginName().contentEquals(parentDir);
     return shouldLoadPlugin;

diff --git a/pinot-tools/src/main/resources/appAssemblerScriptTemplate b/pinot-tools/src/main/resources/appAssemblerScriptTemplate
@@ -155,7 +155,6 @@ if [ -z "$PLUGINS_CLASSPATH" ] ; then
       fi
     fi
   done
-
   unset IFS
 fi
-Original file line number
+Diff line change
@@ Expand Up / @@ -155,7 +155,6 @@ if [ -z "$PLUGINS_CLASSPATH" ] ; then @@
           fi
         fi
       done
       unset IFS
     fi
@@ Expand Down @@