diff --git a/eden/fs/service/eden.thrift b/eden/fs/service/eden.thrift index ed273ffc868b..ccabd86f8c03 100644 --- a/eden/fs/service/eden.thrift +++ b/eden/fs/service/eden.thrift @@ -1753,7 +1753,7 @@ union CheckoutProgressInfoResponse { } /* - * Structs/Unionts for changesSince API + * Structs/Unions for changesSinceV2 API */ struct Added { 1: Dtype fileType; @@ -1810,6 +1810,22 @@ union ChangeNotification { 2: LargeChangeNotification largeChange; } +/** + * Return value of the changesSinceV2 API + */ +struct ChangesSinceV2Result { + 1: JournalPosition toPosition; + 2: list changes; +} + +/** + * Argument to changesSinceV2 API + */ +struct ChangesSinceV2Params { + 1: PathString mountPoint; + 2: JournalPosition fromPosition; +} + service EdenService extends fb303_core.BaseService { list listMounts() throws (1: EdenError ex); void mount(1: MountArgument info) throws (1: EdenError ex); @@ -2646,6 +2662,17 @@ service EdenService extends fb303_core.BaseService { void ensureMaterialized(1: EnsureMaterializedParams params) throws ( 1: EdenError ex, ); + + /** + * Returns a list of change notifications along with a new journal position for a given mount + * since a specific journal position. + * + * This does not resolve expensive operations like moving a directory or changing + * commits. Callers must query Sapling to evaluate those potentially expensive operations. + */ + ChangesSinceV2Result changesSinceV2(1: ChangesSinceV2Params params) throws ( + 1: EdenError ex, + ); } // The following were automatically generated and may benefit from renaming. diff --git a/eden/fs/service/streamingeden.thrift b/eden/fs/service/streamingeden.thrift index d7b39c2a30b9..ac968f2d27ed 100644 --- a/eden/fs/service/streamingeden.thrift +++ b/eden/fs/service/streamingeden.thrift @@ -82,23 +82,6 @@ struct ChangesSinceResult { 1: eden.JournalPosition toPosition; } -/** - * The value of a stream item in a streamChangedSinceV2 result stream. - * - * Each stream item refers to a single change notification - * since the notification clock provided. - */ -struct ChangeNotificationResult { - 1: eden.ChangeNotification change; -} - -/** - * Return value of the streamChangedSinceV2 API - */ -struct ChangesSinceV2Result { - 1: eden.JournalPosition toPosition; -} - /** * Argument to streamChangesSince API. */ @@ -115,14 +98,6 @@ struct StreamSelectedChangesSinceParams { 2: list globs; } -/** - * Argument to streamChangedSinceV2 API - */ -struct StreamChangesSinceV2Params { - 1: eden.PathString mountPoint; - 2: eden.JournalPosition fromPosition; -} - struct TraceTaskEventsRequest {} typedef binary EdenStartStatusUpdate @@ -221,18 +196,6 @@ service StreamingEdenService extends eden.EdenService { 1: eden.EdenError ex, ); - /** - * Returns a stream of change notifications for a given path since a specific point in time. - * - * This does not resolve expensive operations like moving a directory or changing - * commits. Callers must query Sapling to evaluate those potentially expensive operations. - */ - ChangesSinceV2Result, stream< - ChangeNotificationResult throws (1: eden.EdenError ex) - > streamChangesSinceV2(1: StreamChangesSinceV2Params params) throws ( - 1: eden.EdenError ex, - ); - /** * Same as the API above but only returns files that match the globs in filter. * This API is intend to replace the above API but it's currently under development.