feat: Optimize output db query

nervosnetwork · Oct 28, 2019 · 6e36550 · 6e36550
1 parent 9de193b
commit 6e36550
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 4 deletions.
diff --git a/packages/neuron-wallet/src/database/chain/migrations/1572226722928-AddOutputIndex.ts b/packages/neuron-wallet/src/database/chain/migrations/1572226722928-AddOutputIndex.ts
@@ -0,0 +1,13 @@
+import {MigrationInterface, QueryRunner, TableIndex} from "typeorm";
+
+export class AddOutputIndex1572226722928 implements MigrationInterface {
+
+    public async up(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.createIndex("output", new TableIndex({ columnNames: ["lockHash", "status", "hasData", "typeScript"] }))
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.dropIndex("output", new TableIndex({ columnNames: ["lockHash", "status", "hasData", "typeScript"] }))
+    }
+
+}
diff --git a/packages/neuron-wallet/src/database/chain/ormconfig.ts b/packages/neuron-wallet/src/database/chain/ormconfig.ts
@@ -15,6 +15,7 @@ import { ChangeHasDataDefault1568621556467 } from './migrations/1568621556467-Ch
 import { AddLockToInput1570522869590 } from './migrations/1570522869590-AddLockToInput'
 import { AddIndices1572006450765 } from './migrations/1572006450765-AddIndices'
 import { AddIndexToTxTimestamp1572137226866 } from './migrations/1572137226866-AddIndexToTxTimestamp'
+import { AddOutputIndex1572226722928 } from './migrations/1572226722928-AddOutputIndex'
 
 export const CONNECTION_NOT_FOUND_NAME = 'ConnectionNotFoundError'
 
@@ -41,7 +42,8 @@ const connectOptions = async (genesisBlockHash: string): Promise<SqliteConnectio
       ChangeHasDataDefault1568621556467,
       AddLockToInput1570522869590,
       AddIndices1572006450765,
-      AddIndexToTxTimestamp1572137226866
+      AddIndexToTxTimestamp1572137226866,
+      AddOutputIndex1572226722928
     ],
     logging,
     maxQueryExecutionTime: 30

diff --git a/packages/neuron-wallet/src/services/cells.ts b/packages/neuron-wallet/src/services/cells.ts
@@ -28,9 +28,16 @@ export default class CellsService {
 
     const cells: OutputEntity[] = await getConnection()
       .getRepository(OutputEntity)
-      .find({
-        where: queryParams,
-      })
+      .createQueryBuilder('output')
+      .select([
+        "output.lockHash",
+        "output.status",
+        "output.hasData",
+        "output.typeScript",
+        "output.capacity"
+      ])
+      .where(queryParams)
+      .getMany()
 
     const capacity: bigint = cells.map(c => BigInt(c.capacity)).reduce((result, c) => result + c, BigInt(0))