Refactor to fix Dax.Model.Extractor namespace (#120)

albertospelta · web-flow · commit 3049bd8f9764 · 2024-03-22T19:35:41.000+01:00
diff --git a/src/Dax.Model.Extractor.Tests/DaxModelFixture.cs b/src/Dax.Model.Extractor.Tests/DaxModelFixture.cs
@@ -1,6 +1,5 @@
 ﻿namespace Dax.Model.Extractor.Tests
 {
-    using Dax.Metadata.Extractor;
     using Microsoft.AnalysisServices;
     using System.IO;
     using TOM = Microsoft.AnalysisServices.Tabular;
diff --git a/src/Dax.Model.Extractor.Tests/DaxModelTests.cs b/src/Dax.Model.Extractor.Tests/DaxModelTests.cs
@@ -1,6 +1,5 @@
 ﻿namespace Dax.Model.Extractor.Tests
 {
-    using Dax.Metadata.Extractor;
     using Microsoft.AnalysisServices;
     using System.Linq;
     using Xunit;
diff --git a/src/Dax.Model.Extractor.Tests/TomExtractorTests.cs b/src/Dax.Model.Extractor.Tests/TomExtractorTests.cs
@@ -1,6 +1,5 @@
 namespace Dax.Model.Extractor.Tests
 {
-    using Dax.Metadata.Extractor;
     using Microsoft.AnalysisServices;
     using System;
     using Xunit;
diff --git a/src/Dax.Model.Extractor/Data/IDbConnectionExtensions.cs b/src/Dax.Model.Extractor/Data/IDbConnectionExtensions.cs
@@ -1,5 +1,4 @@
-﻿using Dax.Metadata.Extractor;
-using Microsoft.AnalysisServices.AdomdClient;
+﻿using Microsoft.AnalysisServices.AdomdClient;
 using System.Data;
 using System.Data.OleDb;
 
diff --git a/src/Dax.Model.Extractor/DmvExtractor.cs b/src/Dax.Model.Extractor/DmvExtractor.cs
@@ -1,14 +1,13 @@
-﻿using Dax.Model.Extractor.Data;
-using Microsoft.AnalysisServices;
-using Microsoft.AnalysisServices.AdomdClient;
+﻿using Dax.Metadata;
+using Dax.Model.Extractor.Data;
 using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Diagnostics;
 using System.Linq;
 using Tom = Microsoft.AnalysisServices.Tabular;
 
-namespace Dax.Metadata.Extractor
+namespace Dax.Model.Extractor
 {
 
     public class ExtractorException : Exception
@@ -67,7 +66,7 @@ public DmvExtractor(Dax.Metadata.Model daxModel, IDbConnection connection, strin
 
         public static void PopulateFromDmv(Dax.Metadata.Model daxModel, IDbConnection connection, string serverName, string databaseName, string extractorApp, string extractorVersion)
         {
-            Dax.Metadata.Extractor.DmvExtractor de = new Dax.Metadata.Extractor.DmvExtractor(daxModel, connection, serverName, databaseName, extractorApp, extractorVersion);
+            var de = new DmvExtractor(daxModel, connection, serverName, databaseName, extractorApp, extractorVersion);
             de.PopulateModel();
             de.PopulateTables();
             de.PopulatePartitions();
@@ -1099,12 +1098,12 @@ SELECT DISTINCT
                     }
                 }
             }
-            catch (AdomdErrorResponseException ex)
+            catch (Microsoft.AnalysisServices.AdomdClient.AdomdErrorResponseException ex)
             {
                 // We ignore errors accessing this DMV
                 Debug.WriteLine($"Ignored error in DISCOVER_CALC_DEPENDENCY: {ex.Message}");
             }
-            catch (AmoException ex)
+            catch (Microsoft.AnalysisServices.AmoException ex)
             {
                 Debug.WriteLine($"Ignored error in DISCOVER_CALC_DEPENDENCY: {ex.Message}");
             }
diff --git a/src/Dax.Model.Extractor/StatExtractor.cs b/src/Dax.Model.Extractor/StatExtractor.cs
@@ -1,9 +1,10 @@
-﻿using Dax.Model.Extractor.Data;
+﻿using Dax.Metadata;
+using Dax.Model.Extractor.Data;
 using System;
 using System.Data;
 using System.Linq;
 
-namespace Dax.Metadata.Extractor
+namespace Dax.Model.Extractor
 {
     public class StatExtractor
     {
diff --git a/src/Dax.Model.Extractor/TomExtractor.cs b/src/Dax.Model.Extractor/TomExtractor.cs
@@ -1,10 +1,11 @@
-﻿using Microsoft.AnalysisServices.AdomdClient;
+﻿using Dax.Metadata;
+using Microsoft.AnalysisServices.AdomdClient;
 using System;
 using System.Data.OleDb;
 using System.Linq;
 using Tom = Microsoft.AnalysisServices.Tabular;
 
-namespace Dax.Metadata.Extractor
+namespace Dax.Model.Extractor
 {
     public class TomExtractor
     {
@@ -289,20 +290,21 @@ public static Dax.Metadata.Model GetDaxModel(string connectionString, string app
             string databaseName = database.Name;
             string serverName = GetDataSource(connectionString);
 
-            Model daxModel = Dax.Metadata.Extractor.TomExtractor.GetDaxModel(tomModel, applicationName, applicationVersion);
+            var daxModel = TomExtractor.GetDaxModel(tomModel, applicationName, applicationVersion);
 
-            using (AdomdConnection connection = new(connectionString)) {
+            using (AdomdConnection connection = new(connectionString))
+            {
                 // Populate statistics from DMV
-                Dax.Metadata.Extractor.DmvExtractor.PopulateFromDmv(daxModel, connection, serverName, databaseName, applicationName, applicationVersion);
+                DmvExtractor.PopulateFromDmv(daxModel, connection, serverName, databaseName, applicationName, applicationVersion);
 
                 // Populate statistics by querying the data model
                 if (readStatisticsFromData)
                 {
-                    Dax.Metadata.Extractor.StatExtractor.UpdateStatisticsModel(daxModel, connection, sampleRows, analyzeDirectQuery, analyzeDirectLake);
+                    StatExtractor.UpdateStatisticsModel(daxModel, connection, sampleRows, analyzeDirectQuery, analyzeDirectLake);
 
                     // if we have forced all columns into memory then re-run the DMVs to update the data with the new values after everything has been transcoded.
                     if (analyzeDirectLake > DirectLakeExtractionMode.ResidentOnly)
-                        Dax.Metadata.Extractor.DmvExtractor.PopulateFromDmv(daxModel, connection, serverName, databaseName, applicationName, applicationVersion);
+                        DmvExtractor.PopulateFromDmv(daxModel, connection, serverName, databaseName, applicationName, applicationVersion);
                 }
             }
             return daxModel;
@@ -344,23 +346,23 @@ public static Dax.Metadata.Model GetDaxModel(string serverName, string databaseN
             Tom.Database db = GetDatabase(serverName, databaseName);
             Tom.Model tomModel = db.Model;
 
-            Model daxModel = Dax.Metadata.Extractor.TomExtractor.GetDaxModel(tomModel, applicationName, applicationVersion);
+            var daxModel = TomExtractor.GetDaxModel(tomModel, applicationName, applicationVersion);
 
             string connectionString = GetConnectionString(serverName, databaseName);
 
             using (AdomdConnection connection = new(connectionString))
             {
                 // Populate statistics from DMV
-                Dax.Metadata.Extractor.DmvExtractor.PopulateFromDmv(daxModel, connection, serverName, databaseName, applicationName, applicationVersion);
+                DmvExtractor.PopulateFromDmv(daxModel, connection, serverName, databaseName, applicationName, applicationVersion);
 
                 // Populate statistics by querying the data model
                 if (readStatisticsFromData)
                 {
-                    Dax.Metadata.Extractor.StatExtractor.UpdateStatisticsModel(daxModel, connection, sampleRows, analyzeDirectQuery, analyzeDirectLake);
+                    StatExtractor.UpdateStatisticsModel(daxModel, connection, sampleRows, analyzeDirectQuery, analyzeDirectLake);
 
                     // if we have forced all columns into memory then re-run the DMVs to update the data with the new values after everything has been transcoded.
                     if (analyzeDirectLake > DirectLakeExtractionMode.ResidentOnly)
-                        Dax.Metadata.Extractor.DmvExtractor.PopulateFromDmv(daxModel, connection, serverName, databaseName, applicationName, applicationVersion);
+                        DmvExtractor.PopulateFromDmv(daxModel, connection, serverName, databaseName, applicationName, applicationVersion);
                 }
             }
             return daxModel;
diff --git a/src/Dax.Model.Extractor/Util.cs b/src/Dax.Model.Extractor/Util.cs
@@ -4,7 +4,7 @@
 using System.Diagnostics;
 using Tom = Microsoft.AnalysisServices;
 
-namespace Dax.Metadata.Extractor
+namespace Dax.Model.Extractor
 {
     internal class ExtractorInfo
     {
diff --git a/src/Dax.Vpax.Tests/VpaxToolTests.cs b/src/Dax.Vpax.Tests/VpaxToolTests.cs
@@ -1,6 +1,6 @@
 namespace Dax.Vpax.Tests
 {
-    using Dax.Metadata.Extractor;
+    using Dax.Model.Extractor;
     using Dax.Vpax.Tools;
     using Microsoft.AnalysisServices;
     using System;

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`namespace Dax.Model.Extractor.Tests`
`2`	`2`	`{`
`3`		`- using Dax.Metadata.Extractor;`
`4`	`3`	`using Microsoft.AnalysisServices;`
`5`	`4`	`using System.IO;`
`6`	`5`	`using TOM = Microsoft.AnalysisServices.Tabular;`
Original file line number	Diff line number	Diff line change
`@@ -1,14 +1,13 @@`
`1`		`-using Dax.Model.Extractor.Data;`
`2`		`-using Microsoft.AnalysisServices;`
`3`		`-using Microsoft.AnalysisServices.AdomdClient;`
	`1`	`+using Dax.Metadata;`
	`2`	`+using Dax.Model.Extractor.Data;`
`4`	`3`	`using System;`
`5`	`4`	`using System.Collections.Generic;`
`6`	`5`	`using System.Data;`
`7`	`6`	`using System.Diagnostics;`
`8`	`7`	`using System.Linq;`
`9`	`8`	`using Tom = Microsoft.AnalysisServices.Tabular;`
`10`	`9`
`11`		`-namespace Dax.Metadata.Extractor`
	`10`	`+namespace Dax.Model.Extractor`
`12`	`11`	`{`
`13`	`12`
`14`	`13`	`public class ExtractorException : Exception`
`@@ -67,7 +66,7 @@ public DmvExtractor(Dax.Metadata.Model daxModel, IDbConnection connection, strin`
`67`	`66`
`68`	`67`	`public static void PopulateFromDmv(Dax.Metadata.Model daxModel, IDbConnection connection, string serverName, string databaseName, string extractorApp, string extractorVersion)`
`69`	`68`	`{`
`70`		`- Dax.Metadata.Extractor.DmvExtractor de = new Dax.Metadata.Extractor.DmvExtractor(daxModel, connection, serverName, databaseName, extractorApp, extractorVersion);`
	`69`	`+ var de = new DmvExtractor(daxModel, connection, serverName, databaseName, extractorApp, extractorVersion);`
`71`	`70`	`de.PopulateModel();`
`72`	`71`	`de.PopulateTables();`
`73`	`72`	`de.PopulatePartitions();`
`@@ -1099,12 +1098,12 @@ SELECT DISTINCT`
`1099`	`1098`	`}`
`1100`	`1099`	`}`
`1101`	`1100`	`}`
`1102`		`- catch (AdomdErrorResponseException ex)`
	`1101`	`+ catch (Microsoft.AnalysisServices.AdomdClient.AdomdErrorResponseException ex)`
`1103`	`1102`	`{`
`1104`	`1103`	`// We ignore errors accessing this DMV`
`1105`	`1104`	`Debug.WriteLine($"Ignored error in DISCOVER_CALC_DEPENDENCY: {ex.Message}");`
`1106`	`1105`	`}`
`1107`		`- catch (AmoException ex)`
	`1106`	`+ catch (Microsoft.AnalysisServices.AmoException ex)`
`1108`	`1107`	`{`
`1109`	`1108`	`Debug.WriteLine($"Ignored error in DISCOVER_CALC_DEPENDENCY: {ex.Message}");`
`1110`	`1109`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,10 @@`
`1`		`-using Dax.Model.Extractor.Data;`
	`1`	`+using Dax.Metadata;`
	`2`	`+using Dax.Model.Extractor.Data;`
`2`	`3`	`using System;`
`3`	`4`	`using System.Data;`
`4`	`5`	`using System.Linq;`
`5`	`6`
`6`		`-namespace Dax.Metadata.Extractor`
	`7`	`+namespace Dax.Model.Extractor`
`7`	`8`	`{`
`8`	`9`	`public class StatExtractor`
`9`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`using System.Diagnostics;`
`5`	`5`	`using Tom = Microsoft.AnalysisServices;`
`6`	`6`
`7`		`-namespace Dax.Metadata.Extractor`
	`7`	`+namespace Dax.Model.Extractor`
`8`	`8`	`{`
`9`	`9`	`internal class ExtractorInfo`
`10`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`namespace Dax.Vpax.Tests`
`2`	`2`	`{`
`3`		`- using Dax.Metadata.Extractor;`
	`3`	`+ using Dax.Model.Extractor;`
`4`	`4`	`using Dax.Vpax.Tools;`
`5`	`5`	`using Microsoft.AnalysisServices;`
`6`	`6`	`using System;`