Skip to content

D
dlink
Unverified Commit ce0089f4 authored by aiwenmo's avatar aiwenmo Committed by GitHub
Browse files
Options

[Optimization-932][pom] Optimizate package and auto.sh by loading classpaths (#933) 

Co-authored-by: 's avatarwenmo <32723967+wenmo@users.noreply.github.com>
parent c1b4b556
Expand all Show whitespace changes
Inline Side-by-side
Showing with 185 additions and 152 deletions
dlink-admin/pom.xml
View file @ ce0089f4
...@@ -196,83 +196,30 @@ ...@@ -196,83 +196,30 @@
<artifactId>spring-boot-starter-aop</artifactId> <artifactId>spring-boot-starter-aop</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<finalName>${project.artifactId}</finalName>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>${spring-boot-dependencies.version}</version>
<configuration>
<layout>ZIP</layout>
<mainClass>com.dlink.Dlink</mainClass>
<excludes>
<exclude>
<groupId>org.apache.flink</groupId>
<artifactId>flink-*</artifactId>
</exclude>
</excludes>
</configuration>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
</plugin>
<!--<plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-assembly-plugin</artifactId>
<version>3.1.0</version> <version>3.0.0</version>
<configuration> <configuration>
&lt;!&ndash;<outputDirectory>${project.build.directory}/app/bin</outputDirectory>&ndash;&gt; <appendAssemblyId>false</appendAssemblyId>
&lt;!&ndash;这些配置将写入到MANIFEST.MF文件中&ndash;&gt; <descriptors>
<archive> <descriptor>src/main/assembly/package.xml</descriptor>
&lt;!&ndash;指定程序入口&ndash;&gt; </descriptors>
<manifest>
&lt;!&ndash;<addClasspath>true</addClasspath>&ndash;&gt;
<classpathPrefix>../lib/</classpathPrefix>
<mainClass>com.dlink.Dlink</mainClass>
</manifest>
&lt;!&ndash; (配置文件外置目录) &ndash;&gt;
<manifestEntries>
<Class-Path>../config/</Class-Path>
</manifestEntries>
</archive>
<excludes>
<exclude>**/*.xml</exclude>
<exclude>**/*.conf</exclude>
<exclude>**/*.properties</exclude>
<exclude>**/*/*.json</exclude>
</excludes>
</configuration> </configuration>
</plugin>-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>${maven.resource.version}</version>
<executions> <executions>
<execution> <execution>
<id>copy-static</id> <id>make-assembly</id>
<phase>validate</phase> <phase>package</phase>
<goals> <goals>
<goal>copy-resources</goal> <goal>single</goal>
</goals> </goals>
<configuration>
<outputDirectory>src/main/resources/static</outputDirectory>
<overwrite>true</overwrite>
<resources>
<resource>
<!-- 因为dlink-web打包目录在项目跟目录，所以从这里复制 -->
<directory>../dlink-web/dist</directory>
</resource>
</resources>
</configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
</plugins> </plugins>
<finalName>${project.artifactId}-${project.version}</finalName>
</build> </build>
</project> </project>
dlink-admin/src/main/assembly/package.xml 0 → 100644
View file @ ce0089f4
<assembly>
<id>dist</id>
<formats>
<format>dir</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
<directory>${basedir}/src/main/bin</directory>
<lineEnding>unix</lineEnding>
<outputDirectory>service</outputDirectory>
<includes>
<include>*.service</include>
</includes>
</fileSet>
<fileSet>
<directory>${basedir}/src/main/bin</directory>
<lineEnding>unix</lineEnding>
<outputDirectory></outputDirectory>
<fileMode>755</fileMode>
<includes>
<include>*.sh</include>
</includes>
</fileSet>
<fileSet>
<directory>${basedir}/src/main/bin</directory>
<lineEnding>windows</lineEnding>
<outputDirectory></outputDirectory>
<includes>
<include>*.bat</include>
</includes>
</fileSet>
<fileSet>
<directory>target/classes</directory>
<outputDirectory>config</outputDirectory>
<includes>
<include>**/*.properties</include>
<include>**/*.yml</include>
<include>**/*.yaml</include>
<include>**/*.xml</include>
</includes>
</fileSet>
</fileSets>
<dependencySets>
<dependencySet>
<outputDirectory>lib</outputDirectory>
<unpack>false</unpack>
</dependencySet>
</dependencySets>
</assembly>
\ No newline at end of file
dlink-admin/src/main/java/com/dlink/service/impl/JobInstanceServiceImpl.java
View file @ ce0089f4
...@@ -33,6 +33,7 @@ import com.dlink.model.JobInstance; ...@@ -33,6 +33,7 @@ import com.dlink.model.JobInstance;
import com.dlink.model.JobInstanceCount; import com.dlink.model.JobInstanceCount;
import com.dlink.model.JobInstanceStatus; import com.dlink.model.JobInstanceStatus;
import com.dlink.model.JobStatus; import com.dlink.model.JobStatus;
import com.dlink.model.SystemConfiguration;
import com.dlink.service.ClusterConfigurationService; import com.dlink.service.ClusterConfigurationService;
import com.dlink.service.ClusterService; import com.dlink.service.ClusterService;
import com.dlink.service.HistoryService; import com.dlink.service.HistoryService;
...@@ -184,7 +185,11 @@ public class JobInstanceServiceImpl extends SuperServiceImpl<JobInstanceMapper, ...@@ -184,7 +185,11 @@ public class JobInstanceServiceImpl extends SuperServiceImpl<JobInstanceMapper,
@Override @Override
public LineageResult getLineage(Integer id) { public LineageResult getLineage(Integer id) {
History history = getJobInfoDetail(id).getHistory(); History history = getJobInfoDetail(id).getHistory();
return LineageBuilder.getLineage(history.getStatement(), history.getConfig().get("useStatementSet").asBoolean()); if (SystemConfiguration.getInstances().isUseLogicalPlan()) {
return LineageBuilder.getColumnLineageByLogicalPlan(history.getStatement());
} else {
return LineageBuilder.getLineage(history.getStatement());
}
} }
@Override @Override
......
dlink-client/dlink-client-1.14/src/main/java/com/dlink/utils/LineageContext.java
View file @ ce0089f4
...@@ -135,7 +135,7 @@ public class LineageContext { ...@@ -135,7 +135,7 @@ public class LineageContext {
/** /**
* Calling each program's optimize method in sequence. * Calling each program's optimize method in sequence.
*/ */
public RelNode optimize(RelNode relNode) { private RelNode optimize(RelNode relNode) {
return flinkChainedProgram.optimize(relNode, new StreamOptimizeContext() { return flinkChainedProgram.optimize(relNode, new StreamOptimizeContext() {
@Override @Override
public boolean isBatchMode() { public boolean isBatchMode() {
...@@ -149,7 +149,7 @@ public class LineageContext { ...@@ -149,7 +149,7 @@ public class LineageContext {
@Override @Override
public FunctionCatalog getFunctionCatalog() { public FunctionCatalog getFunctionCatalog() {
return ((PlannerBase) tableEnv.getPlanner()).getFlinkContext().getFunctionCatalog(); return getPlanner().getFlinkContext().getFunctionCatalog();
} }
@Override @Override
...@@ -159,17 +159,18 @@ public class LineageContext { ...@@ -159,17 +159,18 @@ public class LineageContext {
@Override @Override
public SqlExprToRexConverterFactory getSqlExprToRexConverterFactory() { public SqlExprToRexConverterFactory getSqlExprToRexConverterFactory() {
return relNode.getCluster().getPlanner().getContext().unwrap(FlinkContext.class).getSqlExprToRexConverterFactory(); return getPlanner().getFlinkContext().getSqlExprToRexConverterFactory();
} }
@Override @Override
public <C> C unwrap(Class<C> clazz) { public <C> C unwrap(Class<C> clazz) {
return StreamOptimizeContext.super.unwrap(clazz); return getPlanner().getFlinkContext().unwrap(clazz);
} }
@Override @Override
public FlinkRelBuilder getFlinkRelBuilder() { public FlinkRelBuilder getFlinkRelBuilder() {
return ((PlannerBase) tableEnv.getPlanner()).getRelBuilder(); return getPlanner().getRelBuilder();
} }
@Override @Override
...@@ -186,6 +187,11 @@ public class LineageContext { ...@@ -186,6 +187,11 @@ public class LineageContext {
public MiniBatchInterval getMiniBatchInterval() { public MiniBatchInterval getMiniBatchInterval() {
return MiniBatchInterval.NONE; return MiniBatchInterval.NONE;
} }
private PlannerBase getPlanner() {
return (PlannerBase) tableEnv.getPlanner();
}
}); });
} }
......
dlink-doc/bin/auto.sh
View file @ ce0089f4
#!/bin/bash #!/bin/bash
# 定义变量 # 定义变量
# 要运行的jar包路径，加不加引号都行。 注意：等号两边 不能 有空格，否则会提示command找不到 # 要运行的jar包路径，加不加引号都行。 注意：等号两边不能有空格，否则会提示command找不到
JAR_NAME="./dlink-admin-*.jar" JAR_NAME="dlink-admin"
#java -Djava.ext.dirs=$JAVA_HOME/jre/lib/ext:$JAVA_HOME/jre/lib:./lib -classpath ."/lib/*.jar" -jar dlink-admin-*.jar # 如果需要将 FLINK 依赖直接加入启动脚本，在 CLASS_PATH 中末尾追加 :$FLINK_HOME/lib/*
# 如果需要将FLINK依赖直接加入启动脚本，在SETTING中增加$FLINK_HOME/lib CLASS_PATH="./lib/*:config:html:./plugins/*"
SETTING="-Dloader.path=./lib,./plugins -Ddruid.mysql.usePingMethod=false"
#if [ ! -d ${HADOOP_HOME} ]; then #if [ ! -d ${HADOOP_HOME} ]; then
# echo 'WARNING!!!...not find HADOOP_HOME for CLASSPATH.' # echo 'WARNING!!!...not find HADOOP_HOME for CLASSPATH.'
#else #else
...@@ -57,7 +55,7 @@ start() { ...@@ -57,7 +55,7 @@ start() {
pid=$(cat ${PIDPATH}/${PIDFILE}) pid=$(cat ${PIDPATH}/${PIDFILE})
if [ -z $pid ]; then if [ -z $pid ]; then
nohup java $SETTING -jar -Xms512M -Xmx2048M -XX:PermSize=512M -XX:MaxPermSize=1024M $JAR_NAME >dlink.log 2>&1 & nohup java -Ddruid.mysql.usePingMethod=false -Xms512M -Xmx2048M -XX:PermSize=512M -XX:MaxPermSize=1024M -XX:+HeapDumpOnOutOfMemoryError -Xverify:none -cp ${CLASS_PATH} com.dlink.Dlink >dlink.log 2>&1 &
echo $! >${PIDPATH}/${PIDFILE} echo $! >${PIDPATH}/${PIDFILE}
echo "........................................Start Dlink Successfully........................................" echo "........................................Start Dlink Successfully........................................"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment