[Do not review] Single resource

src/Microsoft.Health.Fhir.SqlServer/Features/Schema/SchemaVersion.cs

@@ -94,5 +94,6 @@ public enum SchemaVersion
         V82 = 82,
         V83 = 83,
         V84 = 84,
+        V85 = 85,
     }
 }

src/Microsoft.Health.Fhir.SqlServer/Features/Schema/SchemaVersionConstants.cs

@@ -7,8 +7,8 @@ namespace Microsoft.Health.Fhir.SqlServer.Features.Schema
 {
     public static class SchemaVersionConstants
     {
-        public const int Min = (int)SchemaVersion.V83;
-        public const int Max = (int)SchemaVersion.V84;
+        public const int Min = (int)SchemaVersion.V84;
+        public const int Max = (int)SchemaVersion.V85;
         public const int MinForUpgrade = (int)SchemaVersion.V83; // this is used for upgrade tests only
         public const int SearchParameterStatusSchemaVersion = (int)SchemaVersion.V6;
         public const int SupportForReferencesWithMissingTypeVersion = (int)SchemaVersion.V7;
@@ -33,6 +33,7 @@ public static class SchemaVersionConstants
         public const int Merge = (int)SchemaVersion.V50;
         public const int IncrementalImport = (int)SchemaVersion.V53;
         public const int LakePrerequisite = (int)SchemaVersion.V84;
+        public const int Lake = (int)SchemaVersion.V85;
 
         // It is currently used in Azure Healthcare APIs.
         public const int ParameterizedRemovePartitionFromResourceChangesVersion = (int)SchemaVersion.V21;

src/Microsoft.Health.Fhir.SqlServer/Features/Schema/Sql/Scripts/Sequences.sql

@@ -13,3 +13,12 @@ CREATE SEQUENCE dbo.ResourceSurrogateIdUniquifierSequence
         CYCLE
         CACHE 1000000
 GO
+CREATE SEQUENCE dbo.ResourceIdIntMapSequence
+        AS int
+        START WITH 0
+        INCREMENT BY 1
+        MINVALUE 0
+        MAXVALUE 79999
+        CYCLE
+        CACHE 1000000
+GO

src/Microsoft.Health.Fhir.SqlServer/Features/Schema/Sql/Scripts/TransactionCheckWithInitialiScript.sql

@@ -19,6 +19,6 @@ Go
 
 INSERT INTO dbo.SchemaVersion
 VALUES
-    (84, 'started')
+    (85, 'started')
 
 Go

src/Microsoft.Health.Fhir.SqlServer/Features/Schema/Sql/Sprocs/AssignResourceIdInts.sql

@@ -0,0 +1,29 @@
+CREATE PROCEDURE dbo.AssignResourceIdInts @Count int, @FirstIdInt bigint OUT
+AS
+set nocount on
+DECLARE @SP varchar(100) = 'AssignResourceIdInts'
+       ,@Mode varchar(200) = 'Cnt='+convert(varchar,@Count)
+       ,@st datetime = getUTCdate()
+       ,@FirstValueVar sql_variant
+       ,@LastValueVar sql_variant
+       ,@SequenceRangeFirstValue int
+
+BEGIN TRY
+  SET @FirstValueVar = NULL
+  WHILE @FirstValueVar IS NULL
+  BEGIN
+    EXECUTE sys.sp_sequence_get_range @sequence_name = 'dbo.ResourceIdIntMapSequence', @range_size = @Count, @range_first_value = @FirstValueVar OUT, @range_last_value = @LastValueVar OUT
+    SET @SequenceRangeFirstValue = convert(int,@FirstValueVar)
+    IF @SequenceRangeFirstValue > convert(int,@LastValueVar)
+      SET @FirstValueVar = NULL
+  END
+
+  SET @FirstIdInt = datediff_big(millisecond,'0001-01-01',sysUTCdatetime()) * 80000 + @SequenceRangeFirstValue
+END TRY
+BEGIN CATCH
+  IF error_number() = 1750 THROW -- Real error is before 1750, cannot trap in SQL.
+  IF @@trancount > 0 ROLLBACK TRANSACTION
+  EXECUTE dbo.LogEvent @Process=@SP,@Mode=@Mode,@Status='Error';
+  THROW
+END CATCH
+GO

src/Microsoft.Health.Fhir.SqlServer/Features/Schema/Sql/Sprocs/CaptureResourceIdsForChanges.sql

@@ -1,10 +1,10 @@
-CREATE PROCEDURE dbo.CaptureResourceIdsForChanges @Resources dbo.ResourceList READONLY
+CREATE PROCEDURE dbo.CaptureResourceIdsForChanges @Resources dbo.ResourceList READONLY, @ResourcesLake dbo.ResourceListLake READONLY
 AS
 set nocount on
 -- This procedure is intended to be called from the MergeResources procedure and relies on its transaction logic
 INSERT INTO dbo.ResourceChangeData 
        ( ResourceId, ResourceTypeId, ResourceVersion,                                              ResourceChangeTypeId )
   SELECT ResourceId, ResourceTypeId,         Version, CASE WHEN IsDeleted = 1 THEN 2 WHEN Version > 1 THEN 1 ELSE 0 END
-    FROM @Resources
+    FROM (SELECT ResourceId, ResourceTypeId, Version, IsHistory, IsDeleted FROM @Resources UNION ALL SELECT ResourceId, ResourceTypeId, Version, IsHistory, IsDeleted FROM @ResourcesLake) A
     WHERE IsHistory = 0
 GO

src/Microsoft.Health.Fhir.SqlServer/Features/Schema/Sql/Sprocs/GetResourceVersions.sql

@@ -22,12 +22,17 @@ BEGIN TRY
                    END
         ,MatchedVersion = isnull(D.Version,0)
         ,MatchedRawResource = D.RawResource
+        ,MatchedFileId = D.FileId
+        ,MatchedOffsetInFile = D.OffsetInFile
         -- ResourceIndex allows to deal with more than one late arrival per resource 
-    FROM (SELECT TOP (@DummyTop) *, ResourceIndex = convert(int,row_number() OVER (PARTITION BY ResourceTypeId, ResourceId ORDER BY ResourceSurrogateId DESC)) FROM @ResourceDateKeys) A
-         OUTER APPLY (SELECT TOP 1 * FROM dbo.Resource B WITH (INDEX = IX_Resource_ResourceTypeId_ResourceId_Version) WHERE B.ResourceTypeId = A.ResourceTypeId AND B.ResourceId = A.ResourceId AND B.Version > 0 AND B.ResourceSurrogateId < A.ResourceSurrogateId ORDER BY B.ResourceSurrogateId DESC) L -- lower
-         OUTER APPLY (SELECT TOP 1 * FROM dbo.Resource B WITH (INDEX = IX_Resource_ResourceTypeId_ResourceId_Version) WHERE B.ResourceTypeId = A.ResourceTypeId AND B.ResourceId = A.ResourceId AND B.Version > 0 AND B.ResourceSurrogateId > A.ResourceSurrogateId ORDER BY B.ResourceSurrogateId) U -- upper
-         OUTER APPLY (SELECT TOP 1 * FROM dbo.Resource B WITH (INDEX = IX_Resource_ResourceTypeId_ResourceId_Version) WHERE B.ResourceTypeId = A.ResourceTypeId AND B.ResourceId = A.ResourceId AND B.Version < 0 ORDER BY B.Version) M -- minus
-         OUTER APPLY (SELECT TOP 1 * FROM dbo.Resource B WITH (INDEX = IX_Resource_ResourceTypeId_ResourceId_Version) WHERE B.ResourceTypeId = A.ResourceTypeId AND B.ResourceId = A.ResourceId AND B.ResourceSurrogateId BETWEEN A.ResourceSurrogateId AND A.ResourceSurrogateId + 79999) D -- date
+    FROM (SELECT TOP (@DummyTop) A.*, M.ResourceIdInt, ResourceIndex = convert(int,row_number() OVER (PARTITION BY A.ResourceTypeId, A.ResourceId ORDER BY ResourceSurrogateId DESC)) 
+            FROM @ResourceDateKeys A
+                 LEFT OUTER JOIN dbo.ResourceIdIntMap M WITH (INDEX = U_ResourceIdIntMap_ResourceId_ResourceTypeId) ON M.ResourceTypeId = A.ResourceTypeId AND M.ResourceId = A.ResourceId
+         ) A
+         OUTER APPLY (SELECT TOP 1 * FROM dbo.Resource B WHERE B.ResourceTypeId = A.ResourceTypeId AND B.ResourceIdInt = A.ResourceIdInt AND B.Version > 0 AND B.ResourceSurrogateId < A.ResourceSurrogateId ORDER BY B.ResourceSurrogateId DESC) L -- lower
+         OUTER APPLY (SELECT TOP 1 * FROM dbo.Resource B WHERE B.ResourceTypeId = A.ResourceTypeId AND B.ResourceIdInt = A.ResourceIdInt AND B.Version > 0 AND B.ResourceSurrogateId > A.ResourceSurrogateId ORDER BY B.ResourceSurrogateId) U -- upper
+         OUTER APPLY (SELECT TOP 1 * FROM dbo.Resource B WHERE B.ResourceTypeId = A.ResourceTypeId AND B.ResourceIdInt = A.ResourceIdInt AND B.Version < 0 ORDER BY B.Version) M -- minus
+         OUTER APPLY (SELECT TOP 1 * FROM dbo.Resource B WHERE B.ResourceTypeId = A.ResourceTypeId AND B.ResourceIdInt = A.ResourceIdInt AND B.ResourceSurrogateId BETWEEN A.ResourceSurrogateId AND A.ResourceSurrogateId + 79999) D -- date
     OPTION (MAXDOP 1, OPTIMIZE FOR (@DummyTop = 1))
 
   EXECUTE dbo.LogEvent @Process=@SP,@Mode=@Mode,@Status='End',@Start=@st,@Rows=@@rowcount

src/Microsoft.Health.Fhir.SqlServer/Features/Schema/Sql/Sprocs/GetResources.sql

@@ -6,7 +6,6 @@ set nocount on
 DECLARE @st datetime = getUTCdate()
        ,@SP varchar(100) = 'GetResources'
        ,@InputRows int
-       ,@DummyTop bigint = 9223372036854775807
        ,@NotNullVersionExists bit 
        ,@NullVersionExists bit
        ,@MinRT smallint
@@ -22,57 +21,69 @@ BEGIN TRY
       SELECT B.ResourceTypeId
             ,B.ResourceId
             ,ResourceSurrogateId
-            ,B.Version
+            ,C.Version
             ,IsDeleted
             ,IsHistory
             ,RawResource
             ,IsRawResourceMetaSet
             ,SearchParamHash
-        FROM (SELECT TOP (@DummyTop) * FROM @ResourceKeys) A
-             JOIN dbo.Resource B WITH (INDEX = IX_Resource_ResourceTypeId_ResourceId_Version) ON B.ResourceTypeId = A.ResourceTypeId AND B.ResourceId = A.ResourceId AND B.Version = A.Version
-        OPTION (MAXDOP 1, OPTIMIZE FOR (@DummyTop = 1))
+            ,FileId
+            ,OffsetInFile
+        FROM (SELECT * FROM @ResourceKeys) A
+             INNER LOOP JOIN dbo.ResourceIdIntMap B WITH (INDEX = U_ResourceIdIntMap_ResourceId_ResourceTypeId) ON B.ResourceTypeId = A.ResourceTypeId AND B.ResourceId = A.ResourceId
+             INNER LOOP JOIN dbo.Resource C ON C.ResourceTypeId = A.ResourceTypeId AND C.ResourceIdInt = B.ResourceIdInt AND C.Version = A.Version
+        OPTION (MAXDOP 1)
     ELSE
       SELECT *
         FROM (SELECT B.ResourceTypeId
                     ,B.ResourceId
                     ,ResourceSurrogateId
-                    ,B.Version
+                    ,C.Version
                     ,IsDeleted
                     ,IsHistory
                     ,RawResource
                     ,IsRawResourceMetaSet
                     ,SearchParamHash
-                FROM (SELECT TOP (@DummyTop) * FROM @ResourceKeys WHERE Version IS NOT NULL) A
-                     JOIN dbo.Resource B WITH (INDEX = IX_Resource_ResourceTypeId_ResourceId_Version) ON B.ResourceTypeId = A.ResourceTypeId AND B.ResourceId = A.ResourceId AND B.Version = A.Version
+                    ,FileId
+                    ,OffsetInFile
+                FROM (SELECT * FROM @ResourceKeys WHERE Version IS NOT NULL) A
+                     INNER LOOP JOIN dbo.ResourceIdIntMap B WITH (INDEX = U_ResourceIdIntMap_ResourceId_ResourceTypeId) ON B.ResourceTypeId = A.ResourceTypeId AND B.ResourceId = A.ResourceId
+                     INNER LOOP JOIN dbo.Resource C ON C.ResourceTypeId = A.ResourceTypeId AND C.ResourceIdInt = B.ResourceIdInt AND C.Version = A.Version
               UNION ALL
               SELECT B.ResourceTypeId
                     ,B.ResourceId
-                    ,ResourceSurrogateId
-                    ,B.Version
+                    ,C.ResourceSurrogateId
+                    ,C.Version
                     ,IsDeleted
                     ,IsHistory
                     ,RawResource
                     ,IsRawResourceMetaSet
                     ,SearchParamHash
-                FROM (SELECT TOP (@DummyTop) * FROM @ResourceKeys WHERE Version IS NULL) A
-                     JOIN dbo.Resource B WITH (INDEX = IX_Resource_ResourceTypeId_ResourceId) ON B.ResourceTypeId = A.ResourceTypeId AND B.ResourceId = A.ResourceId
-                WHERE IsHistory = 0
+                    ,FileId
+                    ,OffsetInFile
+                FROM (SELECT * FROM @ResourceKeys WHERE Version IS NULL) A
+                     INNER LOOP JOIN dbo.ResourceIdIntMap B WITH (INDEX = U_ResourceIdIntMap_ResourceId_ResourceTypeId) ON B.ResourceTypeId = A.ResourceTypeId AND B.ResourceId = A.ResourceId
+                     INNER LOOP JOIN dbo.CurrentResources C ON C.ResourceTypeId = A.ResourceTypeId AND C.ResourceIdInt = B.ResourceIdInt AND C.IsHistory = 0
+                     LEFT OUTER JOIN dbo.RawResources D ON D.ResourceTypeId = A.ResourceTypeId AND D.ResourceSurrogateId = C.ResourceSurrogateId
              ) A
-        OPTION (MAXDOP 1, OPTIMIZE FOR (@DummyTop = 1))
+        OPTION (MAXDOP 1)
   ELSE
     SELECT B.ResourceTypeId
           ,B.ResourceId
-          ,ResourceSurrogateId
-          ,B.Version
+          ,C.ResourceSurrogateId
+          ,C.Version
           ,IsDeleted
           ,IsHistory
           ,RawResource
           ,IsRawResourceMetaSet
           ,SearchParamHash
-      FROM (SELECT TOP (@DummyTop) * FROM @ResourceKeys) A
-           JOIN dbo.Resource B WITH (INDEX = IX_Resource_ResourceTypeId_ResourceId) ON B.ResourceTypeId = A.ResourceTypeId AND B.ResourceId = A.ResourceId
-      WHERE IsHistory = 0
-      OPTION (MAXDOP 1, OPTIMIZE FOR (@DummyTop = 1))
+          ,FileId
+          ,OffsetInFile
+      FROM (SELECT * FROM @ResourceKeys) A
+           INNER LOOP JOIN dbo.ResourceIdIntMap B WITH (INDEX = U_ResourceIdIntMap_ResourceId_ResourceTypeId) ON B.ResourceTypeId = A.ResourceTypeId AND B.ResourceId = A.ResourceId
+           INNER LOOP JOIN dbo.CurrentResources C ON C.ResourceTypeId = A.ResourceTypeId AND C.ResourceIdInt = B.ResourceIdInt
+           LEFT OUTER JOIN dbo.RawResources D ON D.ResourceTypeId = A.ResourceTypeId AND D.ResourceSurrogateId = C.ResourceSurrogateId
+      OPTION (MAXDOP 1)
 
   EXECUTE dbo.LogEvent @Process=@SP,@Mode=@Mode,@Status='End',@Start=@st,@Rows=@@rowcount
 END TRY
@@ -83,5 +94,5 @@ BEGIN CATCH
 END CATCH
 GO
 --DECLARE @ResourceKeys dbo.ResourceKeyList
---INSERT INTO @ResourceKeys SELECT TOP 1 ResourceTypeId, ResourceId, NULL FROM Resource
+--INSERT INTO @ResourceKeys SELECT 96, newid(), NULL
 --EXECUTE dbo.GetResources @ResourceKeys

src/Microsoft.Health.Fhir.SqlServer/Features/Schema/Sql/Sprocs/GetResourcesByTransactionId.sql

@@ -6,23 +6,8 @@ set nocount on
 DECLARE @SP varchar(100) = object_name(@@procid)
        ,@Mode varchar(100) = 'T='+convert(varchar,@TransactionId)+' H='+convert(varchar,@IncludeHistory)
        ,@st datetime = getUTCdate()
-       ,@DummyTop bigint = 9223372036854775807
-       ,@TypeId smallint
 
 BEGIN TRY
-  DECLARE @Types TABLE (TypeId smallint PRIMARY KEY, Name varchar(100))
-  INSERT INTO @Types EXECUTE dbo.GetUsedResourceTypes
-
-  DECLARE @Keys TABLE (TypeId smallint, SurrogateId bigint PRIMARY KEY (TypeId, SurrogateId))
-  WHILE EXISTS (SELECT * FROM @Types)
-  BEGIN
-    SET @TypeId = (SELECT TOP 1 TypeId FROM @Types ORDER BY TypeId)
-
-    INSERT INTO @Keys SELECT @TypeId, ResourceSurrogateId FROM dbo.Resource WHERE ResourceTypeId = @TypeId AND TransactionId = @TransactionId
-
-    DELETE FROM @Types WHERE TypeId = @TypeId
-  END
-
   IF @ReturnResourceKeysOnly = 0
     SELECT ResourceTypeId
           ,ResourceId
@@ -34,20 +19,20 @@ BEGIN TRY
           ,IsRawResourceMetaSet
           ,SearchParamHash
           ,RequestMethod
-      FROM (SELECT TOP (@DummyTop) * FROM @Keys) A
-           JOIN dbo.Resource B ON ResourceTypeId = TypeId AND ResourceSurrogateId = SurrogateId
-      WHERE IsHistory = 0 OR @IncludeHistory = 1
-      OPTION (MAXDOP 1, OPTIMIZE FOR (@DummyTop = 1))
+          ,FileId
+          ,OffsetInFile
+      FROM dbo.Resource
+      WHERE TransactionId = @TransactionId AND (IsHistory = 0 OR @IncludeHistory = 1)
+      OPTION (MAXDOP 1)
   ELSE
     SELECT ResourceTypeId
           ,ResourceId
           ,ResourceSurrogateId
           ,Version
           ,IsDeleted
-      FROM (SELECT TOP (@DummyTop) * FROM @Keys) A
-           JOIN dbo.Resource B ON ResourceTypeId = TypeId AND ResourceSurrogateId = SurrogateId
-      WHERE IsHistory = 0 OR @IncludeHistory = 1
-      OPTION (MAXDOP 1, OPTIMIZE FOR (@DummyTop = 1))
+      FROM dbo.Resource
+      WHERE TransactionId = @TransactionId AND (IsHistory = 0 OR @IncludeHistory = 1)
+      OPTION (MAXDOP 1)
 
   EXECUTE dbo.LogEvent @Process=@SP,@Mode=@Mode,@Status='End',@Start=@st,@Rows=@@rowcount
 END TRY

src/Microsoft.Health.Fhir.SqlServer/Features/Schema/Sql/Sprocs/GetResourcesByTypeAndSurrogateIdRange.sql

@@ -1,6 +1,6 @@
 --DROP PROCEDURE dbo.GetResourcesByTypeAndSurrogateIdRange
 GO
-CREATE PROCEDURE dbo.GetResourcesByTypeAndSurrogateIdRange @ResourceTypeId smallint, @StartId bigint, @EndId bigint, @GlobalEndId bigint = NULL, @IncludeHistory bit = 0, @IncludeDeleted bit = 0
+CREATE PROCEDURE dbo.GetResourcesByTypeAndSurrogateIdRange @ResourceTypeId smallint, @StartId bigint, @EndId bigint, @GlobalEndId bigint = NULL, @IncludeHistory bit = 1, @IncludeDeleted bit = 1
 AS
 set nocount on
 DECLARE @SP varchar(100) = 'GetResourcesByTypeAndSurrogateIdRange'
@@ -9,18 +9,19 @@ DECLARE @SP varchar(100) = 'GetResourcesByTypeAndSurrogateIdRange'
                            +' E='+isnull(convert(varchar,@EndId),'NULL')
                            +' GE='+isnull(convert(varchar,@GlobalEndId),'NULL')
                            +' HI='+isnull(convert(varchar,@IncludeHistory),'NULL')
-                           +' DE'+isnull(convert(varchar,@IncludeDeleted),'NULL')
+                           +' DE='+isnull(convert(varchar,@IncludeDeleted),'NULL')
        ,@st datetime = getUTCdate()
        ,@DummyTop bigint = 9223372036854775807
+       ,@Rows int
 
 BEGIN TRY
-  DECLARE @ResourceIds TABLE (ResourceId varchar(64) COLLATE Latin1_General_100_CS_AS PRIMARY KEY)
+  DECLARE @ResourceIdInts TABLE (ResourceIdInt bigint PRIMARY KEY)
   DECLARE @SurrogateIds TABLE (MaxSurrogateId bigint PRIMARY KEY)
 
   IF @GlobalEndId IS NOT NULL AND @IncludeHistory = 0 -- snapshot view
   BEGIN
-    INSERT INTO @ResourceIds
-      SELECT DISTINCT ResourceId
+    INSERT INTO @ResourceIdInts
+      SELECT DISTINCT ResourceIdInt
         FROM dbo.Resource 
         WHERE ResourceTypeId = @ResourceTypeId 
           AND ResourceSurrogateId BETWEEN @StartId AND @EndId
@@ -31,30 +32,44 @@ BEGIN TRY
     IF @@rowcount > 0
       INSERT INTO @SurrogateIds
         SELECT ResourceSurrogateId
-          FROM (SELECT ResourceId, ResourceSurrogateId, RowId = row_number() OVER (PARTITION BY ResourceId ORDER BY ResourceSurrogateId DESC)
-                  FROM dbo.Resource WITH (INDEX = IX_Resource_ResourceTypeId_ResourceId_Version) -- w/o hint access to Resource table is inefficient when many versions are present. Hint is ignored if Resource is a view.
+          FROM (SELECT ResourceIdInt, ResourceSurrogateId, RowId = row_number() OVER (PARTITION BY ResourceIdInt ORDER BY ResourceSurrogateId DESC)
+                  FROM dbo.Resource
                   WHERE ResourceTypeId = @ResourceTypeId
-                    AND ResourceId IN (SELECT TOP (@DummyTop) ResourceId FROM @ResourceIds)
+                    AND ResourceIdInt IN (SELECT TOP (@DummyTop) ResourceIdInt FROM @ResourceIdInts)
                     AND ResourceSurrogateId BETWEEN @StartId AND @GlobalEndId
                ) A
           WHERE RowId = 1
             AND ResourceSurrogateId BETWEEN @StartId AND @EndId
           OPTION (MAXDOP 1, OPTIMIZE FOR (@DummyTop = 1))
   END
 
-  SELECT ResourceTypeId, ResourceId, Version, IsDeleted, ResourceSurrogateId, RequestMethod, IsMatch = convert(bit,1), IsPartial = convert(bit,0), IsRawResourceMetaSet, SearchParamHash, RawResource 
-    FROM dbo.Resource
-    WHERE ResourceTypeId = @ResourceTypeId 
-      AND ResourceSurrogateId BETWEEN @StartId AND @EndId 
-      AND (IsHistory = 0 OR @IncludeHistory = 1)
-      AND (IsDeleted = 0 OR @IncludeDeleted = 1)
-  UNION ALL
-  SELECT ResourceTypeId, ResourceId, Version, IsDeleted, ResourceSurrogateId, RequestMethod, IsMatch = convert(bit,1), IsPartial = convert(bit,0), IsRawResourceMetaSet, SearchParamHash, RawResource 
-    FROM @SurrogateIds
-         JOIN dbo.Resource ON ResourceTypeId = @ResourceTypeId AND ResourceSurrogateId = MaxSurrogateId
-    WHERE IsHistory = 1
-      AND (IsDeleted = 0 OR @IncludeDeleted = 1)
-      OPTION (MAXDOP 1)
+  IF @IncludeHistory = 0
+    SELECT ResourceTypeId, ResourceId, Version, IsDeleted, ResourceSurrogateId, RequestMethod, IsMatch = convert(bit,1), IsPartial = convert(bit,0), IsRawResourceMetaSet, SearchParamHash, RawResource, FileId, OffsetInFile
+      FROM dbo.Resource
+      WHERE ResourceTypeId = @ResourceTypeId 
+        AND ResourceSurrogateId BETWEEN @StartId AND @EndId 
+        AND IsHistory = 0
+        AND (IsDeleted = 0 OR @IncludeDeleted = 1)
+    UNION ALL
+    SELECT ResourceTypeId, ResourceId, Version, IsDeleted, ResourceSurrogateId, RequestMethod, IsMatch = convert(bit,1), IsPartial = convert(bit,0), IsRawResourceMetaSet, SearchParamHash, RawResource, FileId, OffsetInFile
+      FROM @SurrogateIds
+           JOIN dbo.Resource ON ResourceTypeId = @ResourceTypeId AND ResourceSurrogateId = MaxSurrogateId
+      WHERE IsHistory = 1
+        AND (IsDeleted = 0 OR @IncludeDeleted = 1)
+    OPTION (MAXDOP 1, LOOP JOIN)
+  ELSE -- @IncludeHistory = 1
+    SELECT ResourceTypeId, ResourceId, Version, IsDeleted, ResourceSurrogateId, RequestMethod, IsMatch = convert(bit,1), IsPartial = convert(bit,0), IsRawResourceMetaSet, SearchParamHash, RawResource, FileId, OffsetInFile
+      FROM dbo.Resource
+      WHERE ResourceTypeId = @ResourceTypeId 
+        AND ResourceSurrogateId BETWEEN @StartId AND @EndId 
+        AND (IsDeleted = 0 OR @IncludeDeleted = 1)
+    UNION ALL
+    SELECT ResourceTypeId, ResourceId, Version, IsDeleted, ResourceSurrogateId, RequestMethod, IsMatch = convert(bit,1), IsPartial = convert(bit,0), IsRawResourceMetaSet, SearchParamHash, RawResource, FileId, OffsetInFile
+      FROM @SurrogateIds
+           JOIN dbo.Resource ON ResourceTypeId = @ResourceTypeId AND ResourceSurrogateId = MaxSurrogateId
+      WHERE IsHistory = 1
+        AND (IsDeleted = 0 OR @IncludeDeleted = 1)
+    OPTION (MAXDOP 1, LOOP JOIN)
 
   EXECUTE dbo.LogEvent @Process=@SP,@Mode=@Mode,@Status='End',@Start=@st,@Rows=@@rowcount
 END TRY