Skip to content

RE: add logs to identify the size of fetched json columns, add logs to identify types of columns of table #59

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
merged 1 commit into from
Apr 24, 2023
Merged

RE: add logs to identify the size of fetched json columns, add logs to identify types of columns of table #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 23 additions & 7 deletions reverse_engineering/helpers/postgresService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,12 @@ module.exports = {
const tableForeignKeys = await db.queryTolerant(queryConstants.GET_TABLE_FOREIGN_KEYS, [tableOid]);
const triggers = await this._getTriggers(schemaName, tableName, schemaOid, tableOid, ignoreUdfUdpTriggers);

logger.info('Table data retrieved', {
schemaName,
tableName,
columnTypes: tableColumns.map(column => column.data_type),
});

const partitioning = prepareTablePartition(partitionResult, tableColumns);
const tableLevelProperties = prepareTableLevelData(tableLevelData, tableToastOptions);
const description = getDescriptionFromResult(descriptionResult);
Expand Down Expand Up @@ -352,7 +358,7 @@ module.exports = {
tableOid,
]);

return _.map(tableColumns, (columnData, index) => {
return _.map(tableColumns, columnData => {
return {
...columnData,
...(_.find(tableColumnsAdditionalData, { name: columnData.column_name }) || {}),
Expand All @@ -368,13 +374,23 @@ module.exports = {
(await db.queryTolerant(queryConstants.GET_ROWS_COUNT(fullTableName), [], true))?.quantity || 0;
const limit = getLimit(quantity, recordSamplingSettings);

const jsonColumns = _.chain(attributes)
.filter(({ type }) => _.includes(['json', 'jsonb'], type))
.map('name')
.join(', ')
.value();
const jsonColumns = attributes.filter(({ type }) => _.includes(['json', 'jsonb'], type));

const jsonColumnsString = _.map(jsonColumns, 'name').join(', ');

const samplingDataSize = await db.queryTolerant(
queryConstants.GET_SAMPLED_DATA_SIZE(fullTableName, jsonColumnsString),
[limit],
true,
);

logger.info('Sampling table', {
tableName,
jsonColumnsNumber: jsonColumns.length,
samplingDataSize: samplingDataSize?._hackolade_tmp_sampling_tbl_size,
});

return await db.queryTolerant(queryConstants.GET_SAMPLED_DATA(fullTableName, jsonColumns), [limit]);
return await db.queryTolerant(queryConstants.GET_SAMPLED_DATA(fullTableName, jsonColumnsString), [limit]);
},

async _retrieveSingleViewData(schemaOid, schemaName, ignoreUdfUdpTriggers, viewName) {
Expand Down
3 changes: 3 additions & 0 deletions reverse_engineering/helpers/queryConstants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,9 @@ const queryConstants = {
GET_DESCRIPTION_BY_OID: `SELECT obj_description($1)`,
GET_ROWS_COUNT: fullTableName => `SELECT COUNT(*) AS quantity FROM ${fullTableName};`,
GET_SAMPLED_DATA: (fullTableName, jsonColumns) => `SELECT ${jsonColumns} FROM ${fullTableName} LIMIT $1;`,
GET_SAMPLED_DATA_SIZE: (fullTableName, jsonColumns) => `
SELECT sum(pg_column_size(_hackolade_tmp_sampling_tbl.*)) AS _hackolade_tmp_sampling_tbl_size
FROM (SELECT ${jsonColumns} FROM ${fullTableName} LIMIT $1) AS _hackolade_tmp_sampling_tbl;`,
GET_INHERITS_PARENT_TABLE_NAME: `
SELECT pc.relname AS parent_table_name FROM pg_catalog.pg_inherits AS pi
INNER JOIN pg_catalog.pg_class AS pc
Expand Down