Skip to content

LW-11521 be-v0.30.1 #1475

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

Closed
wants to merge 3 commits into from
Closed

LW-11521 be-v0.30.1 #1475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e5c2219
chore: alter deployment resource definitions
gytis-ivaskevicius Sep 12, 2024
05fc92c
fix: add asset id index on nft_metadata table
iccicci Sep 16, 2024
1a6900d
refactor(cardano-service): remove JOIN when loading nft metadata
iccicci Sep 16, 2024
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
13 changes: 4 additions & 9 deletions nix/cardano-services/deployments/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,29 +63,24 @@ in

providers = {
backend = {
resources.limits = mkPodResources "512Mi" "1500m";
resources.requests = mkPodResources "350Mi" "1000m";
};

stake-pool-provider = {
resources.limits = mkPodResources "300Mi" "500m";
resources.requests = mkPodResources "150Mi" "100m";
resources.requests = mkPodResources "150Mi" "700m";
env.OVERRIDE_FUZZY_OPTIONS = builtins.toJSON (!(lib.hasPrefix "live" final.namespace));
};

handle-provider = {
resources.limits = mkPodResources "300Mi" "500m";
resources.requests = mkPodResources "150Mi" "100m";
resources.requests = mkPodResources "150Mi" "700m";
};

asset-provider = {
resources.limits = mkPodResources "1024Mi" "500m";
resources.requests = mkPodResources "150Mi" "100m";
resources.requests = mkPodResources "512Mi" "1100m";
};

chain-history-provider = {
resources.limits = mkPodResources "300Mi" "1200m";
resources.requests = mkPodResources "150Mi" "1000m";
resources.requests = mkPodResources "512Mi" "1000m";
};
};

Expand Down
2 changes: 1 addition & 1 deletion packages/cardano-services/src/Asset/TypeormAssetProvider/TypeormAssetProvider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ export class TypeormAssetProvider extends TypeormProvider implements AssetProvid
): Promise<Map<Cardano.AssetId, Asset.NftMetadata>> {
const nftMetadataRepository = dataSource.getRepository(NftMetadataEntity);
const assets = (await nftMetadataRepository.find({
where: { userTokenAsset: { id: In(assetIds) } }
where: { userTokenAssetId: In(assetIds) }
})) as Required<NftMetadataEntity>[];

return new Map(
Expand Down
16 changes: 16 additions & 0 deletions packages/cardano-services/src/Projection/migrations/1726479765002-nft-metadata-index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import { MigrationInterface, QueryRunner } from 'typeorm';
import { NftMetadataEntity } from '@cardano-sdk/projection-typeorm';

export class NftMetadataIndexMigration1726479765002 implements MigrationInterface {
static entity = NftMetadataEntity;

public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(
'CREATE INDEX "IDX_nft_metadata_user_token_asset_id" ON "nft_metadata" ("user_token_asset_id") '
);
}

public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query('DROP INDEX "public"."IDX_nft_metadata_user_token_asset_id"');
}
}
4 changes: 3 additions & 1 deletion packages/cardano-services/src/Projection/migrations/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import { HandleDefaultMigrations1693830294136 } from './1693830294136-handle-def
import { HandleMetadataTableMigrations1693490983715 } from './1693490983715-handle-metadata-table';
import { HandleParentMigration1700556589063 } from './1700556589063-handle-parent';
import { HandleTableMigration1686138943349 } from './1686138943349-handle-table';
import { NftMetadataIndexMigration1726479765002 } from './1726479765002-nft-metadata-index';
import { NftMetadataTableMigration1690269355640 } from './1690269355640-nft-metadata-table';
import { OutputTableMigration1682519108367 } from './1682519108367-output-table';
import { PoolDelistedTableMigration1695899010515 } from './1695899010515-pool-delisted-table';
Expand Down Expand Up @@ -55,5 +56,6 @@ export const migrations: ProjectionMigration[] = [
PoolRewardsTableMigrations1698175956871,
HandleParentMigration1700556589063,
RewardsPledgeNumericMigration1715157190230,
GovernanceActionMigration1724168174191
GovernanceActionMigration1724168174191,
NftMetadataIndexMigration1726479765002
];
3 changes: 2 additions & 1 deletion packages/projection-typeorm/src/entity/NftMetadata.entity.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Asset, Cardano } from '@cardano-sdk/core';
import { AssetEntity } from './Asset.entity';
import { BlockEntity } from './Block.entity';
import { Column, Entity, JoinColumn, ManyToOne, PrimaryGeneratedColumn } from 'typeorm';
import { Column, Entity, Index, JoinColumn, ManyToOne, PrimaryGeneratedColumn } from 'typeorm';
import { OnDeleteCascadeRelationOptions, OnDeleteSetNullRelationOptions } from './util';
import { sanitizeNullCharacters, serializableObj } from './transformers';

Expand Down Expand Up @@ -34,6 +34,7 @@ export class NftMetadataEntity {
parentAsset?: AssetEntity;
@ManyToOne(() => AssetEntity, OnDeleteSetNullRelationOptions)
userTokenAsset?: AssetEntity | null;
@Index()
@Column('varchar', { nullable: true })
userTokenAssetId?: Cardano.AssetId | null;
@ManyToOne(() => BlockEntity, OnDeleteCascadeRelationOptions)
Expand Down