Skip to content

HCK-14758: Fix setting of clusteringKey #129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AlikRakhmonov merged 3 commits into from
Feb 10, 2026
Merged

HCK-14758: Fix setting of clusteringKey #129

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5564285
HCK-14758: Fix settings of clusteringKey
Nightlngale Feb 10, 2026
0c2e473
HCK-14759: Fix
Nightlngale Feb 10, 2026
509b7e1
Merge branch 'develop' into HCK-14758
Nightlngale Feb 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 16 additions & 22 deletions forward_engineering/alterScript/alterScriptHelpers/common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,28 @@
const { isEqual } = require('lodash');
const { escapeQuotes, getTimestamp, getName } = require('../../helpers/utils');
const _ = require('lodash');

const getCompMod = containerData => containerData.role?.compMod ?? {};

const checkCompModEqual = ({ new: newItem, old: oldItem } = {}) => _.isEqual(newItem, oldItem);
const checkCompModEqual = ({ new: newItem, old: oldItem } = {}) => isEqual(newItem, oldItem);

const setEntityKeys = ({ idToNameHashTable, idToActivatedHashTable, entity }) => {
const setKeyArray = obj =>
Array.isArray(obj)
? obj.map(item => ({
...item,
name: idToNameHashTable[item.keyId],
isActivated: idToActivatedHashTable[item.keyId],
}))
: [];

return {
...entity,
clusteringKey:
entity.clusteringKey?.map(key => ({
...key,
name: idToNameHashTable[key.keyId],
isActivated: idToActivatedHashTable[key.keyId],
})) || [],
timeUnitpartitionKey:
entity.timeUnitpartitionKey?.map(key => ({
...key,
name: idToNameHashTable[key.keyId],
isActivated: idToActivatedHashTable[key.keyId],
})) || [],
clusteringKey: setKeyArray(entity.clusteringKey),
timeUnitpartitionKey: setKeyArray(entity.timeUnitpartitionKey),
rangeOptions: [
{
...(entity.rangeOptions ?? {}),
rangePartitionKey:
entity.rangeOptions?.rangePartitionKey?.map(key => ({
...key,
name: idToNameHashTable[key.keyId],
isActivated: idToActivatedHashTable[key.keyId],
})) || [],
rangePartitionKey: setKeyArray(entity.rangeOptions?.rangePartitionKey),
},
],
};
Expand All @@ -40,9 +34,9 @@ const getModifyOptions = ({ jsonSchema, app, options }) => {
const optionsToUpdate = [];

Object.entries(options).forEach(([customOptionName, columnOptionName]) => {
const { new: newOptionValue, old: oldOptionValue } = jsonSchema.role.compMod[customOptionName] || {};
const { new: newOptionValue, old: oldOptionValue } = jsonSchema.compMod[customOptionName] || {};

if (!_.isEqual(newOptionValue, oldOptionValue)) {
if (!isEqual(newOptionValue, oldOptionValue)) {
switch (customOptionName) {
case 'businessName': {
const name = getName(jsonSchema.role);
Expand Down