From a8196b30adfef4f3a8c3a782224975a94c505ecf Mon Sep 17 00:00:00 2001
From: christianwade <chwade@microsoft.com>
Date: Wed, 28 Dec 2016 17:20:19 -0800
Subject: [PATCH] Cleanup

---
 .../ModelConfiguration.cs                     |  4 +--
 .../PartitionProcessor.cs                     | 26 ++++++-------------
 2 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/AsPartitionProcessing/AsPartitionProcessing/ModelConfiguration.cs b/AsPartitionProcessing/AsPartitionProcessing/ModelConfiguration.cs
index 32d9129..f7b156e 100644
--- a/AsPartitionProcessing/AsPartitionProcessing/ModelConfiguration.cs
+++ b/AsPartitionProcessing/AsPartitionProcessing/ModelConfiguration.cs
@@ -49,7 +49,7 @@ namespace AsPartitionProcessing
         public string Password { get; set; }
 
         /// <summary>
-        /// When initialSetUp=false, sets the maximum number of threads on which to run processing commands in parallel. -1 will not set the value.
+        /// Sets the maximum number of threads on which to run processing commands in parallel. -1 will not set the value.
         /// </summary>
         public int MaxParallelism { get; set; }
 
@@ -84,7 +84,7 @@ namespace AsPartitionProcessing
         /// <param name="integratedAuth">Should always set to true for SSAS implementations that will run under the current process account. For Azure AS, normally set to false.</param>
         /// <param name="userName">Only applies when integratedAuth=false. Used for Azure AD UPNs to connect to Azure AS.</param>
         /// <param name="password">Only applies when integratedAuth=false. Used for Azure AD UPNs to connect to Azure AS.</param>
-        /// <param name="maxParallelism">When initialSetUp=false, sets the maximum number of threads on which to run processing commands in parallel. -1 will not set the value.</param>
+        /// <param name="maxParallelism">Sets the maximum number of threads on which to run processing commands in parallel. -1 will not set the value.</param>
         /// <param name="commitTimeout">Set to override of CommitTimeout server property value for the connection. -1 will not override; the server value will be used.</param>
         /// <param name="tableConfigurations">Collection of partitioned tables containing configuration information.</param>
         public ModelConfiguration(
diff --git a/AsPartitionProcessing/AsPartitionProcessing/PartitionProcessor.cs b/AsPartitionProcessing/AsPartitionProcessing/PartitionProcessor.cs
index 9042884..bdd03b7 100644
--- a/AsPartitionProcessing/AsPartitionProcessing/PartitionProcessor.cs
+++ b/AsPartitionProcessing/AsPartitionProcessing/PartitionProcessor.cs
@@ -168,13 +168,6 @@ namespace AsPartitionProcessing
                             templatePartition.RequestRefresh(RefreshType.DataOnly);
                         }
                     }
-
-                    //If initital setup, process tables sequentially
-                    if (_modelConfiguration.InitialSetUp)
-                    {
-                        LogMessage($"Save changes for table {tableConfiguration.AnalysisServicesTable} ...", true);
-                        database.Model.SaveChanges();
-                    }
                 }
 
                 //Commit the data changes, and bring model back online if necessary
@@ -184,18 +177,15 @@ namespace AsPartitionProcessing
                 LogMessage(new String('-', 16), false);
 
                 //Save changes setting MaxParallelism if necessary
-                if (!_modelConfiguration.InitialSetUp)
+                if (_modelConfiguration.MaxParallelism == -1)
                 {
-                    if (_modelConfiguration.MaxParallelism == -1)
-                    {
-                        LogMessage("Save changes ...", true);
-                        database.Model.SaveChanges();
-                    }
-                    else
-                    {
-                        LogMessage($"Save changes with MaxParallelism={Convert.ToString(_modelConfiguration.MaxParallelism)}...", true);
-                        database.Model.SaveChanges(new SaveOptions() { MaxParallelism = _modelConfiguration.MaxParallelism });
-                    }
+                    LogMessage("Save changes ...", true);
+                    database.Model.SaveChanges();
+                }
+                else
+                {
+                    LogMessage($"Save changes with MaxParallelism={Convert.ToString(_modelConfiguration.MaxParallelism)}...", true);
+                    database.Model.SaveChanges(new SaveOptions() { MaxParallelism = _modelConfiguration.MaxParallelism });
                 }
 
                 //Perform recalc if necessary