Skip to content
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

Jump to bottom

Fix excess update filled hierarchy #180

Draft
wants to merge 6 commits into
base: develop
Choose a base branch
from
Draft

Fix excess update filled hierarchy #180

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
eb30dba
Add nested cycles check
AntonIV87 Jun 1, 2021
b022e65
Tests.
Jun 10, 2021
9501a71
Rework cycles methods
Jun 10, 2021
d08b3ec
Remove find hierarchy deep search.
AntonIV87 Jun 11, 2021
f679193
Fixes.
AntonIV87 Jun 11, 2021
071adca
Fixes.
AntonIV87 Jun 11, 2021
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
184 changes: 145 additions & 39 deletions ICSSoft.STORMNET.Business/SQLDataService/SQLDataService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using System.Collections;
using System.Collections.Generic;
using System.Data;
using System.Diagnostics;
using System.Globalization;
using System.Linq;
using System.Text;
Expand Down Expand Up @@ -151,7 +152,8 @@ public Guid GetInstanceId()
/// </summary>
public string CustomizationString
{
get { return customizationString; } set { customizationString = value; }
get { return customizationString; }
set { customizationString = value; }
}

/// <summary>
Expand Down Expand Up @@ -4698,6 +4700,97 @@ private void GetOrderFromDependenciesHelper(Type currentType, Dictionary<Type, L
}
}

/// <summary>
/// Метод определяет возможность реальных циклов.
/// </summary>
/// <param name="objectsList">
/// Список объектов, находящихся в обработке.
/// </param>
/// <param name="dependencie">
/// Тип зависимости по которой искать цилические ссылки внутри списка объектов.
/// </param>
/// <returns>
/// True если цикл возможен.
/// </returns>
private static bool FindRealCyclesWarning(List<DataObject> objectsList, Type dependencie)
{
bool cycleWarningExist = false;

// Получаем словарь содержащий данные об иерархических зависимостях по каждому объекту.
Dictionary<object, List<object>> primaryKeysGraph = new Dictionary<object, List<object>>();

foreach (DataObject parentObject in objectsList)
{
List<object> dependeciesKeys = new List<object>();

var currentParentType = parentObject.GetType();
string[] props = Information.GetAllPropertyNames(currentParentType);

var filterProps = props
.Where(t => Information.GetPropertyType(currentParentType, t).FullName == dependencie.FullName)
.ToList();

if (filterProps.Count != 0)
{
foreach (string property in filterProps)
{
DataObject child = Information.GetPropValueByName(parentObject, property) as DataObject;

if (child != null)
{
dependeciesKeys.Add(child.__PrimaryKey);
NicholasNoise marked this conversation as resolved.
Show resolved Hide resolved
}
}
}

primaryKeysGraph.Add(parentObject.__PrimaryKey, dependeciesKeys);
}

// Определяем, в парвильном ли порядке идут объекты.
bool isBadOrder = FindBadOrderForInsert(primaryKeysGraph);

// Если порядок объектов нелинейный, то он может содержать реальную опасность цикла.
cycleWarningExist = isBadOrder;

return cycleWarningExist;
}

/// <summary>
/// Метод определяет последовательность в которой идут объекты.
/// </summary>
/// <param name="primaryKeysGraph">
/// Список объектов, находящихся в обработке.
/// </param>
/// <returns>
/// True если объекты идут не в линейной последовательнсоти.
/// </returns>
private static bool FindBadOrderForInsert(Dictionary<object, List<object>> primaryKeysGraph)
{
bool isBadOrder = false;
List<object> insertedKeys = new List<object>();

foreach (KeyValuePair<object, List<object>> primaryKey in primaryKeysGraph)
{
foreach (object key in primaryKey.Value)
{
if (primaryKeysGraph.ContainsKey(key) && !insertedKeys.Any(d => PKHelper.EQPK(d, key)))
{
isBadOrder = true;
break;
}
}

if (isBadOrder)
{
break;
}

insertedKeys.Add(primaryKey.Key);
}

return isBadOrder;
}

/// <summary>
/// Поиск циклов в графе зависимостей.
/// </summary>
Expand Down Expand Up @@ -4729,6 +4822,14 @@ private bool FindCycles(
var processingObjectsList = processingObjects.Cast<DataObject>().Where(t => t.GetType() == dependencie && t.GetStatus() == ObjectStatus.Created).ToList();
if (processingObjectsList.Count > 0)
{

bool isRealCyclesWarningExist = FindRealCyclesWarning(processingObjectsList, dependencie);

if (!isRealCyclesWarningExist)
{
return false;
}

// Проверяется создает ли цикл зависимость.
if (!grafDependencies.Contains(dependencie))
{
Expand Down Expand Up @@ -4822,54 +4923,45 @@ private bool FixCyclic(
{
foreach (string prop in filterProps)
{
// Проверяется свойство на NotNull.
if (!Information.GetPropertyNotNull(currentType, prop))
NicholasNoise marked this conversation as resolved.
Show resolved Hide resolved
dependencies.Remove(dependencie);
var createdObjects = createdList.Keys.Where(t => t.GetType() == currentType);

Type[] types = TypeUsage.GetUsageTypes(currentType, prop);
string[] propertyStorageNames = new string[types.Length];
string defaultStorageName = Information.GetPropertyStorageName(currentType, prop);
for (int i = 0; i < types.Length; i++)
{
dependencies.Remove(dependencie);
var createdObjects = createdList.Keys.Where(t => t.GetType() == currentType);
string storageName = defaultStorageName == string.Empty ? Information.GetPropertyStorageName(currentType, prop, i) : $"{defaultStorageName}_m{i}";
propertyStorageNames[i] = PutIdentifierIntoBrackets(storageName);
}

Type[] types = TypeUsage.GetUsageTypes(currentType, prop);
string[] propertyStorageNames = new string[types.Length];
string defaultStorageName = Information.GetPropertyStorageName(currentType, prop);
for (int i = 0; i < types.Length; i++)
{
string storageName = defaultStorageName == string.Empty ? Information.GetPropertyStorageName(currentType, prop, i) : $"{defaultStorageName}_m{i}";
propertyStorageNames[i] = PutIdentifierIntoBrackets(storageName);
}
// Изменяем значения в объектах, для устранения цикла.
foreach (var createdObject in createdObjects)
{
Collections.CaseSensivityStringDictionary propsCollection = createdList[createdObject];

// Изменяем значения в объектах, для устранения цикла.
foreach (var createdObject in createdObjects)
foreach (var propertyStorageName in propertyStorageNames)
{
Collections.CaseSensivityStringDictionary propsCollection = createdList[createdObject];
foreach (var propertyStorageName in propertyStorageNames)
// Добавляем свойство в запрос на изменение объекта.
string propValue = propsCollection.Get(propertyStorageName);
if (propValue != ConvertValueToQueryValueString(null))
{
// Учитываем только непустые свойства в статусе Created.
object propValue = Information.GetPropValueByName(createdObject, prop);
if (propValue is DataObject propObj && propObj.GetStatus(false) == ObjectStatus.Created)
NicholasNoise marked this conversation as resolved.
Show resolved Hide resolved
if (alteredList.ContainsKey(createdObject))
{
// Добавляем свойство в запрос на изменение объекта.
string propQueryValue = propsCollection.Get(propertyStorageName);
if (alteredList.ContainsKey(createdObject))
{
alteredList[createdObject].Add(propertyStorageName, propQueryValue);
}
else
{
var alteredCollection = new Collections.CaseSensivityStringDictionary();
alteredCollection.Add(propertyStorageName, propQueryValue);
alteredList.Add(createdObject, alteredCollection);
}

// Удаляем из списка свойств на изменение в запросе на создание объекта.
propsCollection.Remove(propertyStorageName);
alteredList[createdObject].Add(propertyStorageName, propValue);
}
else
{
var alteredCollection = new Collections.CaseSensivityStringDictionary();
alteredCollection.Add(propertyStorageName, propValue);
alteredList.Add(createdObject, alteredCollection);
}
}

// Удаляем из списка свойств на изменение в запросе на создание объекта.
propsCollection.Remove(propertyStorageName);
}
}
else
{
return false;
}
}

return true;
Expand Down Expand Up @@ -5169,6 +5261,7 @@ public virtual void GenerateQueriesForUpdateObjects(
// Поиск и разрешение циклов в зависимостях.
List<Type> grafDependencies = new List<Type>();
List<Dictionary<Type, List<Type>>> dependenciesList = new List<Dictionary<Type, List<Type>>>();

dependenciesList.Add(dependencies);
for (int i = 0; i < dependenciesList.Count; i++)
{
Expand Down Expand Up @@ -5360,6 +5453,19 @@ public virtual void GenerateQueriesForUpdateObjects(
}
}

private void OrderCreatedListForInsert(ref Dictionary<DataObject, Collections.CaseSensivityStringDictionary> createdList)
{
List<DataObject> dataObjects = createdList.Keys.ToList();

foreach (DataObject dataObject in dataObjects)
{
List<DataObject> extraUpdateList = new List<DataObject>();
Dictionary<Type, List<Type>> dependencies = new Dictionary<Type, List<Type>>();

GetDependencies(dataObject, dataObject.GetType(), dependencies, extraUpdateList);
}
}

private void ProcessBusinessServer(DataObject processingObject, Type typeOfProcessingObject, BusinessServer bs, ArrayList processingObjects, Dictionary<TypeKeyPair, bool> processingObjectsKeys, ref ObjectStatus curObjectStatus)
{
try
Expand Down
Loading