Elgato_dark/zeppelin
1
0
Fork 0
mirror of https://github.com/apache/zeppelin synced 2026-05-24 09:38:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix: Keynames

Browse source
This commit is contained in:
1ambda 2017-03-22 17:50:25 +09:00
parent ee8788e7e0
commit 7bee46471c
1 changed files with 32 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
zeppelin-web/src/app/tabledata/advanced-transformation-util.js
View file

@ -365,6 +365,12 @@ const AggregatorFunctionDiv = {
avg: true
};
export function createKeyNames(schema, cube, groupColumns) {
let keyNames = []
return keyNames
}
/** nested cube `(key) -> (group) -> aggregator` */
export function getKGACube(rows, keyColumns, groupColumns, aggrColumns) {
const schema = {
@ -373,7 +379,7 @@ export function getKGACube(rows, keyColumns, groupColumns, aggrColumns) {
aggregator: aggrColumns.length !== 0,
};
const cube = {}
let cube = {}
const entry = {}
const keyColumnName = keyColumns.map(c => c.name).join('.')
@ -454,11 +460,20 @@ export function getKGACube(rows, keyColumns, groupColumns, aggrColumns) {
} /** end loop for aggrColumns */
}
let keyNames = null
if (!schema.key) {
const mergedGroupColumnName = groupColumns.map(c => c.name).join('.')
cube = { [mergedGroupColumnName]: cube, }
keyNames = [ mergedGroupColumnName, ]
} else {
keyNames = Object.keys(cube).sort() /** keys should be sorted */
}
return {
cube: cube,
schema: schema,
keyColumnName: keyColumnName,
keyNames: Object.keys(cube).sort(), /** keys should be sorted */
keyNames: keyNames,
groupNameSet: groupNameSet,
selectorNameWithIndex: selectorNameWithIndex,
}
@ -472,7 +487,7 @@ export function getKAGCube(rows, keyColumns, groupColumns, aggrColumns) {
aggregator: aggrColumns.length !== 0,
};
const cube = {}
let cube = {}
const keyColumnName = keyColumns.map(c => c.name).join('.')
const groupNameSet = new Set()
@ -557,11 +572,20 @@ export function getKAGCube(rows, keyColumns, groupColumns, aggrColumns) {
} /** end loop for aggrColumns */
}
let keyNames = null
if (!schema.key) {
const mergedGroupColumnName = groupColumns.map(c => c.name).join('.')
cube = { [mergedGroupColumnName]: cube, }
keyNames = [ mergedGroupColumnName, ]
} else {
keyNames = Object.keys(cube).sort() /** keys should be sorted */
}
return {
cube: cube,
schema: schema,
keyColumnName: keyColumnName,
keyNames: Object.keys(cube).sort(), /** keys should be sorted */
keyNames: keyNames,
groupNameSet: groupNameSet,
selectorNameWithIndex: selectorNameWithIndex,
}
@ -626,26 +650,21 @@ export function getNameWithIndex(names) {
export function getArrayRowsFromKGACube(cube, schema, aggregatorColumns,
keyColumnName, keyNames, groupNameSet, selectorNameWithIndex) {
const emptyKey = 'root'
if (!schema.key) {
keyNames = [ emptyKey, ]
cube = { root: cube, }
}
const sortedSelectors = Object.keys(selectorNameWithIndex).sort()
const sortedSelectorNameWithIndex = getNameWithIndex(sortedSelectors)
const keyArrowRows = new Array(sortedSelectors.length)
const keyNameWithIndex = getNameWithIndex(keyNames)
keyNames.map(key => {
for(let i = 0; i < keyNames.length; i++) {
const key = keyNames[i]
const obj = cube[key]
fillArrayRow(schema, aggregatorColumns, obj,
groupNameSet, sortedSelectorNameWithIndex,
key, keyNames, keyArrowRows, keyNameWithIndex,
)
})
}
return {
transformed: keyArrowRows,
@ -704,11 +723,6 @@ export function fillArrayRow(schema, aggrColumns, obj,
export function getObjectRowsFromKGACube(cube, schema, aggregatorColumns,
keyColumnName, keyNames, groupNameSet) {
if (!schema.key) {
keyNames = [ 'root', ]
cube = { root: cube, }
}
const rows = keyNames.reduce((acc, key) => {
const obj = cube[key]
const row = getObjectRow(schema, aggregatorColumns, obj, groupNameSet)
@ -761,11 +775,6 @@ export function getObjectRow(schema, aggrColumns, obj, groupNameSet) {
export function getDrilldownRowsFromKAGCube(cube, schema, aggregatorColumns,
keyColumnName, keyNames, groupNames, selectorNameWithIndex) {
if (!schema.key) {
keyNames = [ 'root', ]
cube = { root: cube, }
}
const sortedSelectors = Object.keys(selectorNameWithIndex).sort()
const sortedSelectorNameWithIndex = getNameWithIndex(sortedSelectors)