Skip to content

Commit 30eba29

Browse files
meta-dmeta-d
authored
Merge pull request #35 from meta-d/develop
Develop
2 parents dc33680 + fe764a4 commit 30eba29

File tree

19 files changed

+123
-117
lines changed

19 files changed

+123
-117
lines changed

‎.deploy/api/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "ocap-server",
33
"author": "Metad",
4-
"version": "2.4.2",
4+
"version": "2.4.3",
55
"scripts": {
66
"start": "nx serve",
77
"build": "nx build",

‎.deploy/k8s/ali-manifest.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ spec:
9696
spec:
9797
containers:
9898
- name: metad-prod-api
99-
image: registry.cn-hangzhou.aliyuncs.com/metad/ocap-api:2.4.1
99+
image: registry.cn-hangzhou.aliyuncs.com/metad/ocap-api:2.4.2
100100
# imagePullPolicy: Always
101101
envFrom:
102102
- secretRef:
@@ -233,7 +233,7 @@ spec:
233233
spec:
234234
containers:
235235
- name: metad-prod-webapp
236-
image: registry.cn-hangzhou.aliyuncs.com/metad/ocap-webapp:2.4.1
236+
image: registry.cn-hangzhou.aliyuncs.com/metad/ocap-webapp:2.4.2
237237
# imagePullPolicy: Always
238238
ports:
239239
- containerPort: 80
@@ -281,7 +281,7 @@ spec:
281281
spec:
282282
containers:
283283
- name: metad-prod-olap
284-
image: registry.cn-hangzhou.aliyuncs.com/metad/ocap-olap:2.4.1
284+
image: registry.cn-hangzhou.aliyuncs.com/metad/ocap-olap:2.4.2
285285
ports:
286286
- containerPort: 8080
287287
protocol: TCP

‎.deploy/webapp/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ocap",
3-
"version": "2.4.2",
3+
"version": "2.4.3",
44
"description": "",
55
"license": "AGPL-3.0",
66
"homepage": "https://mtda.cloud",

‎packages/adapter/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@metad/adapter",
3-
"version": "2.4.2",
3+
"version": "2.4.3",
44
"dependencies": {
55
"@sap/hana-client": "^2.20.20",
66
"axios": "^0.21.4",

‎packages/analytics/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@metad/analytics",
3-
"version": "2.4.2",
3+
"version": "2.4.3",
44
"type": "commonjs",
55
"license": "MIT",
66
"scripts": {

‎packages/analytics/src/model/ocap/types.ts‎

Lines changed: 84 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -1,96 +1,96 @@
1-
import { AgentType, ISemanticModel } from "@metad/contracts"
2-
import { DataSourceOptions, Syntax } from "@metad/ocap-core"
3-
import { isNil, omit } from "lodash"
4-
import { SemanticModel } from "../../core/entities/internal"
5-
import { NgmDSCoreService } from "./core.service"
1+
import { AgentType, ISemanticModel } from '@metad/contracts'
2+
import { DataSourceOptions, Syntax } from '@metad/ocap-core'
3+
import { isNil, omit } from 'lodash'
4+
import { SemanticModel } from '../../core/entities/internal'
5+
import { NgmDSCoreService } from './core.service'
66

77
export const OCAP_AGENT_TOKEN = 'OCAP_AGENT_TOKEN'
88
export const OCAP_DATASOURCE_TOKEN = 'OCAP_DATASOURCE_TOKEN'
99
export const OCAP_MODEL_TOKEN = 'OCAP_MODEL_TOKEN'
1010

1111
export function getSemanticModelKey(model: ISemanticModel) {
12-
return model.id
12+
return model.id
1313
}
1414

1515
export function registerModel(model: SemanticModel, dsCoreService: NgmDSCoreService) {
16-
const modelKey = getSemanticModelKey(model)
17-
const agentType = isNil(model.dataSource)
18-
? AgentType.Wasm
19-
: model.dataSource.useLocalAgent
20-
? AgentType.Local
21-
: AgentType.Server
22-
const dialect =
23-
model.dataSource?.type?.type === 'agent'
24-
? 'sqlite'
25-
: agentType === AgentType.Wasm
26-
? 'duckdb'
27-
: model.dataSource?.type?.type
28-
const catalog = agentType === AgentType.Wasm ? model.catalog || 'main' : model.catalog
29-
const semanticModel = {
30-
...omit(model, 'indicators'),
31-
name: modelKey,
32-
catalog,
33-
dialect,
34-
agentType,
35-
settings: {
36-
dataSourceInfo: model.dataSource?.options?.data_source_info as string
37-
} as any,
38-
schema: {
39-
...(model.options?.schema ?? {}),
40-
indicators: model.indicators
41-
}
42-
} as DataSourceOptions
16+
const modelKey = getSemanticModelKey(model)
17+
const agentType = isNil(model.dataSource)
18+
? AgentType.Wasm
19+
: model.dataSource.useLocalAgent
20+
? AgentType.Local
21+
: AgentType.Server
22+
const dialect =
23+
model.dataSource?.type?.type === 'agent'
24+
? 'sqlite'
25+
: agentType === AgentType.Wasm
26+
? 'duckdb'
27+
: model.dataSource?.type?.type
28+
const catalog = agentType === AgentType.Wasm ? model.catalog || 'main' : model.catalog
29+
const semanticModel = {
30+
...omit(model, 'indicators'),
31+
key: modelKey,
32+
catalog,
33+
dialect,
34+
agentType,
35+
settings: {
36+
dataSourceInfo: model.dataSource?.options?.data_source_info as string
37+
} as any,
38+
schema: {
39+
...(model.options?.schema ?? {}),
40+
indicators: model.indicators
41+
}
42+
} as DataSourceOptions
4343

44-
if (model.dataSource?.type?.protocol?.toUpperCase() === 'SQL') {
45-
semanticModel.settings = semanticModel.settings
46-
? { ...semanticModel.settings }
47-
: {
48-
ignoreUnknownProperty: true
49-
}
50-
semanticModel.settings.dataSourceId = model.dataSource.id
51-
}
44+
if (model.dataSource?.type?.protocol?.toUpperCase() === 'SQL') {
45+
semanticModel.settings = semanticModel.settings
46+
? { ...semanticModel.settings }
47+
: {
48+
ignoreUnknownProperty: true
49+
}
50+
semanticModel.settings.dataSourceId = model.dataSource.id
51+
}
5252

53-
if (model.type === 'XMLA') {
54-
semanticModel.syntax = Syntax.MDX
55-
if (model.dataSource?.type?.protocol?.toUpperCase() === 'SQL') {
56-
dsCoreService.registerModel({
57-
...semanticModel,
58-
/**
59-
* Corresponding name of schema in olap engine:
60-
* ```xml
61-
* <root name="Semantic Model Name">
62-
* <Cube name="Sales">
63-
* ...
64-
* ```
65-
*/
66-
catalog: model.name,
67-
settings: {
68-
...(semanticModel.settings ?? {}),
69-
/**
70-
* Corresponding id of XmlaConnection in olap engine:
71-
*/
72-
dataSourceInfo: model.id
73-
} as any
74-
})
75-
} else {
76-
dsCoreService.registerModel({
77-
...semanticModel,
78-
settings: {
79-
...semanticModel.settings,
80-
dataSourceInfo: model.dataSource?.options?.data_source_info
81-
} as any
82-
})
83-
}
84-
} else {
85-
dsCoreService.registerModel({
86-
...semanticModel,
87-
syntax: Syntax.SQL,
88-
settings: {
89-
...semanticModel.settings,
90-
dataSourceInfo: model.dataSource?.options?.data_source_info
91-
} as any
92-
})
93-
}
53+
if (model.type === 'XMLA') {
54+
semanticModel.syntax = Syntax.MDX
55+
if (model.dataSource?.type?.protocol?.toUpperCase() === 'SQL') {
56+
dsCoreService.registerModel({
57+
...semanticModel,
58+
/**
59+
* Corresponding name of schema in olap engine:
60+
* ```xml
61+
* <root name="Semantic Model Name">
62+
* <Cube name="Sales">
63+
* ...
64+
* ```
65+
*/
66+
catalog: model.name,
67+
settings: {
68+
...(semanticModel.settings ?? {}),
69+
/**
70+
* Corresponding id of XmlaConnection in olap engine:
71+
*/
72+
dataSourceInfo: model.id
73+
} as any
74+
})
75+
} else {
76+
dsCoreService.registerModel({
77+
...semanticModel,
78+
settings: {
79+
...semanticModel.settings,
80+
dataSourceInfo: model.dataSource?.options?.data_source_info
81+
} as any
82+
})
83+
}
84+
} else {
85+
dsCoreService.registerModel({
86+
...semanticModel,
87+
syntax: Syntax.SQL,
88+
settings: {
89+
...semanticModel.settings,
90+
dataSourceInfo: model.dataSource?.options?.data_source_info
91+
} as any
92+
})
93+
}
9494

95-
return semanticModel
96-
}
95+
return semanticModel
96+
}

‎packages/angular/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@metad/ocap-angular",
3-
"version": "2.4.2",
3+
"version": "2.4.3",
44
"keywords": [
55
"metad",
66
"ocap",

‎packages/auth/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@metad/server-auth",
3-
"version": "2.4.2",
3+
"version": "2.4.3",
44
"type": "commonjs",
55
"dependencies": {
66
"@nestjs/common": "^8.0.0",

‎packages/common/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@metad/server-common",
3-
"version": "2.4.2",
3+
"version": "2.4.3",
44
"type": "commonjs",
55
"dependencies": {
66
"@nestjs/typeorm": "^8.0.3",

‎packages/config/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@metad/server-config",
3-
"version": "2.4.2",
3+
"version": "2.4.3",
44
"type": "commonjs",
55
"dependencies": {
66
"@nestjs/common": "^8.0.0",

0 commit comments

Comments
 (0)