Skip to content

Merge remote-tracking branch 'refs/remotes/Microsoft/master' #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jodebrui merged 4 commits into from
Mar 23, 2016
Merged

Merge remote-tracking branch 'refs/remotes/Microsoft/master' #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0b7169c
Merge remote-tracking branch 'refs/remotes/Microsoft/master'
jodebrui Mar 22, 2016
ddff99f
cleaning up workload
jodebrui Mar 23, 2016
21cb882
Merge remote-tracking branch 'refs/remotes/Microsoft/master'
jodebrui Mar 23, 2016
5cce415
Cleaned up unused data source references
jodebrui Mar 23, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 34 additions & 34 deletions Ticket Reservations/DemoWorkload/App.Config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
<?xml version="1.0"?>
<configuration>
<connectionStrings>
<!-- the app uses the TicketReservations conn str.
-->
<add name="TicketReservations" connectionString="Server=.;Database=TicketReservations;Integrated Security=True" providerName="System.Data.SqlClient" />
</connectionStrings>
<appSettings>
<!-- For Azure DB, recommend to reduce the ThreadCount-->
<add key="ThreadCount" value="80" />
<add key="ReadsPerWrite" value="1" />
<add key="RequestCount" value="100000" />
<add key="RowCount" value="100" />
<add key="TransactionCount" value="1" />
<add key="WorkloadIndex" value="0" />
<add key="MaxTps" value="70" />
<add key="MaxLatchWaits" value="20000" />
<add key="ClientSettingsProvider.ServiceUri" value="" />
</appSettings>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" />
</startup>
<system.web>
<membership defaultProvider="ClientAuthenticationMembershipProvider">
<providers>
<add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" />
</providers>
</membership>
<roleManager defaultProvider="ClientRoleProvider" enabled="true">
<providers>
<add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" />
</providers>
</roleManager>
</system.web>
<?xml version="1.0"?>
<configuration>
<connectionStrings>
<!-- the app uses the TicketReservations conn str.
-->
<add name="TicketReservations" connectionString="Server=.;Database=TicketReservations;Integrated Security=True" providerName="System.Data.SqlClient" />
</connectionStrings>
<appSettings>
<!-- For Azure DB, recommend to reduce the ThreadCount-->
<add key="ThreadCount" value="80" />
<add key="ReadsPerWrite" value="1" />
<add key="RequestCount" value="100000" />
<add key="RowCount" value="10" />
<add key="TransactionCount" value="1" />
<add key="WorkloadIndex" value="0" />
<add key="MaxTps" value="100" />
<add key="MaxLatchWaits" value="20000" />
<add key="ClientSettingsProvider.ServiceUri" value="" />
</appSettings>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" />
</startup>
<system.web>
<membership defaultProvider="ClientAuthenticationMembershipProvider">
<providers>
<add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" />
</providers>
</membership>
<roleManager defaultProvider="ClientRoleProvider" enabled="true">
<providers>
<add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" />
</providers>
</roleManager>
</system.web>
</configuration>
413 changes: 206 additions & 207 deletions Ticket Reservations/DemoWorkload/DemoWorkload.csproj
View file
Open in desktop

Large diffs are not rendered by default.

940 changes: 478 additions & 462 deletions Ticket Reservations/DemoWorkload/FrmMain.Designer.cs
View file
Open in desktop

Large diffs are not rendered by default.

78 changes: 39 additions & 39 deletions Ticket Reservations/DemoWorkload/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,39 +1,39 @@
using System.Resources;
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;

// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("DemoWorkload")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Microsoft IT")]
[assembly: AssemblyProduct("DemoWorkload")]
[assembly: AssemblyCopyright("Copyright © Microsoft IT 2012")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]

// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("b5dbed29-db11-442b-bd31-d0e6e97feff7")]

// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: NeutralResourcesLanguage("en-US")]

using System.Resources;
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("DemoWorkload")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Microsoft")]
[assembly: AssemblyProduct("DemoWorkload")]
[assembly: AssemblyCopyright("Copyright © Microsoft 2016")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("b5dbed29-db11-442b-bd31-d0e6e97feff7")]
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: NeutralResourcesLanguage("en-US")]
10 changes: 0 additions & 10 deletions Ticket Reservations/DemoWorkload/Properties/DataSources/hekaton_demoEntities.datasource
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions Ticket Reservations/DemoWorkload/Properties/DataSources/hekaton_demoEntities1.datasource
View file
Open in desktop

This file was deleted.

149 changes: 75 additions & 74 deletions Ticket Reservations/TicketReservations/TicketReservations.sqlproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,75 +1,76 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<Name>TicketReservations</Name>
<SchemaVersion>2.0</SchemaVersion>
<ProjectVersion>4.1</ProjectVersion>
<ProjectGuid>{38641248-77ea-479b-b496-3eda463acead}</ProjectGuid>
<DSP>Microsoft.Data.Tools.Schema.Sql.Sql130DatabaseSchemaProvider</DSP>
<OutputType>Database</OutputType>
<RootPath>
</RootPath>
<RootNamespace>TicketReservations</RootNamespace>
<AssemblyName>TicketReservations</AssemblyName>
<ModelCollation>1033,CI</ModelCollation>
<DefaultFileStructure>BySchemaAndSchemaType</DefaultFileStructure>
<DeployToDatabase>True</DeployToDatabase>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetLanguage>CS</TargetLanguage>
<AppDesignerFolder>Properties</AppDesignerFolder>
<SqlServerVerification>False</SqlServerVerification>
<IncludeCompositeObjects>True</IncludeCompositeObjects>
<TargetDatabaseSet>True</TargetDatabaseSet>
<DefaultCollation>SQL_Latin1_General_CP1_CI_AS</DefaultCollation>
<DefaultFilegroup>PRIMARY</DefaultFilegroup>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<OutputPath>bin\Release\</OutputPath>
<BuildScriptName>$(MSBuildProjectName).sql</BuildScriptName>
<TreatWarningsAsErrors>False</TreatWarningsAsErrors>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<DefineDebug>false</DefineDebug>
<DefineTrace>true</DefineTrace>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>bin\Debug\</OutputPath>
<BuildScriptName>$(MSBuildProjectName).sql</BuildScriptName>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<DefineDebug>true</DefineDebug>
<DefineTrace>true</DefineTrace>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">11.0</VisualStudioVersion>
<!-- Default to the v11.0 targets path if the targets file for the current VS version is not found -->
<SSDTExists Condition="Exists('$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\SSDT\Microsoft.Data.Tools.Schema.SqlTasks.targets')">True</SSDTExists>
<VisualStudioVersion Condition="'$(SSDTExists)' == ''">11.0</VisualStudioVersion>
</PropertyGroup>
<Import Condition="'$(SQLDBExtensionsRefPath)' != ''" Project="$(SQLDBExtensionsRefPath)\Microsoft.Data.Tools.Schema.SqlTasks.targets" />
<Import Condition="'$(SQLDBExtensionsRefPath)' == ''" Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\SSDT\Microsoft.Data.Tools.Schema.SqlTasks.targets" />
<ItemGroup>
<Folder Include="Properties" />
<Folder Include="dbo\" />
<Folder Include="dbo\Tables\" />
<Folder Include="dbo\Stored Procedures\" />
<Folder Include="dbo\Sequences\" />
</ItemGroup>
<ItemGroup>
<Build Include="dbo\Tables\TicketReservationDetail.sql" />
<Build Include="dbo\Stored Procedures\InsertReservationDetails.sql" />
<Build Include="dbo\Stored Procedures\BatchInsertReservations.sql" />
<Build Include="dbo\Stored Procedures\ReadMultipleReservations.sql" />
<Build Include="dbo\Stored Procedures\Demo_Reset.sql" />
<Build Include="dbo\Sequences\TicketReservationSequence.sql" />
</ItemGroup>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<Name>TicketReservations</Name>
<SchemaVersion>2.0</SchemaVersion>
<ProjectVersion>4.1</ProjectVersion>
<ProjectGuid>{38641248-77ea-479b-b496-3eda463acead}</ProjectGuid>
<DSP>Microsoft.Data.Tools.Schema.Sql.Sql130DatabaseSchemaProvider</DSP>
<OutputType>Database</OutputType>
<RootPath>
</RootPath>
<RootNamespace>TicketReservations</RootNamespace>
<AssemblyName>TicketReservations</AssemblyName>
<ModelCollation>1033,CI</ModelCollation>
<DefaultFileStructure>BySchemaAndSchemaType</DefaultFileStructure>
<DeployToDatabase>True</DeployToDatabase>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetLanguage>CS</TargetLanguage>
<AppDesignerFolder>Properties</AppDesignerFolder>
<SqlServerVerification>False</SqlServerVerification>
<IncludeCompositeObjects>True</IncludeCompositeObjects>
<TargetDatabaseSet>True</TargetDatabaseSet>
<DefaultCollation>SQL_Latin1_General_CP1_CI_AS</DefaultCollation>
<DefaultFilegroup>PRIMARY</DefaultFilegroup>
<MemoryOptimizedElevateToSnapshot>True</MemoryOptimizedElevateToSnapshot>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<OutputPath>bin\Release\</OutputPath>
<BuildScriptName>$(MSBuildProjectName).sql</BuildScriptName>
<TreatWarningsAsErrors>False</TreatWarningsAsErrors>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<DefineDebug>false</DefineDebug>
<DefineTrace>true</DefineTrace>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>bin\Debug\</OutputPath>
<BuildScriptName>$(MSBuildProjectName).sql</BuildScriptName>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<DefineDebug>true</DefineDebug>
<DefineTrace>true</DefineTrace>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">11.0</VisualStudioVersion>
<!-- Default to the v11.0 targets path if the targets file for the current VS version is not found -->
<SSDTExists Condition="Exists('$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\SSDT\Microsoft.Data.Tools.Schema.SqlTasks.targets')">True</SSDTExists>
<VisualStudioVersion Condition="'$(SSDTExists)' == ''">11.0</VisualStudioVersion>
</PropertyGroup>
<Import Condition="'$(SQLDBExtensionsRefPath)' != ''" Project="$(SQLDBExtensionsRefPath)\Microsoft.Data.Tools.Schema.SqlTasks.targets" />
<Import Condition="'$(SQLDBExtensionsRefPath)' == ''" Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\SSDT\Microsoft.Data.Tools.Schema.SqlTasks.targets" />
<ItemGroup>
<Folder Include="Properties" />
<Folder Include="dbo\" />
<Folder Include="dbo\Tables\" />
<Folder Include="dbo\Stored Procedures\" />
<Folder Include="dbo\Sequences\" />
</ItemGroup>
<ItemGroup>
<Build Include="dbo\Tables\TicketReservationDetail.sql" />
<Build Include="dbo\Stored Procedures\InsertReservationDetails.sql" />
<Build Include="dbo\Stored Procedures\BatchInsertReservations.sql" />
<Build Include="dbo\Stored Procedures\ReadMultipleReservations.sql" />
<Build Include="dbo\Stored Procedures\Demo_Reset.sql" />
<Build Include="dbo\Sequences\TicketReservationSequence.sql" />
</ItemGroup>
</Project>
52 changes: 28 additions & 24 deletions Ticket Reservations/TicketReservations/dbo/Stored Procedures/BatchInsertReservations.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,28 @@
create proc BatchInsertReservations(@ServerTransactions int, @RowsPerTransaction int, @ThreadID int)
AS
begin
DECLARE @tranCount int = 0;
DECLARE @TS Datetime2;
DECLARE @Char_TS NVARCHAR(23);
DECLARE @CurrentSeq int = 0;

SET @TS = CURRENT_TIMESTAMP;
SET @Char_TS = CAST(@TS AS NVARCHAR(23));
WHILE (@tranCount < @ServerTransactions)
BEGIN
BEGIN TRY
BEGIN TRAN
SET @CurrentSeq = NEXT VALUE FOR TicketReservationSequence ;
EXEC InsertReservationDetails @CurrentSeq, @RowsPerTransaction, @Char_TS, @ThreadID;
COMMIT TRAN
END TRY
BEGIN CATCH
ROLLBACK TRAN
END CATCH
SET @tranCount += 1;
END
END
-- helper stored procedure to

CREATE PROCEDURE BatchInsertReservations(@ServerTransactions int, @RowsPerTransaction int, @ThreadID int)
AS
BEGIN
DECLARE @tranCount int = 0;
DECLARE @TS Datetime2;
DECLARE @Char_TS NVARCHAR(23);
DECLARE @CurrentSeq int = 0;

SET @TS = SYSDATETIME();
SET @Char_TS = CAST(@TS AS NVARCHAR(23));
WHILE (@tranCount < @ServerTransactions)
BEGIN
BEGIN TRY
BEGIN TRAN
SET @CurrentSeq = NEXT VALUE FOR TicketReservationSequence ;
EXEC InsertReservationDetails @CurrentSeq, @RowsPerTransaction, @Char_TS, @ThreadID;
COMMIT TRAN
END TRY
BEGIN CATCH
IF XACT_STATE() = -1
ROLLBACK TRAN
;THROW
END CATCH
SET @tranCount += 1;
END
END
Loading