Skip to content
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.

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

[feat][all]All rename to 'chunjun' #825

Merged
merged 1 commit into from
May 19, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/--ask-a-question.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ Before asking a question, make sure you have:

- Searched existing Stack Overflow questions.
- Googled your question.
- Searched open and closed [GitHub issues](https://github.com/DTStack/flinkx/issues)
- Searched open and closed [GitHub issues](https://github.com/DTStack/chunjun/issues)
- Read the documentation:
- [flinkx Doc](https://github.com/DTStack/flinkx/tree/1.10_release/docs)
- [start-chunjun Doc](https://github.com/DTStack/chunjun/tree/1.10_release/docs)

-->
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/--development-task.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
name: "\U0001F680Development Task"
about: As a flinkx developer, I want to record a development task.
about: As a chunjun developer, I want to record a development task.
title: ''
labels: enhancement
assignees: ''
Expand Down
53 changes: 41 additions & 12 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,16 +1,45 @@
# Created by .ignore support plugin (hsz.mobi)
# Compiled class file
*.class

# Log file
*.log

# BlueJ files
*.ctxt

# Mobile Tools for Java (J2ME)
.mtj.tmp/

# Package Files #
*.jar
*.war
*.nar
*.ear
*.zip
*.tar.gz
*.rar

# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
replay_pid*

# build targets
target/

# Intellij Idea files
.idea/
plugins/
syncplugins/
*.iml
target/

# mac system
.DS_Store

lib/
jobs/

# out log.
nohup.out
flinkconf/
hadoopconf/
/default_task_id_output
/syncplugins
flinkxplugins
flinkx-dist/
flinkx-test/

# auth
*.keytab

# chunjun plugins
chunjun-dist/
11 changes: 0 additions & 11 deletions .gitlab-ci.yml

This file was deleted.

8 changes: 4 additions & 4 deletions bin/flinkx → bin/start-chunjun
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

set -e

export FLINKX_HOME="$(cd "`dirname "$0"`"/..; pwd)"
export CHUNJUN_HOME="$(cd "`dirname "$0"`"/..; pwd)"

# Find the java binary
if [ -n "${JAVA_HOME}" ]; then
Expand All @@ -33,8 +33,8 @@ else
fi
fi

JAR_DIR=$FLINKX_HOME/lib/*
CLASS_NAME=com.dtstack.flinkx.client.Launcher
JAR_DIR=$CHUNJUN_HOME/lib/*
CLASS_NAME=com.dtstack.chunjun.client.Launcher

echo "flinkx starting ..."
echo "ChunJun starting ..."
nohup $JAVA_RUN -cp $JAR_DIR $CLASS_NAME $@ &
2 changes: 1 addition & 1 deletion build/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

find_build=`find build -type f -maxdepth 2`
if [[ $find_build == "" ]] ; then
echo "You have to call the script from the flinkx/ dir"
echo "You have to call the script from the chunjun/ dir"
exit 1
fi

Expand Down
File renamed without changes.
12 changes: 6 additions & 6 deletions flinkx-clients/pom.xml → chunjun-clients/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>flinkx-parent</artifactId>
<groupId>com.dtstack.flinkx</groupId>
<artifactId>chunjun</artifactId>
<groupId>com.dtstack.chunjun</groupId>
<version>1.12-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>flinkx-clients</artifactId>
<name>FlinkX : Clients</name>
<artifactId>chunjun-clients</artifactId>
<name>ChunJun : Clients</name>

<dependencies>

Expand All @@ -21,8 +21,8 @@
</dependency>

<dependency>
<groupId>com.dtstack.flinkx</groupId>
<artifactId>flinkx-core</artifactId>
<groupId>com.dtstack.chunjun</groupId>
<artifactId>chunjun-core</artifactId>
<version>${project.version}</version>
</dependency>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.dtstack.flinkx.client;
package com.dtstack.chunjun.client;

import org.apache.flink.client.program.ClusterClient;

/**
* @program: flinkx
* @program chunjun
* @author: xiuzhu
* @create: 2021/05/31
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.dtstack.flinkx.client;
package com.dtstack.chunjun.client;

import com.dtstack.flinkx.options.Options;
import com.dtstack.flinkx.util.MapUtil;
import com.dtstack.chunjun.options.Options;
import com.dtstack.chunjun.util.MapUtil;

import org.apache.flink.configuration.Configuration;

Expand All @@ -29,7 +29,7 @@
import java.util.Properties;

/**
* @program: flinkx
* @program: Chunjun
* @author: xiuzhu
* @create: 2021/05/31
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,19 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.dtstack.flinkx.client;

import com.dtstack.flinkx.classloader.ClassLoaderManager;
import com.dtstack.flinkx.client.kubernetes.KubernetesApplicationClusterClientHelper;
import com.dtstack.flinkx.client.kubernetes.KubernetesSessionClusterClientHelper;
import com.dtstack.flinkx.client.local.LocalClusterClientHelper;
import com.dtstack.flinkx.client.standalone.StandaloneClusterClientHelper;
import com.dtstack.flinkx.client.yarn.YarnPerJobClusterClientHelper;
import com.dtstack.flinkx.client.yarn.YarnSessionClusterClientHelper;
import com.dtstack.flinkx.enums.ClusterMode;
import com.dtstack.flinkx.options.OptionParser;
import com.dtstack.flinkx.options.Options;
import com.dtstack.flinkx.util.ExecuteProcessHelper;
package com.dtstack.chunjun.client;

import com.dtstack.chunjun.classloader.ClassLoaderManager;
import com.dtstack.chunjun.client.kubernetes.KubernetesApplicationClusterClientHelper;
import com.dtstack.chunjun.client.kubernetes.KubernetesSessionClusterClientHelper;
import com.dtstack.chunjun.client.local.LocalClusterClientHelper;
import com.dtstack.chunjun.client.standalone.StandaloneClusterClientHelper;
import com.dtstack.chunjun.client.yarn.YarnPerJobClusterClientHelper;
import com.dtstack.chunjun.client.yarn.YarnSessionClusterClientHelper;
import com.dtstack.chunjun.enums.ClusterMode;
import com.dtstack.chunjun.options.OptionParser;
import com.dtstack.chunjun.options.Options;
import com.dtstack.chunjun.util.ExecuteProcessHelper;

import org.apache.flink.client.deployment.ClusterDeploymentException;
import org.apache.flink.configuration.ConfigConstants;
Expand All @@ -43,7 +43,7 @@
import java.util.List;

/**
* FlinkX commandline Launcher
* Chunjun commandline Launcher
*
* <p>Company: www.dtstack.com
*
Expand All @@ -52,11 +52,11 @@
public class Launcher {
private static final Logger LOG = LoggerFactory.getLogger(Launcher.class);

public static final String KEY_FLINKX_HOME = "FLINKX_HOME";
public static final String KEY_CHUNJUN_HOME = "CHUNJUN_HOME";
public static final String KEY_FLINK_HOME = "FLINK_HOME";
public static final String KEY_HADOOP_HOME = "HADOOP_HOME";

public static final String PLUGINS_DIR_NAME = "flinkx-dist";
public static final String PLUGINS_DIR_NAME = "chunjun-dist";

public static void main(String[] args) throws Exception {
OptionParser optionParser = new OptionParser(args);
Expand Down Expand Up @@ -121,7 +121,7 @@ public static void main(String[] args) throws Exception {

private static void findDefaultConfigDir(Options launcherOptions)
throws ClusterDeploymentException {
findDefaultFlinkxDistDir(launcherOptions);
findDefaultChunJunDistDir(launcherOptions);

if (ClusterMode.local.name().equalsIgnoreCase(launcherOptions.getMode())) {
return;
Expand Down Expand Up @@ -166,24 +166,24 @@ private static void findDefaultFlinkConf(Options launcherOptions) {
}
}

private static void findDefaultFlinkxDistDir(Options launcherOptions)
private static void findDefaultChunJunDistDir(Options launcherOptions)
throws ClusterDeploymentException {
String distDir = launcherOptions.getFlinkxDistDir();
String distDir = launcherOptions.getChunjunDistDir();
if (StringUtils.isEmpty(distDir)) {
String flinkxHome = getSystemProperty(KEY_FLINKX_HOME);
if (StringUtils.isNotEmpty(flinkxHome)) {
flinkxHome = flinkxHome.trim();
if (flinkxHome.endsWith(File.separator)) {
distDir = flinkxHome + PLUGINS_DIR_NAME;
String chunjunHome = getSystemProperty(KEY_CHUNJUN_HOME);
if (StringUtils.isNotEmpty(chunjunHome)) {
chunjunHome = chunjunHome.trim();
if (chunjunHome.endsWith(File.separator)) {
distDir = chunjunHome + PLUGINS_DIR_NAME;
} else {
distDir = flinkxHome + File.separator + PLUGINS_DIR_NAME;
distDir = chunjunHome + File.separator + PLUGINS_DIR_NAME;
}

launcherOptions.setFlinkxDistDir(distDir);
launcherOptions.setChunjunDistDir(distDir);
}
}
if (StringUtils.isEmpty(distDir)) {
notConfiguredException(KEY_FLINKX_HOME);
notConfiguredException(KEY_CHUNJUN_HOME);
}
System.setProperty(ConfigConstants.ENV_FLINK_PLUGINS_DIR, distDir);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.dtstack.flinkx.client.constants;
package com.dtstack.chunjun.client.constants;

/**
* @program: flinkx
* @program: ChunJun
* @author: xiuzhu
* @create: 2021/06/13
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.dtstack.flinkx.client.kubernetes;
package com.dtstack.chunjun.client.kubernetes;

import com.dtstack.flinkx.client.ClusterClientHelper;
import com.dtstack.flinkx.client.JobDeployer;
import com.dtstack.flinkx.client.constants.ConfigConstant;
import com.dtstack.flinkx.client.util.PluginInfoUtil;
import com.dtstack.flinkx.options.Options;
import com.dtstack.chunjun.client.ClusterClientHelper;
import com.dtstack.chunjun.client.JobDeployer;
import com.dtstack.chunjun.client.constants.ConfigConstant;
import com.dtstack.chunjun.client.util.PluginInfoUtil;
import com.dtstack.chunjun.options.Options;

import org.apache.flink.client.deployment.ClusterSpecification;
import org.apache.flink.client.deployment.application.ApplicationConfiguration;
Expand Down Expand Up @@ -55,7 +55,7 @@
import static org.apache.flink.util.Preconditions.checkNotNull;

/**
* @program: flinkx
* @program: ChunJun
* @author: xiuzhu
* @create: 2021/05/31
*/
Expand Down Expand Up @@ -155,10 +155,10 @@ private void setDeployerConfig(Configuration configuration, Options launcherOpti
throws FileNotFoundException {
configuration.set(DeploymentOptionsInternal.CONF_DIR, launcherOptions.getFlinkConfDir());

String coreJarFileName = PluginInfoUtil.getCoreJarName(launcherOptions.getFlinkxDistDir());
String coreJarFileName = PluginInfoUtil.getCoreJarName(launcherOptions.getChunjunDistDir());
String remoteCoreJarPath =
"local://"
+ launcherOptions.getRemoteFlinkxDistDir()
+ launcherOptions.getRemoteChunJunDistDir()
+ File.separator
+ coreJarFileName;
configuration.set(PipelineOptions.JARS, Collections.singletonList(remoteCoreJarPath));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.dtstack.flinkx.client.kubernetes;
package com.dtstack.chunjun.client.kubernetes;

import com.dtstack.flinkx.client.ClusterClientHelper;
import com.dtstack.flinkx.client.JobDeployer;
import com.dtstack.flinkx.client.util.JobGraphUtil;
import com.dtstack.flinkx.options.Options;
import com.dtstack.chunjun.client.ClusterClientHelper;
import com.dtstack.chunjun.client.JobDeployer;
import com.dtstack.chunjun.client.util.JobGraphUtil;
import com.dtstack.chunjun.options.Options;

import org.apache.flink.api.common.JobID;
import org.apache.flink.client.program.ClusterClient;
Expand All @@ -39,7 +39,7 @@
import java.util.List;

/**
* @program: flinkx
* @program: ChunJun
* @author: xiuzhu
* @create: 2021/05/31
*/
Expand All @@ -61,7 +61,7 @@ public ClusterClient submit(JobDeployer jobDeployer) throws Exception {
}

FlinkKubeClient flinkKubeClient =
FlinkKubeClientFactory.getInstance().fromConfiguration(configuration, "flinkx");
FlinkKubeClientFactory.getInstance().fromConfiguration(configuration, "ChunJun");
try (KubernetesClusterDescriptor descriptor =
new KubernetesClusterDescriptor(configuration, flinkKubeClient); ) {
ClusterClientProvider<String> retrieve = descriptor.retrieve(clusterId);
Expand Down
Loading