query specific revision / service_id / binary_name

Summary:
allow to retrieve specific:

- revision
- binaryName
- serviceID

via Glass API

TODO: this is not fully correct as the right weight needs to be retrieved as well, this will be added on top; i need to catch up with asaflav whetehr taht's already in Hive; but it's fine no one will call this yet anyway

Differential Revision: D71310942

fbshipit-source-id: c7f4fa5bfd295229c1254365d400695836a7b349

Author: Kinga Bojarczuk

glean/glass/Glean/Glass/Attributes/Class.hs

@@ -42,6 +42,7 @@ class LogResult (AttrLog key) => ToAttributes key where
     :: key
     -> Maybe Int
     -> Glean.IdOf Src.File
+    -> AttributeOptions
     -> Glean.RepoHaxl u w [AttrRep key]
 
   -- | Add attributes to symbols

glean/glass/Glean/Glass/Attributes/SymbolKind.hs

@@ -48,7 +48,7 @@ instance ToAttributes SymbolKindAttr where
   type AttrRep SymbolKindAttr = EntityKindLabel
   type AttrLog SymbolKindAttr = ()
 
-  queryForFile _ lim fileId =
+  queryForFile _ lim fileId _ =
     fst <$> Utils.searchRecursiveWithLimit lim q
     where
     -- We actually make two queries!

glean/glass/Glean/Glass/Handler/Documents.hs

@@ -488,7 +488,7 @@ fetchDocumentSymbols [email protected]{..} (FileReference scsrepo path)
             fileId
         -- todo this could be done in Glean in a single pass
         (kinds, merr) <- withRepo fileRepo $
-          documentSymbolKinds mlimit mlang fileId
+          documentSymbolKinds mlimit mlang fileId attrOpts
 
         let revision = getDBRevision (scmRevisions dbInfo) fileRepo scsrepo
         contentMatch <- case wantedRevision of
@@ -667,27 +667,29 @@ documentSymbolKinds
   :: Maybe Int
   -> Maybe Language
   -> Glean.IdOf Src.File
+  -> AttributeOptions
   -> Glean.RepoHaxl u w
      ([Attributes.AttrRep Attributes.SymbolKindAttr], Maybe ErrorLogger)
 
 -- It's not sound to key for all entities in file in C++ , due to traces
 -- So we can't use the generic a attribute technique
-documentSymbolKinds _mlimit (Just Language_Cpp) _fileId =
+documentSymbolKinds _mlimit (Just Language_Cpp) _fileId _ =
   return mempty
 
 -- Anything else, just load from Glean
-documentSymbolKinds mlimit _ fileId =
-  searchFileAttributes Attributes.SymbolKindAttr mlimit fileId
+documentSymbolKinds mlimit _ fileId attrOptions =
+  searchFileAttributes Attributes.SymbolKindAttr mlimit fileId attrOptions
 
 searchFileAttributes
   :: Attributes.ToAttributes key
   => key
   -> Maybe Int
   -> Glean.IdOf Src.File
+  -> AttributeOptions
   -> Glean.RepoHaxl u w
     ([Attributes.AttrRep key], Maybe ErrorLogger)
-searchFileAttributes key mlimit fileId = do
-  eraw <- try $ Attributes.queryForFile key mlimit fileId
+searchFileAttributes key mlimit fileId attrOpts = do
+  eraw <- try $ Attributes.queryForFile key mlimit fileId attrOpts
   repo <- Glean.haxlRepo
   case eraw of
     Left (err::SomeException) -- logic errors or transient errors
@@ -918,6 +920,7 @@ getSymbolAttributes env dbInfo repo opts repofile mlimit
             attrKey
             (theGleanPath repofile)
             mlimit
+            (requestOptions_attribute_opts opts)
           return $ \refs defs ->
             case Attributes.augmentSymbols attrKey attrs refs defs
               (requestOptions_attribute_opts opts) of
@@ -930,12 +933,13 @@ genericFetchFileAttributes
   => key
   -> GleanPath
   -> Maybe Int
+  -> AttributeOptions
   -> RepoHaxl u w ([Attributes.AttrRep key], Maybe ErrorLogger)
-genericFetchFileAttributes key path mlimit = do
+genericFetchFileAttributes key path mlimit attrOptions = do
   efile <- getFile path
   repo <- Glean.haxlRepo
   case efile of
     Left err ->
       return (mempty, Just (logError err <> logError repo))
     Right fileId -> do
-      searchFileAttributes key mlimit (Glean.getId fileId)
+      searchFileAttributes key mlimit (Glean.getId fileId) attrOptions

glean/glass/if/glass.thrift

@@ -83,8 +83,15 @@ struct SymbolLocation {
 
 struct AttributeOptions {
   1: bool fetch_per_line_data = false;
+  2: optional Revision revision;
+  3: optional ServiceID service_id;
+  4: optional BinaryName binary_name;
 }
 
+typedef string ServiceID (hs.newtype)
+
+typedef string BinaryName (hs.newtype)
+
 // Generic request options, supported by most calls
 struct RequestOptions {
   // repo-global preferred revision identifier