Skip to content

Remove useless code #2011

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hit-lacus merged 1 commit into from
Nov 11, 2022
+3 −11
Merged

Remove useless code #2011

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2107,14 +2107,6 @@ public String getKylinParquetJobJarPath() {
return getFileName(kylinHome + File.separator + "lib", PARQUET_JOB_JAR_NAME_PATTERN);
}

/**
* Use https://github.com/spektom/spark-flamegraph for Spark profile
*/
@ConfigTag(ConfigTag.Tag.DEBUG_HACK)
public String getSparkSubmitCmd() {
return getOptional("kylin.engine.spark-cmd", null);
}

public void overrideKylinParquetJobJarPath(String path) {
logger.info("override {} to {}", KYLIN_ENGINE_PARQUET_JOB_JAR, path);
System.setProperty(KYLIN_ENGINE_PARQUET_JOB_JAR, path);
Expand Down
3 changes: 1 addition & 2 deletions .../kylin-spark-engine/src/main/java/org/apache/kylin/engine/spark/job/NSparkExecutable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,8 +397,7 @@ protected String generateSparkCmd(KylinConfig config, String hadoopConf, String
String appArgs) {
StringBuilder sb = new StringBuilder();

String sparkSubmitCmd = config.getSparkSubmitCmd() != null ?
config.getSparkSubmitCmd() : KylinConfig.getSparkHome() + "/bin/spark-submit";
String sparkSubmitCmd = KylinConfig.getSparkHome() + "/bin/spark-submit";
sb.append("export HADOOP_CONF_DIR=%s && %s --class org.apache.kylin.engine.spark.application.SparkEntry ");

Map<String, String> sparkConfs = getSparkConfigOverride(config);
Expand Down
3 changes: 2 additions & 1 deletion server-base/src/main/java/org/apache/kylin/rest/controller/DiagnosisController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import javax.servlet.http.HttpServletResponse;

import org.apache.kylin.common.persistence.AutoDeleteDirectory;
import org.apache.kylin.common.util.ParameterFilter;
import org.apache.kylin.metadata.badquery.BadQueryEntry;
import org.apache.kylin.metadata.badquery.BadQueryHistory;
import org.apache.kylin.rest.exception.InternalErrorException;
Expand Down Expand Up @@ -95,7 +96,7 @@ public void dumpProjectDiagnosisInfo(@PathVariable String project, final HttpSer
public void dumpJobDiagnosisInfo(@PathVariable String jobId, final HttpServletRequest request,
final HttpServletResponse response) {
try (AutoDeleteDirectory diagDir = new AutoDeleteDirectory("diag_job", "")) {
String filePath = dgService.dumpJobDiagnosisInfo(jobId, diagDir.getFile());
String filePath = dgService.dumpJobDiagnosisInfo(ParameterFilter.checkParameter(jobId), diagDir.getFile());
setDownloadResponse(filePath, response);
} catch (IOException e) {
throw new InternalErrorException("Failed to dump job diagnosis info. " + e.getMessage(), e);
Expand Down