Merge pull request #330 from dolthub/liuliu/add-fetch

Graphql, Web: add fetch option in remotes tab

graphql-server/schema.gql

@@ -61,6 +61,8 @@ type Branch {
   table(tableName: String!): Table
   tableNames(filterSystemTables: Boolean, schemaName: String): [String!]!
   head: String
+  remote: String
+  remoteBranch: String
 }
 
 """
@@ -303,10 +305,20 @@ type PushRes {
   message: String!
 }
 
+type FetchRes {
+  success: Boolean!
+}
+
+type RemoteBranchDiffCounts {
+  ahead: Int
+  behind: Int
+}
+
 type Query {
   branch(databaseName: String!, branchName: String!): Branch
   branchOrDefault(databaseName: String!, branchName: String): Branch
   branches(offset: Int, databaseName: String!, sortBy: SortBranchesBy): BranchList!
+  remoteBranches(offset: Int, databaseName: String!, sortBy: SortBranchesBy): BranchList!
   allBranches(offset: Int, databaseName: String!, sortBy: SortBranchesBy): [Branch!]!
   defaultBranch(databaseName: String!): Branch
   commits(offset: Int, databaseName: String!, refName: String, afterCommitId: String, twoDot: Boolean, excludingCommitsFromRefName: String): CommitList!
@@ -323,6 +335,8 @@ type Query {
   docOrDefaultDoc(refName: String!, databaseName: String!, docType: DocType): Doc
   pullWithDetails(databaseName: String!, fromBranchName: String!, toBranchName: String!): PullWithDetails!
   remotes(databaseName: String!, offset: Int): RemoteList!
+  fetchRemote(remoteName: String!, databaseName: String!, branchName: String): FetchRes!
+  remoteBranchDiffCounts(databaseName: String!, fromRefName: String!, toRefName: String!): RemoteBranchDiffCounts!
   rowDiffs(offset: Int, databaseName: String!, fromRefName: String!, toRefName: String!, refName: String, tableName: String!, filterByRowType: DiffRowType, type: CommitDiffType): RowDiffList!
   rows(schemaName: String, refName: String!, databaseName: String!, tableName: String!, offset: Int): RowList!
   schemaDiff(databaseName: String!, fromRefName: String!, toRefName: String!, refName: String, tableName: String!, type: CommitDiffType): SchemaDiff

graphql-server/src/branches/branch.model.ts

@@ -29,6 +29,12 @@ export class Branch {
 
   @Field({ nullable: true })
   head?: string;
+
+  @Field({ nullable: true })
+  remote?: string;
+
+  @Field({ nullable: true })
+  remoteBranch?: string;
 }
 
 @ObjectType()
@@ -50,6 +56,8 @@ export function fromDoltBranchesRow(
     lastUpdated: convertToUTCDate(b.latest_commit_date),
     lastCommitter: b.latest_committer,
     tableNames: tns,
+    remote: b.remote,
+    remoteBranch: b.branch,
   };
 }
 

graphql-server/src/branches/branch.resolver.ts

@@ -87,6 +87,16 @@ export class BranchResolver {
     return fromBranchListRes(res, args);
   }
 
+  @Query(_returns => BranchList)
+  async remoteBranches(@Args() args: ListBranchesArgs): Promise<BranchList> {
+    const conn = this.conn.connection();
+    const res = await conn.getRemoteBranches({
+      ...args,
+      offset: args.offset ?? 0,
+    });
+    return fromBranchListRes(res, args);
+  }
+
   @Query(_returns => [Branch])
   async allBranches(@Args() args: ListBranchesArgs): Promise<Branch[]> {
     const conn = this.conn.connection();

graphql-server/src/queryFactory/dolt/doltEntityManager.ts

@@ -88,6 +88,30 @@ async function getDoltBranchesQB(
   return sel.limit(args.limit).getRawMany();
 }
 
+async function getDoltRemoteBranchesQB(
+  em: EntityManager,
+  args: {
+    limit: number;
+    offset?: number;
+    orderBy?: string;
+    dir?: "ASC" | "DESC";
+  },
+): t.PR {
+  let sel = em
+    .createQueryBuilder()
+    .select("*")
+    .from("dolt_remote_branches", "");
+
+  if (args.orderBy && args.dir) {
+    sel = sel.addOrderBy(args.orderBy, args.dir);
+  }
+  if (args.offset !== undefined) {
+    sel = sel.offset(args.offset);
+  }
+
+  return sel.limit(args.limit).getRawMany();
+}
+
 export async function getDoltBranchesPaginated(
   em: EntityManager,
   args: t.ListBranchesArgs,
@@ -101,6 +125,19 @@ export async function getDoltBranchesPaginated(
   });
 }
 
+export async function getDoltRemoteBranchesPaginated(
+  em: EntityManager,
+  args: t.ListBranchesArgs,
+): t.PR {
+  const [orderBy, dir] = getOrderByColForBranches(args.sortBy);
+  return getDoltRemoteBranchesQB(em, {
+    limit: ROW_LIMIT + 1,
+    offset: args.offset,
+    orderBy,
+    dir,
+  });
+}
+
 export async function getAllDoltBranches(em: EntityManager): t.PR {
   return getDoltBranchesQB(em, { limit: 1000 });
 }

graphql-server/src/queryFactory/dolt/index.ts

@@ -119,6 +119,13 @@ export class DoltQueryFactory
     );
   }
 
+  async getRemoteBranches(args: t.ListBranchesArgs): t.PR {
+    return this.queryForBuilder(
+      async em => dem.getDoltRemoteBranchesPaginated(em, args),
+      args.databaseName,
+    );
+  }
+
   async getAllBranches(args: t.DBArgs): t.PR {
     return this.queryForBuilder(
       async em => dem.getAllDoltBranches(em),
@@ -458,21 +465,38 @@ export class DoltQueryFactory
     );
   }
 
-  async callPullRemote(args: t.PushOrPullRemoteArgs): t.PR {
+  async callPullRemote(args: t.RemoteMaybeBranchArgs): t.PR {
     return this.query(
       qh.callPullRemote,
       [args.remoteName, args.branchName],
       args.databaseName,
     );
   }
 
-  async callPushRemote(args: t.PushOrPullRemoteArgs): t.PR {
+  async callPushRemote(args: t.RemoteMaybeBranchArgs): t.PR {
     return this.query(
       qh.callPushRemote,
       [args.remoteName, args.branchName],
       args.databaseName,
     );
   }
+
+  async callFetchRemote(args: t.RemoteMaybeBranchArgs): t.PR {
+    return this.query(
+      qh.callFetchRemote(!!args.branchName),
+      [args.remoteName, args.branchName],
+      args.databaseName,
+    );
+  }
+
+  async getMergeBase(args: t.RefsArgs): Promise<string> {
+    const res: t.RawRow = await this.query(
+      qh.mergeBase,
+      [args.toRefName, args.fromRefName],
+      args.databaseName,
+    );
+    return Object.values(res[0])[0] as string;
+  }
 }
 
 async function getTableInfoWithQR(

graphql-server/src/queryFactory/dolt/queries.ts

@@ -84,6 +84,9 @@ export const callPullRemote = `CALL DOLT_PULL(?, ?)`;
 
 export const callPushRemote = `CALL DOLT_PUSH(?, ?)`;
 
+export const callFetchRemote = (hasBranchName?: boolean) =>
+  `CALL DOLT_FETCH(?${hasBranchName ? ", ?" : ""})`;
+
 // TAGS
 
 export const callDeleteTag = `CALL DOLT_TAG("-d", ?)`;

graphql-server/src/queryFactory/doltgres/index.ts

@@ -137,6 +137,13 @@ export class DoltgresQueryFactory
     );
   }
 
+  async getRemoteBranches(args: t.ListBranchesArgs): t.PR {
+    return this.queryForBuilder(
+      async em => dem.getDoltRemoteBranchesPaginated(em, args),
+      args.databaseName,
+    );
+  }
+
   async getAllBranches(args: t.DBArgs): t.PR {
     return this.queryForBuilder(
       async em => dem.getAllDoltBranches(em),
@@ -449,21 +456,29 @@ export class DoltgresQueryFactory
     );
   }
 
-  async callPullRemote(args: t.PushOrPullRemoteArgs): t.PR {
+  async callPullRemote(args: t.RemoteMaybeBranchArgs): t.PR {
     return this.query(
       qh.callPullRemote,
       [args.remoteName, args.branchName],
       args.databaseName,
     );
   }
 
-  async callPushRemote(args: t.PushOrPullRemoteArgs): t.PR {
+  async callPushRemote(args: t.RemoteMaybeBranchArgs): t.PR {
     return this.query(
       qh.callPushRemote,
       [args.remoteName, args.branchName],
       args.databaseName,
     );
   }
+
+  async callFetchRemote(args: t.RemoteMaybeBranchArgs): t.PR {
+    return this.query(
+      qh.callFetchRemote(!!args.branchName),
+      [args.remoteName, args.branchName],
+      args.databaseName,
+    );
+  }
 }
 
 async function getTableInfoWithQR(

graphql-server/src/queryFactory/doltgres/queries.ts

@@ -170,3 +170,8 @@ export const callDeleteRemote = `SELECT DOLT_REMOTE('remove', $1::text)`;
 export const callPullRemote = `SELECT DOLT_PULL($1::text, $2::text)`;
 
 export const callPushRemote = `SELECT DOLT_PUSH($1::text, $2::text)`;
+
+export const callFetchRemote = (hasBranchName?: boolean) =>
+  hasBranchName
+    ? `SELECT DOLT_FETCH($1::text, $2::text)`
+    : `SELECT DOLT_FETCH($1::text)`;

graphql-server/src/queryFactory/index.ts

@@ -87,6 +87,8 @@ export declare class QueryFactory {
 
   getBranches(args: t.ListBranchesArgs): t.PR;
 
+  getRemoteBranches(args: t.ListBranchesArgs): t.PR;
+
   getAllBranches(args: t.DBArgs): t.PR;
 
   createNewBranch(args: t.BranchArgs & { fromRefName: string }): t.PR;
@@ -153,7 +155,11 @@ export declare class QueryFactory {
 
   callDeleteRemote(args: t.RemoteArgs): t.PR;
 
-  callPullRemote(args: t.PushOrPullRemoteArgs): t.PR;
+  callPullRemote(args: t.RemoteMaybeBranchArgs): t.PR;
+
+  callPushRemote(args: t.RemoteMaybeBranchArgs): t.PR;
+
+  callFetchRemote(args: t.RemoteMaybeBranchArgs): t.PR;
 
-  callPushRemote(args: t.PushOrPullRemoteArgs): t.PR;
+  getMergeBase(args: t.RefsArgs): Promise<string>;
 }

graphql-server/src/queryFactory/mysql/index.ts

@@ -211,6 +211,10 @@ export class MySQLQueryFactory
     return this.getAllBranches(args);
   }
 
+  async getRemoteBranches(_args: t.ListBranchesArgs): t.PR {
+    throw notDoltError("remote branches");
+  }
+
   async getAllBranches(args: t.DBArgs): t.PR {
     const branch = await this.getBranch({ ...args, branchName: "main" });
     return branch ? [branch] : [];
@@ -328,11 +332,19 @@ export class MySQLQueryFactory
     throw notDoltError("delete remote");
   }
 
-  async callPullRemote(_: t.PushOrPullRemoteArgs): t.PR {
+  async callPullRemote(_: t.RemoteMaybeBranchArgs): t.PR {
     throw notDoltError("pull remote");
   }
 
-  async callPushRemote(_: t.PushOrPullRemoteArgs): t.PR {
+  async callPushRemote(_: t.RemoteMaybeBranchArgs): t.PR {
     throw notDoltError("push remote");
   }
+
+  async callFetchRemote(_: t.RemoteMaybeBranchArgs): t.PR {
+    throw notDoltError("fetch remote");
+  }
+
+  async getMergeBase(_: t.RefsArgs): Promise<string> {
+    throw notDoltError("merge base");
+  }
 }

graphql-server/src/queryFactory/types.ts

@@ -9,7 +9,7 @@ export type RefMaybeSchemaArgs = RefArgs & { schemaName?: string };
 export type BranchArgs = DBArgs & { branchName: string };
 export type RemoteArgs = DBArgs & { remoteName: string };
 export type AddRemoteArgs = RemoteArgs & { remoteUrl: string };
-export type PushOrPullRemoteArgs = RemoteArgs & { branchName?: string };
+export type RemoteMaybeBranchArgs = RemoteArgs & { branchName?: string };
 export type TagArgs = DBArgs & { tagName: string };
 export type TableArgs = RefArgs & { tableName: string };
 export type TableMaybeSchemaArgs = TableArgs & { schemaName?: string };

graphql-server/src/remotes/remote.model.ts

@@ -46,6 +46,21 @@ export class PushRes {
   message: string;
 }
 
+@ObjectType()
+export class FetchRes {
+  @Field()
+  success: boolean;
+}
+
+@ObjectType()
+export class RemoteBranchDiffCounts {
+  @Field(_type => Int, { nullable: true })
+  ahead?: number;
+
+  @Field(_type => Int, { nullable: true })
+  behind?: number;
+}
+
 export function fromDoltRemotesRow(databaseName: string, r: RawRow): Remote {
   return {
     _id: `databases/${databaseName}/remotes/${r.name}`,
@@ -81,3 +96,9 @@ export function fromPushRes(r: RawRow): PushRes {
     message: r.message,
   };
 }
+
+export function fromFetchRes(r: RawRow): FetchRes {
+  return {
+    success: r.status === "0",
+  };
+}