Commit Graph

1741 Commits

Author SHA1 Message Date
khadgarmage
7dcd8b26f7
unit test for common utils (#1520)
* httputil osutil encrytiontutil ut
2019-12-19 21:54:37 +08:00
lgcareer
8133015e25 merge backend licence and front license (#1525)
* merge backend licence and front license

* merge backend licence and front license
2019-12-19 17:20:27 +08:00
zhukai
0567b5829c Add the UTs of FuncUtils and JSONUtilsTest. (#1507)
1.Add FuncUtilsTest.java and JSONUtilsTest.java
2.Add null check in FuncUtils.mkString
3.Add pom config
2019-12-19 11:33:08 +08:00
Tboy
67cde18cc3 fix #1515 (#1516) 2019-12-19 11:31:51 +08:00
Yelli
66217be990 Modify Queue already add to User not change bug -- fix #1514 (#1517)
* add Spark Version in Spark Component

add Spark Version in Spark Component

* add license for SparkVersion.class

add license

* 1 add spark task UT
2 add spark version param check

* add assert check for sparkTaskTest

* fix bug:user queue field does not change with queue table modify

* modify check queue in using method name and updateUserByQueue method param name

modify check queue in using method name and updateUserByQueue method param name
2019-12-19 11:29:52 +08:00
break60
8fa8cb559a Solve jertty packing garbled (#1518)
* Password verification and v-for add key

* DAG automatic layout

* combo.js replacement

* combo.js replacement

* webpack upgrade to 4

* packjson has a file name that has not changed

* Solve jertty packing garbled
2019-12-18 23:03:49 +08:00
Tboy
38b0765ddf
Merge branch 'dev' into dev 2019-12-18 20:30:31 +08:00
break60
9b4d0c3a9a combo.js changes and webpack upgrade to 4.X (#1513)
* Password verification and v-for add key

* DAG automatic layout

* combo.js replacement

* combo.js replacement

* webpack upgrade to 4

* packjson has a file name that has not changed
2019-12-18 18:38:32 +08:00
lgcareer
ab09ed4396 merge frontend and backend tar into one binary tar (#1511) 2019-12-18 16:27:34 +08:00
samz406
6de55c3cea Modify common queue TaskQueueZKImplTest.java unit test (#1505)
* misspell  words

* modify common queue TaskQueueZKImplTest.java unit test

* extends  BaseTaskQueueTest get zkServer

* modify zk config
2019-12-18 13:57:47 +08:00
Tboy
0954084344
merge db (#2)
* Add FileUtilsTest.java , the unit test for FileUtils (#1493)

* #839 enhancement : add Spark Task Component can switch Spark Version (#1494)

* add Spark Version in Spark Component

add Spark Version in Spark Component

* add license for SparkVersion.class

add license

* 1 add spark task UT
2 add spark version param check

* add assert check for sparkTaskTest

* fix AbstractTask's handle method exception (#1490)

* fix AbstractTask's handle method exception

* update ut

* add ZkServer for UT (#1499)

* add ZkServer for UT

* Add FileUtilsTest.java , the unit test for FileUtils (#1493) (#1)

* updates for reference ZkServer

* DAG automatic layout (#1497)

* Password verification and v-for add key

* DAG automatic layout

* Add common utils CollectionUtils.java DateUtils.java unit test (#1496)

* dateutil test

* pom.xml

* Update README_zh_CN.md

* Update README.md

* Add ExcelUtilsTest.java , the unit test for ExcelUtils (#1500)

* fix issue:1477 some tasks would be running all the time when db delayed(#1477) (#1501)

* fix issue:1477 some tasks would be running all the time when db delayed

* fix issue:1477 some tasks would be running all the time when db delayed

* fix issue:1477 some tasks would be running all the time when db delayed

* change npm run build:combined to npm burn build:release (#1504)
2019-12-18 10:52:59 +08:00
Tboy
c2f4b65a86
Merge branch 'dev' into dev 2019-12-18 10:52:43 +08:00
dk.technoboy
85b8324ee3 add BaseTaskQueueTest for UT 2019-12-18 10:49:55 +08:00
lgcareer
5404ff2508 change npm run build:combined to npm burn build:release (#1504) 2019-12-18 10:49:13 +08:00
bao liang
21cb38d1dd fix issue:1477 some tasks would be running all the time when db delayed(#1477) (#1501)
* fix issue:1477 some tasks would be running all the time when db delayed

* fix issue:1477 some tasks would be running all the time when db delayed

* fix issue:1477 some tasks would be running all the time when db delayed
2019-12-18 10:10:19 +08:00
zhukai
5f09349987 Add ExcelUtilsTest.java , the unit test for ExcelUtils (#1500) 2019-12-17 22:58:16 +08:00
dailidong
2212b9d217
Update README.md 2019-12-17 22:05:05 +08:00
dailidong
5713114b1a
Update README_zh_CN.md 2019-12-17 22:03:43 +08:00
khadgarmage
039f02a624
Add common utils CollectionUtils.java DateUtils.java unit test (#1496)
* dateutil test

* pom.xml
2019-12-17 19:52:47 +08:00
break60
da1afb7a04 DAG automatic layout (#1497)
* Password verification and v-for add key

* DAG automatic layout
2019-12-17 17:31:25 +08:00
Tboy
93188b7da1 add ZkServer for UT (#1499)
* add ZkServer for UT

* Add FileUtilsTest.java , the unit test for FileUtils (#1493) (#1)

* updates for reference ZkServer
2019-12-17 16:13:07 +08:00
DK.Pino
15d5d66d05 fix AbstractTask's handle method exception (#1490)
* fix AbstractTask's handle method exception

* update ut
2019-12-17 16:12:16 +08:00
Yelli
4d8d74ac18 #839 enhancement : add Spark Task Component can switch Spark Version (#1494)
* add Spark Version in Spark Component

add Spark Version in Spark Component

* add license for SparkVersion.class

add license

* 1 add spark task UT
2 add spark version param check

* add assert check for sparkTaskTest
2019-12-17 11:33:11 +08:00
dk.technoboy
d88c9219e4 updates for reference ZkServer 2019-12-17 11:06:02 +08:00
Tboy
c8f3e2ea41
Add FileUtilsTest.java , the unit test for FileUtils (#1493) (#1) 2019-12-17 10:50:19 +08:00
dk.technoboy
2f3d270469 add ZkServer for UT 2019-12-17 10:46:31 +08:00
zhukai
4cf8458719 Add FileUtilsTest.java , the unit test for FileUtils (#1493) 2019-12-17 10:35:24 +08:00
魔方不在手
81810f55d5 bug:Catching exceptions and printing exception information (#1457)
* fix:When there are multiple nodes, the monitoring center dashboard displays only one node.

* fix:Catching exceptions and printing exception information

* fix:rollback

* fix:getting project name field bug
2019-12-16 19:48:32 +08:00
dailidong
08e056262a
Update README.md (#1491)
update Get Help part
2019-12-16 18:19:00 +08:00
lgcareer
db786c6cfe add license in sql files (#1487) 2019-12-16 14:57:20 +08:00
zhukai
7eeb10f008 Add CheckUtilsTest.java , the unit test for CheckUtils (#1482) 2019-12-16 11:42:10 +08:00
zhukai
cb659ab1af [Feature] Improve user experience in datasource page (#1471)
To improve user experience in datasource page, add default port for each type database.

1. When create or edit datasource, there is a default vaule for port. If user changes type, the default value changes.
2. Use local variables in browser memory, to cache user previous input port for each type. For example :
	     time-a:  MySQL default  port is 3306 , user change 3306 to 4000.
         time-b:  User change type from MySQL to ClickHouse , the port change  from 4000 to 8123.
         time-c:  User change type from ClickHouse back to MySQL,the port change from 8123 to 4000,use previous input cache to fillback.

3. In edit datasource page, when the page first loads, use the query value fillback instead of default value.
2019-12-16 11:03:59 +08:00
zhukai
bc68d9a039 The method checkEmail do not have null check (#1481)
When the email is empty , it wll be nullpointexception.

So i fix it with null check.
2019-12-16 01:10:05 +08:00
khadgarmage
bfa3a36c92
unit test graph (#1479) 2019-12-14 21:54:11 +08:00
elonlo
6ec5f2e3cd Support Mac local development and debugging (#1435)
- compatible with pstree command
- compatible with create user command
- compatible with list user command
2019-12-12 14:20:59 +08:00
DK.Pino
9a3a6f5a3d fix comment error (#1446) 2019-12-12 14:20:27 +08:00
Simon
a1ded5ee04 fix #1441 (#1445) 2019-12-12 14:19:55 +08:00
khadgarmage
b276ece572
Feature ci (#1454)
* ut report
2019-12-12 14:14:38 +08:00
zhukai
0a8b6bcb81 change maxlength from 128 to 256 (#1451) 2019-12-12 14:08:35 +08:00
khadgarmage
1bf6bdd46d
Feature ci (#1453)
* codecov
2019-12-12 01:28:26 +08:00
khadgarmage
97cbdd892c
Feature ci (#1452)
* codecov test
2019-12-12 01:10:12 +08:00
khadgarmage
12fd10316d
Feature ci (#1447)
* codecov
2019-12-12 00:02:46 +08:00
zhukai
5cecc0e618 for bug #1379. (#1439)
Now all datatype use same method ` stmt.setString(index,value);` even DATE and TIMESTAMP.

So i had improved it. If datatype is DATE use `stmt.setDate(index, java.sql.Date.valueOf(value));` , if datatype is TIMESTAMP use `stmt.setTimestamp(index, java.sql.Timestamp.valueOf(value));`.i

When use DATE the param format must use $[yyyy-MM-dd] , When use TIMESTAMP the param format must use $[yyyy-MM-dd hh:mm:ss].
2019-12-11 16:22:21 +08:00
qiaozhanwei
601a1b6615 remove LogViewServiceGrpc.java file and pom modify (#1436) 2019-12-11 16:08:35 +08:00
gaojun2048
fd93b2bbac
fix https://github.com/apache/incubator-dolphinscheduler/issues/1420 (#1443) 2019-12-11 15:04:24 +08:00
break60
446adb2485 Password verification and v-for add key (#1440) 2019-12-11 14:28:23 +08:00
zhukai
44d780d803 JDBC class driver are duplicate define in Constants.java ,such as: (#1430)
public static final String JDBC_POSTGRESQL_CLASS_NAME = "org.postgresql.Driver";

and

public static final String ORG_POSTGRESQL_DRIVER = "org.postgresql.Driver";
There are same effect, We can only use one of them.
2019-12-10 18:20:16 +08:00
Tboy
6e3538a7c5 correct spelling (#1433) 2019-12-10 18:19:37 +08:00
bao liang
a5277827f2 merge dev-db to dev (#1426)
* [dolphinscheduler-1345] [newfeature] Add DB2 Datasource (#1391)

* Fix the problem that the 'queueId' is not present when creating a tenant based on the default queue. (#1409)

* dolphinscheduler-#1403][bug]improve the check rules (#1408)

1. When check failed, we don’t know whitch parameter has is wrong, Because username、password、email and phone were checks together. I refactored the check method ,Now it will return failed msg by each field.
2. The email check regex support [_|\-|\.]?) in createUser.vue, But it do not support in backend server , I fix it, Now they have the same check regex both in frontend and backend

* jcip-annotations define version information and maven-assembly-plugin add groupId (#1413)

* "v-for" add key (#1419)

* [dolphinscheduler-#1397] [bug]Resources can not be previewed or updated  (#1406)

When create an resource the name will add the suffix, But When rename the resource there is no suffix add to the name, So When update resource name without suffix just like "test.sh" => "test" , Then the bug reproduced.

To fix this bug i add the logic bellow:
When rename, if the name without suffix then add it ,else use the origin name

* simply server module configs (#1424)

* move updateTaskState into try/catch block in case of exception

* fix NPE

* using conf.getInt instead of getString

* for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
for AlertDao, correct the spelling.

* duplicate

* refactor getTaskWorkerGroupId

* add friendly log

* update hearbeat thread num = 1

* fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread

* 1. move verifyTaskInstanceIsNull after taskInstance
2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable

* fix the message

* delete before check to avoid KeeperException$NoNodeException

* fix the message

* check processInstance state before delete tenant

* check processInstance state before delete worker group

* refactor

* merge api constants into common constatns

* update the resource perm

* update the dataSource perm

* fix CheckUtils.checkUserParams method

* update AlertGroupService, extends from BaseService, remove duplicate methods

* refactor

* modify method name

* add hasProjectAndPerm method

* using checkProject instead of getResultStatus

* delete checkAuth method, using hasProjectAndPerm instead.

* correct spelling

* add transactional for deleteWorkerGroupById

* add Transactional for deleteProcessInstanceById method

* change sqlSessionTemplate singleton

* change sqlSessionTemplate singleton and reformat code

* fix unsuitable error message

* update shutdownhook methods

* fix worker log bug

* fix api server debug mode bug

* upgrade zk version

* delete this line ,for zkClient.close() will do the whole thing

* fix master server shutdown error

* degrade zk version and add FourLetterWordMain class

* fix PathChildrenCache not close

* add Transactional for createSession method

* add more message for java-doc

* delete App, let spring manage connectionFactory

* add license

* add class Application for test support

* refactor masterServer and workerServer

* add args

* fix the spring transaction not work bug

* remove author

* delete @Bean annotation

* delete master/worker properties

* updates

* rename application.properties to application-dao.properties

* delete this class

* delete master/worker properties and  refactory master/worker

* delete unused imports

* merge

* delete unused config
2019-12-10 11:20:20 +08:00
baoliang
18e2f753eb merge from dev-db 2019-12-05 20:14:23 +08:00