1c/YY.TechJournalExportAssistant
1
0
Fork 0
mirror of https://github.com/krugersu/YY.TechJournalExportAssistant.git synced 2026-06-19 21:46:53 +02:00
Code Issues Releases Activity

Адаптация под новую версию ClickHouse

Browse Source 
- Адаптация кода под новую версию ClickHouse
- Обновлены служебные библиотеки тестирования
This commit is contained in:
YPermitin
2021-01-26 22:08:36 +05:00
parent aceea71e9c
commit 59cd1d0566
3 changed files with 27 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Libs/YY.TechJournalExportAssistant.ClickHouse/ClickHouseContext.cs
+25 -79
View File
@@ -226,86 +226,32 @@ namespace YY.TechJournalExportAssistant.ClickHouse
}
public void SaveLogPosition(TechJournalLogBase techJournalLog, FileInfo logFileInfo, TechJournalPosition position)
{
var commandAddLogInfo = _connection.CreateCommand();
commandAddLogInfo.CommandText =
@"INSERT INTO LogFiles (
TechJournalLog,
DirectoryName,
Id,
FileName,
CreateDate,
ModificationDate,
LastEventNumber,
LastCurrentFileData,
LastStreamPosition
) VALUES (
{isId:String},
{directoryName:String},
{newId:Int64},
{FileName:String},
{CreateDate:DateTime},
{ModificationDate:DateTime},
{LastEventNumber:Int64},
{LastCurrentFileData:String},
{LastStreamPosition:Int64}
)";
using (ClickHouseBulkCopy bulkCopyInterface = new ClickHouseBulkCopy(_connection)
{
DestinationTableName = "LogFiles",
BatchSize = 100000
})
{
long logFileNewId = GetLogFileInfoNewId(techJournalLog);
IEnumerable<object[]> values = new List<object[]>()
{
new object[]
{
techJournalLog.DirectoryName,
techJournalLog.Name,
logFileNewId,
logFileInfo.Name,
logFileInfo.CreationTimeUtc,
logFileInfo.LastWriteTimeUtc,
position.EventNumber,
position.CurrentFileData.Replace("\\", "\\\\"),
position.StreamPosition ?? 0
}
}.AsEnumerable();
commandAddLogInfo.Parameters.Add(new ClickHouseDbParameter
{
ParameterName = "directoryName",
DbType = DbType.Int64,
Value = techJournalLog.DirectoryName
});
commandAddLogInfo.Parameters.Add(new ClickHouseDbParameter
{
ParameterName = "isId",
DbType = DbType.Int64,
Value = techJournalLog.Name
});
commandAddLogInfo.Parameters.Add(new ClickHouseDbParameter
{
ParameterName = "newId",
DbType = DbType.Int64,
Value = GetLogFileInfoNewId(techJournalLog)
});
commandAddLogInfo.Parameters.Add(new ClickHouseDbParameter
{
ParameterName = "FileName",
DbType = DbType.AnsiString,
Value = logFileInfo.Name
});
commandAddLogInfo.Parameters.Add(new ClickHouseDbParameter
{
ParameterName = "CreateDate",
DbType = DbType.DateTime,
Value = logFileInfo.CreationTimeUtc
});
commandAddLogInfo.Parameters.Add(new ClickHouseDbParameter
{
ParameterName = "ModificationDate",
DbType = DbType.DateTime,
Value = logFileInfo.LastWriteTimeUtc
});
commandAddLogInfo.Parameters.Add(new ClickHouseDbParameter
{
ParameterName = "LastEventNumber",
DbType = DbType.Int64,
Value = position.EventNumber
});
commandAddLogInfo.Parameters.Add(new ClickHouseDbParameter
{
ParameterName = "LastCurrentFileData",
DbType = DbType.AnsiString,
Value = position.CurrentFileData.Replace("\\", "\\\\")
});
commandAddLogInfo.Parameters.Add(new ClickHouseDbParameter
{
ParameterName = "LastStreamPosition",
DbType = DbType.Int64,
Value = position.StreamPosition ?? 0
});
commandAddLogInfo.ExecuteNonQuery();
var bulkResult = bulkCopyInterface.WriteToServerAsync(values);
bulkResult.Wait();
}
}
public long GetLogFileInfoNewId(TechJournalLogBase techJournalLog)
{
Libs/YY.TechJournalExportAssistant.ClickHouse/YY.TechJournalExportAssistant.ClickHouse.csproj
+1 -1
View File
@@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Version>1.0.0.5</Version>
<Version>1.0.0.6</Version>
<Authors>Permitin Yuriy</Authors>
<Product>Technological journal's export assistant to ClickHouse</Product>
<Description>Library for exporting 1C:Enterprise 8.x platform's technological journal files to ClickHouse</Description>
Tests/YY.TechJournalExportAssistant.Tests/YY.TechJournalExportAssistant.Tests.csproj
+1 -1
View File
@@ -13,7 +13,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="3.0.1">
<PackageReference Include="coverlet.collector" Version="3.0.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>