mujiannan/Analysis-Services
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Microsoft/Analysis-Services

Browse Source
This commit is contained in:
christianwade 2019-05-08 16:46:59 -07:00
commit 8dbe11a348
10 changed files with 377 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SetUpAggs/AW Internet Sales/AdventureWorksAggs.smproj
View File

@ -24,7 +24,7 @@
<DeploymentOptionADALCache>Default</DeploymentOptionADALCache>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == '' ">
<DeploymentServerName>asazure://aspaastest14.asazure-int.windows.net/sukanyasaltsrc1</DeploymentServerName>
<DeploymentServerName>localhost\SQL2016</DeploymentServerName>
<DeploymentServerEdition>Developer</DeploymentServerEdition>
<DeploymentServerVersion>Unknown</DeploymentServerVersion>
<DeploymentServerDatabase>AdventureWorksAggs</DeploymentServerDatabase>

2
SetUpAggs/AdventureWorksAggsProvider/AdventureWorksAggsProvider.smproj
View File

@ -24,7 +24,7 @@
<DeploymentOptionQueryImpersonation>Default</DeploymentOptionQueryImpersonation>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == '' ">
<DeploymentServerName>asazure://aspaastest14.asazure-int.windows.net/sukanyasaltsrc1</DeploymentServerName>
<DeploymentServerName>localhost\SQL2016</DeploymentServerName>
<DeploymentServerEdition>Developer</DeploymentServerEdition>
<DeploymentServerVersion>Unknown</DeploymentServerVersion>
<DeploymentServerDatabase>AdventureWorksAggsProvider</DeploymentServerDatabase>

63
SetUpAggs/AggsConfig.json
View File

@ -1,73 +1,36 @@
{
"database": {
"name": "AdventureWorksAggsProvider_PH",
"name": "AdventureWorksAggsProvider",
"tables": [
{
"name": "DimGeography",
"mode": "Dual"
"mode": "DirectQuery",
"refreshType": "Full"
},
{
"name": "DimCustomer",
"mode": "Dual"
"mode": "DirectQuery",
"refreshType": "Full"
},
{
"name": "DimDate",
"mode": "Dual"
"mode": "DirectQuery",
"refreshType": "Full"
},
{
"name": "DimProductSubcategory",
"mode": "Dual"
"mode": "DirectQuery",
"refreshType": "Full"
},
{
"name": "DimProductCategory",
"mode": "Dual"
"mode": "DirectQuery",
"refreshType": "Full"
},
{
"name": "FactInternetSalesAgg",
"mode": "Import",
"aggregationRules": [
{
"aggTableColumn": "OrderDateKey",
"summarization": "GroupBy",
"detailTable": "FactInternetSales",
"detailTableColumn": "OrderDateKey"
},
{
"aggTableColumn": "CustomerKey",
"summarization": "GroupBy",
"detailTable": "FactInternetSales",
"detailTableColumn": "CustomerKey"
},
{
"aggTableColumn": "ProductSubcategoryKey",
"summarization": "GroupBy",
"detailTable": "DimProduct",
"detailTableColumn": "ProductSubcategoryKey"
},
{
"aggTableColumn": "SalesAmount_Sum",
"summarization": "Sum",
"detailTable": "FactInternetSales",
"detailTableColumn": "SalesAmount"
},
{
"aggTableColumn": "UnitPrice_Sum",
"summarization": "Min",
"detailTable": "FactInternetSales",
"detailTableColumn": "UnitPrice"
},
{
"aggTableColumn": "UnitPrice_Count",
"summarization": "Count",
"detailTable": "FactInternetSales",
"detailTableColumn": "UnitPrice"
},
{
"aggTableColumn": "FactInternetSales_Count",
"summarization": "CountTableRows",
"detailTable": "FactInternetSales"
}
]
"mode": "DirectQuery",
"refreshType": "Full"
}
]
}

74
SetUpAggs/AggsConfig2.json
View File

@ -1,74 +0,0 @@
{
"database": {
"name": "AdventureWorksAggsProvider_PH",
"tables": [
{
"name": "DimGeography",
"mode": "Dual"
},
{
"name": "DimCustomer",
"mode": "Dual"
},
{
"name": "DimDate",
"mode": "Dual"
},
{
"name": "DimProductSubcategory",
"mode": "Dual"
},
{
"name": "DimProductCategory",
"mode": "Dual"
},
{
"name": "FactInternetSalesAgg",
"mode": "Import",
"aggregationRules": [
{
"aggTableColumn": "OrderDateKey",
"summarization": "GroupBy",
"detailTable": "FactInternetSales",
"detailTableColumn": "OrderDateKey"
},
{
"aggTableColumn": "CustomerKey",
"summarization": "GroupBy",
"detailTable": "FactInternetSales",
"detailTableColumn": "CustomerKey"
},
{
"aggTableColumn": "ProductSubcategoryKey",
"summarization": "GroupBy",
"detailTable": "DimProduct",
"detailTableColumn": "ProductSubcategoryKey"
},
{
"aggTableColumn": "SalesAmount_Sum",
"summarization": "Sum",
"detailTable": "FactInternetSales",
"detailTableColumn": "SalesAmount"
},
{
"aggTableColumn": "UnitPrice_Sum",
"summarization": "Sum",
"detailTable": "FactInternetSales",
"detailTableColumn": "UnitPrice"
},
{
"aggTableColumn": "UnitPrice_Count",
"summarization": "Count",
"detailTable": "FactInternetSales",
"detailTableColumn": "UnitPrice"
},
{
"aggTableColumn": "FactInternetSales_Count",
"summarization": "CountTableRows",
"detailTable": "FactInternetSales"
}
]
}
]
}
}

75
SetUpAggs/AggsConfig_SetAggs1.json Normal file
View File

@ -0,0 +1,75 @@
{
"database": {
"name": "AdventureWorksAggsProvider",
"tables": [
{
"name": "DimGeography",
"mode": "Dual",
"refreshType": "Full"
},
{
"name": "DimCustomer",
"mode": "Dual",
"refreshType": "Full"
},
{
"name": "DimDate",
"mode": "Dual",
"refreshType": "Full"
},
{
"name": "DimProductSubcategory",
"mode": "Dual",
"refreshType": "Full"
},
{
"name": "DimProductCategory",
"mode": "Dual",
"refreshType": "Full"
},
{
"name": "FactInternetSalesAgg",
"mode": "Import",
"refreshType": "Full",
"aggregationRules": [
{
"aggTableColumn": "OrderDateKey",
"summarization": "GroupBy",
"detailTable": "FactInternetSales",
"detailTableColumn": "OrderDateKey"
},
{
"aggTableColumn": "CustomerKey",
"summarization": "GroupBy",
"detailTable": "FactInternetSales",
"detailTableColumn": "CustomerKey"
},
{
"aggTableColumn": "ProductSubcategoryKey",
"summarization": "GroupBy",
"detailTable": "DimProduct",
"detailTableColumn": "ProductSubcategoryKey"
},
{
"aggTableColumn": "SalesAmount_Sum",
"summarization": "Sum",
"detailTable": "FactInternetSales",
"detailTableColumn": "SalesAmount"
},
{
"aggTableColumn": "UnitPrice_Sum",
"summarization": "Min",
"detailTable": "FactInternetSales",
"detailTableColumn": "UnitPrice"
},
{
"aggTableColumn": "UnitPrice_Count",
"summarization": "Count",
"detailTable": "FactInternetSales",
"detailTableColumn": "UnitPrice"
}
]
}
]
}
}

74
SetUpAggs/AggsConfig_SetAggs2.json Normal file
View File

@ -0,0 +1,74 @@
{
"database": {
"name": "AdventureWorksAggsProvider",
"tables": [
{
"name": "DimGeography",
"mode": "Dual",
"refreshType": "Full"
},
{
"name": "DimCustomer",
"mode": "Dual",
"refreshType": "Full"
},
{
"name": "DimDate",
"mode": "Dual",
"refreshType": "Full"
},
{
"name": "DimProductSubcategory",
"mode": "Dual",
"refreshType": "Full"
},
{
"name": "DimProductCategory",
"mode": "Dual",
"refreshType": "Full"
},
{
"name": "FactInternetSalesAgg",
"mode": "Import",
"refreshType": "Full",
"aggregationRules": [
{
"aggTableColumn": "OrderDateKey",
"summarization": "GroupBy",
"detailTable": "FactInternetSales",
"detailTableColumn": "OrderDateKey"
},
{
"aggTableColumn": "CustomerKey",
"summarization": "GroupBy",
"detailTable": "FactInternetSales",
"detailTableColumn": "CustomerKey"
},
{
"aggTableColumn": "ProductSubcategoryKey",
"summarization": "GroupBy",
"detailTable": "DimProduct",
"detailTableColumn": "ProductSubcategoryKey"
},
{
"aggTableColumn": "SalesAmount_Sum",
"summarization": "Sum",
"detailTable": "FactInternetSales",
"detailTableColumn": "SalesAmount"
},
{
"aggTableColumn": "UnitPrice_Sum",
"summarization": "Sum",
"detailTable": "FactInternetSales",
"detailTableColumn": "UnitPrice"
},
{
"aggTableColumn": "FactInternetSales_Count",
"summarization": "CountTableRows",
"detailTable": "FactInternetSales"
}
]
}
]
}
}

37
SetUpAggs/AggsConfig_SetDQ.json Normal file
View File

@ -0,0 +1,37 @@
{
"database": {
"name": "AdventureWorksAggsProvider",
"tables": [
{
"name": "DimGeography",
"mode": "DirectQuery",
"refreshType": "Full"
},
{
"name": "DimCustomer",
"mode": "DirectQuery",
"refreshType": "Full"
},
{
"name": "DimDate",
"mode": "DirectQuery",
"refreshType": "Full"
},
{
"name": "DimProductSubcategory",
"mode": "DirectQuery",
"refreshType": "Full"
},
{
"name": "DimProductCategory",
"mode": "DirectQuery",
"refreshType": "Full"
},
{
"name": "FactInternetSalesAgg",
"mode": "DirectQuery",
"refreshType": "Full"
}
]
}
}

15
SetUpAggs/Program.cs
View File

@ -66,6 +66,9 @@ namespace SetUpAggs
[JsonProperty("mode")]
public string Mode { get; set; }
[JsonProperty("refreshType")]
public string RefreshType { get; set; }
[JsonProperty("aggregationRules", NullValueHandling = NullValueHandling.Ignore)]
public AggregationRule[] AggregationRules { get; set; }
}
@ -287,8 +290,9 @@ namespace SetUpAggs
/// <param name="serverName"></param>
private void Connect(string serverName)
{
// Changed this line to force login dialogs
//string connectionString = $"Provider=MSOLAP;Data Source={args.Server};";
string connectionString = $"Provider=MSOLAP;Data Source={serverName};Integrated Security=SSPI;Persist Security Info=True;";
string connectionString = $"Provider=MSOLAP;Data Source={serverName};Persist Security Info=True;";
server.Connect(connectionString);
database = server.Databases.FindByName(aggsConfig.Database.Name);
@ -411,12 +415,17 @@ namespace SetUpAggs
{
Console.ForegroundColor = ConsoleColor.White;
Console.Write($"Refreshing table [{tableObj.Name}] ");
tableObj.RequestRefresh(RefreshType.Full);
Table tableConfig = aggsConfig.Database.Tables.First(x => x.Name == tableObj.Name);
var refreshType = (RefreshType)Enum.Parse(typeof(RefreshType), tableConfig.RefreshType);
tableObj.RequestRefresh(refreshType);
Console.ForegroundColor = ConsoleColor.Green;
Console.WriteLine("COMPLETE");
}
database.Model.SaveChanges();
// Removed this line which was throwing errors on large models, and it seems to commit the changes without it
// database.Model.SaveChanges();
Console.ForegroundColor = ConsoleColor.White;
Console.WriteLine("Refreshing tables - end: " + DateTime.Now.ToString("hh:mm:ss tt"));

110
SetUpAggs/README.md Normal file
View File

@ -0,0 +1,110 @@
# SetUpAggs
This utility is designed to assist in updating a Power BI dataset to utilize the Composite Model and Aggregations features. The utility will connect to a Power BI workspace through the XMLA endpoint and read in a configuration file, this configuration file will specify the database and associated tables to update the Composite Model and Aggregations properties.
It will upgrade the model to Compatibility Level 1465, this change is not reversible via this utility. The utility will only update the metadata of tables listed in the configuration file, but it will both add and remove Aggregation column definitions, so that the model metadata will match the configuration file. Partition mode changes will be applied to all the partitions defined on the table.
## Example Usage
SetUpAggs.exe apply -Server [PowerBI workspace URL] -ConfigFile AggsConfig.json
## Steps
* Parse command line arguments, show basic help
* Connect to model
* Validate configuration file against the model, exit with relevant error message if issue is found in configuration or model
* Update model compatibility level if current compatibility level is below 1465
* Apply configuration changes to model
* For each table
* For each partition, update partition mode to Dual, DirectQuery, Import, or Default as specified in config
* For each column, remove any AlternateOf definitions that do not match an aggregation rule in the config
* For each rule, add the AlternateOf definition to the model if it does not already exist
* If changes were made to the model, run the ExpandFull on the model
* If changes were made to the model, refresh the tables that were modified
## Configuration File Example
Accepted values for enumeration fields:
database.tables[].mode - Default, DirectQuery, Dual, Import
database.tables[].refreshType - Add, Automatic, Calculate, ClearValues, DataOnly, Defragment, Full
database.tables[].aggregationRules[].summarization - Count, GroupBy, Max, Min, Sum, CountTableRows
```json
{
"database": {
"name": "AdventureWorksAggsProvider",
"tables": [
{
"name": "DimGeography",
"mode": "Dual",
"refreshType": "Full"
},
{
"name": "DimCustomer",
"mode": "Dual",
"refreshType": "Full"
},
{
"name": "DimDate",
"mode": "Dual",
"refreshType": "Full"
},
{
"name": "DimProductSubcategory",
"mode": "Dual",
"refreshType": "Full"
},
{
"name": "DimProductCategory",
"mode": "Dual",
"refreshType": "Full"
},
{
"name": "FactInternetSalesAgg",
"mode": "Import",
"refreshType": "Full",
"aggregationRules": [
{
"aggTableColumn": "OrderDateKey",
"summarization": "GroupBy",
"detailTable": "FactInternetSales",
"detailTableColumn": "OrderDateKey"
},
{
"aggTableColumn": "CustomerKey",
"summarization": "GroupBy",
"detailTable": "FactInternetSales",
"detailTableColumn": "CustomerKey"
},
{
"aggTableColumn": "ProductSubcategoryKey",
"summarization": "GroupBy",
"detailTable": "DimProduct",
"detailTableColumn": "ProductSubcategoryKey"
},
{
"aggTableColumn": "SalesAmount_Sum",
"summarization": "Sum",
"detailTable": "FactInternetSales",
"detailTableColumn": "SalesAmount"
},
{
"aggTableColumn": "UnitPrice_Sum",
"summarization": "Sum",
"detailTable": "FactInternetSales",
"detailTableColumn": "UnitPrice"
},
{
"aggTableColumn": "FactInternetSales_Count",
"summarization": "CountTableRows",
"detailTable": "FactInternetSales"
}
]
}
]
}
}
```

32
SetUpAggs/SetUpAggs.csproj
View File

@ -11,6 +11,21 @@
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
<UpdateEnabled>false</UpdateEnabled>
<UpdateMode>Foreground</UpdateMode>
<UpdateInterval>7</UpdateInterval>
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
<UpdatePeriodically>false</UpdatePeriodically>
<UpdateRequired>false</UpdateRequired>
<MapFileExtensions>true</MapFileExtensions>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
@ -67,8 +82,25 @@
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<None Include="AggsConfig.json" />
<None Include="AggsConfig_SetAggs1.json" />
<None Include="AggsConfig_SetAggs2.json" />
<None Include="AggsConfig_SetDQ.json" />
<None Include="App.config" />
<None Include="packages.config" />
<None Include="README.md" />
</ItemGroup>
<ItemGroup>
<BootstrapperPackage Include=".NETFramework,Version=v4.6.1">
<Visible>False</Visible>
<ProductName>Microsoft .NET Framework 4.6.1 %28x86 and x64%29</ProductName>
<Install>true</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1</ProductName>
<Install>false</Install>
</BootstrapperPackage>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>