Browse Source
* add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml * .escheduler_env.sh to dolphinscheduler_env.sh * dao yml assembly to conf directory * table name modify * entity title table name modify * logback log name modify * running through the big process * running through the big process error modify * logback log name modify * data_source.properties rename * logback log name modify * install.sh optimization * install.sh optimization * command count modify * command state update * countCommandState sql update * countCommandState sql update * remove application.yml file * master.properties modify * install.sh modify * install.sh modify * api server startup modify * the current user quits and the session is completely emptied. bug fix * remove pom package resources * checkQueueNameExist method update * checkQueueExist * install.sh error output update * signOut error update * ProcessDao is null bug fix * install.sh add mail.user * request url variables replace * process define import bug fix * process define import export bug fix * processdefine import export bug fix * down log suffix format modify * import export process define contains crontab error bug fix * add Flink local mode * ProcessDao is null bug fix * loadAverage display problem bug fix * MasterServer rename Server * rollback .env * rollback .env * MasterServer rename Server * the task is abnormal and task is running bug fix * owners and administrators can delete * dockerfile optimization * dockerfile optimization * dockerfile optimization * remove application-alert.properties * task log print worker log bug fix * remove .escheduler_env.sh * change dockerfile email address * dockerfile dao application.properties and install.sh modify * application.properties modify * application.properties modify * dockerfile startup.sh modify * remove docs * nginx conf modify * dockerfile application.properties modify * dockerfile email address change * the alert module is modified in English. * alert server comment and chinese modify * api server useless code and chinese modify * common，dao，server useless code and chinese modifypull/2/head
qiaozhanwei
5 years ago
committed by
bao liang
22 changed files with 36 additions and 355 deletions
@ -1,29 +0,0 @@
|
||||
/* |
||||
* Licensed to the Apache Software Foundation (ASF) under one or more |
||||
* contributor license agreements. See the NOTICE file distributed with |
||||
* this work for additional information regarding copyright ownership. |
||||
* The ASF licenses this file to You under the Apache License, Version 2.0 |
||||
* (the "License"); you may not use this file except in compliance with |
||||
* the License. You may obtain a copy of the License at |
||||
* |
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
* |
||||
* Unless required by applicable law or agreed to in writing, software |
||||
* distributed under the License is distributed on an "AS IS" BASIS, |
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
* See the License for the specific language governing permissions and |
||||
* limitations under the License. |
||||
*/ |
||||
package org.apache.dolphinscheduler.common.enums; |
||||
|
||||
/** |
||||
* depend strategy |
||||
*/ |
||||
public enum DependStrategy { |
||||
|
||||
/** |
||||
* 0 none，1 all success 2 all failed 3 one success 4 one failed |
||||
*/ |
||||
NONE, ALL_SUCCESS, ALL_FAILED, ONE_SUCCESS, ONE_FAILED |
||||
|
||||
} |
||||
@ -1,29 +0,0 @@
|
||||
/* |
||||
* Licensed to the Apache Software Foundation (ASF) under one or more |
||||
* contributor license agreements. See the NOTICE file distributed with |
||||
* this work for additional information regarding copyright ownership. |
||||
* The ASF licenses this file to You under the Apache License, Version 2.0 |
||||
* (the "License"); you may not use this file except in compliance with |
||||
* the License. You may obtain a copy of the License at |
||||
* |
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
* |
||||
* Unless required by applicable law or agreed to in writing, software |
||||
* distributed under the License is distributed on an "AS IS" BASIS, |
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
* See the License for the specific language governing permissions and |
||||
* limitations under the License. |
||||
*/ |
||||
package org.apache.dolphinscheduler.common.enums; |
||||
|
||||
/** |
||||
* self depency strategy |
||||
*/ |
||||
public enum SelfDependStrategy { |
||||
|
||||
/** |
||||
* 0 donot depend the last cycle; |
||||
* 1 depend the last cycle |
||||
**/ |
||||
NO_DEP_PRE, DEP_PRE |
||||
} |
||||
@ -1,29 +0,0 @@
|
||||
/* |
||||
* Licensed to the Apache Software Foundation (ASF) under one or more |
||||
* contributor license agreements. See the NOTICE file distributed with |
||||
* this work for additional information regarding copyright ownership. |
||||
* The ASF licenses this file to You under the Apache License, Version 2.0 |
||||
* (the "License"); you may not use this file except in compliance with |
||||
* the License. You may obtain a copy of the License at |
||||
* |
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
* |
||||
* Unless required by applicable law or agreed to in writing, software |
||||
* distributed under the License is distributed on an "AS IS" BASIS, |
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
* See the License for the specific language governing permissions and |
||||
* limitations under the License. |
||||
*/ |
||||
package org.apache.dolphinscheduler.common.enums; |
||||
|
||||
/** |
||||
* cycle enums |
||||
*/ |
||||
public enum ServerEnum { |
||||
|
||||
/** |
||||
* master server , worker server |
||||
*/ |
||||
MASTER_SERVER,WORKER_SERVER |
||||
|
||||
} |
||||
@ -1,37 +0,0 @@
|
||||
/* |
||||
* Licensed to the Apache Software Foundation (ASF) under one or more |
||||
* contributor license agreements. See the NOTICE file distributed with |
||||
* this work for additional information regarding copyright ownership. |
||||
* The ASF licenses this file to You under the Apache License, Version 2.0 |
||||
* (the "License"); you may not use this file except in compliance with |
||||
* the License. You may obtain a copy of the License at |
||||
* |
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
* |
||||
* Unless required by applicable law or agreed to in writing, software |
||||
* distributed under the License is distributed on an "AS IS" BASIS, |
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
* See the License for the specific language governing permissions and |
||||
* limitations under the License. |
||||
*/ |
||||
package org.apache.dolphinscheduler.common.utils; |
||||
|
||||
/** |
||||
* enum field util |
||||
*/ |
||||
public class EnumFieldUtil { |
||||
/** |
||||
* Generate a string for the enums field |
||||
* |
||||
* @param field |
||||
* @param enumClass |
||||
* @return |
||||
*/ |
||||
public static String genFieldStr(String field, Class<?> enumClass) { |
||||
//TODO...
|
||||
// delete this class when mybatisplus is ok
|
||||
return ""; |
||||
// return "#{" + field + ",javaType=" + enumClass.getName() + ",typeHandler=" + EnumOrdinalTypeHandler.class.getName() + "}";
|
||||
} |
||||
|
||||
} |
||||
@ -1,62 +0,0 @@
|
||||
/* |
||||
* Licensed to the Apache Software Foundation (ASF) under one or more |
||||
* contributor license agreements. See the NOTICE file distributed with |
||||
* this work for additional information regarding copyright ownership. |
||||
* The ASF licenses this file to You under the Apache License, Version 2.0 |
||||
* (the "License"); you may not use this file except in compliance with |
||||
* the License. You may obtain a copy of the License at |
||||
* |
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
* |
||||
* Unless required by applicable law or agreed to in writing, software |
||||
* distributed under the License is distributed on an "AS IS" BASIS, |
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
* See the License for the specific language governing permissions and |
||||
* limitations under the License. |
||||
*/ |
||||
package org.apache.dolphinscheduler.dao.entity; |
||||
|
||||
import org.apache.dolphinscheduler.common.enums.SelfDependStrategy; |
||||
|
||||
/** |
||||
* dependency |
||||
*/ |
||||
public class Dependency { |
||||
|
||||
/** |
||||
* self depend strategy |
||||
*/ |
||||
private SelfDependStrategy self; |
||||
|
||||
/** |
||||
* outer dependency string |
||||
*/ |
||||
private String outer; |
||||
|
||||
|
||||
public Dependency(){} |
||||
|
||||
public Dependency(String outer, SelfDependStrategy self){ |
||||
|
||||
this.outer = outer; |
||||
this.self = self; |
||||
|
||||
} |
||||
|
||||
|
||||
public SelfDependStrategy getSelf() { |
||||
return self; |
||||
} |
||||
|
||||
public void setSelf(SelfDependStrategy self) { |
||||
this.self = self; |
||||
} |
||||
|
||||
public String getOuter() { |
||||
return outer; |
||||
} |
||||
|
||||
public void setOuter(String outer) { |
||||
this.outer = outer; |
||||
} |
||||
} |
||||
@ -1,49 +0,0 @@
|
||||
/* |
||||
* Licensed to the Apache Software Foundation (ASF) under one or more |
||||
* contributor license agreements. See the NOTICE file distributed with |
||||
* this work for additional information regarding copyright ownership. |
||||
* The ASF licenses this file to You under the Apache License, Version 2.0 |
||||
* (the "License"); you may not use this file except in compliance with |
||||
* the License. You may obtain a copy of the License at |
||||
* |
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
* |
||||
* Unless required by applicable law or agreed to in writing, software |
||||
* distributed under the License is distributed on an "AS IS" BASIS, |
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
* See the License for the specific language governing permissions and |
||||
* limitations under the License. |
||||
*/ |
||||
package org.apache.dolphinscheduler.server.zk; |
||||
|
||||
import org.junit.Assert; |
||||
import org.junit.Test; |
||||
|
||||
import java.util.Arrays; |
||||
import java.util.List; |
||||
|
||||
/** |
||||
* |
||||
*/ |
||||
public class ZKWorkerClientTest { |
||||
|
||||
@Test |
||||
public void getZKWorkerClient() throws Exception { |
||||
|
||||
|
||||
// ZKWorkerClient zkWorkerClient = ZKWorkerClient.getZKWorkerClient();
|
||||
// zkWorkerClient.removeDeadServerByHost("127.0.0.1", Constants.WORKER_PREFIX);
|
||||
|
||||
|
||||
} |
||||
|
||||
@Test |
||||
public void test(){ |
||||
String ips = ""; |
||||
|
||||
List<String> ipList = Arrays.asList(ips.split(",")); |
||||
|
||||
|
||||
Assert.assertEquals(1, ipList.size()); |
||||
} |
||||
} |
||||
Loading…
Reference in new issue