Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
D
dataease
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
zhu
dataease
Commits
1fa8fae2
提交
1fa8fae2
authored
3月 22, 2022
作者:
taojinlong
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
feat: 支持集群(doris)
上级
301b5155
隐藏空白字符变更
内嵌
并排
正在显示
11 个修改的文件
包含
55 行增加
和
30 行删除
+55
-30
DorisConfiguration.java
...n/java/io/dataease/dto/datasource/DorisConfiguration.java
+3
-0
DDLProvider.java
backend/src/main/java/io/dataease/provider/DDLProvider.java
+2
-1
DDLProviderImpl.java
...d/src/main/java/io/dataease/provider/DDLProviderImpl.java
+2
-1
DorisDDLProvider.java
...a/io/dataease/provider/engine/doris/DorisDDLProvider.java
+12
-4
MysqlDDLProvider.java
...a/io/dataease/provider/engine/mysql/MysqlDDLProvider.java
+2
-1
ExtractDataService.java
.../java/io/dataease/service/dataset/ExtractDataService.java
+1
-1
DatasourceService.java
...ava/io/dataease/service/datasource/DatasourceService.java
+5
-0
EngineService.java
...c/main/java/io/dataease/service/engine/EngineService.java
+17
-20
zh.js
frontend/src/lang/zh.js
+5
-0
SimpleModeSetting.vue
frontend/src/views/system/SysParam/SimpleModeSetting.vue
+0
-1
index.vue
frontend/src/views/system/SysParam/index.vue
+6
-1
没有找到文件。
backend/src/main/java/io/dataease/dto/datasource/DorisConfiguration.java
浏览文件 @
1fa8fae2
...
...
@@ -8,4 +8,7 @@ import lombok.Setter;
public
class
DorisConfiguration
extends
MysqlConfiguration
{
private
Integer
httpPort
;
private
Integer
replicationNum
=
1
;
private
Integer
bucketNum
=
10
;
}
backend/src/main/java/io/dataease/provider/DDLProvider.java
浏览文件 @
1fa8fae2
package
io
.
dataease
.
provider
;
import
io.dataease.base.domain.DatasetTableField
;
import
io.dataease.base.domain.Datasource
;
import
java.util.List
;
...
...
@@ -17,7 +18,7 @@ public abstract class DDLProvider {
public
abstract
String
replaceTable
(
String
name
);
public
abstract
String
createTableSql
(
String
name
,
List
<
DatasetTableField
>
datasetTableFields
);
public
abstract
String
createTableSql
(
String
name
,
List
<
DatasetTableField
>
datasetTableFields
,
Datasource
engine
);
public
abstract
String
insertSql
(
String
name
,
List
<
String
[]>
dataList
,
int
page
,
int
pageNumber
);
}
backend/src/main/java/io/dataease/provider/DDLProviderImpl.java
浏览文件 @
1fa8fae2
package
io
.
dataease
.
provider
;
import
io.dataease.base.domain.DatasetTableField
;
import
io.dataease.base.domain.Datasource
;
import
io.dataease.commons.utils.Md5Utils
;
import
java.util.Arrays
;
...
...
@@ -28,7 +29,7 @@ public class DDLProviderImpl extends DDLProvider {
}
@Override
public
String
createTableSql
(
String
name
,
List
<
DatasetTableField
>
datasetTableFields
)
{
public
String
createTableSql
(
String
name
,
List
<
DatasetTableField
>
datasetTableFields
,
Datasource
engine
)
{
return
null
;
}
...
...
backend/src/main/java/io/dataease/provider/engine/doris/DorisDDLProvider.java
浏览文件 @
1fa8fae2
package
io
.
dataease
.
provider
.
engine
.
doris
;
import
com.google.gson.Gson
;
import
io.dataease.base.domain.DatasetTableField
;
import
io.dataease.base.domain.Datasource
;
import
io.dataease.commons.utils.TableUtils
;
import
io.dataease.dto.datasource.DorisConfiguration
;
import
io.dataease.dto.datasource.JdbcConfiguration
;
import
io.dataease.dto.datasource.MysqlConfiguration
;
import
io.dataease.provider.DDLProviderImpl
;
import
org.springframework.stereotype.Service
;
...
...
@@ -16,8 +21,8 @@ public class DorisDDLProvider extends DDLProviderImpl {
private
static
final
String
creatTableSql
=
"CREATE TABLE IF NOT EXISTS `TABLE_NAME`"
+
"Column_Fields"
+
"UNIQUE KEY(dataease_uuid)\n"
+
"DISTRIBUTED BY HASH(dataease_uuid) BUCKETS
10
\n"
+
"PROPERTIES(\"replication_num\" = \"
1
\");"
;
"DISTRIBUTED BY HASH(dataease_uuid) BUCKETS
BUCKETS_NUM
\n"
+
"PROPERTIES(\"replication_num\" = \"
ReplicationNum
\");"
;
@Override
public
String
createView
(
String
name
,
String
viewSQL
)
{
...
...
@@ -41,9 +46,12 @@ public class DorisDDLProvider extends DDLProviderImpl {
}
@Override
public
String
createTableSql
(
String
tableName
,
List
<
DatasetTableField
>
datasetTableFields
)
{
public
String
createTableSql
(
String
tableName
,
List
<
DatasetTableField
>
datasetTableFields
,
Datasource
engine
)
{
DorisConfiguration
dorisConfiguration
=
new
Gson
().
fromJson
(
engine
.
getConfiguration
(),
DorisConfiguration
.
class
);
String
dorisTableColumnSql
=
createDorisTableColumnSql
(
datasetTableFields
);
return
creatTableSql
.
replace
(
"TABLE_NAME"
,
tableName
).
replace
(
"Column_Fields"
,
dorisTableColumnSql
);
return
creatTableSql
.
replace
(
"TABLE_NAME"
,
tableName
).
replace
(
"Column_Fields"
,
dorisTableColumnSql
)
.
replace
(
"BUCKETS_NUM"
,
dorisConfiguration
.
getBucketNum
().
toString
())
.
replace
(
"ReplicationNum"
,
dorisConfiguration
.
getReplicationNum
().
toString
());
}
private
String
createDorisTableColumnSql
(
final
List
<
DatasetTableField
>
datasetTableFields
)
{
...
...
backend/src/main/java/io/dataease/provider/engine/mysql/MysqlDDLProvider.java
浏览文件 @
1fa8fae2
package
io
.
dataease
.
provider
.
engine
.
mysql
;
import
io.dataease.base.domain.DatasetTableField
;
import
io.dataease.base.domain.Datasource
;
import
io.dataease.commons.utils.TableUtils
;
import
io.dataease.provider.DDLProviderImpl
;
import
org.springframework.stereotype.Service
;
...
...
@@ -43,7 +44,7 @@ public class MysqlDDLProvider extends DDLProviderImpl {
}
@Override
public
String
createTableSql
(
String
tableName
,
List
<
DatasetTableField
>
datasetTableFields
)
{
public
String
createTableSql
(
String
tableName
,
List
<
DatasetTableField
>
datasetTableFields
,
Datasource
engine
)
{
String
dorisTableColumnSql
=
createDorisTableColumnSql
(
datasetTableFields
);
return
creatTableSql
.
replace
(
"TABLE_NAME"
,
tableName
).
replace
(
"Column_Fields"
,
dorisTableColumnSql
);
}
...
...
backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
浏览文件 @
1fa8fae2
...
...
@@ -605,7 +605,7 @@ public class ExtractDataService {
DatasourceRequest
datasourceRequest
=
new
DatasourceRequest
();
datasourceRequest
.
setDatasource
(
engine
);
DDLProvider
ddlProvider
=
ProviderFactory
.
getDDLProvider
(
engine
.
getType
());
datasourceRequest
.
setQuery
(
ddlProvider
.
createTableSql
(
tableName
,
datasetTableFields
));
datasourceRequest
.
setQuery
(
ddlProvider
.
createTableSql
(
tableName
,
datasetTableFields
,
engine
));
jdbcProvider
.
exec
(
datasourceRequest
);
}
...
...
backend/src/main/java/io/dataease/service/datasource/DatasourceService.java
浏览文件 @
1fa8fae2
...
...
@@ -59,6 +59,11 @@ public class DatasourceService {
@DeCleaner
(
DePermissionType
.
DATASOURCE
)
public
Datasource
addDatasource
(
Datasource
datasource
)
throws
Exception
{
try
{
DatasourceTypes
datasourceType
=
DatasourceTypes
.
valueOf
(
datasource
.
getType
());
}
catch
(
Exception
e
){
throw
e
;
}
checkName
(
datasource
);
long
currentTimeMillis
=
System
.
currentTimeMillis
();
datasource
.
setId
(
UUID
.
randomUUID
().
toString
());
...
...
backend/src/main/java/io/dataease/service/engine/EngineService.java
浏览文件 @
1fa8fae2
...
...
@@ -9,6 +9,7 @@ import io.dataease.commons.utils.BeanUtils;
import
io.dataease.controller.ResultHolder
;
import
io.dataease.controller.request.datasource.DatasourceRequest
;
import
io.dataease.dto.DatasourceDTO
;
import
io.dataease.listener.util.CacheUtils
;
import
io.dataease.provider.ProviderFactory
;
import
io.dataease.provider.datasource.DatasourceProvider
;
import
io.dataease.service.datasource.DatasourceService
;
...
...
@@ -31,8 +32,6 @@ public class EngineService {
private
DeEngineMapper
deEngineMapper
;
@Resource
private
DatasourceService
datasource
;
static
private
Datasource
ds
=
null
;
public
Boolean
isLocalMode
(){
return
env
.
getProperty
(
"engine_mode"
,
"local"
).
equalsIgnoreCase
(
"local"
);
...
...
@@ -51,7 +50,13 @@ public class EngineService {
}
public
DeEngine
info
(){
List
<
DeEngine
>
deEngines
=
deEngineMapper
.
selectByExampleWithBLOBs
(
new
DeEngineExample
());
DeEngineExample
deEngineExample
=
new
DeEngineExample
();
if
(
isClusterMode
()){
deEngineExample
.
createCriteria
().
andTypeEqualTo
(
"engine_doris"
);
}
else
{
deEngineExample
.
createCriteria
().
andTypeEqualTo
(
"engine_mysql"
);
}
List
<
DeEngine
>
deEngines
=
deEngineMapper
.
selectByExampleWithBLOBs
(
deEngineExample
);
if
(
CollectionUtils
.
isEmpty
(
deEngines
)){
return
new
DeEngine
();
}
...
...
@@ -69,7 +74,7 @@ public class EngineService {
datasourceProvider
.
checkStatus
(
datasourceRequest
);
return
ResultHolder
.
success
(
datasource
);
}
catch
(
Exception
e
){
return
ResultHolder
.
error
(
"
Datasourc
e is invalid: "
+
e
.
getMessage
());
return
ResultHolder
.
error
(
"
Engin
e is invalid: "
+
e
.
getMessage
());
}
}
...
...
@@ -79,26 +84,23 @@ public class EngineService {
deEngineMapper
.
insert
(
engine
);
}
else
{
deEngineMapper
.
updateByPrimaryKeyWithBLOBs
(
engine
);
datasource
.
handleConnectionPool
(
getDeEngine
(),
"delete"
);
}
datasource
.
handleConnectionPool
(
this
.
ds
,
"delete"
);
setDs
(
engine
);
datasource
.
handleConnectionPool
(
this
.
ds
,
"add"
);
datasource
.
handleConnectionPool
(
getDeEngine
()
,
"add"
);
return
ResultHolder
.
success
(
engine
);
}
private
void
setDs
(
DeEngine
engine
){
if
(
this
.
ds
==
null
){
this
.
ds
=
new
Datasource
();
BeanUtils
.
copyBean
(
this
.
ds
,
engine
);
}
else
{
BeanUtils
.
copyBean
(
this
.
ds
,
engine
);
}
CacheUtils
.
put
(
"ENGINE"
,
"engine"
,
engine
,
null
,
null
);
}
public
Datasource
getDeEngine
()
throws
Exception
{
if
(
this
.
ds
!=
null
)
{
return
this
.
ds
;
Object
catcheEngine
=
CacheUtils
.
get
(
"ENGINE"
,
"engine"
);
if
(
catcheEngine
!=
null
){
return
(
Datasource
)
catcheEngine
;
}
if
(
isLocalMode
()){
JSONObject
jsonObject
=
new
JSONObject
();
jsonObject
.
put
(
"dataSourceType"
,
"jdbc"
);
...
...
@@ -123,12 +125,7 @@ public class EngineService {
}
setDs
(
deEngines
.
get
(
0
));
}
// if(isSimpleMode()){
//
// }
//TODO cluster mode
return
this
.
ds
;
return
getDeEngine
();
}
...
...
frontend/src/lang/zh.js
浏览文件 @
1fa8fae2
...
...
@@ -1301,6 +1301,7 @@ export default {
user_name
:
'用户名'
,
password
:
'密码'
,
host
:
'主机名/IP地址'
,
doris_host
:
'Doris 地址'
,
port
:
'端口'
,
datasource_url
:
'地址'
,
please_input_datasource_url
:
'请输入 Elasticsearch 地址,如: http://es_host:es_port'
,
...
...
@@ -1332,6 +1333,10 @@ export default {
initial_pool_size
:
'初始连接数'
,
min_pool_size
:
'最小连接数'
,
max_pool_size
:
'最大连接数'
,
bucket_num
:
'Bucket 数量'
,
replication_num
:
'副本数量'
,
please_input_bucket_num
:
'请输入 Bucket 数量'
,
please_input_replication_num
:
'请输入副本数量'
,
max_idle_time
:
'最大空闲(秒)'
,
acquire_increment
:
'增长数'
,
connect_timeout
:
'连接超时(秒)'
,
...
...
frontend/src/views/system/SysParam/SimpleModeSetting.vue
浏览文件 @
1fa8fae2
<
template
>
<div>
<!--邮件表单-->
<el-form
ref=
"form"
v-loading=
"loading"
:model=
"form"
:rules=
"rules"
...
...
frontend/src/views/system/SysParam/index.vue
浏览文件 @
1fa8fae2
...
...
@@ -30,6 +30,10 @@
<simple-mode
/>
</el-tab-pane>
<el-tab-pane
v-if=
"engineMode==='cluster'"
:lazy=
"true"
:label=
"$t('system_parameter_setting.engine_mode_setting')"
name=
"six"
>
<cluster-mode
/>
</el-tab-pane>
</el-tabs>
</layout-content>
</
template
>
...
...
@@ -37,13 +41,14 @@
import
BasicSetting
from
'./BasicSetting'
import
EmailSetting
from
'./EmailSetting'
import
SimpleMode
from
'./SimpleModeSetting'
import
ClusterMode
from
'./ClusterModeSetting'
import
LayoutContent
from
'@/components/business/LayoutContent'
import
PluginCom
from
'@/views/system/plugin/PluginCom'
import
{
pluginLoaded
}
from
'@/api/user'
import
{
engineMode
}
from
'@/api/system/engine'
export
default
{
components
:
{
BasicSetting
,
EmailSetting
,
LayoutContent
,
PluginCom
,
SimpleMode
},
components
:
{
BasicSetting
,
EmailSetting
,
LayoutContent
,
PluginCom
,
SimpleMode
,
ClusterMode
},
data
()
{
return
{
activeName
:
'zero'
,
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论