Merge pull request #8107 from NuGet/dev

[ReleasePrep][2020.07.14]RI dev into master

Author: ryuyu

.github/CODEOWNERS

@@ -2,5 +2,4 @@
 # the repo. Unless a later match takes precedence,
 # review when someone opens a pull request.
 # For more on how to customize the CODEOWNERS file - https://help.github.com/en/articles/about-code-owners
-*       @agr @cristinamanum @dannyjdev @joelverhagen @loic-sharma @ryuyu @scottbommarito @skofman1 @shishirx34 @xavierdecoster @zhhyu 
- 
+*       @agr @cristinamanum @dannyjdev @drewgillies @joelverhagen @loic-sharma @lyndaidaii @ryuyu @skofman1 @shishirx34 @xavierdecoster @zhhyu 

src/NuGetGallery.Core/Entities/EntitiesContext.cs

@@ -56,7 +56,18 @@ public EntitiesContext(DbConnection connection, bool readOnly)
            ReadOnly = readOnly;
         }
 
+        public IDisposable WithQueryHint(string queryHint)
+        {
+            if (QueryHint != null)
+            {
+                throw new InvalidOperationException("A query hint is already applied.");
+            }
+
+            return new QueryHintScope(this, queryHint);
+        }
+
         public bool ReadOnly { get; private set; }
+        public string QueryHint { get; private set; }
         public DbSet<Package> Packages { get; set; }
         public DbSet<PackageDeprecation> Deprecations { get; set; }
         public DbSet<PackageRegistration> PackageRegistrations { get; set; }
@@ -503,5 +514,21 @@ protected override void OnModelCreating(DbModelBuilder modelBuilder)
                 .WillCascadeOnDelete(false);
         }
 #pragma warning restore 618
+
+        private class QueryHintScope : IDisposable
+        {
+            private readonly EntitiesContext _entitiesContext;
+
+            public QueryHintScope(EntitiesContext entitiesContext, string queryHint)
+            {
+                _entitiesContext = entitiesContext ?? throw new ArgumentNullException(nameof(entitiesContext));
+                _entitiesContext.QueryHint = queryHint;
+            }
+
+            public void Dispose()
+            {
+                _entitiesContext.QueryHint = null;
+            }
+        }
     }
 }

src/NuGetGallery.Core/Entities/IReadOnlyEntitiesContext.cs

@@ -14,5 +14,19 @@ public interface IReadOnlyEntitiesContext : IDisposable
         DbSet<T> Set<T>() where T : class;
 
         void SetCommandTimeout(int? seconds);
+
+        /// <summary>
+        /// Sets the <see cref="QueryHint"/> for queries to the provided value until the returned disposable is disposed.
+        /// Note that this method MUST NOT be called with user input.
+        /// </summary>
+        /// <param name="queryHint">The query hint.</param>
+        /// <example>Provide "RECOMPILE" to disable query plan caching.</example>
+        /// <returns>A disposable that determines the lifetime of the provided query hint.</returns>
+        IDisposable WithQueryHint(string queryHint);
+
+        /// <summary>
+        /// The current query hint to use for queries. Can be set using <see cref="WithQueryHint(string)"/>.
+        /// </summary>
+        string QueryHint { get; }
     }
 }

src/NuGetGallery.Core/Entities/QueryHintInterceptor.cs

@@ -0,0 +1,37 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System.Data.Common;
+using System.Data.Entity.Infrastructure.Interception;
+using System.Diagnostics.CodeAnalysis;
+
+namespace NuGetGallery
+{
+    /// <summary>
+    /// A global (static) interceptor for Entity Framework queries. This is used for
+    /// <see cref="IReadOnlyEntitiesContext.WithQueryHint(string)"/> to set a query hint for a short window of time on
+    /// a specific entity context. Inspired by: https://stackoverflow.com/a/45170243
+    /// </summary>
+    public class QueryHintInterceptor : DbCommandInterceptor
+    {
+        [SuppressMessage("Microsoft.Security", "CA2100:Review SQL queries for security vulnerabilities", Justification = "The query hint is not customer input.")]
+        public override void ReaderExecuting(DbCommand command, DbCommandInterceptionContext<DbDataReader> interceptionContext)
+        {
+            foreach (var dbContext in interceptionContext.DbContexts)
+            {
+                if (dbContext is IReadOnlyEntitiesContext entitiesContext)
+                {
+                    var queryHint = entitiesContext.QueryHint;
+                    if (queryHint != null)
+                    {
+                        command.CommandText += $" OPTION ( {queryHint} )";
+                    }
+
+                    break;
+                }
+            }
+
+            base.ReaderExecuting(command, interceptionContext);
+        }
+    }
+}

src/NuGetGallery.Core/Entities/ReadOnlyEntitiesContext.cs

@@ -30,6 +30,8 @@ public DbSet<Package> Packages
             }
         }
 
+        public string QueryHint => _entitiesContext.QueryHint;
+
         DbSet<T> IReadOnlyEntitiesContext.Set<T>()
         {
             return _entitiesContext.Set<T>();
@@ -44,5 +46,7 @@ public void Dispose()
         {
             _entitiesContext.Dispose();
         }
+
+        public IDisposable WithQueryHint(string queryHint) => _entitiesContext.WithQueryHint(queryHint);
     }
 }

src/NuGetGallery.Core/NuGetGallery.Core.csproj

@@ -121,6 +121,7 @@
     <Compile Include="DisposableAction.cs" />
     <Compile Include="Entities\DatabaseWrapper.cs" />
     <Compile Include="Entities\DbContextTransactionWrapper.cs" />
+    <Compile Include="Entities\QueryHintInterceptor.cs" />
     <Compile Include="Entities\ReadOnlyEntitiesContext.cs" />
     <Compile Include="Entities\IReadOnlyEntitiesContext.cs" />
     <Compile Include="Entities\ReadOnlyEntityRepository.cs" />

src/NuGetGallery.Services/Configuration/FeatureFlagService.cs

@@ -20,6 +20,7 @@ public class FeatureFlagService : IFeatureFlagService
         private const string EmbeddedIconFlightName = GalleryPrefix + "EmbeddedIcons";
         private const string ForceFlatContainerIconsFeatureName = GalleryPrefix + "ForceFlatContainerIcons";
         private const string GitHubUsageFlightName = GalleryPrefix + "GitHubUsage";
+        private const string AdvancedSearchFlightName = GalleryPrefix + "AdvancedSearch";
         private const string PackageDependentsFlightName = GalleryPrefix + "PackageDependents";
         private const string ManageDeprecationFeatureName = GalleryPrefix + "ManageDeprecation";
         private const string ManageDeprecationForManyVersionsFeatureName = GalleryPrefix + "ManageDeprecationMany";
@@ -136,6 +137,11 @@ public bool IsGitHubUsageEnabled(User user)
             return _client.IsEnabled(GitHubUsageFlightName, user, defaultValue: false);
         }
 
+        public bool IsAdvancedSearchEnabled(User user)
+        {
+            return _client.IsEnabled(AdvancedSearchFlightName, user, defaultValue: false);
+        }
+
         public bool IsPackageDependentsEnabled(User user)
         {
             return _client.IsEnabled(PackageDependentsFlightName, user, defaultValue: false);

src/NuGetGallery.Services/Configuration/IFeatureFlagService.cs

@@ -80,6 +80,14 @@ public interface IFeatureFlagService
         /// <returns>Whether or not the Flight is enabled for the user</returns>
         bool IsGitHubUsageEnabled(User user);
 
+        /// <summary>
+        /// Whether a user can see the "Advanced Search" panel in the packages list view as well as use the 
+        /// advanced search request parameters
+        /// </summary>
+        /// <param name="user">The user to test for the Flight</param>
+        /// <returns>Whether or not the Flight is enabled for the user</returns>
+        bool IsAdvancedSearchEnabled(User user);
+
         /// <summary>
         /// Whether a user can see the "Package Dependents" section in a package's display page. Also, no
         /// data is gathered from the database

src/NuGetGallery.Services/PackageManagement/PackageService.cs

@@ -155,8 +155,13 @@ public PackageDependents GetPackageDependents(string id)
             }
 
             PackageDependents result = new PackageDependents();
-            result.TopPackages = GetListOfDependents(id);
-            result.TotalPackageCount = GetDependentCount(id);
+            
+            using (_entitiesContext.WithQueryHint("RECOMPILE"))
+            {
+                result.TopPackages = GetListOfDependents(id);
+                result.TotalPackageCount = GetDependentCount(id);
+            }
+
             return result;
         }
 

src/NuGetGallery/App_Data/Files/Content/AB-Test-Configuration.json

@@ -1,5 +1,5 @@
 {
   "PreviewSearchPercentage": 0,
   "PreviewHijackPercentage": 0,
-  "DependentsPercentage": 0
+  "DependentsPercentage": 100
 }