Cleanup: remove unused directory parameter to GEN_PREFETCH_DIR

Summary: We also rename to POPULATE_REMOTE_DECLS

Reviewed By: bobrenjc93

Differential Revision: D47209166

fbshipit-source-id: 01744cc2fb678bfc99567ebe4fe6d0699e4654d6

Author: Catherine Gasnier

hphp/hack/src/client/clientArgs.ml

@@ -392,9 +392,13 @@ let parse_check_args cmd ~from_default =
         " (mode) for each entry in input list get list of function dependencies [file:line:character list]"
       );
       ( "--gen-prefetch-dir",
-        Arg.String (fun x -> set_mode (MODE_GEN_PREFETCH_DIR x)),
-        " generate a directory of decls and typecheck dependencies to use for prefetching"
-        ^ " Usage: --gen-prefetch-dir ~/prefetched-dir" );
+        Arg.String (fun _x -> set_mode MODE_POPULATE_REMOTE_DECLS),
+        " Compute all decls for the repo and upload them to the remote decl service."
+        ^ " Usage: --gen-prefetch-dir unused" );
+      ( "--populate-remote-decls",
+        Arg.Unit (fun () -> set_mode MODE_POPULATE_REMOTE_DECLS),
+        " Compute all decls for the repo and upload them to the remote decl service."
+      );
       ( "--gen-saved-ignore-type-errors",
         Arg.Set gen_saved_ignore_type_errors,
         " generate a saved state even if there are type errors (default: false)."

hphp/hack/src/client/clientCheck.ml

@@ -276,8 +276,8 @@ let main_internal
     let%lwt results = rpc_with_retry args @@ Rpc.FIND_REFS action in
     ClientFindRefs.go results args.output_json;
     Lwt.return (Exit_status.No_error, Telemetry.create ())
-  | MODE_GEN_PREFETCH_DIR dirname ->
-    let%lwt (_, telemetry) = rpc args @@ Rpc.GEN_PREFETCH_DIR dirname in
+  | MODE_POPULATE_REMOTE_DECLS ->
+    let%lwt (_, telemetry) = rpc args Rpc.POPULATE_REMOTE_DECLS in
     Lwt.return (Exit_status.No_error, telemetry)
   | MODE_GO_TO_IMPL_CLASS class_name ->
     let%lwt results =

hphp/hack/src/client/clientEnv.ml

@@ -32,7 +32,7 @@ type client_mode =
   | MODE_FORMAT of int * int
   | MODE_FULL_FIDELITY_PARSE of string
   | MODE_FULL_FIDELITY_SCHEMA
-  | MODE_GEN_PREFETCH_DIR of string
+  | MODE_POPULATE_REMOTE_DECLS
   | MODE_GO_TO_IMPL_CLASS of string
   | MODE_GO_TO_IMPL_CLASS_REMOTE of string
   | MODE_GO_TO_IMPL_METHOD of string

hphp/hack/src/server/dune

@@ -463,7 +463,6 @@
   serverFileDependents
   serverFileSync
   serverFormat
-  serverGenPrefetchDir
   serverIdle
   serverInferTypeBatch
   serverTastHolesBatch
@@ -472,6 +471,7 @@
   serverLint
   serverMethodJumps
   serverMethodJumpsBatch
+  serverPopulateRemoteDecls
   serverRage
   serverRename
   serverRewriteLambdaParameters

hphp/hack/src/server/serverCommand.ml

@@ -46,7 +46,7 @@ let rpc_command_needs_full_check : type a. a t -> bool =
   | DELETE_CHECKPOINT _ -> true
   | IN_MEMORY_DEP_TABLE_SIZE -> true
   | NO_PRECHECKED_FILES -> true
-  | GEN_PREFETCH_DIR _ -> false
+  | POPULATE_REMOTE_DECLS -> false
   | STATS -> false
   | DISCONNECT -> false
   | STATUS_SINGLE _ -> false

hphp/hack/src/server/serverCommandTypes.ml

@@ -556,7 +556,7 @@ type _ t =
   | RAGE : ServerRageTypes.result t
   | CST_SEARCH : cst_search_input -> (Hh_json.json, string) result t
   | NO_PRECHECKED_FILES : unit t
-  | GEN_PREFETCH_DIR : string -> unit t
+  | POPULATE_REMOTE_DECLS : unit t
   | FUN_DEPS_BATCH : (string * int * int) list -> string list t
   | LIST_FILES_WITH_ERRORS : string list t
   | FILE_DEPENDENTS : string list -> string list t

hphp/hack/src/server/serverCommandTypesUtils.ml

@@ -59,7 +59,7 @@ let debug_describe_t : type a. a t -> string = function
   | RAGE -> "RAGE"
   | CST_SEARCH _ -> "CST_SEARCH"
   | NO_PRECHECKED_FILES -> "NO_PRECHECKED_FILES"
-  | GEN_PREFETCH_DIR _ -> "GEN_PREFETCH_DIR"
+  | POPULATE_REMOTE_DECLS -> "POPULATE_REMOTE_DECLS"
   | FUN_DEPS_BATCH _ -> "FUN_DEPS_BATCH"
   | LIST_FILES_WITH_ERRORS -> "LIST_FILES_WITH_ERRORS"
   | FILE_DEPENDENTS _ -> "FILE_DEPENDENTS"

hphp/hack/src/server/serverGenPrefetchDir.ml renamed to hphp/hack/src/server/serverPopulateRemoteDecls.ml

@@ -22,18 +22,10 @@ let ( >>= ) res f =
       | Ok r -> f r
       | Error e -> Future.Promise.return (Error e))
 
-let ( >|= ) = Future.Promise.bind
-
 let return_ok x = Future.Promise.return (Ok x)
 
 let return_err x = Future.Promise.return (Error x)
 
-let get_name_and_decl_hashes_from_decls decls : (string * Int64.t) list =
-  List.filter_map decls ~f:(fun (name, decl, decl_hash) ->
-      match decl with
-      | Shallow_decl_defs.Class _ -> Some (name, decl_hash)
-      | _ -> None)
-
 let get_hhconfig_version ~(repo : Path.t) :
     (string, string) result Future.Promise.t =
   let hhconfig_path =

hphp/hack/src/server/serverPopulateRemoteDecls.mli

@@ -0,0 +1,10 @@
+(*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the "hack" directory of this source tree.
+ *
+ *)
+
+val go :
+  ServerEnv.env -> ServerEnv.genv -> MultiWorker.worker list option -> unit

hphp/hack/src/server/serverRpc.ml

@@ -411,10 +411,8 @@ let handle : type a. genv -> env -> is_stale:bool -> a t -> env * a =
       (env, Error (Exception.to_string e))
   end
   | NO_PRECHECKED_FILES -> (ServerPrecheckedFiles.expand_all env, ())
-  | GEN_PREFETCH_DIR dir ->
-    (* TODO(bobren) remove dir entirely from saved state job invocation *)
-    let _ = dir in
-    (env, ServerGenPrefetchDir.go env genv genv.workers)
+  | POPULATE_REMOTE_DECLS ->
+    (env, ServerPopulateRemoteDecls.go env genv genv.workers)
   | FUN_DEPS_BATCH positions ->
     (env, ServerFunDepsBatch.go genv.workers positions env)
   | LIST_FILES_WITH_ERRORS -> (env, ServerEnv.list_files env)