Compare commits
108
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
bef84d6dc3 | ||
|
|
b061509126 | ||
|
|
5c0487358e | ||
|
|
5c7eedbf7b | ||
|
|
74475cb68f | ||
|
|
24978f76b5 | ||
|
|
0698567f53 | ||
|
|
ec78e35733 | ||
|
|
4801ce6b83 | ||
|
|
7eb8cd5ead | ||
|
|
d7b42e3cee | ||
|
|
35d65f107b | ||
|
|
e335a2d827 | ||
|
|
abc7d44ce2 | ||
|
|
85ff7f412a | ||
|
|
8a3ad08456 | ||
|
|
f181d34cbe | ||
|
|
002087f62a | ||
|
|
e37ae056c0 | ||
|
|
b8a7f398c9 | ||
|
|
2038d747d8 | ||
|
|
edf127069f | ||
|
|
07448cede9 | ||
|
|
9aef42cb21 | ||
|
|
baa43cbecf | ||
|
|
de3e491843 | ||
|
|
7cc09350a0 | ||
|
|
059e1202e1 | ||
|
|
9093f56498 | ||
|
|
649b4560ff | ||
|
|
6c060f6171 | ||
|
|
581b9259b8 | ||
|
|
e7bd57964e | ||
|
|
6ea955aacd | ||
|
|
29d028fee2 | ||
|
|
dc5da87a65 | ||
|
|
7de98a313f | ||
|
|
7873e76ba0 | ||
|
|
5b8a8a8882 | ||
|
|
21052090a2 | ||
|
|
9bd32b8225 | ||
|
|
e8e234f420 | ||
|
|
be23237a45 | ||
|
|
a9d92650f8 | ||
|
|
c03fb13126 | ||
|
|
01e6e37db6 | ||
|
|
786b0849a7 | ||
|
|
4826fc9237 | ||
|
|
c3341ec29f | ||
|
|
eb88052c7e | ||
|
|
74332f9944 | ||
|
|
54c97b5610 | ||
|
|
5c05afd9b3 | ||
|
|
dcbba39e4a | ||
|
|
d09f22007e | ||
|
|
a07e7ea6b8 | ||
|
|
4da52ff724 | ||
|
|
05c7a32fc5 | ||
|
|
404d3073f9 | ||
|
|
7f1154d70c | ||
|
|
5bc2e29096 | ||
|
|
f5731a184c | ||
|
|
120fe8e5c6 | ||
|
|
137fdc537d | ||
|
|
a605e57bee | ||
|
|
3ca4bf784c | ||
|
|
6c3b7ebdaf | ||
|
|
2fbb6fe563 | ||
|
|
9ea33ac110 | ||
|
|
0bc021912a | ||
|
|
fa017bd9ff | ||
|
|
57b59215e6 | ||
|
|
210768e391 | ||
|
|
f01e8a578d | ||
|
|
528a00cf98 | ||
|
|
96a04a7c84 | ||
|
|
abaf48beb4 | ||
|
|
08fcae94c0 | ||
|
|
30814a2ed6 | ||
|
|
3c61de5f13 | ||
|
|
771c58d4ad | ||
|
|
5db5d40a99 | ||
|
|
020ec9c6bf | ||
|
|
4e28835bbd | ||
|
|
6985fbb090 | ||
|
|
2f42311220 | ||
|
|
3842efcef1 | ||
|
|
635107eb68 | ||
|
|
1b9a49b924 | ||
|
|
ead35389d5 | ||
|
|
22b44845fb | ||
|
|
8ab26f3e1d | ||
|
|
01c61bb16d | ||
|
|
e09e49ce56 | ||
|
|
e6cc20858b | ||
|
|
2eb80082d8 | ||
|
|
d55ef854ba | ||
|
|
b1417ece5d | ||
|
|
f6ae219a72 | ||
|
|
1e4b9cf833 | ||
|
|
228931dd2a | ||
|
|
f5b4b36ea1 | ||
|
|
f19d2d695b | ||
|
|
d4b9b6bcba | ||
|
|
84d74a7873 | ||
|
|
8c34280d75 | ||
|
|
474d96ced4 | ||
|
|
1432692a26 |
No files matched your search
@@ -1,5 +1,11 @@
|
|||||||
{
|
{
|
||||||
"dockerFile": "Dockerfile",
|
"build": {
|
||||||
|
"dockerfile": "../docker/images/bluetradingsystems/linux_dotnet8_dev/Dockerfile",
|
||||||
|
"options": [
|
||||||
|
"--secret",
|
||||||
|
"id=bitbucket_access_token,src=${localWorkspaceFolder}/.secrets/bitbucket_access_token.txt"
|
||||||
|
]
|
||||||
|
},
|
||||||
"hostRequirements": {
|
"hostRequirements": {
|
||||||
"memory": "8gb",
|
"memory": "8gb",
|
||||||
"storage": "10gb"
|
"storage": "10gb"
|
||||||
|
|||||||
Binary file not shown.
@@ -1,4 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
|
|
||||||
this_dir="$(realpath "$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")")"
|
|
||||||
sudo dpkg -i "$this_dir/emumba-deribit-connector-3.3.1-Linux.LICENSE_DISABLED.deb"
|
|
||||||
@@ -29,6 +29,9 @@
|
|||||||
# tools/deploy.sh --help
|
# tools/deploy.sh --help
|
||||||
#
|
#
|
||||||
|
|
||||||
|
### Host/Runtime ###
|
||||||
|
TZ=Etc/UTC
|
||||||
|
|
||||||
### Sparkd ###
|
### Sparkd ###
|
||||||
# The internal image for sparkd to use. For more info, view:
|
# The internal image for sparkd to use. For more info, view:
|
||||||
# src/server/sparkd/Dockerfile
|
# src/server/sparkd/Dockerfile
|
||||||
@@ -38,6 +41,9 @@ SPARKD__CONFIG_DIR=src/app_sparkd/configurations/dev
|
|||||||
# Mount a specific volume or dir to "~/sparkdata/data" inside the docker.
|
# Mount a specific volume or dir to "~/sparkdata/data" inside the docker.
|
||||||
# Defaults to a volume named "sparkd_<config_port>" (e.g., sparkd_8000).
|
# Defaults to a volume named "sparkd_<config_port>" (e.g., sparkd_8000).
|
||||||
# SPARKD__DATA_DIR=/home/bts/sparkdata/data
|
# SPARKD__DATA_DIR=/home/bts/sparkdata/data
|
||||||
|
# Mount volume or dir to "/md_recording" inside the docker. Defaults to volume
|
||||||
|
# "sparkd_md_recording_<config_port>" (e.g., sparkd_md_recording_8000).
|
||||||
|
# SPARKD__MD_RECORDING_DIR=/home/bts/md_recording
|
||||||
SPARKD__SOURCE_DIR=install/sparkd-release-gcc
|
SPARKD__SOURCE_DIR=install/sparkd-release-gcc
|
||||||
SPARKD__RUNTIME_CONF_DIR=/home/ubuntu/8000/sparkdata/conf/
|
SPARKD__RUNTIME_CONF_DIR=/home/ubuntu/8000/sparkdata/conf/
|
||||||
SPARKD__CONFIG_PORT=8000
|
SPARKD__CONFIG_PORT=8000
|
||||||
@@ -45,6 +51,7 @@ SPARKD__QUICKBUS_PORT=8001
|
|||||||
SPARKD__SIM_FIX_PORT=8002
|
SPARKD__SIM_FIX_PORT=8002
|
||||||
SPARKD__SHM_SIZE=4gb
|
SPARKD__SHM_SIZE=4gb
|
||||||
SPARKD__PYTHON_REQUIREMENTS=requirements.txt
|
SPARKD__PYTHON_REQUIREMENTS=requirements.txt
|
||||||
|
SPARKD__ENTRYPOINT=src/app_sparkd/sparkd-entrypoint.sh
|
||||||
|
|
||||||
### PubSubServer ###
|
### PubSubServer ###
|
||||||
PUBSUB__CONFIG_DIR=src/DataStreamSuite/PubSubServer/Configurations/Development
|
PUBSUB__CONFIG_DIR=src/DataStreamSuite/PubSubServer/Configurations/Development
|
||||||
|
|||||||
Vendored
+48
-25
@@ -1,25 +1,6 @@
|
|||||||
{
|
{
|
||||||
"version": "0.2.0",
|
"version": "0.2.0",
|
||||||
"configurations": [
|
"configurations": [
|
||||||
{
|
|
||||||
"name": "(gdb) Attach",
|
|
||||||
"type": "cppdbg",
|
|
||||||
"request": "attach",
|
|
||||||
"program": "${workspaceFolder}/build/sparkd-debug-clang/src/app_sparkd/sparkd",
|
|
||||||
"MIMode": "gdb",
|
|
||||||
"setupCommands": [
|
|
||||||
{
|
|
||||||
"description": "Enable pretty-printing for gdb",
|
|
||||||
"text": "-enable-pretty-printing",
|
|
||||||
"ignoreFailures": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"description": "Set Disassembly Flavor to Intel",
|
|
||||||
"text": "-gdb-set disassembly-flavor intel",
|
|
||||||
"ignoreFailures": true
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"name": "Python Debugger: Current File with Arguments",
|
"name": "Python Debugger: Current File with Arguments",
|
||||||
"type": "debugpy",
|
"type": "debugpy",
|
||||||
@@ -161,17 +142,30 @@
|
|||||||
"name": "DataStreamQueryAnalyzer",
|
"name": "DataStreamQueryAnalyzer",
|
||||||
"type": "coreclr",
|
"type": "coreclr",
|
||||||
"request": "launch",
|
"request": "launch",
|
||||||
//"preLaunchTask": "Build DataStreamQueryAnalyzer (Debug)",
|
"preLaunchTask": "Build DataStream (Debug)",
|
||||||
"program": "",
|
"program": "",
|
||||||
"windows": {
|
"windows": {
|
||||||
"program": "DataStreamQueryAnalyzer.exe",
|
"program": "DataStreamQueryAnalyzer.exe",
|
||||||
"args": [
|
|
||||||
"--config",
|
|
||||||
"${workspaceFolder}/src/DataStreamSuite/DataStreamQueryAnalyzer/Configurations/DataStreamQueryAnalyzer.json"
|
|
||||||
],
|
|
||||||
"cwd": "build/Debug/bin/net8.0-windows",
|
"cwd": "build/Debug/bin/net8.0-windows",
|
||||||
"env": {
|
"env": {
|
||||||
"PYTHON_EXE": "${workspaceFolder}/.venv/Scripts/python.exe"
|
"PYTHON_EXE": "${workspaceFolder}/.venv/Scripts/python.exe",
|
||||||
|
"DOTNET_ENVIRONMENT": "${input:dataStreamQueryAnalyzerEnvironment}",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
"stopAtEntry": false,
|
||||||
|
"console": "integratedTerminal",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "DataStreamQueryAnalyzer (Skip Build)",
|
||||||
|
"type": "coreclr",
|
||||||
|
"request": "launch",
|
||||||
|
"program": "",
|
||||||
|
"windows": {
|
||||||
|
"program": "DataStreamQueryAnalyzer.exe",
|
||||||
|
"cwd": "build/Debug/bin/net8.0-windows",
|
||||||
|
"env": {
|
||||||
|
"PYTHON_EXE": "${workspaceFolder}/.venv/Scripts/python.exe",
|
||||||
|
"DOTNET_ENVIRONMENT": "${input:dataStreamQueryAnalyzerEnvironment}",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
"stopAtEntry": false,
|
"stopAtEntry": false,
|
||||||
@@ -390,6 +384,25 @@
|
|||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"name": "Sparkd Attach",
|
||||||
|
"type": "cppdbg",
|
||||||
|
"request": "attach",
|
||||||
|
"program": "${workspaceFolder}/build/sparkd-debug-clang/src/app_sparkd/sparkd",
|
||||||
|
"MIMode": "gdb",
|
||||||
|
"setupCommands": [
|
||||||
|
{
|
||||||
|
"description": "Enable pretty-printing for gdb",
|
||||||
|
"text": "-enable-pretty-printing",
|
||||||
|
"ignoreFailures": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"description": "Set Disassembly Flavor to Intel",
|
||||||
|
"text": "-gdb-set disassembly-flavor intel",
|
||||||
|
"ignoreFailures": true
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
],
|
],
|
||||||
"inputs": [
|
"inputs": [
|
||||||
{
|
{
|
||||||
@@ -415,6 +428,16 @@
|
|||||||
],
|
],
|
||||||
"default": "MarketDataPublisher",
|
"default": "MarketDataPublisher",
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"id": "dataStreamQueryAnalyzerEnvironment",
|
||||||
|
"type": "pickString",
|
||||||
|
"description": "DataStreamQueryAnalyzer Configuration",
|
||||||
|
"options": [
|
||||||
|
"Development",
|
||||||
|
"Local",
|
||||||
|
],
|
||||||
|
"default": "Development",
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"id": "dataStreamPublisherEnvironment",
|
"id": "dataStreamPublisherEnvironment",
|
||||||
"type": "pickString",
|
"type": "pickString",
|
||||||
|
|||||||
Vendored
+1
-1
@@ -1 +1 @@
|
|||||||
PYTHONPATH=/workspaces/spark/build/sparkd-debug-clang/src/lib_python_interop;/workspaces/spark/src/lib_python_interop/python_interop_plugins
|
PYTHONPATH=/workspaces/spark/build/sparkd-debug-clang/src/lib_python_interop;/workspaces/spark/src/lib_python_interop/python_interop_plugins;/workspaces/spark/tools/py
|
||||||
Vendored
+22
-15
@@ -541,12 +541,11 @@
|
|||||||
"command": "",
|
"command": "",
|
||||||
"windows": {
|
"windows": {
|
||||||
"command": "DataStreamQueryAnalyzer.exe",
|
"command": "DataStreamQueryAnalyzer.exe",
|
||||||
"args": [
|
|
||||||
"--config",
|
|
||||||
"${workspaceFolder}/src/DataStreamSuite/DataStreamQueryAnalyzer/Configurations/DataStreamQueryAnalyzer.json",
|
|
||||||
],
|
|
||||||
"options": {
|
"options": {
|
||||||
"cwd": "${workspaceFolder}/build/${input:buildConfiguration}/bin/net8.0-windows"
|
"cwd": "${workspaceFolder}/build/${input:buildConfiguration}/bin/net8.0-windows",
|
||||||
|
"env": {
|
||||||
|
"DOTNET_ENVIRONMENT": "${input:dataStreamQueryAnalyzerEnvironment}",
|
||||||
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
"icon": {
|
"icon": {
|
||||||
@@ -561,12 +560,11 @@
|
|||||||
"command": "",
|
"command": "",
|
||||||
"windows": {
|
"windows": {
|
||||||
"command": "DataStreamQueryAnalyzer.exe",
|
"command": "DataStreamQueryAnalyzer.exe",
|
||||||
"args": [
|
|
||||||
"--config",
|
|
||||||
"${workspaceFolder}/src/DataStreamSuite/DataStreamQueryAnalyzer/Configurations/DataStreamQueryAnalyzer.json",
|
|
||||||
],
|
|
||||||
"options": {
|
"options": {
|
||||||
"cwd": "${workspaceFolder}/build/Debug/bin/net8.0-windows"
|
"cwd": "${workspaceFolder}/build/Debug/bin/net8.0-windows",
|
||||||
|
"env": {
|
||||||
|
"DOTNET_ENVIRONMENT": "${input:dataStreamQueryAnalyzerEnvironment}",
|
||||||
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
"icon": {
|
"icon": {
|
||||||
@@ -581,12 +579,11 @@
|
|||||||
"command": "",
|
"command": "",
|
||||||
"windows": {
|
"windows": {
|
||||||
"command": "DataStreamQueryAnalyzer.exe",
|
"command": "DataStreamQueryAnalyzer.exe",
|
||||||
"args": [
|
|
||||||
"--config",
|
|
||||||
"${workspaceFolder}/src/DataStreamSuite/DataStreamQueryAnalyzer/Configurations/DataStreamQueryAnalyzer.json",
|
|
||||||
],
|
|
||||||
"options": {
|
"options": {
|
||||||
"cwd": "${workspaceFolder}/build/Release/bin/net8.0-windows"
|
"cwd": "${workspaceFolder}/build/Release/bin/net8.0-windows",
|
||||||
|
"env": {
|
||||||
|
"DOTNET_ENVIRONMENT": "${input:dataStreamQueryAnalyzerEnvironment}",
|
||||||
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
"icon": {
|
"icon": {
|
||||||
@@ -1048,6 +1045,16 @@
|
|||||||
],
|
],
|
||||||
"default": "Debug",
|
"default": "Debug",
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"id": "dataStreamQueryAnalyzerEnvironment",
|
||||||
|
"type": "pickString",
|
||||||
|
"description": "DataStreamQueryAnalyzer Configuration",
|
||||||
|
"options": [
|
||||||
|
"Development",
|
||||||
|
"Local",
|
||||||
|
],
|
||||||
|
"default": "Development",
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"id": "sparkdCmakePreset",
|
"id": "sparkdCmakePreset",
|
||||||
"type": "pickString",
|
"type": "pickString",
|
||||||
|
|||||||
+62
-5
@@ -11,14 +11,20 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bts.Spark.Core", "src\cs\Bt
|
|||||||
EndProject
|
EndProject
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bts.Spark.Api", "src\cs\Bts.Spark.Api\Bts.Spark.Api.csproj", "{8949AF88-F1D3-4BC4-827F-B088B555F7B9}"
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bts.Spark.Api", "src\cs\Bts.Spark.Api\Bts.Spark.Api.csproj", "{8949AF88-F1D3-4BC4-827F-B088B555F7B9}"
|
||||||
EndProject
|
EndProject
|
||||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DataStreamSuite", "DataStreamSuite", "{60E0D592-FFB3-0D0A-C4AA-E88919B48F9D}"
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bts.Extensions.Hosting", "src\cs\Bts.Extensions.Hosting\Bts.Extensions.Hosting.csproj", "{37E4E890-D025-4729-90F9-6F95862F47BC}"
|
||||||
EndProject
|
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bts.Extensions.Hosting", "src\DataStreamSuite\Bts.Extensions.Hosting\Bts.Extensions.Hosting.csproj", "{37E4E890-D025-4729-90F9-6F95862F47BC}"
|
|
||||||
EndProject
|
EndProject
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bts.Spark.Sdk", "src\cs\Bts.Spark.Sdk\Bts.Spark.Sdk.csproj", "{A5FF3FAF-43CB-496B-AF4B-F61EFD645579}"
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bts.Spark.Sdk", "src\cs\Bts.Spark.Sdk\Bts.Spark.Sdk.csproj", "{A5FF3FAF-43CB-496B-AF4B-F61EFD645579}"
|
||||||
EndProject
|
EndProject
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bts.Spark.Sdk.Demo", "src\cs\Bts.Spark.Sdk.Demo\Bts.Spark.Sdk.Demo.csproj", "{FCFDBDBE-74B0-41C4-9011-C651B21056D4}"
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bts.Spark.Sdk.Demo", "src\cs\Bts.Spark.Sdk.Demo\Bts.Spark.Sdk.Demo.csproj", "{FCFDBDBE-74B0-41C4-9011-C651B21056D4}"
|
||||||
EndProject
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bts.Collections", "src\cs\Bts.Collections\Bts.Collections.csproj", "{3BF4DF96-5AFF-4674-866A-71A8090627FF}"
|
||||||
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bts.Core", "src\cs\Bts.Core\Bts.Core.csproj", "{CD0A3EEF-303A-44EE-85F2-76F4CE632A3B}"
|
||||||
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bts.Disposables", "src\cs\Bts.Disposables\Bts.Disposables.csproj", "{62067659-AA2E-4CB5-B7CE-0B38EAA92080}"
|
||||||
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bts.Numerics", "src\cs\Bts.Numerics\Bts.Numerics.csproj", "{2FE1E5D0-168A-4D83-9B18-0D48250B4BFE}"
|
||||||
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
Debug|Any CPU = Debug|Any CPU
|
Debug|Any CPU = Debug|Any CPU
|
||||||
@@ -89,6 +95,54 @@ Global
|
|||||||
{FCFDBDBE-74B0-41C4-9011-C651B21056D4}.Release|x64.Build.0 = Release|Any CPU
|
{FCFDBDBE-74B0-41C4-9011-C651B21056D4}.Release|x64.Build.0 = Release|Any CPU
|
||||||
{FCFDBDBE-74B0-41C4-9011-C651B21056D4}.Release|x86.ActiveCfg = Release|Any CPU
|
{FCFDBDBE-74B0-41C4-9011-C651B21056D4}.Release|x86.ActiveCfg = Release|Any CPU
|
||||||
{FCFDBDBE-74B0-41C4-9011-C651B21056D4}.Release|x86.Build.0 = Release|Any CPU
|
{FCFDBDBE-74B0-41C4-9011-C651B21056D4}.Release|x86.Build.0 = Release|Any CPU
|
||||||
|
{3BF4DF96-5AFF-4674-866A-71A8090627FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{3BF4DF96-5AFF-4674-866A-71A8090627FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{3BF4DF96-5AFF-4674-866A-71A8090627FF}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||||
|
{3BF4DF96-5AFF-4674-866A-71A8090627FF}.Debug|x64.Build.0 = Debug|Any CPU
|
||||||
|
{3BF4DF96-5AFF-4674-866A-71A8090627FF}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||||
|
{3BF4DF96-5AFF-4674-866A-71A8090627FF}.Debug|x86.Build.0 = Debug|Any CPU
|
||||||
|
{3BF4DF96-5AFF-4674-866A-71A8090627FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{3BF4DF96-5AFF-4674-866A-71A8090627FF}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{3BF4DF96-5AFF-4674-866A-71A8090627FF}.Release|x64.ActiveCfg = Release|Any CPU
|
||||||
|
{3BF4DF96-5AFF-4674-866A-71A8090627FF}.Release|x64.Build.0 = Release|Any CPU
|
||||||
|
{3BF4DF96-5AFF-4674-866A-71A8090627FF}.Release|x86.ActiveCfg = Release|Any CPU
|
||||||
|
{3BF4DF96-5AFF-4674-866A-71A8090627FF}.Release|x86.Build.0 = Release|Any CPU
|
||||||
|
{CD0A3EEF-303A-44EE-85F2-76F4CE632A3B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{CD0A3EEF-303A-44EE-85F2-76F4CE632A3B}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{CD0A3EEF-303A-44EE-85F2-76F4CE632A3B}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||||
|
{CD0A3EEF-303A-44EE-85F2-76F4CE632A3B}.Debug|x64.Build.0 = Debug|Any CPU
|
||||||
|
{CD0A3EEF-303A-44EE-85F2-76F4CE632A3B}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||||
|
{CD0A3EEF-303A-44EE-85F2-76F4CE632A3B}.Debug|x86.Build.0 = Debug|Any CPU
|
||||||
|
{CD0A3EEF-303A-44EE-85F2-76F4CE632A3B}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{CD0A3EEF-303A-44EE-85F2-76F4CE632A3B}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{CD0A3EEF-303A-44EE-85F2-76F4CE632A3B}.Release|x64.ActiveCfg = Release|Any CPU
|
||||||
|
{CD0A3EEF-303A-44EE-85F2-76F4CE632A3B}.Release|x64.Build.0 = Release|Any CPU
|
||||||
|
{CD0A3EEF-303A-44EE-85F2-76F4CE632A3B}.Release|x86.ActiveCfg = Release|Any CPU
|
||||||
|
{CD0A3EEF-303A-44EE-85F2-76F4CE632A3B}.Release|x86.Build.0 = Release|Any CPU
|
||||||
|
{62067659-AA2E-4CB5-B7CE-0B38EAA92080}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{62067659-AA2E-4CB5-B7CE-0B38EAA92080}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{62067659-AA2E-4CB5-B7CE-0B38EAA92080}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||||
|
{62067659-AA2E-4CB5-B7CE-0B38EAA92080}.Debug|x64.Build.0 = Debug|Any CPU
|
||||||
|
{62067659-AA2E-4CB5-B7CE-0B38EAA92080}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||||
|
{62067659-AA2E-4CB5-B7CE-0B38EAA92080}.Debug|x86.Build.0 = Debug|Any CPU
|
||||||
|
{62067659-AA2E-4CB5-B7CE-0B38EAA92080}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{62067659-AA2E-4CB5-B7CE-0B38EAA92080}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{62067659-AA2E-4CB5-B7CE-0B38EAA92080}.Release|x64.ActiveCfg = Release|Any CPU
|
||||||
|
{62067659-AA2E-4CB5-B7CE-0B38EAA92080}.Release|x64.Build.0 = Release|Any CPU
|
||||||
|
{62067659-AA2E-4CB5-B7CE-0B38EAA92080}.Release|x86.ActiveCfg = Release|Any CPU
|
||||||
|
{62067659-AA2E-4CB5-B7CE-0B38EAA92080}.Release|x86.Build.0 = Release|Any CPU
|
||||||
|
{2FE1E5D0-168A-4D83-9B18-0D48250B4BFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{2FE1E5D0-168A-4D83-9B18-0D48250B4BFE}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{2FE1E5D0-168A-4D83-9B18-0D48250B4BFE}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||||
|
{2FE1E5D0-168A-4D83-9B18-0D48250B4BFE}.Debug|x64.Build.0 = Debug|Any CPU
|
||||||
|
{2FE1E5D0-168A-4D83-9B18-0D48250B4BFE}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||||
|
{2FE1E5D0-168A-4D83-9B18-0D48250B4BFE}.Debug|x86.Build.0 = Debug|Any CPU
|
||||||
|
{2FE1E5D0-168A-4D83-9B18-0D48250B4BFE}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{2FE1E5D0-168A-4D83-9B18-0D48250B4BFE}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{2FE1E5D0-168A-4D83-9B18-0D48250B4BFE}.Release|x64.ActiveCfg = Release|Any CPU
|
||||||
|
{2FE1E5D0-168A-4D83-9B18-0D48250B4BFE}.Release|x64.Build.0 = Release|Any CPU
|
||||||
|
{2FE1E5D0-168A-4D83-9B18-0D48250B4BFE}.Release|x86.ActiveCfg = Release|Any CPU
|
||||||
|
{2FE1E5D0-168A-4D83-9B18-0D48250B4BFE}.Release|x86.Build.0 = Release|Any CPU
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
HideSolutionNode = FALSE
|
HideSolutionNode = FALSE
|
||||||
@@ -97,9 +151,12 @@ Global
|
|||||||
{C5A3B5EA-BE9F-76E5-E9B8-8A22B289B295} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
|
{C5A3B5EA-BE9F-76E5-E9B8-8A22B289B295} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
|
||||||
{E3BF9514-CB1A-4E07-A8DD-73300FD9726C} = {C5A3B5EA-BE9F-76E5-E9B8-8A22B289B295}
|
{E3BF9514-CB1A-4E07-A8DD-73300FD9726C} = {C5A3B5EA-BE9F-76E5-E9B8-8A22B289B295}
|
||||||
{8949AF88-F1D3-4BC4-827F-B088B555F7B9} = {C5A3B5EA-BE9F-76E5-E9B8-8A22B289B295}
|
{8949AF88-F1D3-4BC4-827F-B088B555F7B9} = {C5A3B5EA-BE9F-76E5-E9B8-8A22B289B295}
|
||||||
{60E0D592-FFB3-0D0A-C4AA-E88919B48F9D} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
|
{37E4E890-D025-4729-90F9-6F95862F47BC} = {C5A3B5EA-BE9F-76E5-E9B8-8A22B289B295}
|
||||||
{37E4E890-D025-4729-90F9-6F95862F47BC} = {60E0D592-FFB3-0D0A-C4AA-E88919B48F9D}
|
|
||||||
{A5FF3FAF-43CB-496B-AF4B-F61EFD645579} = {C5A3B5EA-BE9F-76E5-E9B8-8A22B289B295}
|
{A5FF3FAF-43CB-496B-AF4B-F61EFD645579} = {C5A3B5EA-BE9F-76E5-E9B8-8A22B289B295}
|
||||||
{FCFDBDBE-74B0-41C4-9011-C651B21056D4} = {C5A3B5EA-BE9F-76E5-E9B8-8A22B289B295}
|
{FCFDBDBE-74B0-41C4-9011-C651B21056D4} = {C5A3B5EA-BE9F-76E5-E9B8-8A22B289B295}
|
||||||
|
{3BF4DF96-5AFF-4674-866A-71A8090627FF} = {C5A3B5EA-BE9F-76E5-E9B8-8A22B289B295}
|
||||||
|
{CD0A3EEF-303A-44EE-85F2-76F4CE632A3B} = {C5A3B5EA-BE9F-76E5-E9B8-8A22B289B295}
|
||||||
|
{62067659-AA2E-4CB5-B7CE-0B38EAA92080} = {C5A3B5EA-BE9F-76E5-E9B8-8A22B289B295}
|
||||||
|
{2FE1E5D0-168A-4D83-9B18-0D48250B4BFE} = {C5A3B5EA-BE9F-76E5-E9B8-8A22B289B295}
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
EndGlobal
|
EndGlobal
|
||||||
+8
-2
@@ -32,14 +32,20 @@
|
|||||||
"lhs": "${hostSystemName}",
|
"lhs": "${hostSystemName}",
|
||||||
"rhs": "Windows"
|
"rhs": "Windows"
|
||||||
},
|
},
|
||||||
"generator": "Visual Studio 17 2022",
|
"generator": "Ninja Multi-Config",
|
||||||
"environment": {
|
"environment": {
|
||||||
"SPARK_CMAKE_CXX_FLAGS": "/MP /WX /wd4250 /wd4251 /wd4244 /wd4267 /wd4355 /wd4275 /wd4345 /bigobj /EHsc /DCURL_STATICLIB /D_WINSOCK_DEPRECATED_NO_WARNINGS /D__TBB_NO_IMPLICIT_LINKAGE /DBOOST_ALL_NO_LIB /std:c++20 /D_SCL_SECURE_NO_WARNINGS /D_CRT_SECURE_NO_WARNINGS /D_WIN32_WINNT=0x0600"
|
"SPARK_CMAKE_CXX_FLAGS": "/WX /wd4250 /wd4251 /wd4244 /wd4267 /wd4355 /wd4275 /wd4345 /bigobj /EHsc /DCURL_STATICLIB /D_WINSOCK_DEPRECATED_NO_WARNINGS /D__TBB_NO_IMPLICIT_LINKAGE /DBOOST_ALL_NO_LIB /std:c++20 /D_SCL_SECURE_NO_WARNINGS /D_CRT_SECURE_NO_WARNINGS /D_WIN32_WINNT=0x0600"
|
||||||
},
|
},
|
||||||
"cacheVariables": {
|
"cacheVariables": {
|
||||||
|
"CMAKE_C_COMPILER": "clang-cl",
|
||||||
|
"CMAKE_CXX_COMPILER": "clang-cl",
|
||||||
"CMAKE_CXX_FLAGS": "$env{SPARK_CMAKE_CXX_FLAGS}",
|
"CMAKE_CXX_FLAGS": "$env{SPARK_CMAKE_CXX_FLAGS}",
|
||||||
"CMAKE_CXX_FLAGS_DEBUG": "$env{SPARK_CMAKE_CXX_FLAGS} /MTd",
|
"CMAKE_CXX_FLAGS_DEBUG": "$env{SPARK_CMAKE_CXX_FLAGS} /MTd",
|
||||||
"CMAKE_CXX_FLAGS_RELEASE": "$env{SPARK_CMAKE_CXX_FLAGS} /MT",
|
"CMAKE_CXX_FLAGS_RELEASE": "$env{SPARK_CMAKE_CXX_FLAGS} /MT",
|
||||||
|
"CMAKE_EXPORT_COMPILE_COMMANDS": {
|
||||||
|
"type": "BOOL",
|
||||||
|
"value": "ON"
|
||||||
|
},
|
||||||
"CMAKE_SHARED_LINKER_FLAGS_DEBUG": "/DEBUG",
|
"CMAKE_SHARED_LINKER_FLAGS_DEBUG": "/DEBUG",
|
||||||
"CMAKE_SHARED_LINKER_FLAGS_RELEASE": "/OPT:REF /OPT:ICF /LTCG",
|
"CMAKE_SHARED_LINKER_FLAGS_RELEASE": "/OPT:REF /OPT:ICF /LTCG",
|
||||||
"EXTERNALS_ROOT": "${sourceDir}/externals/windows"
|
"EXTERNALS_ROOT": "${sourceDir}/externals/windows"
|
||||||
|
|||||||
+166
-2
@@ -43,7 +43,21 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bts.ColumnExpressions", "sr
|
|||||||
EndProject
|
EndProject
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataStream", "src\DataStreamSuite\DataStream\DataStream.csproj", "{39AEA075-6457-46C0-8821-1158BE6EFA57}"
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataStream", "src\DataStreamSuite\DataStream\DataStream.csproj", "{39AEA075-6457-46C0-8821-1158BE6EFA57}"
|
||||||
EndProject
|
EndProject
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bts.Extensions.Hosting", "src\DataStreamSuite\Bts.Extensions.Hosting\Bts.Extensions.Hosting.csproj", "{F3DC52D7-8C59-4EC0-86D9-0E5732EAFCF7}"
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bts.Extensions.Hosting", "src\cs\Bts.Extensions.Hosting\Bts.Extensions.Hosting.csproj", "{F3DC52D7-8C59-4EC0-86D9-0E5732EAFCF7}"
|
||||||
|
EndProject
|
||||||
|
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "cs", "cs", "{385C4948-E080-56A6-E29E-8B0F4913175C}"
|
||||||
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bts.Net", "src\cs\Bts.Net\Bts.Net.csproj", "{43FB297B-7A4D-4835-A878-E6DF345B580C}"
|
||||||
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bts.IO.Compression", "src\cs\Bts.IO.Compression\Bts.IO.Compression.csproj", "{BC277499-8215-4F9F-B9AB-07B6391110BF}"
|
||||||
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bts.Collections", "src\cs\Bts.Collections\Bts.Collections.csproj", "{C42F4CCB-9E65-4370-939A-527ACDBC4DA6}"
|
||||||
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bts.Core", "src\cs\Bts.Core\Bts.Core.csproj", "{802ECF0B-7264-4168-95D1-158E47FB65CC}"
|
||||||
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bts.Disposables", "src\cs\Bts.Disposables\Bts.Disposables.csproj", "{95C5F6C0-88E5-4338-9A4F-614CF6C03CC0}"
|
||||||
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bts.Numerics", "src\cs\Bts.Numerics\Bts.Numerics.csproj", "{0354655D-2394-42BB-B1D4-2D75B9BCABF1}"
|
||||||
EndProject
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
@@ -517,6 +531,150 @@ Global
|
|||||||
{F3DC52D7-8C59-4EC0-86D9-0E5732EAFCF7}.RelWithDebInfo|Any CPU.Build.0 = Debug|Any CPU
|
{F3DC52D7-8C59-4EC0-86D9-0E5732EAFCF7}.RelWithDebInfo|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{F3DC52D7-8C59-4EC0-86D9-0E5732EAFCF7}.RelWithDebInfo|x86.ActiveCfg = Debug|Any CPU
|
{F3DC52D7-8C59-4EC0-86D9-0E5732EAFCF7}.RelWithDebInfo|x86.ActiveCfg = Debug|Any CPU
|
||||||
{F3DC52D7-8C59-4EC0-86D9-0E5732EAFCF7}.RelWithDebInfo|x86.Build.0 = Debug|Any CPU
|
{F3DC52D7-8C59-4EC0-86D9-0E5732EAFCF7}.RelWithDebInfo|x86.Build.0 = Debug|Any CPU
|
||||||
|
{43FB297B-7A4D-4835-A878-E6DF345B580C}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||||
|
{43FB297B-7A4D-4835-A878-E6DF345B580C}.Debug|x64.Build.0 = Debug|Any CPU
|
||||||
|
{43FB297B-7A4D-4835-A878-E6DF345B580C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{43FB297B-7A4D-4835-A878-E6DF345B580C}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{43FB297B-7A4D-4835-A878-E6DF345B580C}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||||
|
{43FB297B-7A4D-4835-A878-E6DF345B580C}.Debug|x86.Build.0 = Debug|Any CPU
|
||||||
|
{43FB297B-7A4D-4835-A878-E6DF345B580C}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
|
||||||
|
{43FB297B-7A4D-4835-A878-E6DF345B580C}.MinSizeRel|x64.Build.0 = Debug|Any CPU
|
||||||
|
{43FB297B-7A4D-4835-A878-E6DF345B580C}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{43FB297B-7A4D-4835-A878-E6DF345B580C}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{43FB297B-7A4D-4835-A878-E6DF345B580C}.MinSizeRel|x86.ActiveCfg = Debug|Any CPU
|
||||||
|
{43FB297B-7A4D-4835-A878-E6DF345B580C}.MinSizeRel|x86.Build.0 = Debug|Any CPU
|
||||||
|
{43FB297B-7A4D-4835-A878-E6DF345B580C}.Release|x64.ActiveCfg = Release|Any CPU
|
||||||
|
{43FB297B-7A4D-4835-A878-E6DF345B580C}.Release|x64.Build.0 = Release|Any CPU
|
||||||
|
{43FB297B-7A4D-4835-A878-E6DF345B580C}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{43FB297B-7A4D-4835-A878-E6DF345B580C}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{43FB297B-7A4D-4835-A878-E6DF345B580C}.Release|x86.ActiveCfg = Release|Any CPU
|
||||||
|
{43FB297B-7A4D-4835-A878-E6DF345B580C}.Release|x86.Build.0 = Release|Any CPU
|
||||||
|
{43FB297B-7A4D-4835-A878-E6DF345B580C}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU
|
||||||
|
{43FB297B-7A4D-4835-A878-E6DF345B580C}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU
|
||||||
|
{43FB297B-7A4D-4835-A878-E6DF345B580C}.RelWithDebInfo|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{43FB297B-7A4D-4835-A878-E6DF345B580C}.RelWithDebInfo|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{43FB297B-7A4D-4835-A878-E6DF345B580C}.RelWithDebInfo|x86.ActiveCfg = Debug|Any CPU
|
||||||
|
{43FB297B-7A4D-4835-A878-E6DF345B580C}.RelWithDebInfo|x86.Build.0 = Debug|Any CPU
|
||||||
|
{BC277499-8215-4F9F-B9AB-07B6391110BF}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||||
|
{BC277499-8215-4F9F-B9AB-07B6391110BF}.Debug|x64.Build.0 = Debug|Any CPU
|
||||||
|
{BC277499-8215-4F9F-B9AB-07B6391110BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{BC277499-8215-4F9F-B9AB-07B6391110BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{BC277499-8215-4F9F-B9AB-07B6391110BF}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||||
|
{BC277499-8215-4F9F-B9AB-07B6391110BF}.Debug|x86.Build.0 = Debug|Any CPU
|
||||||
|
{BC277499-8215-4F9F-B9AB-07B6391110BF}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
|
||||||
|
{BC277499-8215-4F9F-B9AB-07B6391110BF}.MinSizeRel|x64.Build.0 = Debug|Any CPU
|
||||||
|
{BC277499-8215-4F9F-B9AB-07B6391110BF}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{BC277499-8215-4F9F-B9AB-07B6391110BF}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{BC277499-8215-4F9F-B9AB-07B6391110BF}.MinSizeRel|x86.ActiveCfg = Debug|Any CPU
|
||||||
|
{BC277499-8215-4F9F-B9AB-07B6391110BF}.MinSizeRel|x86.Build.0 = Debug|Any CPU
|
||||||
|
{BC277499-8215-4F9F-B9AB-07B6391110BF}.Release|x64.ActiveCfg = Release|Any CPU
|
||||||
|
{BC277499-8215-4F9F-B9AB-07B6391110BF}.Release|x64.Build.0 = Release|Any CPU
|
||||||
|
{BC277499-8215-4F9F-B9AB-07B6391110BF}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{BC277499-8215-4F9F-B9AB-07B6391110BF}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{BC277499-8215-4F9F-B9AB-07B6391110BF}.Release|x86.ActiveCfg = Release|Any CPU
|
||||||
|
{BC277499-8215-4F9F-B9AB-07B6391110BF}.Release|x86.Build.0 = Release|Any CPU
|
||||||
|
{BC277499-8215-4F9F-B9AB-07B6391110BF}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU
|
||||||
|
{BC277499-8215-4F9F-B9AB-07B6391110BF}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU
|
||||||
|
{BC277499-8215-4F9F-B9AB-07B6391110BF}.RelWithDebInfo|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{BC277499-8215-4F9F-B9AB-07B6391110BF}.RelWithDebInfo|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{BC277499-8215-4F9F-B9AB-07B6391110BF}.RelWithDebInfo|x86.ActiveCfg = Debug|Any CPU
|
||||||
|
{BC277499-8215-4F9F-B9AB-07B6391110BF}.RelWithDebInfo|x86.Build.0 = Debug|Any CPU
|
||||||
|
{C42F4CCB-9E65-4370-939A-527ACDBC4DA6}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||||
|
{C42F4CCB-9E65-4370-939A-527ACDBC4DA6}.Debug|x64.Build.0 = Debug|Any CPU
|
||||||
|
{C42F4CCB-9E65-4370-939A-527ACDBC4DA6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{C42F4CCB-9E65-4370-939A-527ACDBC4DA6}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{C42F4CCB-9E65-4370-939A-527ACDBC4DA6}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||||
|
{C42F4CCB-9E65-4370-939A-527ACDBC4DA6}.Debug|x86.Build.0 = Debug|Any CPU
|
||||||
|
{C42F4CCB-9E65-4370-939A-527ACDBC4DA6}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
|
||||||
|
{C42F4CCB-9E65-4370-939A-527ACDBC4DA6}.MinSizeRel|x64.Build.0 = Debug|Any CPU
|
||||||
|
{C42F4CCB-9E65-4370-939A-527ACDBC4DA6}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{C42F4CCB-9E65-4370-939A-527ACDBC4DA6}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{C42F4CCB-9E65-4370-939A-527ACDBC4DA6}.MinSizeRel|x86.ActiveCfg = Debug|Any CPU
|
||||||
|
{C42F4CCB-9E65-4370-939A-527ACDBC4DA6}.MinSizeRel|x86.Build.0 = Debug|Any CPU
|
||||||
|
{C42F4CCB-9E65-4370-939A-527ACDBC4DA6}.Release|x64.ActiveCfg = Release|Any CPU
|
||||||
|
{C42F4CCB-9E65-4370-939A-527ACDBC4DA6}.Release|x64.Build.0 = Release|Any CPU
|
||||||
|
{C42F4CCB-9E65-4370-939A-527ACDBC4DA6}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{C42F4CCB-9E65-4370-939A-527ACDBC4DA6}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{C42F4CCB-9E65-4370-939A-527ACDBC4DA6}.Release|x86.ActiveCfg = Release|Any CPU
|
||||||
|
{C42F4CCB-9E65-4370-939A-527ACDBC4DA6}.Release|x86.Build.0 = Release|Any CPU
|
||||||
|
{C42F4CCB-9E65-4370-939A-527ACDBC4DA6}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU
|
||||||
|
{C42F4CCB-9E65-4370-939A-527ACDBC4DA6}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU
|
||||||
|
{C42F4CCB-9E65-4370-939A-527ACDBC4DA6}.RelWithDebInfo|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{C42F4CCB-9E65-4370-939A-527ACDBC4DA6}.RelWithDebInfo|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{C42F4CCB-9E65-4370-939A-527ACDBC4DA6}.RelWithDebInfo|x86.ActiveCfg = Debug|Any CPU
|
||||||
|
{C42F4CCB-9E65-4370-939A-527ACDBC4DA6}.RelWithDebInfo|x86.Build.0 = Debug|Any CPU
|
||||||
|
{802ECF0B-7264-4168-95D1-158E47FB65CC}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||||
|
{802ECF0B-7264-4168-95D1-158E47FB65CC}.Debug|x64.Build.0 = Debug|Any CPU
|
||||||
|
{802ECF0B-7264-4168-95D1-158E47FB65CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{802ECF0B-7264-4168-95D1-158E47FB65CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{802ECF0B-7264-4168-95D1-158E47FB65CC}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||||
|
{802ECF0B-7264-4168-95D1-158E47FB65CC}.Debug|x86.Build.0 = Debug|Any CPU
|
||||||
|
{802ECF0B-7264-4168-95D1-158E47FB65CC}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
|
||||||
|
{802ECF0B-7264-4168-95D1-158E47FB65CC}.MinSizeRel|x64.Build.0 = Debug|Any CPU
|
||||||
|
{802ECF0B-7264-4168-95D1-158E47FB65CC}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{802ECF0B-7264-4168-95D1-158E47FB65CC}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{802ECF0B-7264-4168-95D1-158E47FB65CC}.MinSizeRel|x86.ActiveCfg = Debug|Any CPU
|
||||||
|
{802ECF0B-7264-4168-95D1-158E47FB65CC}.MinSizeRel|x86.Build.0 = Debug|Any CPU
|
||||||
|
{802ECF0B-7264-4168-95D1-158E47FB65CC}.Release|x64.ActiveCfg = Release|Any CPU
|
||||||
|
{802ECF0B-7264-4168-95D1-158E47FB65CC}.Release|x64.Build.0 = Release|Any CPU
|
||||||
|
{802ECF0B-7264-4168-95D1-158E47FB65CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{802ECF0B-7264-4168-95D1-158E47FB65CC}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{802ECF0B-7264-4168-95D1-158E47FB65CC}.Release|x86.ActiveCfg = Release|Any CPU
|
||||||
|
{802ECF0B-7264-4168-95D1-158E47FB65CC}.Release|x86.Build.0 = Release|Any CPU
|
||||||
|
{802ECF0B-7264-4168-95D1-158E47FB65CC}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU
|
||||||
|
{802ECF0B-7264-4168-95D1-158E47FB65CC}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU
|
||||||
|
{802ECF0B-7264-4168-95D1-158E47FB65CC}.RelWithDebInfo|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{802ECF0B-7264-4168-95D1-158E47FB65CC}.RelWithDebInfo|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{802ECF0B-7264-4168-95D1-158E47FB65CC}.RelWithDebInfo|x86.ActiveCfg = Debug|Any CPU
|
||||||
|
{802ECF0B-7264-4168-95D1-158E47FB65CC}.RelWithDebInfo|x86.Build.0 = Debug|Any CPU
|
||||||
|
{95C5F6C0-88E5-4338-9A4F-614CF6C03CC0}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||||
|
{95C5F6C0-88E5-4338-9A4F-614CF6C03CC0}.Debug|x64.Build.0 = Debug|Any CPU
|
||||||
|
{95C5F6C0-88E5-4338-9A4F-614CF6C03CC0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{95C5F6C0-88E5-4338-9A4F-614CF6C03CC0}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{95C5F6C0-88E5-4338-9A4F-614CF6C03CC0}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||||
|
{95C5F6C0-88E5-4338-9A4F-614CF6C03CC0}.Debug|x86.Build.0 = Debug|Any CPU
|
||||||
|
{95C5F6C0-88E5-4338-9A4F-614CF6C03CC0}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
|
||||||
|
{95C5F6C0-88E5-4338-9A4F-614CF6C03CC0}.MinSizeRel|x64.Build.0 = Debug|Any CPU
|
||||||
|
{95C5F6C0-88E5-4338-9A4F-614CF6C03CC0}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{95C5F6C0-88E5-4338-9A4F-614CF6C03CC0}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{95C5F6C0-88E5-4338-9A4F-614CF6C03CC0}.MinSizeRel|x86.ActiveCfg = Debug|Any CPU
|
||||||
|
{95C5F6C0-88E5-4338-9A4F-614CF6C03CC0}.MinSizeRel|x86.Build.0 = Debug|Any CPU
|
||||||
|
{95C5F6C0-88E5-4338-9A4F-614CF6C03CC0}.Release|x64.ActiveCfg = Release|Any CPU
|
||||||
|
{95C5F6C0-88E5-4338-9A4F-614CF6C03CC0}.Release|x64.Build.0 = Release|Any CPU
|
||||||
|
{95C5F6C0-88E5-4338-9A4F-614CF6C03CC0}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{95C5F6C0-88E5-4338-9A4F-614CF6C03CC0}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{95C5F6C0-88E5-4338-9A4F-614CF6C03CC0}.Release|x86.ActiveCfg = Release|Any CPU
|
||||||
|
{95C5F6C0-88E5-4338-9A4F-614CF6C03CC0}.Release|x86.Build.0 = Release|Any CPU
|
||||||
|
{95C5F6C0-88E5-4338-9A4F-614CF6C03CC0}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU
|
||||||
|
{95C5F6C0-88E5-4338-9A4F-614CF6C03CC0}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU
|
||||||
|
{95C5F6C0-88E5-4338-9A4F-614CF6C03CC0}.RelWithDebInfo|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{95C5F6C0-88E5-4338-9A4F-614CF6C03CC0}.RelWithDebInfo|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{95C5F6C0-88E5-4338-9A4F-614CF6C03CC0}.RelWithDebInfo|x86.ActiveCfg = Debug|Any CPU
|
||||||
|
{95C5F6C0-88E5-4338-9A4F-614CF6C03CC0}.RelWithDebInfo|x86.Build.0 = Debug|Any CPU
|
||||||
|
{0354655D-2394-42BB-B1D4-2D75B9BCABF1}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||||
|
{0354655D-2394-42BB-B1D4-2D75B9BCABF1}.Debug|x64.Build.0 = Debug|Any CPU
|
||||||
|
{0354655D-2394-42BB-B1D4-2D75B9BCABF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{0354655D-2394-42BB-B1D4-2D75B9BCABF1}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{0354655D-2394-42BB-B1D4-2D75B9BCABF1}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||||
|
{0354655D-2394-42BB-B1D4-2D75B9BCABF1}.Debug|x86.Build.0 = Debug|Any CPU
|
||||||
|
{0354655D-2394-42BB-B1D4-2D75B9BCABF1}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
|
||||||
|
{0354655D-2394-42BB-B1D4-2D75B9BCABF1}.MinSizeRel|x64.Build.0 = Debug|Any CPU
|
||||||
|
{0354655D-2394-42BB-B1D4-2D75B9BCABF1}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{0354655D-2394-42BB-B1D4-2D75B9BCABF1}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{0354655D-2394-42BB-B1D4-2D75B9BCABF1}.MinSizeRel|x86.ActiveCfg = Debug|Any CPU
|
||||||
|
{0354655D-2394-42BB-B1D4-2D75B9BCABF1}.MinSizeRel|x86.Build.0 = Debug|Any CPU
|
||||||
|
{0354655D-2394-42BB-B1D4-2D75B9BCABF1}.Release|x64.ActiveCfg = Release|Any CPU
|
||||||
|
{0354655D-2394-42BB-B1D4-2D75B9BCABF1}.Release|x64.Build.0 = Release|Any CPU
|
||||||
|
{0354655D-2394-42BB-B1D4-2D75B9BCABF1}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{0354655D-2394-42BB-B1D4-2D75B9BCABF1}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{0354655D-2394-42BB-B1D4-2D75B9BCABF1}.Release|x86.ActiveCfg = Release|Any CPU
|
||||||
|
{0354655D-2394-42BB-B1D4-2D75B9BCABF1}.Release|x86.Build.0 = Release|Any CPU
|
||||||
|
{0354655D-2394-42BB-B1D4-2D75B9BCABF1}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU
|
||||||
|
{0354655D-2394-42BB-B1D4-2D75B9BCABF1}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU
|
||||||
|
{0354655D-2394-42BB-B1D4-2D75B9BCABF1}.RelWithDebInfo|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{0354655D-2394-42BB-B1D4-2D75B9BCABF1}.RelWithDebInfo|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{0354655D-2394-42BB-B1D4-2D75B9BCABF1}.RelWithDebInfo|x86.ActiveCfg = Debug|Any CPU
|
||||||
|
{0354655D-2394-42BB-B1D4-2D75B9BCABF1}.RelWithDebInfo|x86.Build.0 = Debug|Any CPU
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
HideSolutionNode = FALSE
|
HideSolutionNode = FALSE
|
||||||
@@ -535,7 +693,13 @@ Global
|
|||||||
{9F6D7DE8-185B-4C1D-B809-3314D092DF28} = {C09ED521-D2DF-40BC-A76F-EB3CB870B2F6}
|
{9F6D7DE8-185B-4C1D-B809-3314D092DF28} = {C09ED521-D2DF-40BC-A76F-EB3CB870B2F6}
|
||||||
{6BD3F6D8-B6FC-44E8-B8FE-06352F638B9B} = {C09ED521-D2DF-40BC-A76F-EB3CB870B2F6}
|
{6BD3F6D8-B6FC-44E8-B8FE-06352F638B9B} = {C09ED521-D2DF-40BC-A76F-EB3CB870B2F6}
|
||||||
{39AEA075-6457-46C0-8821-1158BE6EFA57} = {C09ED521-D2DF-40BC-A76F-EB3CB870B2F6}
|
{39AEA075-6457-46C0-8821-1158BE6EFA57} = {C09ED521-D2DF-40BC-A76F-EB3CB870B2F6}
|
||||||
{F3DC52D7-8C59-4EC0-86D9-0E5732EAFCF7} = {C09ED521-D2DF-40BC-A76F-EB3CB870B2F6}
|
{385C4948-E080-56A6-E29E-8B0F4913175C} = {267F81EF-A8AB-49FD-9F56-D7EC3C1F7C7C}
|
||||||
|
{43FB297B-7A4D-4835-A878-E6DF345B580C} = {385C4948-E080-56A6-E29E-8B0F4913175C}
|
||||||
|
{BC277499-8215-4F9F-B9AB-07B6391110BF} = {385C4948-E080-56A6-E29E-8B0F4913175C}
|
||||||
|
{C42F4CCB-9E65-4370-939A-527ACDBC4DA6} = {385C4948-E080-56A6-E29E-8B0F4913175C}
|
||||||
|
{802ECF0B-7264-4168-95D1-158E47FB65CC} = {385C4948-E080-56A6-E29E-8B0F4913175C}
|
||||||
|
{95C5F6C0-88E5-4338-9A4F-614CF6C03CC0} = {385C4948-E080-56A6-E29E-8B0F4913175C}
|
||||||
|
{0354655D-2394-42BB-B1D4-2D75B9BCABF1} = {385C4948-E080-56A6-E29E-8B0F4913175C}
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||||
SolutionGuid = {422D1620-0166-4C26-9A81-CA8A2EB1AB58}
|
SolutionGuid = {422D1620-0166-4C26-9A81-CA8A2EB1AB58}
|
||||||
|
|||||||
+32
-36
@@ -2,6 +2,7 @@ services:
|
|||||||
sparkd:
|
sparkd:
|
||||||
volumes:
|
volumes:
|
||||||
- ${SPARKD__DATA_DIR:-sparkd_data}:/home/bts/.local/share/bts/sparkd/data
|
- ${SPARKD__DATA_DIR:-sparkd_data}:/home/bts/.local/share/bts/sparkd/data
|
||||||
|
- ${SPARKD__MD_RECORDING_DIR:-md_recording}:/md_recording
|
||||||
build:
|
build:
|
||||||
dockerfile: src/app_sparkd/Dockerfile
|
dockerfile: src/app_sparkd/Dockerfile
|
||||||
args:
|
args:
|
||||||
@@ -9,24 +10,34 @@ services:
|
|||||||
- SOURCE_DIR=${SPARKD__SOURCE_DIR}
|
- SOURCE_DIR=${SPARKD__SOURCE_DIR}
|
||||||
- CONFIG_DIR=${SPARKD__CONFIG_DIR}
|
- CONFIG_DIR=${SPARKD__CONFIG_DIR}
|
||||||
- PYTHON_REQUIREMENTS=${SPARKD__PYTHON_REQUIREMENTS}
|
- PYTHON_REQUIREMENTS=${SPARKD__PYTHON_REQUIREMENTS}
|
||||||
|
- ENTRYPOINT_SCRIPT=${SPARKD__ENTRYPOINT}
|
||||||
shm_size: "${SPARKD__SHM_SIZE:-512mb}"
|
shm_size: "${SPARKD__SHM_SIZE:-512mb}"
|
||||||
command: >
|
env_file:
|
||||||
sh -c "
|
- .env
|
||||||
echo bts | sudo -S chown -R bts:bts /home/bts/.local/share/bts/sparkd/data
|
- ${SPARKD__CONFIG_DIR}/.env
|
||||||
if [ -e "/home/bts/.local/share/bts/sparkd/data/logging.sparkd/log" ]; then
|
ports:
|
||||||
mv "/home/bts/.local/share/bts/sparkd/data/logging.sparkd/log" "/home/bts/.local/share/bts/sparkd/data/logging.sparkd/log_$(date '+%Y%m%d-%H%M')"
|
- "${SPARKD__CONFIG_PORT}:${SPARKD__CONFIG_PORT}"
|
||||||
fi
|
- "${SPARKD__QUICKBUS_PORT}:${SPARKD__QUICKBUS_PORT}"
|
||||||
if [ -e "/home/bts/.local/share/bts/conf/.env.local" ]; then
|
- "${SPARKD__SIM_FIX_PORT}:${SPARKD__SIM_FIX_PORT}"
|
||||||
echo 'Sourcing /home/bts/.local/share/bts/conf/.env.local'
|
deploy:
|
||||||
set -a
|
resources:
|
||||||
. /home/bts/.local/share/bts/sparkd/conf/.env.local
|
limits:
|
||||||
set +a
|
memory: "${SPARKD__MEMORY:-4gb}"
|
||||||
fi
|
|
||||||
if [ -d /home/bts/.local/share/bts/sparkd/conf/plugins ]; then
|
sparkd-shell:
|
||||||
echo 'Copying /home/bts/.local/share/bts/sparkd/conf/plugins to runtime dir (/home/bts/bin)'
|
volumes:
|
||||||
cp -r /home/bts/.local/share/bts/sparkd/conf/plugins /home/bts/bin/
|
- ${SPARKD__DATA_DIR:-sparkd_data}:/home/bts/.local/share/bts/sparkd/data
|
||||||
fi
|
- ${SPARKD__MD_RECORDING_DIR:-md_recording}:/md_recording
|
||||||
./sparkd run"
|
build:
|
||||||
|
dockerfile: docker/images/bluetradingsystems/linux_shell/Dockerfile
|
||||||
|
args:
|
||||||
|
- IMAGE=${SPARKD__IMAGE}
|
||||||
|
- SOURCE_DIR=${SPARKD__SOURCE_DIR}
|
||||||
|
- CONFIG_DIR=${SPARKD__CONFIG_DIR}
|
||||||
|
- PYTHON_REQUIREMENTS=${SPARKD__PYTHON_REQUIREMENTS}
|
||||||
|
- ENTRYPOINT_SCRIPT=${SPARKD__ENTRYPOINT}
|
||||||
|
shm_size: "${SPARKD__SHM_SIZE:-512mb}"
|
||||||
|
command: "do sleep 1; done"
|
||||||
env_file:
|
env_file:
|
||||||
- .env
|
- .env
|
||||||
- ${SPARKD__CONFIG_DIR}/.env
|
- ${SPARKD__CONFIG_DIR}/.env
|
||||||
@@ -50,26 +61,8 @@ services:
|
|||||||
- SOURCE_DIR=${SPARKD__SOURCE_DIR}
|
- SOURCE_DIR=${SPARKD__SOURCE_DIR}
|
||||||
- CONFIG_DIR=${SPARKD__CONFIG_DIR}
|
- CONFIG_DIR=${SPARKD__CONFIG_DIR}
|
||||||
- PYTHON_REQUIREMENTS=${SPARKD__PYTHON_REQUIREMENTS}
|
- PYTHON_REQUIREMENTS=${SPARKD__PYTHON_REQUIREMENTS}
|
||||||
|
- ENTRYPOINT_SCRIPT=${SPARKD__ENTRYPOINT}
|
||||||
shm_size: "${SPARKD__SHM_SIZE:-512mb}"
|
shm_size: "${SPARKD__SHM_SIZE:-512mb}"
|
||||||
command: >
|
|
||||||
sh -c "
|
|
||||||
echo bts | sudo -S chown -R bts:bts /home/bts/.local/share/bts/sparkd
|
|
||||||
if [ -e "/home/bts/.local/share/bts/sparkd/data/logging.sparkd/log" ]; then
|
|
||||||
mv "/home/bts/.local/share/bts/sparkd/data/logging.sparkd/log" "/home/bts/.local/share/bts/sparkd/data/logging.sparkd/log_$(date '+%Y%m%d-%H%M')"
|
|
||||||
fi
|
|
||||||
ls -alh /home/bts/.local/share/bts/sparkd/conf/
|
|
||||||
cat /home/bts/.local/share/bts/sparkd/conf/.env.local
|
|
||||||
if [ -e "/home/bts/.local/share/bts/sparkd/conf/.env.local" ]; then
|
|
||||||
echo 'Sourcing /home/bts/.local/share/bts/sparkd/conf/.env.local'
|
|
||||||
set -a
|
|
||||||
. /home/bts/.local/share/bts/sparkd/conf/.env.local
|
|
||||||
set +a
|
|
||||||
fi
|
|
||||||
if [ -d /home/bts/.local/share/bts/sparkd/conf/plugins ]; then
|
|
||||||
echo 'Copying /home/bts/.local/share/bts/sparkd/conf/plugins to runtime dir (/home/bts/bin)'
|
|
||||||
cp -r /home/bts/.local/share/bts/sparkd/conf/plugins /home/bts/bin/
|
|
||||||
fi
|
|
||||||
./sparkd run"
|
|
||||||
env_file:
|
env_file:
|
||||||
- .env
|
- .env
|
||||||
- ${SPARKD__CONFIG_DIR}/.env
|
- ${SPARKD__CONFIG_DIR}/.env
|
||||||
@@ -195,3 +188,6 @@ volumes:
|
|||||||
name: "md_publisher_22019"
|
name: "md_publisher_22019"
|
||||||
historic_md:
|
historic_md:
|
||||||
name: "historic_md"
|
name: "historic_md"
|
||||||
|
md_recording:
|
||||||
|
name: "sparkd_md_recording_${SPARKD__CONFIG_PORT:-8000}"
|
||||||
|
external: true
|
||||||
@@ -8,6 +8,7 @@ RUN apt-get update && apt-get install -y ca-certificates
|
|||||||
RUN apt-get update && apt-get install -y libssh2-1-dev
|
RUN apt-get update && apt-get install -y libssh2-1-dev
|
||||||
RUN apt-get update && apt-get install -y software-properties-common
|
RUN apt-get update && apt-get install -y software-properties-common
|
||||||
RUN apt-get update && apt-get install -y sudo
|
RUN apt-get update && apt-get install -y sudo
|
||||||
|
RUN apt-get update && apt-get install -y tzdata
|
||||||
|
|
||||||
# GCC
|
# GCC
|
||||||
ARG gcc_major=13
|
ARG gcc_major=13
|
||||||
|
|||||||
+30
-11
@@ -55,14 +55,16 @@ RUN \
|
|||||||
clangd-$clang_major
|
clangd-$clang_major
|
||||||
|
|
||||||
# CMake
|
# CMake
|
||||||
RUN \
|
RUN set -eux \
|
||||||
curl -fsSL https://apt.kitware.com/keys/kitware-archive-latest.asc 2> /dev/null \
|
&& apt-get update \
|
||||||
| gpg --dearmor - \
|
&& apt-get install -y --no-install-recommends ca-certificates curl gpg \
|
||||||
| tee /usr/share/keyrings/kitware-archive-keyring.gpg > /dev/null \
|
&& curl -fsSL https://apt.kitware.com/keys/kitware-archive-latest.asc \
|
||||||
&& echo "deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ $(lsb_release -cs) main" \
|
| gpg --dearmor -o /usr/share/keyrings/kitware-archive-keyring.gpg \
|
||||||
| tee /etc/apt/sources.list.d/kitware.list > /dev/null \
|
&& echo "deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ $(lsb_release -cs) main" \
|
||||||
&& apt-get update \
|
> /etc/apt/sources.list.d/kitware.list \
|
||||||
&& apt-get install -y cmake
|
&& apt-get update \
|
||||||
|
&& apt-get install -y --no-install-recommends cmake \
|
||||||
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
# Dotnet
|
# Dotnet
|
||||||
RUN apt-get update && apt-get install -y dotnet8
|
RUN apt-get update && apt-get install -y dotnet8
|
||||||
@@ -80,9 +82,14 @@ RUN mkdir -p /etc/apt/keyrings \
|
|||||||
# Emumba (deps)
|
# Emumba (deps)
|
||||||
RUN apt-get update && apt-get -y install rapidjson-dev
|
RUN apt-get update && apt-get -y install rapidjson-dev
|
||||||
# Emumba
|
# Emumba
|
||||||
COPY emumba /emumba
|
ARG EMUMBA_DERIBIT_CONNECTOR_DEB_URL="https://api.bitbucket.org/2.0/repositories/bluetradesys/spark/downloads/emumba-deribit-connector-3.3.1-Linux.LICENSE_DISABLED.deb"
|
||||||
RUN dpkg -i /emumba/emumba-deribit-connector-3.3.1-Linux.LICENSE_DISABLED.deb \
|
RUN --mount=type=secret,id=bitbucket_access_token \
|
||||||
&& rm -r /emumba
|
set -eux \
|
||||||
|
&& apt-get update \
|
||||||
|
&& TOKEN="$(cat /run/secrets/bitbucket_access_token)" \
|
||||||
|
&& curl -fL -H "Authorization: Bearer ${TOKEN}" $EMUMBA_DERIBIT_CONNECTOR_DEB_URL -o /tmp/emumba-deribit-connector.deb \
|
||||||
|
&& apt-get install -y /tmp/emumba-deribit-connector.deb \
|
||||||
|
&& rm -f /tmp/emumba-deribit-connector.deb
|
||||||
|
|
||||||
# Pcap
|
# Pcap
|
||||||
RUN apt-get update && apt-get install -y libpcap0.8-dev
|
RUN apt-get update && apt-get install -y libpcap0.8-dev
|
||||||
@@ -90,6 +97,18 @@ RUN apt-get update && apt-get install -y libpcap0.8-dev
|
|||||||
# Databento (deps)
|
# Databento (deps)
|
||||||
RUN apt-get update && apt-get -y install libzstd-dev
|
RUN apt-get update && apt-get -y install libzstd-dev
|
||||||
|
|
||||||
|
# Rakurai
|
||||||
|
ARG RAKURAI_DEB_URL="https://api.bitbucket.org/2.0/repositories/bluetradesys/spark/downloads/rakurai-dex-connector_0.0.5_amd64.deb"
|
||||||
|
RUN --mount=type=secret,id=bitbucket_access_token \
|
||||||
|
set -eux \
|
||||||
|
&& apt-get update \
|
||||||
|
&& TOKEN="$(cat /run/secrets/bitbucket_access_token)" \
|
||||||
|
&& curl -fL -H "Authorization: Bearer ${TOKEN}" $RAKURAI_DEB_URL -o /tmp/rakurai.deb \
|
||||||
|
# Need --force-overwrite because rakuirai and emumba-deribit-connector both include the same
|
||||||
|
# spdlog headers.
|
||||||
|
&& apt-get install -y -o Dpkg::Options::="--force-overwrite" /tmp/rakurai.deb \
|
||||||
|
&& rm -f /tmp/rakuirai.deb
|
||||||
|
|
||||||
# Docker in Docker
|
# Docker in Docker
|
||||||
RUN apt-get update && apt-get install -y \
|
RUN apt-get update && apt-get install -y \
|
||||||
docker.io \
|
docker.io \
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
FROM ubuntu:24.04
|
||||||
|
|
||||||
|
ARG DEBIAN_FRONTEND=noninteractive
|
||||||
|
|
||||||
|
RUN apt-get update && apt-get install -y \
|
||||||
|
fish \
|
||||||
|
less \
|
||||||
|
vim
|
||||||
|
|
||||||
|
USER bts
|
||||||
|
WORKDIR /home/bts
|
||||||
+1
-1
Submodule externals updated: 4f6734703c...9fa7a9898e.
+3
-3
@@ -18,10 +18,10 @@ MarkupSafe==3.0.2
|
|||||||
mccabe==0.6.1
|
mccabe==0.6.1
|
||||||
numpy==2.2.6
|
numpy==2.2.6
|
||||||
platformdirs==2.3.0
|
platformdirs==2.3.0
|
||||||
protobuf==4.21.12
|
protobuf==6.33.4
|
||||||
pybars3==0.9.7
|
pybars3==0.9.7
|
||||||
pybind11==2.13.6
|
pybind11==3.0.1
|
||||||
pybind11-stubgen==2.5.3
|
pybind11-stubgen==2.5.5
|
||||||
pybit==5.11.0
|
pybit==5.11.0
|
||||||
pycodestyle==2.7.0
|
pycodestyle==2.7.0
|
||||||
pycparser==2.20
|
pycparser==2.20
|
||||||
|
|||||||
+389
-380
@@ -1,405 +1,414 @@
|
|||||||
|
|
||||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||||
# Visual Studio Version 17
|
# Visual Studio Version 17
|
||||||
VisualStudioVersion = 17.3.32922.545
|
VisualStudioVersion = 17.0.31903.59
|
||||||
MinimumVisualStudioVersion = 15.0.26124.0
|
MinimumVisualStudioVersion = 10.0.40219.1
|
||||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bts.Spark.Api", "src\cs\Bts.Spark.Api\Bts.Spark.Api.csproj", "{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}"
|
|
||||||
EndProject
|
|
||||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spark", "src\client\spark\Spark.csproj", "{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}"
|
|
||||||
EndProject
|
|
||||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spark.Console", "src\client\Spark.Console\Spark.Console.csproj", "{387566C6-C6F6-412C-A30C-9855BBCB4816}"
|
|
||||||
EndProject
|
|
||||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bts.Spark.Core", "src\cs\Bts.Spark.Core\Bts.Spark.Core.csproj", "{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}"
|
|
||||||
EndProject
|
|
||||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_sdk", "src\client\spark_sdk\spark_sdk.csproj", "{6963C314-83C4-4667-B0D0-C2F7AE208C29}"
|
|
||||||
EndProject
|
|
||||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_test", "src\client\spark_test\spark_test.csproj", "{ECD78CC5-138F-4809-A764-2358C2AC2E82}"
|
|
||||||
EndProject
|
|
||||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_websocket", "src\client\spark_websocket\spark_websocket.csproj", "{3201359D-C071-4089-9EDE-B04D759F1508}"
|
|
||||||
EndProject
|
|
||||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_api_server", "src\client\spark_api_server\spark_api_server.csproj", "{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}"
|
|
||||||
EndProject
|
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataStreamCore", "src\DataStreamSuite\DataStreamCore\DataStreamCore.csproj", "{4E4F491F-C688-43C4-88DA-AC92BC5FA1B8}"
|
|
||||||
EndProject
|
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataStream", "src\DataStreamSuite\DataStream\DataStream.csproj", "{2AC54ADC-3246-427E-9CA9-FEA2DBCB9432}"
|
|
||||||
EndProject
|
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharedStreams", "src\DataStreamSuite\SharedStreams\SharedStreams.csproj", "{4E96E5CC-7791-40B3-A8A1-C34FBB736B3B}"
|
|
||||||
EndProject
|
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PubSub", "src\DataStreamSuite\PubSub\PubSub.csproj", "{51C40BA9-F226-4A35-939D-1ED6F5FF7299}"
|
|
||||||
EndProject
|
|
||||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{827E0CD3-B72D-47B6-A68D-7590B98EB39B}"
|
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{827E0CD3-B72D-47B6-A68D-7590B98EB39B}"
|
||||||
EndProject
|
EndProject
|
||||||
|
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "cs", "cs", "{D7C6B9C7-1058-B1EA-FEE6-34C56B05AEDB}"
|
||||||
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bts.Spark.Core", "src\cs\Bts.Spark.Core\Bts.Spark.Core.csproj", "{684863A1-3396-4D31-A731-C0725CF07F4E}"
|
||||||
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bts.Spark.Api", "src\cs\Bts.Spark.Api\Bts.Spark.Api.csproj", "{45292808-4EF3-4D4A-B3F5-B75C42EE5870}"
|
||||||
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bts.Extensions.Hosting", "src\cs\Bts.Extensions.Hosting\Bts.Extensions.Hosting.csproj", "{AA57F8D9-7BD6-4161-881B-AD2CEF9A30F6}"
|
||||||
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bts.IO.Compression", "src\cs\Bts.IO.Compression\Bts.IO.Compression.csproj", "{28A26DF7-5F7A-43A2-A548-B55FEBCC3958}"
|
||||||
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bts.Net", "src\cs\Bts.Net\Bts.Net.csproj", "{7543386A-5EBA-4AF0-9E0F-35657B58557D}"
|
||||||
|
EndProject
|
||||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DataStreamSuite", "DataStreamSuite", "{60E0D592-FFB3-0D0A-C4AA-E88919B48F9D}"
|
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DataStreamSuite", "DataStreamSuite", "{60E0D592-FFB3-0D0A-C4AA-E88919B48F9D}"
|
||||||
EndProject
|
EndProject
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bts.Net", "src\DataStreamSuite\Bts.Net\Bts.Net.csproj", "{5DE3B533-DCE6-4BF4-8F7E-08C440E177B4}"
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PubSub", "src\DataStreamSuite\PubSub\PubSub.csproj", "{C13A5ABD-F739-4BE8-A2FE-511E989A5B43}"
|
||||||
EndProject
|
EndProject
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bts.Extensions.Hosting", "src\DataStreamSuite\Bts.Extensions.Hosting\Bts.Extensions.Hosting.csproj", "{90A48718-F6A7-4747-97EA-89632B451008}"
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataStreamCore", "src\DataStreamSuite\DataStreamCore\DataStreamCore.csproj", "{F7C6F079-67BA-4899-9B43-D3F8C121D264}"
|
||||||
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ArithmeticExpressions", "src\DataStreamSuite\ArithmeticExpressions\ArithmeticExpressions.csproj", "{E60C119D-2919-4E2F-9D39-90DB1A8FF9A7}"
|
||||||
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BaseUtilities", "src\DataStreamSuite\BaseUtilities\BaseUtilities.csproj", "{ECBAA198-EC93-4174-8156-BDA5F5E95042}"
|
||||||
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BooleanExpressions", "src\DataStreamSuite\BooleanExpressions\BooleanExpressions.csproj", "{F54AE5C0-2ECA-4151-82E6-0D7EFE88FF40}"
|
||||||
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bts.ColumnExpressions", "src\DataStreamSuite\Bts.ColumnExpressions\Bts.ColumnExpressions.csproj", "{A898C6C3-F134-4AF0-AFB3-3834C58CC0D7}"
|
||||||
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bts.ColumnSortExpressions", "src\DataStreamSuite\Bts.ColumnSortExpressions\Bts.ColumnSortExpressions.csproj", "{1E296FB3-D185-4A95-A1EB-AA5B37B85C60}"
|
||||||
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataStreamExpressions", "src\DataStreamSuite\DataStreamExpressions\DataStreamExpressions.csproj", "{B6070F41-8759-448B-B56D-A7D15D489569}"
|
||||||
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataStream", "src\DataStreamSuite\DataStream\DataStream.csproj", "{B2D721AB-920C-4CD6-8DBF-6778A115A449}"
|
||||||
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharedStreams", "src\DataStreamSuite\SharedStreams\SharedStreams.csproj", "{38EE36C6-892C-4C94-8BB0-1ACB164E1F20}"
|
||||||
|
EndProject
|
||||||
|
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "client", "client", "{C5A3B5EA-BE9F-76E5-E9B8-8A22B289B295}"
|
||||||
|
EndProject
|
||||||
|
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "spark", "spark", "{42C014A0-00C5-0620-8552-38912E891A7F}"
|
||||||
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spark", "src\client\spark\Spark.csproj", "{D432F3E9-3D2F-4623-B7B9-CEBA6701FFC3}"
|
||||||
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "spark_test", "src\client\spark_test\spark_test.csproj", "{DD00F5D5-6C2F-4FDA-AE3D-25CF01A9A224}"
|
||||||
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spark.Console", "src\client\Spark.Console\Spark.Console.csproj", "{2B8243FF-60C6-4607-8AAE-7762D29B0A48}"
|
||||||
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bts.Collections", "src\cs\Bts.Collections\Bts.Collections.csproj", "{00D21F82-61F4-467F-B125-268018A185E5}"
|
||||||
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bts.Core", "src\cs\Bts.Core\Bts.Core.csproj", "{513A3F0D-46B5-4AC2-B700-8671933F6347}"
|
||||||
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bts.Disposables", "src\cs\Bts.Disposables\Bts.Disposables.csproj", "{D419D996-9870-4FF5-82AD-08370D1C945F}"
|
||||||
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bts.Numerics", "src\cs\Bts.Numerics\Bts.Numerics.csproj", "{697BC3A3-1A98-43D3-A6E8-BB39A05EA049}"
|
||||||
EndProject
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
Debug|x64 = Debug|x64
|
|
||||||
Debug|Any CPU = Debug|Any CPU
|
Debug|Any CPU = Debug|Any CPU
|
||||||
|
Debug|x64 = Debug|x64
|
||||||
Debug|x86 = Debug|x86
|
Debug|x86 = Debug|x86
|
||||||
MinSizeRel|x64 = MinSizeRel|x64
|
|
||||||
MinSizeRel|Any CPU = MinSizeRel|Any CPU
|
|
||||||
MinSizeRel|x86 = MinSizeRel|x86
|
|
||||||
Release|x64 = Release|x64
|
|
||||||
Release|Any CPU = Release|Any CPU
|
Release|Any CPU = Release|Any CPU
|
||||||
|
Release|x64 = Release|x64
|
||||||
Release|x86 = Release|x86
|
Release|x86 = Release|x86
|
||||||
RelWithDebInfo|x64 = RelWithDebInfo|x64
|
|
||||||
RelWithDebInfo|Any CPU = RelWithDebInfo|Any CPU
|
|
||||||
RelWithDebInfo|x86 = RelWithDebInfo|x86
|
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||||
{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Debug|x64.ActiveCfg = Debug|x64
|
{684863A1-3396-4D31-A731-C0725CF07F4E}.Debug|Any CPU.ActiveCfg = Debug|x64
|
||||||
{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Debug|x64.Build.0 = Debug|x64
|
{684863A1-3396-4D31-A731-C0725CF07F4E}.Debug|Any CPU.Build.0 = Debug|x64
|
||||||
{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{684863A1-3396-4D31-A731-C0725CF07F4E}.Debug|x64.ActiveCfg = Debug|x64
|
||||||
{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{684863A1-3396-4D31-A731-C0725CF07F4E}.Debug|x64.Build.0 = Debug|x64
|
||||||
{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Debug|x86.ActiveCfg = Debug|Any CPU
|
{684863A1-3396-4D31-A731-C0725CF07F4E}.Debug|x86.ActiveCfg = Debug|x64
|
||||||
{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Debug|x86.Build.0 = Debug|Any CPU
|
{684863A1-3396-4D31-A731-C0725CF07F4E}.Debug|x86.Build.0 = Debug|x64
|
||||||
{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.MinSizeRel|x64.ActiveCfg = Release|x64
|
{684863A1-3396-4D31-A731-C0725CF07F4E}.Release|Any CPU.ActiveCfg = Release|x64
|
||||||
{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.MinSizeRel|x64.Build.0 = Release|x64
|
{684863A1-3396-4D31-A731-C0725CF07F4E}.Release|Any CPU.Build.0 = Release|x64
|
||||||
{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.MinSizeRel|Any CPU.ActiveCfg = MinSizeRel|Any CPU
|
{684863A1-3396-4D31-A731-C0725CF07F4E}.Release|x64.ActiveCfg = Release|x64
|
||||||
{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.MinSizeRel|Any CPU.Build.0 = MinSizeRel|Any CPU
|
{684863A1-3396-4D31-A731-C0725CF07F4E}.Release|x64.Build.0 = Release|x64
|
||||||
{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.MinSizeRel|x86.ActiveCfg = MinSizeRel|Any CPU
|
{684863A1-3396-4D31-A731-C0725CF07F4E}.Release|x86.ActiveCfg = Release|x64
|
||||||
{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.MinSizeRel|x86.Build.0 = MinSizeRel|Any CPU
|
{684863A1-3396-4D31-A731-C0725CF07F4E}.Release|x86.Build.0 = Release|x64
|
||||||
{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Release|x64.ActiveCfg = Release|x64
|
{45292808-4EF3-4D4A-B3F5-B75C42EE5870}.Debug|Any CPU.ActiveCfg = Debug|x64
|
||||||
{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Release|x64.Build.0 = Release|x64
|
{45292808-4EF3-4D4A-B3F5-B75C42EE5870}.Debug|Any CPU.Build.0 = Debug|x64
|
||||||
{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{45292808-4EF3-4D4A-B3F5-B75C42EE5870}.Debug|x64.ActiveCfg = Debug|x64
|
||||||
{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Release|Any CPU.Build.0 = Release|Any CPU
|
{45292808-4EF3-4D4A-B3F5-B75C42EE5870}.Debug|x64.Build.0 = Debug|x64
|
||||||
{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Release|x86.ActiveCfg = Release|Any CPU
|
{45292808-4EF3-4D4A-B3F5-B75C42EE5870}.Debug|x86.ActiveCfg = Debug|x64
|
||||||
{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Release|x86.Build.0 = Release|Any CPU
|
{45292808-4EF3-4D4A-B3F5-B75C42EE5870}.Debug|x86.Build.0 = Debug|x64
|
||||||
{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.RelWithDebInfo|x64.ActiveCfg = Release|x64
|
{45292808-4EF3-4D4A-B3F5-B75C42EE5870}.Release|Any CPU.ActiveCfg = Release|x64
|
||||||
{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.RelWithDebInfo|x64.Build.0 = Release|x64
|
{45292808-4EF3-4D4A-B3F5-B75C42EE5870}.Release|Any CPU.Build.0 = Release|x64
|
||||||
{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.RelWithDebInfo|Any CPU.ActiveCfg = RelWithDebInfo|Any CPU
|
{45292808-4EF3-4D4A-B3F5-B75C42EE5870}.Release|x64.ActiveCfg = Release|x64
|
||||||
{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.RelWithDebInfo|Any CPU.Build.0 = RelWithDebInfo|Any CPU
|
{45292808-4EF3-4D4A-B3F5-B75C42EE5870}.Release|x64.Build.0 = Release|x64
|
||||||
{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|Any CPU
|
{45292808-4EF3-4D4A-B3F5-B75C42EE5870}.Release|x86.ActiveCfg = Release|x64
|
||||||
{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|Any CPU
|
{45292808-4EF3-4D4A-B3F5-B75C42EE5870}.Release|x86.Build.0 = Release|x64
|
||||||
{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.Debug|x64.ActiveCfg = Debug|x64
|
{AA57F8D9-7BD6-4161-881B-AD2CEF9A30F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.Debug|x64.Build.0 = Debug|x64
|
{AA57F8D9-7BD6-4161-881B-AD2CEF9A30F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{AA57F8D9-7BD6-4161-881B-AD2CEF9A30F6}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||||
{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{AA57F8D9-7BD6-4161-881B-AD2CEF9A30F6}.Debug|x64.Build.0 = Debug|Any CPU
|
||||||
{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.Debug|x86.ActiveCfg = Debug|Any CPU
|
{AA57F8D9-7BD6-4161-881B-AD2CEF9A30F6}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||||
{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.Debug|x86.Build.0 = Debug|Any CPU
|
{AA57F8D9-7BD6-4161-881B-AD2CEF9A30F6}.Debug|x86.Build.0 = Debug|Any CPU
|
||||||
{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.MinSizeRel|x64.ActiveCfg = Release|x64
|
{AA57F8D9-7BD6-4161-881B-AD2CEF9A30F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.MinSizeRel|x64.Build.0 = Release|x64
|
{AA57F8D9-7BD6-4161-881B-AD2CEF9A30F6}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.MinSizeRel|Any CPU.ActiveCfg = MinSizeRel|Any CPU
|
{AA57F8D9-7BD6-4161-881B-AD2CEF9A30F6}.Release|x64.ActiveCfg = Release|Any CPU
|
||||||
{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.MinSizeRel|Any CPU.Build.0 = MinSizeRel|Any CPU
|
{AA57F8D9-7BD6-4161-881B-AD2CEF9A30F6}.Release|x64.Build.0 = Release|Any CPU
|
||||||
{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.MinSizeRel|x86.ActiveCfg = MinSizeRel|Any CPU
|
{AA57F8D9-7BD6-4161-881B-AD2CEF9A30F6}.Release|x86.ActiveCfg = Release|Any CPU
|
||||||
{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.MinSizeRel|x86.Build.0 = MinSizeRel|Any CPU
|
{AA57F8D9-7BD6-4161-881B-AD2CEF9A30F6}.Release|x86.Build.0 = Release|Any CPU
|
||||||
{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.Release|x64.ActiveCfg = Release|x64
|
{28A26DF7-5F7A-43A2-A548-B55FEBCC3958}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.Release|x64.Build.0 = Release|x64
|
{28A26DF7-5F7A-43A2-A548-B55FEBCC3958}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{28A26DF7-5F7A-43A2-A548-B55FEBCC3958}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||||
{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.Release|Any CPU.Build.0 = Release|Any CPU
|
{28A26DF7-5F7A-43A2-A548-B55FEBCC3958}.Debug|x64.Build.0 = Debug|Any CPU
|
||||||
{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.Release|x86.ActiveCfg = Release|Any CPU
|
{28A26DF7-5F7A-43A2-A548-B55FEBCC3958}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||||
{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.Release|x86.Build.0 = Release|Any CPU
|
{28A26DF7-5F7A-43A2-A548-B55FEBCC3958}.Debug|x86.Build.0 = Debug|Any CPU
|
||||||
{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.RelWithDebInfo|x64.ActiveCfg = Release|x64
|
{28A26DF7-5F7A-43A2-A548-B55FEBCC3958}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.RelWithDebInfo|x64.Build.0 = Release|x64
|
{28A26DF7-5F7A-43A2-A548-B55FEBCC3958}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.RelWithDebInfo|Any CPU.ActiveCfg = RelWithDebInfo|Any CPU
|
{28A26DF7-5F7A-43A2-A548-B55FEBCC3958}.Release|x64.ActiveCfg = Release|Any CPU
|
||||||
{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.RelWithDebInfo|Any CPU.Build.0 = RelWithDebInfo|Any CPU
|
{28A26DF7-5F7A-43A2-A548-B55FEBCC3958}.Release|x64.Build.0 = Release|Any CPU
|
||||||
{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|Any CPU
|
{28A26DF7-5F7A-43A2-A548-B55FEBCC3958}.Release|x86.ActiveCfg = Release|Any CPU
|
||||||
{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|Any CPU
|
{28A26DF7-5F7A-43A2-A548-B55FEBCC3958}.Release|x86.Build.0 = Release|Any CPU
|
||||||
{387566C6-C6F6-412C-A30C-9855BBCB4816}.Debug|x64.ActiveCfg = Debug|x64
|
{7543386A-5EBA-4AF0-9E0F-35657B58557D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{387566C6-C6F6-412C-A30C-9855BBCB4816}.Debug|x64.Build.0 = Debug|x64
|
{7543386A-5EBA-4AF0-9E0F-35657B58557D}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{387566C6-C6F6-412C-A30C-9855BBCB4816}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{7543386A-5EBA-4AF0-9E0F-35657B58557D}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||||
{387566C6-C6F6-412C-A30C-9855BBCB4816}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{7543386A-5EBA-4AF0-9E0F-35657B58557D}.Debug|x64.Build.0 = Debug|Any CPU
|
||||||
{387566C6-C6F6-412C-A30C-9855BBCB4816}.Debug|x86.ActiveCfg = Debug|Any CPU
|
{7543386A-5EBA-4AF0-9E0F-35657B58557D}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||||
{387566C6-C6F6-412C-A30C-9855BBCB4816}.Debug|x86.Build.0 = Debug|Any CPU
|
{7543386A-5EBA-4AF0-9E0F-35657B58557D}.Debug|x86.Build.0 = Debug|Any CPU
|
||||||
{387566C6-C6F6-412C-A30C-9855BBCB4816}.MinSizeRel|x64.ActiveCfg = Debug|x64
|
{7543386A-5EBA-4AF0-9E0F-35657B58557D}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{387566C6-C6F6-412C-A30C-9855BBCB4816}.MinSizeRel|x64.Build.0 = Debug|x64
|
{7543386A-5EBA-4AF0-9E0F-35657B58557D}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
{387566C6-C6F6-412C-A30C-9855BBCB4816}.MinSizeRel|Any CPU.ActiveCfg = MinSizeRel|Any CPU
|
{7543386A-5EBA-4AF0-9E0F-35657B58557D}.Release|x64.ActiveCfg = Release|Any CPU
|
||||||
{387566C6-C6F6-412C-A30C-9855BBCB4816}.MinSizeRel|Any CPU.Build.0 = MinSizeRel|Any CPU
|
{7543386A-5EBA-4AF0-9E0F-35657B58557D}.Release|x64.Build.0 = Release|Any CPU
|
||||||
{387566C6-C6F6-412C-A30C-9855BBCB4816}.MinSizeRel|x86.ActiveCfg = MinSizeRel|Any CPU
|
{7543386A-5EBA-4AF0-9E0F-35657B58557D}.Release|x86.ActiveCfg = Release|Any CPU
|
||||||
{387566C6-C6F6-412C-A30C-9855BBCB4816}.MinSizeRel|x86.Build.0 = MinSizeRel|Any CPU
|
{7543386A-5EBA-4AF0-9E0F-35657B58557D}.Release|x86.Build.0 = Release|Any CPU
|
||||||
{387566C6-C6F6-412C-A30C-9855BBCB4816}.Release|x64.ActiveCfg = Release|x64
|
{C13A5ABD-F739-4BE8-A2FE-511E989A5B43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{387566C6-C6F6-412C-A30C-9855BBCB4816}.Release|x64.Build.0 = Release|x64
|
{C13A5ABD-F739-4BE8-A2FE-511E989A5B43}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{387566C6-C6F6-412C-A30C-9855BBCB4816}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{C13A5ABD-F739-4BE8-A2FE-511E989A5B43}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||||
{387566C6-C6F6-412C-A30C-9855BBCB4816}.Release|Any CPU.Build.0 = Release|Any CPU
|
{C13A5ABD-F739-4BE8-A2FE-511E989A5B43}.Debug|x64.Build.0 = Debug|Any CPU
|
||||||
{387566C6-C6F6-412C-A30C-9855BBCB4816}.Release|x86.ActiveCfg = Release|Any CPU
|
{C13A5ABD-F739-4BE8-A2FE-511E989A5B43}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||||
{387566C6-C6F6-412C-A30C-9855BBCB4816}.Release|x86.Build.0 = Release|Any CPU
|
{C13A5ABD-F739-4BE8-A2FE-511E989A5B43}.Debug|x86.Build.0 = Debug|Any CPU
|
||||||
{387566C6-C6F6-412C-A30C-9855BBCB4816}.RelWithDebInfo|x64.ActiveCfg = Release|x64
|
{C13A5ABD-F739-4BE8-A2FE-511E989A5B43}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{387566C6-C6F6-412C-A30C-9855BBCB4816}.RelWithDebInfo|x64.Build.0 = Release|x64
|
{C13A5ABD-F739-4BE8-A2FE-511E989A5B43}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
{387566C6-C6F6-412C-A30C-9855BBCB4816}.RelWithDebInfo|Any CPU.ActiveCfg = RelWithDebInfo|Any CPU
|
{C13A5ABD-F739-4BE8-A2FE-511E989A5B43}.Release|x64.ActiveCfg = Release|Any CPU
|
||||||
{387566C6-C6F6-412C-A30C-9855BBCB4816}.RelWithDebInfo|Any CPU.Build.0 = RelWithDebInfo|Any CPU
|
{C13A5ABD-F739-4BE8-A2FE-511E989A5B43}.Release|x64.Build.0 = Release|Any CPU
|
||||||
{387566C6-C6F6-412C-A30C-9855BBCB4816}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|Any CPU
|
{C13A5ABD-F739-4BE8-A2FE-511E989A5B43}.Release|x86.ActiveCfg = Release|Any CPU
|
||||||
{387566C6-C6F6-412C-A30C-9855BBCB4816}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|Any CPU
|
{C13A5ABD-F739-4BE8-A2FE-511E989A5B43}.Release|x86.Build.0 = Release|Any CPU
|
||||||
{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Debug|x64.ActiveCfg = Debug|x64
|
{F7C6F079-67BA-4899-9B43-D3F8C121D264}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Debug|x64.Build.0 = Debug|x64
|
{F7C6F079-67BA-4899-9B43-D3F8C121D264}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{F7C6F079-67BA-4899-9B43-D3F8C121D264}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||||
{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{F7C6F079-67BA-4899-9B43-D3F8C121D264}.Debug|x64.Build.0 = Debug|Any CPU
|
||||||
{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Debug|x86.ActiveCfg = Debug|Any CPU
|
{F7C6F079-67BA-4899-9B43-D3F8C121D264}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||||
{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Debug|x86.Build.0 = Debug|Any CPU
|
{F7C6F079-67BA-4899-9B43-D3F8C121D264}.Debug|x86.Build.0 = Debug|Any CPU
|
||||||
{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.MinSizeRel|x64.ActiveCfg = Release|x64
|
{F7C6F079-67BA-4899-9B43-D3F8C121D264}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.MinSizeRel|x64.Build.0 = Release|x64
|
{F7C6F079-67BA-4899-9B43-D3F8C121D264}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.MinSizeRel|Any CPU.ActiveCfg = MinSizeRel|Any CPU
|
{F7C6F079-67BA-4899-9B43-D3F8C121D264}.Release|x64.ActiveCfg = Release|Any CPU
|
||||||
{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.MinSizeRel|Any CPU.Build.0 = MinSizeRel|Any CPU
|
{F7C6F079-67BA-4899-9B43-D3F8C121D264}.Release|x64.Build.0 = Release|Any CPU
|
||||||
{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.MinSizeRel|x86.ActiveCfg = MinSizeRel|Any CPU
|
{F7C6F079-67BA-4899-9B43-D3F8C121D264}.Release|x86.ActiveCfg = Release|Any CPU
|
||||||
{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.MinSizeRel|x86.Build.0 = MinSizeRel|Any CPU
|
{F7C6F079-67BA-4899-9B43-D3F8C121D264}.Release|x86.Build.0 = Release|Any CPU
|
||||||
{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Release|x64.ActiveCfg = Release|x64
|
{E60C119D-2919-4E2F-9D39-90DB1A8FF9A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Release|x64.Build.0 = Release|x64
|
{E60C119D-2919-4E2F-9D39-90DB1A8FF9A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{E60C119D-2919-4E2F-9D39-90DB1A8FF9A7}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||||
{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Release|Any CPU.Build.0 = Release|Any CPU
|
{E60C119D-2919-4E2F-9D39-90DB1A8FF9A7}.Debug|x64.Build.0 = Debug|Any CPU
|
||||||
{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Release|x86.ActiveCfg = Release|Any CPU
|
{E60C119D-2919-4E2F-9D39-90DB1A8FF9A7}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||||
{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Release|x86.Build.0 = Release|Any CPU
|
{E60C119D-2919-4E2F-9D39-90DB1A8FF9A7}.Debug|x86.Build.0 = Debug|Any CPU
|
||||||
{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.RelWithDebInfo|x64.ActiveCfg = Release|x64
|
{E60C119D-2919-4E2F-9D39-90DB1A8FF9A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.RelWithDebInfo|x64.Build.0 = Release|x64
|
{E60C119D-2919-4E2F-9D39-90DB1A8FF9A7}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.RelWithDebInfo|Any CPU.ActiveCfg = RelWithDebInfo|Any CPU
|
{E60C119D-2919-4E2F-9D39-90DB1A8FF9A7}.Release|x64.ActiveCfg = Release|Any CPU
|
||||||
{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.RelWithDebInfo|Any CPU.Build.0 = RelWithDebInfo|Any CPU
|
{E60C119D-2919-4E2F-9D39-90DB1A8FF9A7}.Release|x64.Build.0 = Release|Any CPU
|
||||||
{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|Any CPU
|
{E60C119D-2919-4E2F-9D39-90DB1A8FF9A7}.Release|x86.ActiveCfg = Release|Any CPU
|
||||||
{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|Any CPU
|
{E60C119D-2919-4E2F-9D39-90DB1A8FF9A7}.Release|x86.Build.0 = Release|Any CPU
|
||||||
{6963C314-83C4-4667-B0D0-C2F7AE208C29}.Debug|x64.ActiveCfg = Debug|x64
|
{ECBAA198-EC93-4174-8156-BDA5F5E95042}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{6963C314-83C4-4667-B0D0-C2F7AE208C29}.Debug|x64.Build.0 = Debug|x64
|
{ECBAA198-EC93-4174-8156-BDA5F5E95042}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{6963C314-83C4-4667-B0D0-C2F7AE208C29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{ECBAA198-EC93-4174-8156-BDA5F5E95042}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||||
{6963C314-83C4-4667-B0D0-C2F7AE208C29}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{ECBAA198-EC93-4174-8156-BDA5F5E95042}.Debug|x64.Build.0 = Debug|Any CPU
|
||||||
{6963C314-83C4-4667-B0D0-C2F7AE208C29}.Debug|x86.ActiveCfg = Debug|Any CPU
|
{ECBAA198-EC93-4174-8156-BDA5F5E95042}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||||
{6963C314-83C4-4667-B0D0-C2F7AE208C29}.Debug|x86.Build.0 = Debug|Any CPU
|
{ECBAA198-EC93-4174-8156-BDA5F5E95042}.Debug|x86.Build.0 = Debug|Any CPU
|
||||||
{6963C314-83C4-4667-B0D0-C2F7AE208C29}.MinSizeRel|x64.ActiveCfg = Release|x64
|
{ECBAA198-EC93-4174-8156-BDA5F5E95042}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{6963C314-83C4-4667-B0D0-C2F7AE208C29}.MinSizeRel|x64.Build.0 = Release|x64
|
{ECBAA198-EC93-4174-8156-BDA5F5E95042}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
{6963C314-83C4-4667-B0D0-C2F7AE208C29}.MinSizeRel|Any CPU.ActiveCfg = MinSizeRel|Any CPU
|
{ECBAA198-EC93-4174-8156-BDA5F5E95042}.Release|x64.ActiveCfg = Release|Any CPU
|
||||||
{6963C314-83C4-4667-B0D0-C2F7AE208C29}.MinSizeRel|Any CPU.Build.0 = MinSizeRel|Any CPU
|
{ECBAA198-EC93-4174-8156-BDA5F5E95042}.Release|x64.Build.0 = Release|Any CPU
|
||||||
{6963C314-83C4-4667-B0D0-C2F7AE208C29}.MinSizeRel|x86.ActiveCfg = MinSizeRel|Any CPU
|
{ECBAA198-EC93-4174-8156-BDA5F5E95042}.Release|x86.ActiveCfg = Release|Any CPU
|
||||||
{6963C314-83C4-4667-B0D0-C2F7AE208C29}.MinSizeRel|x86.Build.0 = MinSizeRel|Any CPU
|
{ECBAA198-EC93-4174-8156-BDA5F5E95042}.Release|x86.Build.0 = Release|Any CPU
|
||||||
{6963C314-83C4-4667-B0D0-C2F7AE208C29}.Release|x64.ActiveCfg = Release|x64
|
{F54AE5C0-2ECA-4151-82E6-0D7EFE88FF40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{6963C314-83C4-4667-B0D0-C2F7AE208C29}.Release|x64.Build.0 = Release|x64
|
{F54AE5C0-2ECA-4151-82E6-0D7EFE88FF40}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{6963C314-83C4-4667-B0D0-C2F7AE208C29}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{F54AE5C0-2ECA-4151-82E6-0D7EFE88FF40}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||||
{6963C314-83C4-4667-B0D0-C2F7AE208C29}.Release|Any CPU.Build.0 = Release|Any CPU
|
{F54AE5C0-2ECA-4151-82E6-0D7EFE88FF40}.Debug|x64.Build.0 = Debug|Any CPU
|
||||||
{6963C314-83C4-4667-B0D0-C2F7AE208C29}.Release|x86.ActiveCfg = Release|Any CPU
|
{F54AE5C0-2ECA-4151-82E6-0D7EFE88FF40}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||||
{6963C314-83C4-4667-B0D0-C2F7AE208C29}.Release|x86.Build.0 = Release|Any CPU
|
{F54AE5C0-2ECA-4151-82E6-0D7EFE88FF40}.Debug|x86.Build.0 = Debug|Any CPU
|
||||||
{6963C314-83C4-4667-B0D0-C2F7AE208C29}.RelWithDebInfo|x64.ActiveCfg = Release|x64
|
{F54AE5C0-2ECA-4151-82E6-0D7EFE88FF40}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{6963C314-83C4-4667-B0D0-C2F7AE208C29}.RelWithDebInfo|x64.Build.0 = Release|x64
|
{F54AE5C0-2ECA-4151-82E6-0D7EFE88FF40}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
{6963C314-83C4-4667-B0D0-C2F7AE208C29}.RelWithDebInfo|Any CPU.ActiveCfg = RelWithDebInfo|Any CPU
|
{F54AE5C0-2ECA-4151-82E6-0D7EFE88FF40}.Release|x64.ActiveCfg = Release|Any CPU
|
||||||
{6963C314-83C4-4667-B0D0-C2F7AE208C29}.RelWithDebInfo|Any CPU.Build.0 = RelWithDebInfo|Any CPU
|
{F54AE5C0-2ECA-4151-82E6-0D7EFE88FF40}.Release|x64.Build.0 = Release|Any CPU
|
||||||
{6963C314-83C4-4667-B0D0-C2F7AE208C29}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|Any CPU
|
{F54AE5C0-2ECA-4151-82E6-0D7EFE88FF40}.Release|x86.ActiveCfg = Release|Any CPU
|
||||||
{6963C314-83C4-4667-B0D0-C2F7AE208C29}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|Any CPU
|
{F54AE5C0-2ECA-4151-82E6-0D7EFE88FF40}.Release|x86.Build.0 = Release|Any CPU
|
||||||
{ECD78CC5-138F-4809-A764-2358C2AC2E82}.Debug|x64.ActiveCfg = Debug|x64
|
{A898C6C3-F134-4AF0-AFB3-3834C58CC0D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{ECD78CC5-138F-4809-A764-2358C2AC2E82}.Debug|x64.Build.0 = Debug|x64
|
{A898C6C3-F134-4AF0-AFB3-3834C58CC0D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{ECD78CC5-138F-4809-A764-2358C2AC2E82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{A898C6C3-F134-4AF0-AFB3-3834C58CC0D7}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||||
{ECD78CC5-138F-4809-A764-2358C2AC2E82}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{A898C6C3-F134-4AF0-AFB3-3834C58CC0D7}.Debug|x64.Build.0 = Debug|Any CPU
|
||||||
{ECD78CC5-138F-4809-A764-2358C2AC2E82}.Debug|x86.ActiveCfg = Debug|Any CPU
|
{A898C6C3-F134-4AF0-AFB3-3834C58CC0D7}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||||
{ECD78CC5-138F-4809-A764-2358C2AC2E82}.Debug|x86.Build.0 = Debug|Any CPU
|
{A898C6C3-F134-4AF0-AFB3-3834C58CC0D7}.Debug|x86.Build.0 = Debug|Any CPU
|
||||||
{ECD78CC5-138F-4809-A764-2358C2AC2E82}.MinSizeRel|x64.ActiveCfg = Debug|x64
|
{A898C6C3-F134-4AF0-AFB3-3834C58CC0D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{ECD78CC5-138F-4809-A764-2358C2AC2E82}.MinSizeRel|x64.Build.0 = Debug|x64
|
{A898C6C3-F134-4AF0-AFB3-3834C58CC0D7}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
{ECD78CC5-138F-4809-A764-2358C2AC2E82}.MinSizeRel|Any CPU.ActiveCfg = MinSizeRel|Any CPU
|
{A898C6C3-F134-4AF0-AFB3-3834C58CC0D7}.Release|x64.ActiveCfg = Release|Any CPU
|
||||||
{ECD78CC5-138F-4809-A764-2358C2AC2E82}.MinSizeRel|Any CPU.Build.0 = MinSizeRel|Any CPU
|
{A898C6C3-F134-4AF0-AFB3-3834C58CC0D7}.Release|x64.Build.0 = Release|Any CPU
|
||||||
{ECD78CC5-138F-4809-A764-2358C2AC2E82}.MinSizeRel|x86.ActiveCfg = MinSizeRel|Any CPU
|
{A898C6C3-F134-4AF0-AFB3-3834C58CC0D7}.Release|x86.ActiveCfg = Release|Any CPU
|
||||||
{ECD78CC5-138F-4809-A764-2358C2AC2E82}.MinSizeRel|x86.Build.0 = MinSizeRel|Any CPU
|
{A898C6C3-F134-4AF0-AFB3-3834C58CC0D7}.Release|x86.Build.0 = Release|Any CPU
|
||||||
{ECD78CC5-138F-4809-A764-2358C2AC2E82}.Release|x64.ActiveCfg = Release|x64
|
{1E296FB3-D185-4A95-A1EB-AA5B37B85C60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{ECD78CC5-138F-4809-A764-2358C2AC2E82}.Release|x64.Build.0 = Release|x64
|
{1E296FB3-D185-4A95-A1EB-AA5B37B85C60}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{ECD78CC5-138F-4809-A764-2358C2AC2E82}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{1E296FB3-D185-4A95-A1EB-AA5B37B85C60}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||||
{ECD78CC5-138F-4809-A764-2358C2AC2E82}.Release|Any CPU.Build.0 = Release|Any CPU
|
{1E296FB3-D185-4A95-A1EB-AA5B37B85C60}.Debug|x64.Build.0 = Debug|Any CPU
|
||||||
{ECD78CC5-138F-4809-A764-2358C2AC2E82}.Release|x86.ActiveCfg = Release|Any CPU
|
{1E296FB3-D185-4A95-A1EB-AA5B37B85C60}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||||
{ECD78CC5-138F-4809-A764-2358C2AC2E82}.Release|x86.Build.0 = Release|Any CPU
|
{1E296FB3-D185-4A95-A1EB-AA5B37B85C60}.Debug|x86.Build.0 = Debug|Any CPU
|
||||||
{ECD78CC5-138F-4809-A764-2358C2AC2E82}.RelWithDebInfo|x64.ActiveCfg = Release|x64
|
{1E296FB3-D185-4A95-A1EB-AA5B37B85C60}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{ECD78CC5-138F-4809-A764-2358C2AC2E82}.RelWithDebInfo|x64.Build.0 = Release|x64
|
{1E296FB3-D185-4A95-A1EB-AA5B37B85C60}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
{ECD78CC5-138F-4809-A764-2358C2AC2E82}.RelWithDebInfo|Any CPU.ActiveCfg = RelWithDebInfo|Any CPU
|
{1E296FB3-D185-4A95-A1EB-AA5B37B85C60}.Release|x64.ActiveCfg = Release|Any CPU
|
||||||
{ECD78CC5-138F-4809-A764-2358C2AC2E82}.RelWithDebInfo|Any CPU.Build.0 = RelWithDebInfo|Any CPU
|
{1E296FB3-D185-4A95-A1EB-AA5B37B85C60}.Release|x64.Build.0 = Release|Any CPU
|
||||||
{ECD78CC5-138F-4809-A764-2358C2AC2E82}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|Any CPU
|
{1E296FB3-D185-4A95-A1EB-AA5B37B85C60}.Release|x86.ActiveCfg = Release|Any CPU
|
||||||
{ECD78CC5-138F-4809-A764-2358C2AC2E82}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|Any CPU
|
{1E296FB3-D185-4A95-A1EB-AA5B37B85C60}.Release|x86.Build.0 = Release|Any CPU
|
||||||
{3201359D-C071-4089-9EDE-B04D759F1508}.Debug|x64.ActiveCfg = Debug|x64
|
{B6070F41-8759-448B-B56D-A7D15D489569}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{3201359D-C071-4089-9EDE-B04D759F1508}.Debug|x64.Build.0 = Debug|x64
|
{B6070F41-8759-448B-B56D-A7D15D489569}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{3201359D-C071-4089-9EDE-B04D759F1508}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{B6070F41-8759-448B-B56D-A7D15D489569}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||||
{3201359D-C071-4089-9EDE-B04D759F1508}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{B6070F41-8759-448B-B56D-A7D15D489569}.Debug|x64.Build.0 = Debug|Any CPU
|
||||||
{3201359D-C071-4089-9EDE-B04D759F1508}.Debug|x86.ActiveCfg = Debug|Any CPU
|
{B6070F41-8759-448B-B56D-A7D15D489569}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||||
{3201359D-C071-4089-9EDE-B04D759F1508}.Debug|x86.Build.0 = Debug|Any CPU
|
{B6070F41-8759-448B-B56D-A7D15D489569}.Debug|x86.Build.0 = Debug|Any CPU
|
||||||
{3201359D-C071-4089-9EDE-B04D759F1508}.MinSizeRel|x64.ActiveCfg = Debug|x64
|
{B6070F41-8759-448B-B56D-A7D15D489569}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{3201359D-C071-4089-9EDE-B04D759F1508}.MinSizeRel|x64.Build.0 = Debug|x64
|
{B6070F41-8759-448B-B56D-A7D15D489569}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
{3201359D-C071-4089-9EDE-B04D759F1508}.MinSizeRel|Any CPU.ActiveCfg = MinSizeRel|Any CPU
|
{B6070F41-8759-448B-B56D-A7D15D489569}.Release|x64.ActiveCfg = Release|Any CPU
|
||||||
{3201359D-C071-4089-9EDE-B04D759F1508}.MinSizeRel|Any CPU.Build.0 = MinSizeRel|Any CPU
|
{B6070F41-8759-448B-B56D-A7D15D489569}.Release|x64.Build.0 = Release|Any CPU
|
||||||
{3201359D-C071-4089-9EDE-B04D759F1508}.MinSizeRel|x86.ActiveCfg = MinSizeRel|Any CPU
|
{B6070F41-8759-448B-B56D-A7D15D489569}.Release|x86.ActiveCfg = Release|Any CPU
|
||||||
{3201359D-C071-4089-9EDE-B04D759F1508}.MinSizeRel|x86.Build.0 = MinSizeRel|Any CPU
|
{B6070F41-8759-448B-B56D-A7D15D489569}.Release|x86.Build.0 = Release|Any CPU
|
||||||
{3201359D-C071-4089-9EDE-B04D759F1508}.Release|x64.ActiveCfg = Release|x64
|
{B2D721AB-920C-4CD6-8DBF-6778A115A449}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{3201359D-C071-4089-9EDE-B04D759F1508}.Release|x64.Build.0 = Release|x64
|
{B2D721AB-920C-4CD6-8DBF-6778A115A449}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{3201359D-C071-4089-9EDE-B04D759F1508}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{B2D721AB-920C-4CD6-8DBF-6778A115A449}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||||
{3201359D-C071-4089-9EDE-B04D759F1508}.Release|Any CPU.Build.0 = Release|Any CPU
|
{B2D721AB-920C-4CD6-8DBF-6778A115A449}.Debug|x64.Build.0 = Debug|Any CPU
|
||||||
{3201359D-C071-4089-9EDE-B04D759F1508}.Release|x86.ActiveCfg = Release|Any CPU
|
{B2D721AB-920C-4CD6-8DBF-6778A115A449}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||||
{3201359D-C071-4089-9EDE-B04D759F1508}.Release|x86.Build.0 = Release|Any CPU
|
{B2D721AB-920C-4CD6-8DBF-6778A115A449}.Debug|x86.Build.0 = Debug|Any CPU
|
||||||
{3201359D-C071-4089-9EDE-B04D759F1508}.RelWithDebInfo|x64.ActiveCfg = Release|x64
|
{B2D721AB-920C-4CD6-8DBF-6778A115A449}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{3201359D-C071-4089-9EDE-B04D759F1508}.RelWithDebInfo|x64.Build.0 = Release|x64
|
{B2D721AB-920C-4CD6-8DBF-6778A115A449}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
{3201359D-C071-4089-9EDE-B04D759F1508}.RelWithDebInfo|Any CPU.ActiveCfg = RelWithDebInfo|Any CPU
|
{B2D721AB-920C-4CD6-8DBF-6778A115A449}.Release|x64.ActiveCfg = Release|Any CPU
|
||||||
{3201359D-C071-4089-9EDE-B04D759F1508}.RelWithDebInfo|Any CPU.Build.0 = RelWithDebInfo|Any CPU
|
{B2D721AB-920C-4CD6-8DBF-6778A115A449}.Release|x64.Build.0 = Release|Any CPU
|
||||||
{3201359D-C071-4089-9EDE-B04D759F1508}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|Any CPU
|
{B2D721AB-920C-4CD6-8DBF-6778A115A449}.Release|x86.ActiveCfg = Release|Any CPU
|
||||||
{3201359D-C071-4089-9EDE-B04D759F1508}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|Any CPU
|
{B2D721AB-920C-4CD6-8DBF-6778A115A449}.Release|x86.Build.0 = Release|Any CPU
|
||||||
{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.Debug|x64.ActiveCfg = Debug|x64
|
{38EE36C6-892C-4C94-8BB0-1ACB164E1F20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.Debug|x64.Build.0 = Debug|x64
|
{38EE36C6-892C-4C94-8BB0-1ACB164E1F20}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{38EE36C6-892C-4C94-8BB0-1ACB164E1F20}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||||
{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{38EE36C6-892C-4C94-8BB0-1ACB164E1F20}.Debug|x64.Build.0 = Debug|Any CPU
|
||||||
{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.Debug|x86.ActiveCfg = Debug|Any CPU
|
{38EE36C6-892C-4C94-8BB0-1ACB164E1F20}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||||
{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.Debug|x86.Build.0 = Debug|Any CPU
|
{38EE36C6-892C-4C94-8BB0-1ACB164E1F20}.Debug|x86.Build.0 = Debug|Any CPU
|
||||||
{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.MinSizeRel|x64.ActiveCfg = Debug|x64
|
{38EE36C6-892C-4C94-8BB0-1ACB164E1F20}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.MinSizeRel|x64.Build.0 = Debug|x64
|
{38EE36C6-892C-4C94-8BB0-1ACB164E1F20}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.MinSizeRel|Any CPU.ActiveCfg = MinSizeRel|Any CPU
|
{38EE36C6-892C-4C94-8BB0-1ACB164E1F20}.Release|x64.ActiveCfg = Release|Any CPU
|
||||||
{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.MinSizeRel|Any CPU.Build.0 = MinSizeRel|Any CPU
|
{38EE36C6-892C-4C94-8BB0-1ACB164E1F20}.Release|x64.Build.0 = Release|Any CPU
|
||||||
{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.MinSizeRel|x86.ActiveCfg = MinSizeRel|Any CPU
|
{38EE36C6-892C-4C94-8BB0-1ACB164E1F20}.Release|x86.ActiveCfg = Release|Any CPU
|
||||||
{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.MinSizeRel|x86.Build.0 = MinSizeRel|Any CPU
|
{38EE36C6-892C-4C94-8BB0-1ACB164E1F20}.Release|x86.Build.0 = Release|Any CPU
|
||||||
{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.Release|x64.ActiveCfg = Release|x64
|
{D432F3E9-3D2F-4623-B7B9-CEBA6701FFC3}.Debug|Any CPU.ActiveCfg = Debug|x64
|
||||||
{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.Release|x64.Build.0 = Release|x64
|
{D432F3E9-3D2F-4623-B7B9-CEBA6701FFC3}.Debug|Any CPU.Build.0 = Debug|x64
|
||||||
{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{D432F3E9-3D2F-4623-B7B9-CEBA6701FFC3}.Debug|x64.ActiveCfg = Debug|x64
|
||||||
{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.Release|Any CPU.Build.0 = Release|Any CPU
|
{D432F3E9-3D2F-4623-B7B9-CEBA6701FFC3}.Debug|x64.Build.0 = Debug|x64
|
||||||
{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.Release|x86.ActiveCfg = Release|Any CPU
|
{D432F3E9-3D2F-4623-B7B9-CEBA6701FFC3}.Debug|x86.ActiveCfg = Debug|x64
|
||||||
{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.Release|x86.Build.0 = Release|Any CPU
|
{D432F3E9-3D2F-4623-B7B9-CEBA6701FFC3}.Debug|x86.Build.0 = Debug|x64
|
||||||
{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.RelWithDebInfo|x64.ActiveCfg = Release|x64
|
{D432F3E9-3D2F-4623-B7B9-CEBA6701FFC3}.Release|Any CPU.ActiveCfg = Release|x64
|
||||||
{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.RelWithDebInfo|x64.Build.0 = Release|x64
|
{D432F3E9-3D2F-4623-B7B9-CEBA6701FFC3}.Release|Any CPU.Build.0 = Release|x64
|
||||||
{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.RelWithDebInfo|Any CPU.ActiveCfg = RelWithDebInfo|Any CPU
|
{D432F3E9-3D2F-4623-B7B9-CEBA6701FFC3}.Release|x64.ActiveCfg = Release|x64
|
||||||
{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.RelWithDebInfo|Any CPU.Build.0 = RelWithDebInfo|Any CPU
|
{D432F3E9-3D2F-4623-B7B9-CEBA6701FFC3}.Release|x64.Build.0 = Release|x64
|
||||||
{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|Any CPU
|
{D432F3E9-3D2F-4623-B7B9-CEBA6701FFC3}.Release|x86.ActiveCfg = Release|x64
|
||||||
{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|Any CPU
|
{D432F3E9-3D2F-4623-B7B9-CEBA6701FFC3}.Release|x86.Build.0 = Release|x64
|
||||||
{4E4F491F-C688-43C4-88DA-AC92BC5FA1B8}.Debug|x64.ActiveCfg = Debug|Any CPU
|
{DD00F5D5-6C2F-4FDA-AE3D-25CF01A9A224}.Debug|Any CPU.ActiveCfg = Debug|x64
|
||||||
{4E4F491F-C688-43C4-88DA-AC92BC5FA1B8}.Debug|x64.Build.0 = Debug|Any CPU
|
{DD00F5D5-6C2F-4FDA-AE3D-25CF01A9A224}.Debug|Any CPU.Build.0 = Debug|x64
|
||||||
{4E4F491F-C688-43C4-88DA-AC92BC5FA1B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{DD00F5D5-6C2F-4FDA-AE3D-25CF01A9A224}.Debug|x64.ActiveCfg = Debug|x64
|
||||||
{4E4F491F-C688-43C4-88DA-AC92BC5FA1B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{DD00F5D5-6C2F-4FDA-AE3D-25CF01A9A224}.Debug|x64.Build.0 = Debug|x64
|
||||||
{4E4F491F-C688-43C4-88DA-AC92BC5FA1B8}.Debug|x86.ActiveCfg = Debug|Any CPU
|
{DD00F5D5-6C2F-4FDA-AE3D-25CF01A9A224}.Debug|x86.ActiveCfg = Debug|x64
|
||||||
{4E4F491F-C688-43C4-88DA-AC92BC5FA1B8}.Debug|x86.Build.0 = Debug|Any CPU
|
{DD00F5D5-6C2F-4FDA-AE3D-25CF01A9A224}.Debug|x86.Build.0 = Debug|x64
|
||||||
{4E4F491F-C688-43C4-88DA-AC92BC5FA1B8}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
|
{DD00F5D5-6C2F-4FDA-AE3D-25CF01A9A224}.Release|Any CPU.ActiveCfg = Release|x64
|
||||||
{4E4F491F-C688-43C4-88DA-AC92BC5FA1B8}.MinSizeRel|x64.Build.0 = Debug|Any CPU
|
{DD00F5D5-6C2F-4FDA-AE3D-25CF01A9A224}.Release|Any CPU.Build.0 = Release|x64
|
||||||
{4E4F491F-C688-43C4-88DA-AC92BC5FA1B8}.MinSizeRel|Any CPU.ActiveCfg = MinSizeRel|Any CPU
|
{DD00F5D5-6C2F-4FDA-AE3D-25CF01A9A224}.Release|x64.ActiveCfg = Release|x64
|
||||||
{4E4F491F-C688-43C4-88DA-AC92BC5FA1B8}.MinSizeRel|Any CPU.Build.0 = MinSizeRel|Any CPU
|
{DD00F5D5-6C2F-4FDA-AE3D-25CF01A9A224}.Release|x64.Build.0 = Release|x64
|
||||||
{4E4F491F-C688-43C4-88DA-AC92BC5FA1B8}.MinSizeRel|x86.ActiveCfg = MinSizeRel|Any CPU
|
{DD00F5D5-6C2F-4FDA-AE3D-25CF01A9A224}.Release|x86.ActiveCfg = Release|x64
|
||||||
{4E4F491F-C688-43C4-88DA-AC92BC5FA1B8}.MinSizeRel|x86.Build.0 = MinSizeRel|Any CPU
|
{DD00F5D5-6C2F-4FDA-AE3D-25CF01A9A224}.Release|x86.Build.0 = Release|x64
|
||||||
{4E4F491F-C688-43C4-88DA-AC92BC5FA1B8}.Release|x64.ActiveCfg = Release|Any CPU
|
{2B8243FF-60C6-4607-8AAE-7762D29B0A48}.Debug|Any CPU.ActiveCfg = Debug|x64
|
||||||
{4E4F491F-C688-43C4-88DA-AC92BC5FA1B8}.Release|x64.Build.0 = Release|Any CPU
|
{2B8243FF-60C6-4607-8AAE-7762D29B0A48}.Debug|Any CPU.Build.0 = Debug|x64
|
||||||
{4E4F491F-C688-43C4-88DA-AC92BC5FA1B8}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{2B8243FF-60C6-4607-8AAE-7762D29B0A48}.Debug|x64.ActiveCfg = Debug|x64
|
||||||
{4E4F491F-C688-43C4-88DA-AC92BC5FA1B8}.Release|Any CPU.Build.0 = Release|Any CPU
|
{2B8243FF-60C6-4607-8AAE-7762D29B0A48}.Debug|x64.Build.0 = Debug|x64
|
||||||
{4E4F491F-C688-43C4-88DA-AC92BC5FA1B8}.Release|x86.ActiveCfg = Release|Any CPU
|
{2B8243FF-60C6-4607-8AAE-7762D29B0A48}.Debug|x86.ActiveCfg = Debug|x64
|
||||||
{4E4F491F-C688-43C4-88DA-AC92BC5FA1B8}.Release|x86.Build.0 = Release|Any CPU
|
{2B8243FF-60C6-4607-8AAE-7762D29B0A48}.Debug|x86.Build.0 = Debug|x64
|
||||||
{4E4F491F-C688-43C4-88DA-AC92BC5FA1B8}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU
|
{2B8243FF-60C6-4607-8AAE-7762D29B0A48}.Release|Any CPU.ActiveCfg = Release|x64
|
||||||
{4E4F491F-C688-43C4-88DA-AC92BC5FA1B8}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU
|
{2B8243FF-60C6-4607-8AAE-7762D29B0A48}.Release|Any CPU.Build.0 = Release|x64
|
||||||
{4E4F491F-C688-43C4-88DA-AC92BC5FA1B8}.RelWithDebInfo|Any CPU.ActiveCfg = RelWithDebInfo|Any CPU
|
{2B8243FF-60C6-4607-8AAE-7762D29B0A48}.Release|x64.ActiveCfg = Release|x64
|
||||||
{4E4F491F-C688-43C4-88DA-AC92BC5FA1B8}.RelWithDebInfo|Any CPU.Build.0 = RelWithDebInfo|Any CPU
|
{2B8243FF-60C6-4607-8AAE-7762D29B0A48}.Release|x64.Build.0 = Release|x64
|
||||||
{4E4F491F-C688-43C4-88DA-AC92BC5FA1B8}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|Any CPU
|
{2B8243FF-60C6-4607-8AAE-7762D29B0A48}.Release|x86.ActiveCfg = Release|x64
|
||||||
{4E4F491F-C688-43C4-88DA-AC92BC5FA1B8}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|Any CPU
|
{2B8243FF-60C6-4607-8AAE-7762D29B0A48}.Release|x86.Build.0 = Release|x64
|
||||||
{2AC54ADC-3246-427E-9CA9-FEA2DBCB9432}.Debug|x64.ActiveCfg = Debug|Any CPU
|
{00D21F82-61F4-467F-B125-268018A185E5}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||||
{2AC54ADC-3246-427E-9CA9-FEA2DBCB9432}.Debug|x64.Build.0 = Debug|Any CPU
|
{00D21F82-61F4-467F-B125-268018A185E5}.Debug|x64.Build.0 = Debug|Any CPU
|
||||||
{2AC54ADC-3246-427E-9CA9-FEA2DBCB9432}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{00D21F82-61F4-467F-B125-268018A185E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{2AC54ADC-3246-427E-9CA9-FEA2DBCB9432}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{00D21F82-61F4-467F-B125-268018A185E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{2AC54ADC-3246-427E-9CA9-FEA2DBCB9432}.Debug|x86.ActiveCfg = Debug|Any CPU
|
{00D21F82-61F4-467F-B125-268018A185E5}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||||
{2AC54ADC-3246-427E-9CA9-FEA2DBCB9432}.Debug|x86.Build.0 = Debug|Any CPU
|
{00D21F82-61F4-467F-B125-268018A185E5}.Debug|x86.Build.0 = Debug|Any CPU
|
||||||
{2AC54ADC-3246-427E-9CA9-FEA2DBCB9432}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
|
{00D21F82-61F4-467F-B125-268018A185E5}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
|
||||||
{2AC54ADC-3246-427E-9CA9-FEA2DBCB9432}.MinSizeRel|x64.Build.0 = Debug|Any CPU
|
{00D21F82-61F4-467F-B125-268018A185E5}.MinSizeRel|x64.Build.0 = Debug|Any CPU
|
||||||
{2AC54ADC-3246-427E-9CA9-FEA2DBCB9432}.MinSizeRel|Any CPU.ActiveCfg = MinSizeRel|Any CPU
|
{00D21F82-61F4-467F-B125-268018A185E5}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{2AC54ADC-3246-427E-9CA9-FEA2DBCB9432}.MinSizeRel|Any CPU.Build.0 = MinSizeRel|Any CPU
|
{00D21F82-61F4-467F-B125-268018A185E5}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{2AC54ADC-3246-427E-9CA9-FEA2DBCB9432}.MinSizeRel|x86.ActiveCfg = MinSizeRel|Any CPU
|
{00D21F82-61F4-467F-B125-268018A185E5}.MinSizeRel|x86.ActiveCfg = Debug|Any CPU
|
||||||
{2AC54ADC-3246-427E-9CA9-FEA2DBCB9432}.MinSizeRel|x86.Build.0 = MinSizeRel|Any CPU
|
{00D21F82-61F4-467F-B125-268018A185E5}.MinSizeRel|x86.Build.0 = Debug|Any CPU
|
||||||
{2AC54ADC-3246-427E-9CA9-FEA2DBCB9432}.Release|x64.ActiveCfg = Release|Any CPU
|
{00D21F82-61F4-467F-B125-268018A185E5}.Release|x64.ActiveCfg = Release|Any CPU
|
||||||
{2AC54ADC-3246-427E-9CA9-FEA2DBCB9432}.Release|x64.Build.0 = Release|Any CPU
|
{00D21F82-61F4-467F-B125-268018A185E5}.Release|x64.Build.0 = Release|Any CPU
|
||||||
{2AC54ADC-3246-427E-9CA9-FEA2DBCB9432}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{00D21F82-61F4-467F-B125-268018A185E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{2AC54ADC-3246-427E-9CA9-FEA2DBCB9432}.Release|Any CPU.Build.0 = Release|Any CPU
|
{00D21F82-61F4-467F-B125-268018A185E5}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
{2AC54ADC-3246-427E-9CA9-FEA2DBCB9432}.Release|x86.ActiveCfg = Release|Any CPU
|
{00D21F82-61F4-467F-B125-268018A185E5}.Release|x86.ActiveCfg = Release|Any CPU
|
||||||
{2AC54ADC-3246-427E-9CA9-FEA2DBCB9432}.Release|x86.Build.0 = Release|Any CPU
|
{00D21F82-61F4-467F-B125-268018A185E5}.Release|x86.Build.0 = Release|Any CPU
|
||||||
{2AC54ADC-3246-427E-9CA9-FEA2DBCB9432}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU
|
{00D21F82-61F4-467F-B125-268018A185E5}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU
|
||||||
{2AC54ADC-3246-427E-9CA9-FEA2DBCB9432}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU
|
{00D21F82-61F4-467F-B125-268018A185E5}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU
|
||||||
{2AC54ADC-3246-427E-9CA9-FEA2DBCB9432}.RelWithDebInfo|Any CPU.ActiveCfg = RelWithDebInfo|Any CPU
|
{00D21F82-61F4-467F-B125-268018A185E5}.RelWithDebInfo|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{2AC54ADC-3246-427E-9CA9-FEA2DBCB9432}.RelWithDebInfo|Any CPU.Build.0 = RelWithDebInfo|Any CPU
|
{00D21F82-61F4-467F-B125-268018A185E5}.RelWithDebInfo|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{2AC54ADC-3246-427E-9CA9-FEA2DBCB9432}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|Any CPU
|
{00D21F82-61F4-467F-B125-268018A185E5}.RelWithDebInfo|x86.ActiveCfg = Debug|Any CPU
|
||||||
{2AC54ADC-3246-427E-9CA9-FEA2DBCB9432}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|Any CPU
|
{00D21F82-61F4-467F-B125-268018A185E5}.RelWithDebInfo|x86.Build.0 = Debug|Any CPU
|
||||||
{4E96E5CC-7791-40B3-A8A1-C34FBB736B3B}.Debug|x64.ActiveCfg = Debug|Any CPU
|
{513A3F0D-46B5-4AC2-B700-8671933F6347}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||||
{4E96E5CC-7791-40B3-A8A1-C34FBB736B3B}.Debug|x64.Build.0 = Debug|Any CPU
|
{513A3F0D-46B5-4AC2-B700-8671933F6347}.Debug|x64.Build.0 = Debug|Any CPU
|
||||||
{4E96E5CC-7791-40B3-A8A1-C34FBB736B3B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{513A3F0D-46B5-4AC2-B700-8671933F6347}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{4E96E5CC-7791-40B3-A8A1-C34FBB736B3B}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{513A3F0D-46B5-4AC2-B700-8671933F6347}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{4E96E5CC-7791-40B3-A8A1-C34FBB736B3B}.Debug|x86.ActiveCfg = Debug|Any CPU
|
{513A3F0D-46B5-4AC2-B700-8671933F6347}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||||
{4E96E5CC-7791-40B3-A8A1-C34FBB736B3B}.Debug|x86.Build.0 = Debug|Any CPU
|
{513A3F0D-46B5-4AC2-B700-8671933F6347}.Debug|x86.Build.0 = Debug|Any CPU
|
||||||
{4E96E5CC-7791-40B3-A8A1-C34FBB736B3B}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
|
{513A3F0D-46B5-4AC2-B700-8671933F6347}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
|
||||||
{4E96E5CC-7791-40B3-A8A1-C34FBB736B3B}.MinSizeRel|x64.Build.0 = Debug|Any CPU
|
{513A3F0D-46B5-4AC2-B700-8671933F6347}.MinSizeRel|x64.Build.0 = Debug|Any CPU
|
||||||
{4E96E5CC-7791-40B3-A8A1-C34FBB736B3B}.MinSizeRel|Any CPU.ActiveCfg = MinSizeRel|Any CPU
|
{513A3F0D-46B5-4AC2-B700-8671933F6347}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{4E96E5CC-7791-40B3-A8A1-C34FBB736B3B}.MinSizeRel|Any CPU.Build.0 = MinSizeRel|Any CPU
|
{513A3F0D-46B5-4AC2-B700-8671933F6347}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{4E96E5CC-7791-40B3-A8A1-C34FBB736B3B}.MinSizeRel|x86.ActiveCfg = MinSizeRel|Any CPU
|
{513A3F0D-46B5-4AC2-B700-8671933F6347}.MinSizeRel|x86.ActiveCfg = Debug|Any CPU
|
||||||
{4E96E5CC-7791-40B3-A8A1-C34FBB736B3B}.MinSizeRel|x86.Build.0 = MinSizeRel|Any CPU
|
{513A3F0D-46B5-4AC2-B700-8671933F6347}.MinSizeRel|x86.Build.0 = Debug|Any CPU
|
||||||
{4E96E5CC-7791-40B3-A8A1-C34FBB736B3B}.Release|x64.ActiveCfg = Release|Any CPU
|
{513A3F0D-46B5-4AC2-B700-8671933F6347}.Release|x64.ActiveCfg = Release|Any CPU
|
||||||
{4E96E5CC-7791-40B3-A8A1-C34FBB736B3B}.Release|x64.Build.0 = Release|Any CPU
|
{513A3F0D-46B5-4AC2-B700-8671933F6347}.Release|x64.Build.0 = Release|Any CPU
|
||||||
{4E96E5CC-7791-40B3-A8A1-C34FBB736B3B}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{513A3F0D-46B5-4AC2-B700-8671933F6347}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{4E96E5CC-7791-40B3-A8A1-C34FBB736B3B}.Release|Any CPU.Build.0 = Release|Any CPU
|
{513A3F0D-46B5-4AC2-B700-8671933F6347}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
{4E96E5CC-7791-40B3-A8A1-C34FBB736B3B}.Release|x86.ActiveCfg = Release|Any CPU
|
{513A3F0D-46B5-4AC2-B700-8671933F6347}.Release|x86.ActiveCfg = Release|Any CPU
|
||||||
{4E96E5CC-7791-40B3-A8A1-C34FBB736B3B}.Release|x86.Build.0 = Release|Any CPU
|
{513A3F0D-46B5-4AC2-B700-8671933F6347}.Release|x86.Build.0 = Release|Any CPU
|
||||||
{4E96E5CC-7791-40B3-A8A1-C34FBB736B3B}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU
|
{513A3F0D-46B5-4AC2-B700-8671933F6347}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU
|
||||||
{4E96E5CC-7791-40B3-A8A1-C34FBB736B3B}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU
|
{513A3F0D-46B5-4AC2-B700-8671933F6347}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU
|
||||||
{4E96E5CC-7791-40B3-A8A1-C34FBB736B3B}.RelWithDebInfo|Any CPU.ActiveCfg = RelWithDebInfo|Any CPU
|
{513A3F0D-46B5-4AC2-B700-8671933F6347}.RelWithDebInfo|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{4E96E5CC-7791-40B3-A8A1-C34FBB736B3B}.RelWithDebInfo|Any CPU.Build.0 = RelWithDebInfo|Any CPU
|
{513A3F0D-46B5-4AC2-B700-8671933F6347}.RelWithDebInfo|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{4E96E5CC-7791-40B3-A8A1-C34FBB736B3B}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|Any CPU
|
{513A3F0D-46B5-4AC2-B700-8671933F6347}.RelWithDebInfo|x86.ActiveCfg = Debug|Any CPU
|
||||||
{4E96E5CC-7791-40B3-A8A1-C34FBB736B3B}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|Any CPU
|
{513A3F0D-46B5-4AC2-B700-8671933F6347}.RelWithDebInfo|x86.Build.0 = Debug|Any CPU
|
||||||
{51C40BA9-F226-4A35-939D-1ED6F5FF7299}.Debug|x64.ActiveCfg = Debug|Any CPU
|
{D419D996-9870-4FF5-82AD-08370D1C945F}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||||
{51C40BA9-F226-4A35-939D-1ED6F5FF7299}.Debug|x64.Build.0 = Debug|Any CPU
|
{D419D996-9870-4FF5-82AD-08370D1C945F}.Debug|x64.Build.0 = Debug|Any CPU
|
||||||
{51C40BA9-F226-4A35-939D-1ED6F5FF7299}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{D419D996-9870-4FF5-82AD-08370D1C945F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{51C40BA9-F226-4A35-939D-1ED6F5FF7299}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{D419D996-9870-4FF5-82AD-08370D1C945F}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{51C40BA9-F226-4A35-939D-1ED6F5FF7299}.Debug|x86.ActiveCfg = Debug|Any CPU
|
{D419D996-9870-4FF5-82AD-08370D1C945F}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||||
{51C40BA9-F226-4A35-939D-1ED6F5FF7299}.Debug|x86.Build.0 = Debug|Any CPU
|
{D419D996-9870-4FF5-82AD-08370D1C945F}.Debug|x86.Build.0 = Debug|Any CPU
|
||||||
{51C40BA9-F226-4A35-939D-1ED6F5FF7299}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
|
{D419D996-9870-4FF5-82AD-08370D1C945F}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
|
||||||
{51C40BA9-F226-4A35-939D-1ED6F5FF7299}.MinSizeRel|x64.Build.0 = Debug|Any CPU
|
{D419D996-9870-4FF5-82AD-08370D1C945F}.MinSizeRel|x64.Build.0 = Debug|Any CPU
|
||||||
{51C40BA9-F226-4A35-939D-1ED6F5FF7299}.MinSizeRel|Any CPU.ActiveCfg = MinSizeRel|Any CPU
|
{D419D996-9870-4FF5-82AD-08370D1C945F}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{51C40BA9-F226-4A35-939D-1ED6F5FF7299}.MinSizeRel|Any CPU.Build.0 = MinSizeRel|Any CPU
|
{D419D996-9870-4FF5-82AD-08370D1C945F}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{51C40BA9-F226-4A35-939D-1ED6F5FF7299}.MinSizeRel|x86.ActiveCfg = MinSizeRel|Any CPU
|
{D419D996-9870-4FF5-82AD-08370D1C945F}.MinSizeRel|x86.ActiveCfg = Debug|Any CPU
|
||||||
{51C40BA9-F226-4A35-939D-1ED6F5FF7299}.MinSizeRel|x86.Build.0 = MinSizeRel|Any CPU
|
{D419D996-9870-4FF5-82AD-08370D1C945F}.MinSizeRel|x86.Build.0 = Debug|Any CPU
|
||||||
{51C40BA9-F226-4A35-939D-1ED6F5FF7299}.Release|x64.ActiveCfg = Release|Any CPU
|
{D419D996-9870-4FF5-82AD-08370D1C945F}.Release|x64.ActiveCfg = Release|Any CPU
|
||||||
{51C40BA9-F226-4A35-939D-1ED6F5FF7299}.Release|x64.Build.0 = Release|Any CPU
|
{D419D996-9870-4FF5-82AD-08370D1C945F}.Release|x64.Build.0 = Release|Any CPU
|
||||||
{51C40BA9-F226-4A35-939D-1ED6F5FF7299}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{D419D996-9870-4FF5-82AD-08370D1C945F}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{51C40BA9-F226-4A35-939D-1ED6F5FF7299}.Release|Any CPU.Build.0 = Release|Any CPU
|
{D419D996-9870-4FF5-82AD-08370D1C945F}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
{51C40BA9-F226-4A35-939D-1ED6F5FF7299}.Release|x86.ActiveCfg = Release|Any CPU
|
{D419D996-9870-4FF5-82AD-08370D1C945F}.Release|x86.ActiveCfg = Release|Any CPU
|
||||||
{51C40BA9-F226-4A35-939D-1ED6F5FF7299}.Release|x86.Build.0 = Release|Any CPU
|
{D419D996-9870-4FF5-82AD-08370D1C945F}.Release|x86.Build.0 = Release|Any CPU
|
||||||
{51C40BA9-F226-4A35-939D-1ED6F5FF7299}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU
|
{D419D996-9870-4FF5-82AD-08370D1C945F}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU
|
||||||
{51C40BA9-F226-4A35-939D-1ED6F5FF7299}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU
|
{D419D996-9870-4FF5-82AD-08370D1C945F}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU
|
||||||
{51C40BA9-F226-4A35-939D-1ED6F5FF7299}.RelWithDebInfo|Any CPU.ActiveCfg = RelWithDebInfo|Any CPU
|
{D419D996-9870-4FF5-82AD-08370D1C945F}.RelWithDebInfo|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{51C40BA9-F226-4A35-939D-1ED6F5FF7299}.RelWithDebInfo|Any CPU.Build.0 = RelWithDebInfo|Any CPU
|
{D419D996-9870-4FF5-82AD-08370D1C945F}.RelWithDebInfo|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{51C40BA9-F226-4A35-939D-1ED6F5FF7299}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|Any CPU
|
{D419D996-9870-4FF5-82AD-08370D1C945F}.RelWithDebInfo|x86.ActiveCfg = Debug|Any CPU
|
||||||
{51C40BA9-F226-4A35-939D-1ED6F5FF7299}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|Any CPU
|
{D419D996-9870-4FF5-82AD-08370D1C945F}.RelWithDebInfo|x86.Build.0 = Debug|Any CPU
|
||||||
{5DE3B533-DCE6-4BF4-8F7E-08C440E177B4}.Debug|x64.ActiveCfg = Debug|Any CPU
|
{697BC3A3-1A98-43D3-A6E8-BB39A05EA049}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||||
{5DE3B533-DCE6-4BF4-8F7E-08C440E177B4}.Debug|x64.Build.0 = Debug|Any CPU
|
{697BC3A3-1A98-43D3-A6E8-BB39A05EA049}.Debug|x64.Build.0 = Debug|Any CPU
|
||||||
{5DE3B533-DCE6-4BF4-8F7E-08C440E177B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{697BC3A3-1A98-43D3-A6E8-BB39A05EA049}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{5DE3B533-DCE6-4BF4-8F7E-08C440E177B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{697BC3A3-1A98-43D3-A6E8-BB39A05EA049}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{5DE3B533-DCE6-4BF4-8F7E-08C440E177B4}.Debug|x86.ActiveCfg = Debug|Any CPU
|
{697BC3A3-1A98-43D3-A6E8-BB39A05EA049}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||||
{5DE3B533-DCE6-4BF4-8F7E-08C440E177B4}.Debug|x86.Build.0 = Debug|Any CPU
|
{697BC3A3-1A98-43D3-A6E8-BB39A05EA049}.Debug|x86.Build.0 = Debug|Any CPU
|
||||||
{5DE3B533-DCE6-4BF4-8F7E-08C440E177B4}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
|
{697BC3A3-1A98-43D3-A6E8-BB39A05EA049}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
|
||||||
{5DE3B533-DCE6-4BF4-8F7E-08C440E177B4}.MinSizeRel|x64.Build.0 = Debug|Any CPU
|
{697BC3A3-1A98-43D3-A6E8-BB39A05EA049}.MinSizeRel|x64.Build.0 = Debug|Any CPU
|
||||||
{5DE3B533-DCE6-4BF4-8F7E-08C440E177B4}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU
|
{697BC3A3-1A98-43D3-A6E8-BB39A05EA049}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{5DE3B533-DCE6-4BF4-8F7E-08C440E177B4}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU
|
{697BC3A3-1A98-43D3-A6E8-BB39A05EA049}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{5DE3B533-DCE6-4BF4-8F7E-08C440E177B4}.MinSizeRel|x86.ActiveCfg = Debug|Any CPU
|
{697BC3A3-1A98-43D3-A6E8-BB39A05EA049}.MinSizeRel|x86.ActiveCfg = Debug|Any CPU
|
||||||
{5DE3B533-DCE6-4BF4-8F7E-08C440E177B4}.MinSizeRel|x86.Build.0 = Debug|Any CPU
|
{697BC3A3-1A98-43D3-A6E8-BB39A05EA049}.MinSizeRel|x86.Build.0 = Debug|Any CPU
|
||||||
{5DE3B533-DCE6-4BF4-8F7E-08C440E177B4}.Release|x64.ActiveCfg = Release|Any CPU
|
{697BC3A3-1A98-43D3-A6E8-BB39A05EA049}.Release|x64.ActiveCfg = Release|Any CPU
|
||||||
{5DE3B533-DCE6-4BF4-8F7E-08C440E177B4}.Release|x64.Build.0 = Release|Any CPU
|
{697BC3A3-1A98-43D3-A6E8-BB39A05EA049}.Release|x64.Build.0 = Release|Any CPU
|
||||||
{5DE3B533-DCE6-4BF4-8F7E-08C440E177B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{697BC3A3-1A98-43D3-A6E8-BB39A05EA049}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{5DE3B533-DCE6-4BF4-8F7E-08C440E177B4}.Release|Any CPU.Build.0 = Release|Any CPU
|
{697BC3A3-1A98-43D3-A6E8-BB39A05EA049}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
{5DE3B533-DCE6-4BF4-8F7E-08C440E177B4}.Release|x86.ActiveCfg = Release|Any CPU
|
{697BC3A3-1A98-43D3-A6E8-BB39A05EA049}.Release|x86.ActiveCfg = Release|Any CPU
|
||||||
{5DE3B533-DCE6-4BF4-8F7E-08C440E177B4}.Release|x86.Build.0 = Release|Any CPU
|
{697BC3A3-1A98-43D3-A6E8-BB39A05EA049}.Release|x86.Build.0 = Release|Any CPU
|
||||||
{5DE3B533-DCE6-4BF4-8F7E-08C440E177B4}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU
|
{697BC3A3-1A98-43D3-A6E8-BB39A05EA049}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU
|
||||||
{5DE3B533-DCE6-4BF4-8F7E-08C440E177B4}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU
|
{697BC3A3-1A98-43D3-A6E8-BB39A05EA049}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU
|
||||||
{5DE3B533-DCE6-4BF4-8F7E-08C440E177B4}.RelWithDebInfo|Any CPU.ActiveCfg = Debug|Any CPU
|
{697BC3A3-1A98-43D3-A6E8-BB39A05EA049}.RelWithDebInfo|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{5DE3B533-DCE6-4BF4-8F7E-08C440E177B4}.RelWithDebInfo|Any CPU.Build.0 = Debug|Any CPU
|
{697BC3A3-1A98-43D3-A6E8-BB39A05EA049}.RelWithDebInfo|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{5DE3B533-DCE6-4BF4-8F7E-08C440E177B4}.RelWithDebInfo|x86.ActiveCfg = Debug|Any CPU
|
{697BC3A3-1A98-43D3-A6E8-BB39A05EA049}.RelWithDebInfo|x86.ActiveCfg = Debug|Any CPU
|
||||||
{5DE3B533-DCE6-4BF4-8F7E-08C440E177B4}.RelWithDebInfo|x86.Build.0 = Debug|Any CPU
|
{697BC3A3-1A98-43D3-A6E8-BB39A05EA049}.RelWithDebInfo|x86.Build.0 = Debug|Any CPU
|
||||||
{90A48718-F6A7-4747-97EA-89632B451008}.Debug|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{90A48718-F6A7-4747-97EA-89632B451008}.Debug|x64.Build.0 = Debug|Any CPU
|
|
||||||
{90A48718-F6A7-4747-97EA-89632B451008}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{90A48718-F6A7-4747-97EA-89632B451008}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{90A48718-F6A7-4747-97EA-89632B451008}.Debug|x86.ActiveCfg = Debug|Any CPU
|
|
||||||
{90A48718-F6A7-4747-97EA-89632B451008}.Debug|x86.Build.0 = Debug|Any CPU
|
|
||||||
{90A48718-F6A7-4747-97EA-89632B451008}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{90A48718-F6A7-4747-97EA-89632B451008}.MinSizeRel|x64.Build.0 = Debug|Any CPU
|
|
||||||
{90A48718-F6A7-4747-97EA-89632B451008}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{90A48718-F6A7-4747-97EA-89632B451008}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{90A48718-F6A7-4747-97EA-89632B451008}.MinSizeRel|x86.ActiveCfg = Debug|Any CPU
|
|
||||||
{90A48718-F6A7-4747-97EA-89632B451008}.MinSizeRel|x86.Build.0 = Debug|Any CPU
|
|
||||||
{90A48718-F6A7-4747-97EA-89632B451008}.Release|x64.ActiveCfg = Release|Any CPU
|
|
||||||
{90A48718-F6A7-4747-97EA-89632B451008}.Release|x64.Build.0 = Release|Any CPU
|
|
||||||
{90A48718-F6A7-4747-97EA-89632B451008}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{90A48718-F6A7-4747-97EA-89632B451008}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{90A48718-F6A7-4747-97EA-89632B451008}.Release|x86.ActiveCfg = Release|Any CPU
|
|
||||||
{90A48718-F6A7-4747-97EA-89632B451008}.Release|x86.Build.0 = Release|Any CPU
|
|
||||||
{90A48718-F6A7-4747-97EA-89632B451008}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{90A48718-F6A7-4747-97EA-89632B451008}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU
|
|
||||||
{90A48718-F6A7-4747-97EA-89632B451008}.RelWithDebInfo|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{90A48718-F6A7-4747-97EA-89632B451008}.RelWithDebInfo|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{90A48718-F6A7-4747-97EA-89632B451008}.RelWithDebInfo|x86.ActiveCfg = Debug|Any CPU
|
|
||||||
{90A48718-F6A7-4747-97EA-89632B451008}.RelWithDebInfo|x86.Build.0 = Debug|Any CPU
|
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
HideSolutionNode = FALSE
|
HideSolutionNode = FALSE
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(NestedProjects) = preSolution
|
GlobalSection(NestedProjects) = preSolution
|
||||||
|
{D7C6B9C7-1058-B1EA-FEE6-34C56B05AEDB} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
|
||||||
|
{684863A1-3396-4D31-A731-C0725CF07F4E} = {D7C6B9C7-1058-B1EA-FEE6-34C56B05AEDB}
|
||||||
|
{45292808-4EF3-4D4A-B3F5-B75C42EE5870} = {D7C6B9C7-1058-B1EA-FEE6-34C56B05AEDB}
|
||||||
|
{AA57F8D9-7BD6-4161-881B-AD2CEF9A30F6} = {D7C6B9C7-1058-B1EA-FEE6-34C56B05AEDB}
|
||||||
|
{28A26DF7-5F7A-43A2-A548-B55FEBCC3958} = {D7C6B9C7-1058-B1EA-FEE6-34C56B05AEDB}
|
||||||
|
{7543386A-5EBA-4AF0-9E0F-35657B58557D} = {D7C6B9C7-1058-B1EA-FEE6-34C56B05AEDB}
|
||||||
{60E0D592-FFB3-0D0A-C4AA-E88919B48F9D} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
|
{60E0D592-FFB3-0D0A-C4AA-E88919B48F9D} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
|
||||||
{5DE3B533-DCE6-4BF4-8F7E-08C440E177B4} = {60E0D592-FFB3-0D0A-C4AA-E88919B48F9D}
|
{C13A5ABD-F739-4BE8-A2FE-511E989A5B43} = {60E0D592-FFB3-0D0A-C4AA-E88919B48F9D}
|
||||||
{90A48718-F6A7-4747-97EA-89632B451008} = {60E0D592-FFB3-0D0A-C4AA-E88919B48F9D}
|
{F7C6F079-67BA-4899-9B43-D3F8C121D264} = {60E0D592-FFB3-0D0A-C4AA-E88919B48F9D}
|
||||||
EndGlobalSection
|
{E60C119D-2919-4E2F-9D39-90DB1A8FF9A7} = {60E0D592-FFB3-0D0A-C4AA-E88919B48F9D}
|
||||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
{ECBAA198-EC93-4174-8156-BDA5F5E95042} = {60E0D592-FFB3-0D0A-C4AA-E88919B48F9D}
|
||||||
SolutionGuid = {422D1620-0166-4C26-9A81-CA8A2EB1AB58}
|
{F54AE5C0-2ECA-4151-82E6-0D7EFE88FF40} = {60E0D592-FFB3-0D0A-C4AA-E88919B48F9D}
|
||||||
EndGlobalSection
|
{A898C6C3-F134-4AF0-AFB3-3834C58CC0D7} = {60E0D592-FFB3-0D0A-C4AA-E88919B48F9D}
|
||||||
GlobalSection(Performance) = preSolution
|
{1E296FB3-D185-4A95-A1EB-AA5B37B85C60} = {60E0D592-FFB3-0D0A-C4AA-E88919B48F9D}
|
||||||
HasPerformanceSessions = true
|
{B6070F41-8759-448B-B56D-A7D15D489569} = {60E0D592-FFB3-0D0A-C4AA-E88919B48F9D}
|
||||||
|
{B2D721AB-920C-4CD6-8DBF-6778A115A449} = {60E0D592-FFB3-0D0A-C4AA-E88919B48F9D}
|
||||||
|
{38EE36C6-892C-4C94-8BB0-1ACB164E1F20} = {60E0D592-FFB3-0D0A-C4AA-E88919B48F9D}
|
||||||
|
{C5A3B5EA-BE9F-76E5-E9B8-8A22B289B295} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
|
||||||
|
{42C014A0-00C5-0620-8552-38912E891A7F} = {C5A3B5EA-BE9F-76E5-E9B8-8A22B289B295}
|
||||||
|
{D432F3E9-3D2F-4623-B7B9-CEBA6701FFC3} = {42C014A0-00C5-0620-8552-38912E891A7F}
|
||||||
|
{DD00F5D5-6C2F-4FDA-AE3D-25CF01A9A224} = {C5A3B5EA-BE9F-76E5-E9B8-8A22B289B295}
|
||||||
|
{2B8243FF-60C6-4607-8AAE-7762D29B0A48} = {C5A3B5EA-BE9F-76E5-E9B8-8A22B289B295}
|
||||||
|
{00D21F82-61F4-467F-B125-268018A185E5} = {D7C6B9C7-1058-B1EA-FEE6-34C56B05AEDB}
|
||||||
|
{513A3F0D-46B5-4AC2-B700-8671933F6347} = {D7C6B9C7-1058-B1EA-FEE6-34C56B05AEDB}
|
||||||
|
{D419D996-9870-4FF5-82AD-08370D1C945F} = {D7C6B9C7-1058-B1EA-FEE6-34C56B05AEDB}
|
||||||
|
{697BC3A3-1A98-43D3-A6E8-BB39A05EA049} = {D7C6B9C7-1058-B1EA-FEE6-34C56B05AEDB}
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
EndGlobal
|
EndGlobal
|
||||||
@@ -23,16 +23,16 @@ public static class DataStreamExtensions {
|
|||||||
public static ViewStream AsViewStream<T>(this IObservable<IDataPacket<T>> source, string? name = null, ILogger? logger = null) where T : IBlueRow =>
|
public static ViewStream AsViewStream<T>(this IObservable<IDataPacket<T>> source, string? name = null, ILogger? logger = null) where T : IBlueRow =>
|
||||||
source as ViewStream ?? new ObservableViewStream(source.Select(dp => new DataPacket(dp.newRows, dp.addedRows, dp.deletedRows)), name, logger);
|
source as ViewStream ?? new ObservableViewStream(source.Select(dp => new DataPacket(dp.newRows, dp.addedRows, dp.deletedRows)), name, logger);
|
||||||
|
|
||||||
public static IObservable<DataPacket> AsObservable(this ViewStream source) {
|
public static IObservable<IDataPacket> AsObservable(this ViewStream source) {
|
||||||
return source as IObservable<DataPacket> ?? Observable.Create<DataPacket>(Subscribe);
|
return source as IObservable<IDataPacket> ?? Observable.Create<IDataPacket>(Subscribe);
|
||||||
|
|
||||||
IDisposable Subscribe(IObserver<DataPacket> observer) {
|
IDisposable Subscribe(IObserver<IDataPacket> observer) {
|
||||||
source.onChange += OnChange;
|
source.onChange += OnChange;
|
||||||
return Disposable.Create(() => source.onChange -= OnChange);
|
return Disposable.Create(() => source.onChange -= OnChange);
|
||||||
|
|
||||||
void OnChange(object? newValue) =>
|
void OnChange(object? newValue) =>
|
||||||
observer.OnNext(newValue as DataPacket ?? throw new ArgumentException(
|
observer.OnNext(newValue as IDataPacket ?? throw new ArgumentException(
|
||||||
$"Expected DataPacket, got {newValue?.GetType()}", nameof(newValue)));
|
$"Expected IDataPacket, got {newValue?.GetType()}", nameof(newValue)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -88,8 +88,7 @@ namespace BCG {
|
|||||||
return Task.CompletedTask;
|
return Task.CompletedTask;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void _on_str(DataPacket dp)
|
void _on_str(IDataPacket dp) {
|
||||||
{
|
|
||||||
foreach (IBlueRow r in dp.newRows)
|
foreach (IBlueRow r in dp.newRows)
|
||||||
{
|
{
|
||||||
string name = r.get<string>("name");
|
string name = r.get<string>("name");
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ namespace BCG {
|
|||||||
[DataStreamUserRespresentation("remoteQuery")]
|
[DataStreamUserRespresentation("remoteQuery")]
|
||||||
public class RemoteQueryStream : ViewStream {
|
public class RemoteQueryStream : ViewStream {
|
||||||
private readonly string _name, _stream_exp;
|
private readonly string _name, _stream_exp;
|
||||||
private PublisherCore _publisher_core = new PublisherCore();
|
private PublisherCore _publisher_core = PublisherCore.Create();
|
||||||
private ViewStream _source_str;
|
private ViewStream _source_str;
|
||||||
|
|
||||||
public RemoteQueryStream(params string[] lines) {
|
public RemoteQueryStream(params string[] lines) {
|
||||||
|
|||||||
+3
-3
@@ -102,10 +102,10 @@ namespace BCG
|
|||||||
List<ColumnInfo> col_info = new List<ColumnInfo>();
|
List<ColumnInfo> col_info = new List<ColumnInfo>();
|
||||||
col_info.Add(new ColumnInfo("id", col_index++, typeof(int)));
|
col_info.Add(new ColumnInfo("id", col_index++, typeof(int)));
|
||||||
foreach (Pair<string, Type> p in group_by_col_info)
|
foreach (Pair<string, Type> p in group_by_col_info)
|
||||||
col_info.Add(new ColumnInfo(p.first, col_index++, p.second));
|
col_info.Add(new ColumnInfo(p.first ?? string.Empty, col_index++, ExceptionAssert.NotNull(p.second)));
|
||||||
foreach (string tc_prefix in tc_prefixes)
|
foreach (string tc_prefix in tc_prefixes)
|
||||||
foreach (Pair<string, Type> p in _cols_per_transposed)
|
foreach (Pair<string, Type> p in _cols_per_transposed)
|
||||||
col_info.Add(new ColumnInfo(_get_full_column_name(tc_prefix, p.first ?? string.Empty), col_index++, p.second));
|
col_info.Add(new ColumnInfo(_get_full_column_name(tc_prefix, p.first ?? string.Empty), col_index++, ExceptionAssert.NotNull(p.second)));
|
||||||
IBlueTableSchema schema = new BlueTableSchema(col_info.ToArray(), "xy_transposed_" + table_name);
|
IBlueTableSchema schema = new BlueTableSchema(col_info.ToArray(), "xy_transposed_" + table_name);
|
||||||
if (_schema == null)
|
if (_schema == null)
|
||||||
_schema = schema;
|
_schema = schema;
|
||||||
@@ -182,7 +182,7 @@ namespace BCG
|
|||||||
if (_transpsed_col_value_comparer_wrapper != null)
|
if (_transpsed_col_value_comparer_wrapper != null)
|
||||||
tc_values.Sort(_transpsed_col_value_comparer_wrapper);
|
tc_values.Sort(_transpsed_col_value_comparer_wrapper);
|
||||||
List<string> prefixes = new List<string>();
|
List<string> prefixes = new List<string>();
|
||||||
foreach (Pair<int, object[]> p in tc_values)
|
foreach (Pair<int, object?[]> p in tc_values)
|
||||||
prefixes.Add(tc_prefixes[p.first]);
|
prefixes.Add(tc_prefixes[p.first]);
|
||||||
_set_schema(prefixes, group_by_col_info, table_name);
|
_set_schema(prefixes, group_by_col_info, table_name);
|
||||||
BlueTable result = new BlueTable(_schema);
|
BlueTable result = new BlueTable(_schema);
|
||||||
|
|||||||
+25
-19
@@ -1,17 +1,17 @@
|
|||||||
|
using Spark.Core.Diagnostics;
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
using System.Collections;
|
using System.Collections;
|
||||||
|
using System.Diagnostics.CodeAnalysis;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
|
|
||||||
using BCG;
|
|
||||||
using BCG.Utilities;
|
|
||||||
|
|
||||||
namespace BCG
|
namespace BCG
|
||||||
{
|
{
|
||||||
public class ConcatenateColumnsMapper : IStreamMapper
|
public class ConcatenateColumnsMapper : IStreamMapper
|
||||||
{
|
{
|
||||||
protected IDictionary myTempColMap = new SortedList ();
|
protected IDictionary myTempColMap = new SortedList ();
|
||||||
protected ArrayList myColMap;
|
protected ArrayList? myColMap;
|
||||||
protected BlueTableSchema mySchema;
|
protected BlueTableSchema? mySchema;
|
||||||
|
|
||||||
public ConcatenateColumnsMapper(params string [] columnDefs)
|
public ConcatenateColumnsMapper(params string [] columnDefs)
|
||||||
{
|
{
|
||||||
@@ -55,11 +55,7 @@ namespace BCG
|
|||||||
myColMap = new ArrayList (myTempColMap.Count);
|
myColMap = new ArrayList (myTempColMap.Count);
|
||||||
foreach (DictionaryEntry de in myTempColMap)
|
foreach (DictionaryEntry de in myTempColMap)
|
||||||
{
|
{
|
||||||
string[] cols = de.Value as string[];
|
myColMap.Add(Array.ConvertAll((string[])de.Value!, c => inputSchema[c].colNo));
|
||||||
ArrayList temp = new ArrayList ();
|
|
||||||
foreach (string col in cols)
|
|
||||||
temp.Add (inputSchema[col].colNo);
|
|
||||||
myColMap.Add (temp.ToArray(typeof(int)) as int[]);
|
|
||||||
}
|
}
|
||||||
myTempColMap.Clear ();
|
myTempColMap.Clear ();
|
||||||
}
|
}
|
||||||
@@ -72,6 +68,8 @@ namespace BCG
|
|||||||
|
|
||||||
public virtual IBlueRow map (IBlueRow row)
|
public virtual IBlueRow map (IBlueRow row)
|
||||||
{
|
{
|
||||||
|
requireSchema();
|
||||||
|
requireColMap();
|
||||||
object[] retVal = new object[mySchema.columnInfo.Length];
|
object[] retVal = new object[mySchema.columnInfo.Length];
|
||||||
row.CopyTo (retVal, myColMap.Count);
|
row.CopyTo (retVal, myColMap.Count);
|
||||||
for (int colNo = 0; colNo < myColMap.Count; colNo ++)
|
for (int colNo = 0; colNo < myColMap.Count; colNo ++)
|
||||||
@@ -90,11 +88,21 @@ namespace BCG
|
|||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
protected virtual object myGetConcatValue (IBlueRow row, int colNo)
|
protected virtual object myGetConcatValue (IBlueRow row, int colNo)
|
||||||
{
|
{
|
||||||
|
requireColMap();
|
||||||
StringBuilder b = new StringBuilder();
|
StringBuilder b = new StringBuilder();
|
||||||
foreach (int cn in myColMap[colNo] as int[])
|
foreach (int cn in (int[])myColMap[colNo]!) {
|
||||||
b.Append(row[cn].ToString());
|
b.Append(row[cn]?.ToString());
|
||||||
|
}
|
||||||
return b.ToString ();
|
return b.ToString ();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[MemberNotNull(nameof(myColMap))]
|
||||||
|
protected void requireColMap() =>
|
||||||
|
ExceptionAssert.NotNull(myColMap);
|
||||||
|
|
||||||
|
[MemberNotNull(nameof(mySchema))]
|
||||||
|
void requireSchema() =>
|
||||||
|
ExceptionAssert.NotNull(mySchema);
|
||||||
}
|
}
|
||||||
|
|
||||||
public class ConcatenateColumnsMapperForSameDataSet : ConcatenateColumnsMapper
|
public class ConcatenateColumnsMapperForSameDataSet : ConcatenateColumnsMapper
|
||||||
@@ -107,23 +115,21 @@ namespace BCG
|
|||||||
myDicts = new HashTableND [columnDefs.Length];
|
myDicts = new HashTableND [columnDefs.Length];
|
||||||
int i = 0;
|
int i = 0;
|
||||||
foreach (DictionaryEntry de in myTempColMap)
|
foreach (DictionaryEntry de in myTempColMap)
|
||||||
myDicts[i++] = new HashTableND ((de.Value as string[]).Length);
|
myDicts[i++] = new HashTableND(((string[])de.Value!).Length);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override object myGetConcatValue (IBlueRow row, int colNo)
|
protected override object myGetConcatValue (IBlueRow row, int colNo)
|
||||||
{
|
{
|
||||||
int[] cols = myColMap[colNo] as int[];
|
requireColMap();
|
||||||
object[] vals = new object[cols.Length];
|
|
||||||
for (int i = 0; i < vals.Length; i++)
|
|
||||||
vals[i] = row[cols[i]];
|
|
||||||
HashTableND ht = myDicts[colNo];
|
HashTableND ht = myDicts[colNo];
|
||||||
object rv = ht.getValue (vals);
|
var vals = Array.ConvertAll((int[])myColMap[colNo]!, c => row[c]);
|
||||||
|
var rv = ht.getValue(vals);
|
||||||
if (rv != null)
|
if (rv != null)
|
||||||
return rv;
|
return rv;
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
rv = base.myGetConcatValue (row, colNo);
|
rv = base.myGetConcatValue (row, colNo);
|
||||||
object[] args = new object[vals.Length + 1];
|
var args = new object?[vals.Length + 1];
|
||||||
vals.CopyTo (args, 0);
|
vals.CopyTo (args, 0);
|
||||||
args[args.Length-1] = rv;
|
args[args.Length-1] = rv;
|
||||||
ht.add (args);
|
ht.add (args);
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ namespace BCG
|
|||||||
{
|
{
|
||||||
IDictionary<string, double> columnSums = new Dictionary<string, double>();
|
IDictionary<string, double> columnSums = new Dictionary<string, double>();
|
||||||
|
|
||||||
IBlueRow resultRow = null;
|
IBlueRow? resultRow = null;
|
||||||
foreach (IBlueRow row in rows)
|
foreach (IBlueRow row in rows)
|
||||||
{
|
{
|
||||||
resultRow = row;
|
resultRow = row;
|
||||||
@@ -29,7 +29,7 @@ namespace BCG
|
|||||||
{
|
{
|
||||||
double sum = 0.0f;
|
double sum = 0.0f;
|
||||||
columnSums.TryGetValue(colName, out sum);
|
columnSums.TryGetValue(colName, out sum);
|
||||||
sum += (double) row[colName];
|
sum += (double)row[colName]!;
|
||||||
columnSums[colName] = sum;
|
columnSums[colName] = sum;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,3 @@
|
|||||||
using System;
|
|
||||||
using System.Collections;
|
|
||||||
|
|
||||||
using BCG.Utilities;
|
|
||||||
|
|
||||||
namespace BCG
|
namespace BCG
|
||||||
{
|
{
|
||||||
public class DistinctRowEvaluator : GroupByEvaluator
|
public class DistinctRowEvaluator : GroupByEvaluator
|
||||||
@@ -14,10 +9,8 @@ namespace BCG
|
|||||||
public DistinctRowEvaluator(string colMapExpression, string[] columnNames)
|
public DistinctRowEvaluator(string colMapExpression, string[] columnNames)
|
||||||
: base (colMapExpression, null, columnNames) {}
|
: base (colMapExpression, null, columnNames) {}
|
||||||
|
|
||||||
|
public override IBlueRow? evaluate(IDataPacket packet) {
|
||||||
public override IBlueRow evaluate (DataPacket packet)
|
myOutputTable ??= new GroupByOutputTable(packet.Schema);
|
||||||
{
|
|
||||||
myOutputTable = myOutputTable == null ? new GroupByOutputTable (packet.schema) : myOutputTable;
|
|
||||||
string hashString = GroupByStream.getRepString (packet, myGroupByCols);
|
string hashString = GroupByStream.getRepString (packet, myGroupByCols);
|
||||||
if (packet.newRows.Count == 0)
|
if (packet.newRows.Count == 0)
|
||||||
//if there are no rows for this group we remove the group from the output table
|
//if there are no rows for this group we remove the group from the output table
|
||||||
|
|||||||
@@ -67,7 +67,7 @@ namespace BCG {
|
|||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
public event FilterChangeDelegate onFilterChange;
|
public event FilterChangeDelegate? onFilterChange;
|
||||||
|
|
||||||
#region IStreamFilter
|
#region IStreamFilter
|
||||||
public bool filter(IBlueRow row) {
|
public bool filter(IBlueRow row) {
|
||||||
|
|||||||
@@ -43,7 +43,7 @@ namespace bts.SilverPine {
|
|||||||
operations = operations_;
|
operations = operations_;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static IBlueRow group_by(List<IBlueRow> rows, MultiRowOpHelper parameters) {
|
public static IBlueRow? group_by(List<IBlueRow> rows, MultiRowOpHelper parameters) {
|
||||||
if (rows.Count() == 0) {
|
if (rows.Count() == 0) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
@@ -73,7 +73,7 @@ namespace bts.SilverPine {
|
|||||||
// rolling_rows are the rolling window of rows. the 0th row is the one thats gettin
|
// rolling_rows are the rolling window of rows. the 0th row is the one thats gettin
|
||||||
// calculated. rows 1 - n-1 are its window rows. the schema is based on the operations.
|
// calculated. rows 1 - n-1 are its window rows. the schema is based on the operations.
|
||||||
|
|
||||||
public IBlueRow rolling_calc(List<IBlueRow> rolling_rows) {
|
public IBlueRow? rolling_calc(List<IBlueRow> rolling_rows) {
|
||||||
if (rolling_rows.Count() == 0) {
|
if (rolling_rows.Count() == 0) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
@@ -123,4 +123,4 @@ namespace bts.SilverPine {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
using System;
|
using Bts.DataStreamCore;
|
||||||
|
|
||||||
namespace BCG
|
namespace BCG
|
||||||
{
|
{
|
||||||
@@ -9,18 +9,18 @@ namespace BCG
|
|||||||
public abstract class GroupByEvaluator : IGroupByEvaluator
|
public abstract class GroupByEvaluator : IGroupByEvaluator
|
||||||
{
|
{
|
||||||
protected string[] myGroupByCols;
|
protected string[] myGroupByCols;
|
||||||
protected string myOutputColumn;
|
protected string? myOutputColumn;
|
||||||
protected GroupByOutputTable myOutputTable;
|
protected GroupByOutputTable? myOutputTable;
|
||||||
protected string myColMapExpression;
|
protected string? myColMapExpression;
|
||||||
|
|
||||||
#region constructors
|
#region constructors
|
||||||
public GroupByEvaluator (string outputCol, string[] groupByCols)
|
public GroupByEvaluator (string? outputCol, string[] groupByCols)
|
||||||
{
|
{
|
||||||
myOutputColumn = outputCol;
|
myOutputColumn = outputCol;
|
||||||
myGroupByCols = groupByCols;
|
myGroupByCols = groupByCols;
|
||||||
}
|
}
|
||||||
|
|
||||||
public GroupByEvaluator (string colMapExpression, string outputCol, string[] groupByCols)
|
public GroupByEvaluator (string colMapExpression, string? outputCol, string[] groupByCols)
|
||||||
: this (outputCol, groupByCols) {myColMapExpression = colMapExpression;}
|
: this (outputCol, groupByCols) {myColMapExpression = colMapExpression;}
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
@@ -42,7 +42,7 @@ namespace BCG
|
|||||||
return retVal;
|
return retVal;
|
||||||
}
|
}
|
||||||
|
|
||||||
public abstract IBlueRow evaluate (DataPacket dp) ;
|
public abstract IBlueRow? evaluate(IDataPacket dp);
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region Helper methods
|
#region Helper methods
|
||||||
@@ -52,21 +52,20 @@ namespace BCG
|
|||||||
/// <param name="r"></param>
|
/// <param name="r"></param>
|
||||||
/// <param name="id"></param>
|
/// <param name="id"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
protected IBlueRow myProject (IBlueRow r, int id)
|
protected IBlueRow? myProject(IBlueRow? r, int id) =>
|
||||||
{
|
r is null
|
||||||
return r == null ? null :
|
? null
|
||||||
myColMapExpression == null || myColMapExpression.Length < 1 ?
|
: myColMapExpression is null || myColMapExpression.Length < 1
|
||||||
BlueDataUtility.getNewReplacedRow (r, id, "id") :
|
? BlueDataUtility.getNewReplacedRow(r, id, "id")
|
||||||
BlueDataUtility.getNewReplacedRow(myProjectRow (r, myColMapExpression),
|
: BlueDataUtility.getNewReplacedRow(myProjectRow(r, myColMapExpression), id, "id");
|
||||||
id, "id");
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Projects the id, conserving the id
|
/// Projects the id, conserving the id
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="r"></param>
|
/// <param name="r"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
protected IBlueRow myProject (IBlueRow r) {return myProject (r, r == null ? Int32.MinValue : (int)r["id"]);}
|
protected IBlueRow? myProject(IBlueRow? r) =>
|
||||||
|
myProject(r, r is null ? int.MinValue : r.Id());
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
IBlueRow myProjectRow (IBlueRow r, string colMapExpression) =>
|
IBlueRow myProjectRow (IBlueRow r, string colMapExpression) =>
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
|
using Bts.DataStreamCore;
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
using BCG.Utilities;
|
|
||||||
using System.Collections;
|
using System.Collections;
|
||||||
|
|
||||||
namespace BCG
|
namespace BCG
|
||||||
@@ -22,10 +23,12 @@ namespace BCG
|
|||||||
/// <param name="groupRepString"></param>
|
/// <param name="groupRepString"></param>
|
||||||
public void addRow (IBlueRow row, string groupRepString)
|
public void addRow (IBlueRow row, string groupRepString)
|
||||||
{
|
{
|
||||||
if (myDict[groupRepString] != null)
|
var grp = myDict[groupRepString];
|
||||||
myTable.deleteRow ((IBlueRow)myDict[groupRepString]);
|
if (grp is not null) {
|
||||||
|
myTable.deleteRow((IBlueRow)grp);
|
||||||
|
}
|
||||||
myTable.addRow (row);
|
myTable.addRow (row);
|
||||||
myDict[groupRepString] = myTable[(int)row["id"]];
|
myDict[groupRepString] = myTable[row.Id()];
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -35,7 +38,7 @@ namespace BCG
|
|||||||
public void removeRow (string groupRepString)
|
public void removeRow (string groupRepString)
|
||||||
{
|
{
|
||||||
// BlueEventLog.logAssert (myDict[groupRepString] != null);
|
// BlueEventLog.logAssert (myDict[groupRepString] != null);
|
||||||
myTable.deleteRow ((IBlueRow)myDict[groupRepString]);
|
myTable.deleteRow ((IBlueRow)myDict[groupRepString]!);
|
||||||
myDict.Remove (groupRepString);
|
myDict.Remove (groupRepString);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -48,11 +51,8 @@ namespace BCG
|
|||||||
myDict.Clear ();
|
myDict.Clear ();
|
||||||
}
|
}
|
||||||
|
|
||||||
public IBlueRow getRow (string groupRepString)
|
public IBlueRow? getRow(string groupRepString) =>
|
||||||
{
|
myDict[groupRepString] as IBlueRow;
|
||||||
return myDict[groupRepString] == null ? null :
|
|
||||||
myDict[groupRepString] as IBlueRow;
|
|
||||||
}
|
|
||||||
|
|
||||||
#region IBlueRowCollection members
|
#region IBlueRowCollection members
|
||||||
public IBlueRow this[int id] {get{return myTable[id];}}
|
public IBlueRow this[int id] {get{return myTable[id];}}
|
||||||
|
|||||||
@@ -1,19 +1,22 @@
|
|||||||
|
using Spark.Core.Diagnostics;
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
using System.Collections;
|
using System.Collections;
|
||||||
using BCG.Utilities;
|
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using System.Diagnostics.CodeAnalysis;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
|
||||||
namespace BCG {
|
namespace BCG {
|
||||||
internal class GroupByStream : MethodDrivenStream {
|
internal class GroupByStream : MethodDrivenStream {
|
||||||
private class MyFuncGroupByEvaluator : IGroupByEvaluator {
|
private class MyFuncGroupByEvaluator : IGroupByEvaluator {
|
||||||
private string[] _groupby_cols;
|
private string[] _groupby_cols;
|
||||||
private Func<DataPacket, IBlueRow> _groupby_func;
|
readonly Func<IDataPacket, IBlueRow> _groupby_func;
|
||||||
public MyFuncGroupByEvaluator(IEnumerable<string> groupby_cols, Func<DataPacket, IBlueRow> groupby_func) {
|
public MyFuncGroupByEvaluator(IEnumerable<string> groupby_cols, Func<IDataPacket, IBlueRow> groupby_func) {
|
||||||
_groupby_cols = groupby_cols.ToArray();
|
_groupby_cols = groupby_cols.ToArray();
|
||||||
_groupby_func = groupby_func;
|
_groupby_func = groupby_func;
|
||||||
}
|
}
|
||||||
public IBlueRow evaluate(DataPacket packet) { return _groupby_func(packet); }
|
public IBlueRow evaluate(IDataPacket packet) =>
|
||||||
|
_groupby_func(packet);
|
||||||
|
|
||||||
public string[] groupByColumns { get { return _groupby_cols; } }
|
public string[] groupByColumns { get { return _groupby_cols; } }
|
||||||
|
|
||||||
@@ -25,14 +28,15 @@ namespace BCG {
|
|||||||
/// Serves as a quick way to access all rows belonging to the same group
|
/// Serves as a quick way to access all rows belonging to the same group
|
||||||
/// </summary>
|
/// </summary>
|
||||||
private bool myIdGuard = true;
|
private bool myIdGuard = true;
|
||||||
private RowDictionaryTable myBookKeepingTable;
|
RowDictionaryTable? myBookKeepingTable;
|
||||||
private IGroupByEvaluator myGroupByEvaluator;
|
private IGroupByEvaluator myGroupByEvaluator;
|
||||||
private IBlueTableSchema mySchema; //input schema, as output schema can differ (IGroupByEvaluator's
|
// input schema, as output schema can differ (IGroupByEvaluator's
|
||||||
|
IBlueTableSchema? mySchema;
|
||||||
//can map a schema to another
|
//can map a schema to another
|
||||||
private IBlueTableSchema myOutputSchema;
|
IBlueTableSchema? myOutputSchema;
|
||||||
private int myIdGenerator = 0;
|
private int myIdGenerator = 0;
|
||||||
|
|
||||||
public GroupByStream(ViewStream stream, IEnumerable<string> groupby_cols, Func<DataPacket, IBlueRow> groupby_func)
|
public GroupByStream(ViewStream stream, IEnumerable<string> groupby_cols, Func<IDataPacket, IBlueRow> groupby_func)
|
||||||
: this(stream, new MyFuncGroupByEvaluator(groupby_cols, groupby_func)) { }
|
: this(stream, new MyFuncGroupByEvaluator(groupby_cols, groupby_func)) { }
|
||||||
|
|
||||||
public GroupByStream(ViewStream stream, IGroupByEvaluator groupByEvaluator)
|
public GroupByStream(ViewStream stream, IGroupByEvaluator groupByEvaluator)
|
||||||
@@ -45,14 +49,14 @@ namespace BCG {
|
|||||||
}
|
}
|
||||||
|
|
||||||
protected override void myHandleFirstCall() {
|
protected override void myHandleFirstCall() {
|
||||||
|
requireLastArrivedPacket();
|
||||||
mySchema = myLastArrivedPacket.schema;
|
mySchema = myLastArrivedPacket.schema;
|
||||||
myOutputSchema = myGroupByEvaluator.getOutputSchema(mySchema);
|
myOutputSchema = myGroupByEvaluator.getOutputSchema(mySchema);
|
||||||
myBookKeepingTable = new RowDictionaryTable(myLastArrivedPacket.newRows,
|
myBookKeepingTable = new RowDictionaryTable(myLastArrivedPacket.newRows,
|
||||||
myGroupByEvaluator.groupByColumns);
|
myGroupByEvaluator.groupByColumns);
|
||||||
GroupByOutputTable temp = new GroupByOutputTable(myOutputSchema);
|
GroupByOutputTable temp = new GroupByOutputTable(myOutputSchema);
|
||||||
foreach (IBlueRowCollection rowGroup in myBookKeepingTable.getGroups()) {
|
foreach (IBlueRowCollection rowGroup in myBookKeepingTable.getGroups()) {
|
||||||
IBlueRow newRow = myEvaluate(new DataPacket(rowGroup,
|
var newRow = myEvaluate(new DataPacket(rowGroup, rowGroup, new BlueTable(mySchema)));
|
||||||
rowGroup, new BlueTable(mySchema)));
|
|
||||||
if (newRow != null)
|
if (newRow != null)
|
||||||
temp.addRow(newRow, myGetGroupString(rowGroup));
|
temp.addRow(newRow, myGetGroupString(rowGroup));
|
||||||
}
|
}
|
||||||
@@ -78,15 +82,14 @@ namespace BCG {
|
|||||||
ArrayList handledAddGroups = new ArrayList();
|
ArrayList handledAddGroups = new ArrayList();
|
||||||
string groupRepString;
|
string groupRepString;
|
||||||
|
|
||||||
|
requireBookKeeping();
|
||||||
foreach (IBlueRowCollection delGroup in delGroups.getGroups()) {
|
foreach (IBlueRowCollection delGroup in delGroups.getGroups()) {
|
||||||
// BlueEventLog.logAssert (delGroup.Count > 0);
|
// BlueEventLog.logAssert (delGroup.Count > 0);
|
||||||
groupRepString = myGetGroupString(delGroup);
|
groupRepString = myGetGroupString(delGroup);
|
||||||
IBlueRowCollection addGroup = addGroups.getGroup(groupRepString) == null ?
|
IBlueRowCollection addGroup = addGroups.getGroup(groupRepString) ?? new BlueTable(mySchema);
|
||||||
new BlueTable(mySchema) : addGroups.getGroup(groupRepString);
|
|
||||||
handledAddGroups.Add(addGroup);
|
handledAddGroups.Add(addGroup);
|
||||||
IBlueRowCollection aggGroup = myBookKeepingTable.getGroup(groupRepString) == null ?
|
IBlueRowCollection aggGroup = myBookKeepingTable.getGroup(groupRepString) ?? new BlueTable(mySchema);
|
||||||
new BlueTable(mySchema) : myBookKeepingTable.getGroup(groupRepString);
|
var newRow = myEvaluate(new DataPacket(aggGroup, addGroup, delGroup));
|
||||||
IBlueRow newRow = myEvaluate(new DataPacket(aggGroup, addGroup, delGroup));
|
|
||||||
myFireSwitch |= myMergeRow(newRow, groupRepString);
|
myFireSwitch |= myMergeRow(newRow, groupRepString);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -98,16 +101,16 @@ namespace BCG {
|
|||||||
//the loop above
|
//the loop above
|
||||||
|
|
||||||
groupRepString = myGetGroupString(addGroup);
|
groupRepString = myGetGroupString(addGroup);
|
||||||
IBlueRowCollection aggGroup = myBookKeepingTable.getGroup(groupRepString);
|
var aggGroup = ExceptionAssert.NotNull(myBookKeepingTable.getGroup(groupRepString));
|
||||||
// BlueEventLog.logAssert (aggGroup != null && aggGroup.Count > 0);
|
// BlueEventLog.logAssert (aggGroup != null && aggGroup.Count > 0);
|
||||||
IBlueRow newRow = myEvaluate(new DataPacket(aggGroup, addGroup,
|
var newRow = myEvaluate(new DataPacket(aggGroup, addGroup, new BlueTable(aggGroup.schema)));
|
||||||
new BlueTable(aggGroup.schema)));
|
|
||||||
myFireSwitch |= myMergeRow(newRow, groupRepString);
|
myFireSwitch |= myMergeRow(newRow, groupRepString);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private bool myMergeRow(IBlueRow newRow, string groupRepString) {
|
private bool myMergeRow(IBlueRow? newRow, string groupRepString) {
|
||||||
|
requireLastFiredPacket();
|
||||||
IBlueRow existingRow = ((GroupByOutputTable)myLastFiredPacket.newRows).getRow(groupRepString);
|
IBlueRow existingRow = ((GroupByOutputTable)myLastFiredPacket.newRows).getRow(groupRepString);
|
||||||
//BlueEventLog.logAssert (newRow != null || existingRow != null);
|
//BlueEventLog.logAssert (newRow != null || existingRow != null);
|
||||||
if (existingRow == null && newRow == null)
|
if (existingRow == null && newRow == null)
|
||||||
@@ -115,6 +118,7 @@ namespace BCG {
|
|||||||
else if (existingRow != null && newRow != null && BlueDataUtility.compute_equality(existingRow, newRow))
|
else if (existingRow != null && newRow != null && BlueDataUtility.compute_equality(existingRow, newRow))
|
||||||
return false;
|
return false;
|
||||||
else if (existingRow == null) {
|
else if (existingRow == null) {
|
||||||
|
ArgumentNullException.ThrowIfNull(newRow);
|
||||||
//row added for the first time
|
//row added for the first time
|
||||||
((GroupByOutputTable)myLastFiredPacket.newRows).addRow(newRow, groupRepString);
|
((GroupByOutputTable)myLastFiredPacket.newRows).addRow(newRow, groupRepString);
|
||||||
((BlueTable)myLastFiredPacket.addedRows).addRow(newRow);
|
((BlueTable)myLastFiredPacket.addedRows).addRow(newRow);
|
||||||
@@ -137,6 +141,9 @@ namespace BCG {
|
|||||||
/// <param name="delGroups"></param>
|
/// <param name="delGroups"></param>
|
||||||
/// <param name="addGroups"></param>
|
/// <param name="addGroups"></param>
|
||||||
private void myInitIncrementalChangeData(out RowDictionaryTable delGroups, out RowDictionaryTable addGroups) {
|
private void myInitIncrementalChangeData(out RowDictionaryTable delGroups, out RowDictionaryTable addGroups) {
|
||||||
|
ExceptionAssert.NotNull(myBookKeepingTable);
|
||||||
|
requireLastFiredPacket();
|
||||||
|
requireLastArrivedPacket();
|
||||||
delGroups =
|
delGroups =
|
||||||
new RowDictionaryTable(myLastArrivedPacket.deletedRows, myGroupByEvaluator.groupByColumns);
|
new RowDictionaryTable(myLastArrivedPacket.deletedRows, myGroupByEvaluator.groupByColumns);
|
||||||
addGroups =
|
addGroups =
|
||||||
@@ -150,16 +157,19 @@ namespace BCG {
|
|||||||
}
|
}
|
||||||
|
|
||||||
protected override void myOnTableClear() {
|
protected override void myOnTableClear() {
|
||||||
if (myBookKeepingTable.Count == 0)
|
if (ExceptionAssert.NotNull(myBookKeepingTable).Count == 0) {
|
||||||
return; //ie there arent any rows, so no need to optimize the 'cleansing' process
|
// ie there arent any rows, so no need to optimize the 'cleansing' process
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
requireLastFiredPacket();
|
||||||
myLastFiredPacket.deletedRows = new BlueTable(myLastFiredPacket.newRows);
|
myLastFiredPacket.deletedRows = new BlueTable(myLastFiredPacket.newRows);
|
||||||
myLastFiredPacket.addedRows = new BlueTable(myLastFiredPacket.deletedRows.schema);
|
myLastFiredPacket.addedRows = new BlueTable(myLastFiredPacket.deletedRows.schema);
|
||||||
(myLastFiredPacket.newRows as GroupByOutputTable).clear();
|
((GroupByOutputTable)myLastFiredPacket.newRows).clear();
|
||||||
myBookKeepingTable.clear();
|
myBookKeepingTable.clear();
|
||||||
myGroupByEvaluator.clear();
|
myGroupByEvaluator.clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
private IBlueRow myEvaluate(DataPacket dp) {
|
private IBlueRow? myEvaluate(DataPacket dp) {
|
||||||
IBlueRow evalRow = myGroupByEvaluator.evaluate(dp);
|
IBlueRow evalRow = myGroupByEvaluator.evaluate(dp);
|
||||||
return evalRow == null ? null :
|
return evalRow == null ? null :
|
||||||
myIdGuard ?
|
myIdGuard ?
|
||||||
@@ -187,11 +197,11 @@ namespace BCG {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static string getRepString(DataPacket dp, string[] colNames) {
|
public static string getRepString(IDataPacket dp, string[] colNames) {
|
||||||
return BlueDataUtility.rowToString(getRepRow(dp), colNames);
|
return BlueDataUtility.rowToString(getRepRow(dp), colNames);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static IBlueRow getRepRow(DataPacket dp) {
|
public static IBlueRow? getRepRow(IDataPacket dp) {
|
||||||
if (dp.newRows.Count > 0)
|
if (dp.newRows.Count > 0)
|
||||||
return BlueDataUtility.extractRow(dp.newRows, 0);
|
return BlueDataUtility.extractRow(dp.newRows, 0);
|
||||||
else if (dp.addedRows.Count > 0)
|
else if (dp.addedRows.Count > 0)
|
||||||
@@ -210,13 +220,13 @@ namespace BCG {
|
|||||||
/// <param name="newValue"></param>
|
/// <param name="newValue"></param>
|
||||||
/// <param name="isAdd"></param>
|
/// <param name="isAdd"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public static object incrementalAdd(object lastValue, object newValue, bool isAdd) {
|
public static object? incrementalAdd(object lastValue, object newValue, bool isAdd) {
|
||||||
if (lastValue == null || lastValue.Equals(DBNull.Value))
|
if (lastValue == null || lastValue.Equals(DBNull.Value))
|
||||||
return newValue;
|
return newValue;
|
||||||
// BlueEventLog.logAssert (lastValue.GetType().Equals (typeof(Int32)) && newValue.GetType().Equals (typeof(Int32)) ||
|
// BlueEventLog.logAssert (lastValue.GetType().Equals (typeof(Int32)) && newValue.GetType().Equals (typeof(Int32)) ||
|
||||||
// lastValue.GetType().Equals (typeof(Double)) && newValue.GetType().Equals (typeof(Double)) ||
|
// lastValue.GetType().Equals (typeof(Double)) && newValue.GetType().Equals (typeof(Double)) ||
|
||||||
// lastValue.GetType().Equals (typeof(Decimal)) && newValue.GetType().Equals (typeof(Decimal)));
|
// lastValue.GetType().Equals (typeof(Decimal)) && newValue.GetType().Equals (typeof(Decimal)));
|
||||||
Object retVal = null;
|
object? retVal = null;
|
||||||
if (newValue.GetType().Equals(typeof(int)))
|
if (newValue.GetType().Equals(typeof(int)))
|
||||||
retVal = isAdd ? (int)lastValue + (int)newValue : (int)lastValue - (int)newValue;
|
retVal = isAdd ? (int)lastValue + (int)newValue : (int)lastValue - (int)newValue;
|
||||||
else if (newValue.GetType().Equals(typeof(Double)))
|
else if (newValue.GetType().Equals(typeof(Double)))
|
||||||
@@ -228,6 +238,9 @@ namespace BCG {
|
|||||||
return retVal;
|
return retVal;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[MemberNotNull(nameof(myBookKeepingTable))]
|
||||||
|
void requireBookKeeping() =>
|
||||||
|
ExceptionAssert.NotNull(myBookKeepingTable);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -1,5 +1,3 @@
|
|||||||
using System;
|
|
||||||
|
|
||||||
namespace BCG
|
namespace BCG
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -14,7 +12,7 @@ namespace BCG
|
|||||||
/// deletetion) and the added and deletedRows being the increments. If a group has
|
/// deletetion) and the added and deletedRows being the increments. If a group has
|
||||||
/// to be totally removed then a null should be returned
|
/// to be totally removed then a null should be returned
|
||||||
/// </summary>
|
/// </summary>
|
||||||
IBlueRow evaluate (DataPacket packet);
|
IBlueRow? evaluate(IDataPacket packet);
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Returns the columns (belonging to the original schema) on which this IGroupByEvaluator
|
/// Returns the columns (belonging to the original schema) on which this IGroupByEvaluator
|
||||||
|
|||||||
@@ -1,8 +1,3 @@
|
|||||||
using System;
|
|
||||||
using System.Collections;
|
|
||||||
|
|
||||||
using BCG.Utilities;
|
|
||||||
|
|
||||||
namespace BCG {
|
namespace BCG {
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Computes the max for a given column
|
/// Computes the max for a given column
|
||||||
@@ -14,14 +9,13 @@ namespace BCG {
|
|||||||
public MaxGroupByEvaluator(string colMapEpression, string outputCol, string[] groupByCols)
|
public MaxGroupByEvaluator(string colMapEpression, string outputCol, string[] groupByCols)
|
||||||
: base(colMapEpression, outputCol, groupByCols) { }
|
: base(colMapEpression, outputCol, groupByCols) { }
|
||||||
|
|
||||||
public override IBlueRow evaluate(DataPacket dp) {
|
public override IBlueRow? evaluate(IDataPacket dp) {
|
||||||
myOutputTable = myOutputTable == null ? new GroupByOutputTable(dp.schema) :
|
myOutputTable ??= new GroupByOutputTable(dp.Schema);
|
||||||
myOutputTable;
|
|
||||||
string hashString = BlueDataUtility.rowToString(GroupByStream.getRepRow(dp), myGroupByCols);
|
string hashString = BlueDataUtility.rowToString(GroupByStream.getRepRow(dp), myGroupByCols);
|
||||||
IBlueRow currMaxRow = myOutputTable.getRow(hashString);
|
var currMaxRow = myOutputTable.getRow(hashString);
|
||||||
IBlueRow maxRow = BlueDataUtility.computeMaxRow(dp.deletedRows, myOutputColumn);
|
IBlueRow maxRow = BlueDataUtility.computeMaxRow(dp.deletedRows, myOutputColumn);
|
||||||
if (maxRow != null) {
|
if (maxRow != null) {
|
||||||
bts.Log.assert(currMaxRow != null);
|
bts.Log.notnull(currMaxRow);
|
||||||
bts.Log.assert(BlueDataUtility.compare_rows(maxRow, currMaxRow, myOutputColumn) <= 0);
|
bts.Log.assert(BlueDataUtility.compare_rows(maxRow, currMaxRow, myOutputColumn) <= 0);
|
||||||
if (BlueDataUtility.compare_rows(maxRow, currMaxRow, myOutputColumn) == 0) {
|
if (BlueDataUtility.compare_rows(maxRow, currMaxRow, myOutputColumn) == 0) {
|
||||||
maxRow = BlueDataUtility.computeMaxRow(dp.newRows, myOutputColumn);
|
maxRow = BlueDataUtility.computeMaxRow(dp.newRows, myOutputColumn);
|
||||||
|
|||||||
@@ -1,10 +1,9 @@
|
|||||||
using System;
|
|
||||||
using System.Collections;
|
|
||||||
using BCG.Utilities;
|
|
||||||
using System.IO;
|
|
||||||
|
|
||||||
namespace BCG
|
namespace BCG
|
||||||
{
|
{
|
||||||
|
using Spark.Core.Diagnostics;
|
||||||
|
|
||||||
|
using System.Diagnostics.CodeAnalysis;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Some basic event handling functionality factorred out of any Stream whose behaviour
|
/// Some basic event handling functionality factorred out of any Stream whose behaviour
|
||||||
/// is driven by some interface passed on by the user
|
/// is driven by some interface passed on by the user
|
||||||
@@ -12,8 +11,8 @@ namespace BCG
|
|||||||
public abstract class MethodDrivenStream : ViewStream
|
public abstract class MethodDrivenStream : ViewStream
|
||||||
{
|
{
|
||||||
protected ViewStream myStream;
|
protected ViewStream myStream;
|
||||||
protected DataPacket myLastArrivedPacket;
|
protected DataPacket? myLastArrivedPacket;
|
||||||
protected DataPacket myLastFiredPacket;
|
protected DataPacket? myLastFiredPacket;
|
||||||
protected bool myFireSwitch = true;
|
protected bool myFireSwitch = true;
|
||||||
|
|
||||||
public MethodDrivenStream(ViewStream vs) {myStream = vs;}
|
public MethodDrivenStream(ViewStream vs) {myStream = vs;}
|
||||||
@@ -59,6 +58,7 @@ namespace BCG
|
|||||||
/// To handle the first call, the LastFiredPacket is supposed to be initialized and filled
|
/// To handle the first call, the LastFiredPacket is supposed to be initialized and filled
|
||||||
/// with data.
|
/// with data.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
[MemberNotNull(nameof(myLastFiredPacket))]
|
||||||
protected abstract void myHandleFirstCall ();
|
protected abstract void myHandleFirstCall ();
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -89,5 +89,13 @@ namespace BCG
|
|||||||
{
|
{
|
||||||
myStream.onChange -= new DataStream.ChangeDelegate (myChangeHandler);
|
myStream.onChange -= new DataStream.ChangeDelegate (myChangeHandler);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[MemberNotNull(nameof(myLastArrivedPacket))]
|
||||||
|
protected void requireLastArrivedPacket() =>
|
||||||
|
ExceptionAssert.NotNull(myLastArrivedPacket);
|
||||||
|
|
||||||
|
[MemberNotNull(nameof(myLastFiredPacket))]
|
||||||
|
protected void requireLastFiredPacket() =>
|
||||||
|
ExceptionAssert.NotNull(myLastFiredPacket);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,7 +1,3 @@
|
|||||||
using System;
|
|
||||||
|
|
||||||
using BCG.Utilities;
|
|
||||||
|
|
||||||
namespace BCG {
|
namespace BCG {
|
||||||
public class MinGroupByEvaluator : MaxGroupByEvaluator {
|
public class MinGroupByEvaluator : MaxGroupByEvaluator {
|
||||||
public MinGroupByEvaluator(string outputCol, string[] groupByCols)
|
public MinGroupByEvaluator(string outputCol, string[] groupByCols)
|
||||||
@@ -10,10 +6,10 @@ namespace BCG {
|
|||||||
public MinGroupByEvaluator(string colMapEpression, string outputCol, string[] groupByCols) :
|
public MinGroupByEvaluator(string colMapEpression, string outputCol, string[] groupByCols) :
|
||||||
base(colMapEpression, outputCol, groupByCols) { }
|
base(colMapEpression, outputCol, groupByCols) { }
|
||||||
|
|
||||||
public override IBlueRow evaluate(DataPacket dp) {
|
public override IBlueRow? evaluate(IDataPacket dp) {
|
||||||
myOutputTable = myOutputTable == null ? new GroupByOutputTable(dp.schema) : myOutputTable;
|
myOutputTable ??= new GroupByOutputTable(dp.Schema);
|
||||||
string stringRep = BlueDataUtility.rowToString(GroupByStream.getRepRow(dp), myGroupByCols);
|
string stringRep = BlueDataUtility.rowToString(GroupByStream.getRepRow(dp), myGroupByCols);
|
||||||
IBlueRow currMinRow = myOutputTable.getRow(stringRep);
|
var currMinRow = myOutputTable.getRow(stringRep);
|
||||||
IBlueRow minRow = BlueDataUtility.computeMinRow(dp.deletedRows, myOutputColumn);
|
IBlueRow minRow = BlueDataUtility.computeMinRow(dp.deletedRows, myOutputColumn);
|
||||||
if (minRow != null) {
|
if (minRow != null) {
|
||||||
// BlueEventLog.logAssert (currMinRow != null);
|
// BlueEventLog.logAssert (currMinRow != null);
|
||||||
|
|||||||
@@ -1,5 +1,3 @@
|
|||||||
using System;
|
|
||||||
|
|
||||||
namespace BCG {
|
namespace BCG {
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Computes the sum for a given column
|
/// Computes the sum for a given column
|
||||||
@@ -10,8 +8,8 @@ namespace BCG {
|
|||||||
public SumGroupByEvaluator(string colMapEpression, string outputCol, string[] groupByCols)
|
public SumGroupByEvaluator(string colMapEpression, string outputCol, string[] groupByCols)
|
||||||
: base(colMapEpression, outputCol, groupByCols) { }
|
: base(colMapEpression, outputCol, groupByCols) { }
|
||||||
|
|
||||||
public override IBlueRow evaluate(DataPacket dp) {
|
public override IBlueRow evaluate(IDataPacket dp) {
|
||||||
myOutputTable = myOutputTable == null ? new GroupByOutputTable(dp.schema) : myOutputTable;
|
myOutputTable ??= new GroupByOutputTable(dp.Schema);
|
||||||
|
|
||||||
IBlueRow sumRow = BlueDataUtility.computeSum(dp.newRows, myOutputColumn);
|
IBlueRow sumRow = BlueDataUtility.computeSum(dp.newRows, myOutputColumn);
|
||||||
return sumRow;
|
return sumRow;
|
||||||
@@ -33,7 +31,7 @@ namespace BCG {
|
|||||||
|
|
||||||
#region IGroupByEvaluator Members
|
#region IGroupByEvaluator Members
|
||||||
|
|
||||||
public IBlueRow evaluate(DataPacket packet) { return BlueDataUtility.computeSum(packet.newRows, myOutputCols); }
|
public IBlueRow evaluate(IDataPacket packet) => BlueDataUtility.computeSum(packet.newRows, myOutputCols);
|
||||||
|
|
||||||
public string[] groupByColumns { get { return myGroupByCols; } }
|
public string[] groupByColumns { get { return myGroupByCols; } }
|
||||||
|
|
||||||
@@ -51,9 +49,8 @@ namespace BCG {
|
|||||||
public SumGroupByEvaluator(string colMapEpression, string outputCol, string[] groupByCols)
|
public SumGroupByEvaluator(string colMapEpression, string outputCol, string[] groupByCols)
|
||||||
: base(colMapEpression, outputCol, groupByCols) { }
|
: base(colMapEpression, outputCol, groupByCols) { }
|
||||||
|
|
||||||
public override IBlueRow evaluate(DataPacket dp) {
|
public override IBlueRow evaluate(IDataPacket dp) {
|
||||||
myOutputTable = myOutputTable == null ? new GroupByOutputTable(dp.schema) : myOutputTable;
|
myOutputTable ??= new GroupByOutputTable(dp.Schema);
|
||||||
|
|
||||||
IBlueRow sumRow = BlueDataUtility.computeSum<T>(dp.newRows, myOutputColumn);
|
IBlueRow sumRow = BlueDataUtility.computeSum<T>(dp.newRows, myOutputColumn);
|
||||||
return sumRow;
|
return sumRow;
|
||||||
}
|
}
|
||||||
@@ -68,7 +65,7 @@ namespace BCG {
|
|||||||
|
|
||||||
#region IGroupByEvaluator Members
|
#region IGroupByEvaluator Members
|
||||||
|
|
||||||
public IBlueRow evaluate(DataPacket packet) { return BlueDataUtility.computeSum<T>(packet.newRows, myOutputCols); }
|
public IBlueRow evaluate(IDataPacket packet) => BlueDataUtility.computeSum<T>(packet.newRows, myOutputCols);
|
||||||
|
|
||||||
public string[] groupByColumns { get { return myGroupByCols; } }
|
public string[] groupByColumns { get { return myGroupByCols; } }
|
||||||
|
|
||||||
|
|||||||
@@ -45,12 +45,13 @@ namespace BCG {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public SumStream(ViewStream stream, string[] output_columns, string[] groupby_columns, bool force_null_into_other_columns) {
|
public SumStream(ViewStream stream, string[] output_columns, string[] groupby_columns, bool force_null_into_other_columns) {
|
||||||
ViewStream rs = null;
|
ViewStream? rs = null;
|
||||||
groupby_columns = groupby_columns ?? new string[] { };
|
groupby_columns = groupby_columns ?? new string[] { };
|
||||||
if (groupby_columns.Length == 0) {
|
if (groupby_columns.Length == 0) {
|
||||||
// rs = new AddColumnsStream(stream, "fake_col=0");
|
// rs = new AddColumnsStream(stream, "fake_col=0");
|
||||||
// rs = new GroupByStream(rs, new MultiColumnSumGroupByEvaluator(output_columns, new string[] { "fake_col" }));
|
// rs = new GroupByStream(rs, new MultiColumnSumGroupByEvaluator(output_columns, new string[] { "fake_col" }));
|
||||||
// rs = new ProjectStream(rs, "!fake_col");
|
// rs = new ProjectStream(rs, "!fake_col");
|
||||||
|
throw new ArgumentException("No groupby columns specified", nameof(groupby_columns));
|
||||||
} else {
|
} else {
|
||||||
rs = new GroupByStream(stream, new MultiColumnSumGroupByEvaluator(output_columns, groupby_columns));
|
rs = new GroupByStream(stream, new MultiColumnSumGroupByEvaluator(output_columns, groupby_columns));
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
using mbts;
|
using mbts;
|
||||||
|
|
||||||
|
using Spark.Core.Diagnostics;
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
|
||||||
@@ -35,7 +37,7 @@ namespace BCG {
|
|||||||
List<NonIncJoinSpec> rv = new List<NonIncJoinSpec>();
|
List<NonIncJoinSpec> rv = new List<NonIncJoinSpec>();
|
||||||
foreach (Triplet<ViewStream, string, string> r in join_specs) {
|
foreach (Triplet<ViewStream, string, string> r in join_specs) {
|
||||||
string[] keys = String.IsNullOrEmpty(r.second) ? new string[] { } : r.second.Split(' ');
|
string[] keys = String.IsNullOrEmpty(r.second) ? new string[] { } : r.second.Split(' ');
|
||||||
string[] visible_cols = r.third.Split(' ');
|
string[] visible_cols = ExceptionAssert.NotNull(r.third).Split(' ');
|
||||||
List<string> data_col_names = new List<string>(), mapped_col_names = new List<string>();
|
List<string> data_col_names = new List<string>(), mapped_col_names = new List<string>();
|
||||||
foreach (string s in visible_cols) {
|
foreach (string s in visible_cols) {
|
||||||
string[] toks = s.Split(':');
|
string[] toks = s.Split(':');
|
||||||
@@ -47,7 +49,7 @@ namespace BCG {
|
|||||||
mapped_col_names.Add(toks[1]);
|
mapped_col_names.Add(toks[1]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
rv.Add(new NonIncJoinSpec(r.first, keys, data_col_names.ToArray(), mapped_col_names.ToArray()));
|
rv.Add(new(ExceptionAssert.NotNull(r.first), keys, data_col_names.ToArray(), mapped_col_names.ToArray()));
|
||||||
}
|
}
|
||||||
return rv.ToArray();
|
return rv.ToArray();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -290,6 +290,7 @@ namespace BCG
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
ExceptionAssert.NotNull(myState);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void myAddRows(IBlueRowCollection addedRows, bool isLeft, BlueTable state, BlueTable addedRowsOut)
|
private void myAddRows(IBlueRowCollection addedRows, bool isLeft, BlueTable state, BlueTable addedRowsOut)
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
using Spark.Core.Diagnostics;
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
|
|
||||||
namespace BCG
|
namespace BCG
|
||||||
@@ -18,16 +20,21 @@ namespace BCG
|
|||||||
|
|
||||||
public override void onTableClear (bool isLeft)
|
public override void onTableClear (bool isLeft)
|
||||||
{
|
{
|
||||||
|
requireSchema();
|
||||||
|
requireLastFiredPacket();
|
||||||
myLastFiredPacket.deletedRows = myLastFiredPacket.newRows;
|
myLastFiredPacket.deletedRows = myLastFiredPacket.newRows;
|
||||||
myLastFiredPacket.newRows = new JoinForeignTable (mySchema);
|
myLastFiredPacket.newRows = new JoinForeignTable (mySchema);
|
||||||
myLastFiredPacket.addedRows = new BlueTable (mySchema);
|
myLastFiredPacket.addedRows = new BlueTable (mySchema);
|
||||||
if (!isLeft)
|
if (!isLeft) {
|
||||||
|
ExceptionAssert.NotNull(myLeftDataPacket);
|
||||||
foreach (IBlueRow row in myLeftDataPacket.newRows)
|
foreach (IBlueRow row in myLeftDataPacket.newRows)
|
||||||
((JoinTable)myLastFiredPacket.newRows).addRow (row, null, myLastFiredPacket);
|
((JoinTable)myLastFiredPacket.newRows).addRow (row, null, myLastFiredPacket);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void myInitFiredPacket ()
|
protected override void myInitFiredPacket ()
|
||||||
{
|
{
|
||||||
|
requireSchema();
|
||||||
myLastFiredPacket = new DataPacket ();
|
myLastFiredPacket = new DataPacket ();
|
||||||
myLastFiredPacket.newRows = new JoinForeignTable (mySchema);
|
myLastFiredPacket.newRows = new JoinForeignTable (mySchema);
|
||||||
myLastFiredPacket.addedRows = new BlueTable (mySchema);
|
myLastFiredPacket.addedRows = new BlueTable (mySchema);
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ namespace BCG
|
|||||||
: this (r, null, null)
|
: this (r, null, null)
|
||||||
{}
|
{}
|
||||||
|
|
||||||
public SimpleNode(IBlueRow r, SimpleNode? nx, SimpleNode? pv) {
|
public SimpleNode(IBlueRow? r, SimpleNode? nx, SimpleNode? pv) {
|
||||||
row = r;
|
row = r;
|
||||||
next = nx;
|
next = nx;
|
||||||
prev = pv;
|
prev = pv;
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
using bts;
|
using bts;
|
||||||
|
|
||||||
|
using Spark.Core.Diagnostics;
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
|
||||||
@@ -60,7 +62,7 @@ namespace BCG {
|
|||||||
if (columnAndType.Length == 1)
|
if (columnAndType.Length == 1)
|
||||||
ci[n] = new ColumnInfo(c, n, typeof(double));
|
ci[n] = new ColumnInfo(c, n, typeof(double));
|
||||||
else
|
else
|
||||||
ci[n] = new ColumnInfo(columnAndType[0], n, Type.GetType("System." + columnAndType[1], true));
|
ci[n] = new(columnAndType[0], n, ExceptionAssert.NotNull(Type.GetType("System." + columnAndType[1], true)));
|
||||||
n++;
|
n++;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -2,6 +2,8 @@ using BCG;
|
|||||||
|
|
||||||
using MongoDB.Driver.Core.WireProtocol.Messages;
|
using MongoDB.Driver.Core.WireProtocol.Messages;
|
||||||
|
|
||||||
|
using Spark.Core.Diagnostics;
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
@@ -37,12 +39,12 @@ namespace bts {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void _handle_stream_update(object dp_obj) {
|
void _handle_stream_update(object dp_obj) {
|
||||||
DataPacket dp = dp_obj as DataPacket;
|
var dp = ExceptionAssert.Argument.Is<IDataPacket>(dp_obj);
|
||||||
IDictionary<int, List<IBlueRow>> groups = !String.IsNullOrEmpty(_group_by_col) ?
|
IDictionary<int, List<IBlueRow>> groups = !String.IsNullOrEmpty(_group_by_col) ?
|
||||||
BlueDataUtility.group_together(dp.newRows, new string[] { _group_by_col })
|
BlueDataUtility.group_together(dp.newRows, new string[] { _group_by_col })
|
||||||
:
|
:
|
||||||
new Dictionary<int, List<IBlueRow>>() { { 0, dp.newRows.to_list() } };
|
new Dictionary<int, List<IBlueRow>>() { { 0, dp.newRows.to_list() } };
|
||||||
BlueTable out_table = null;
|
BlueTable? out_table = null;
|
||||||
foreach (var kv in groups) {
|
foreach (var kv in groups) {
|
||||||
List<IBlueRow> group_rows = kv.Value;
|
List<IBlueRow> group_rows = kv.Value;
|
||||||
group_rows.Sort((r1, r2) => BlueDataUtility.compare_rows(r2, r1, _sort_col_name));
|
group_rows.Sort((r1, r2) => BlueDataUtility.compare_rows(r2, r1, _sort_col_name));
|
||||||
@@ -71,4 +73,4 @@ namespace bts {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -23,6 +23,6 @@ namespace BCG
|
|||||||
/// fires an event when the mapper
|
/// fires an event when the mapper
|
||||||
/// changes itself
|
/// changes itself
|
||||||
/// </summary>
|
/// </summary>
|
||||||
event MapperChangeDelegate onMapperChange;
|
event MapperChangeDelegate? onMapperChange;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -75,6 +75,7 @@ namespace BCG {
|
|||||||
|
|
||||||
protected override void myHandleFirstCall() {
|
protected override void myHandleFirstCall() {
|
||||||
ArgumentNullException.ThrowIfNull(myMapper);
|
ArgumentNullException.ThrowIfNull(myMapper);
|
||||||
|
requireLastArrivedPacket();
|
||||||
IBlueTableSchema outputSchema = myMapper.getOutputSchema(myLastArrivedPacket.newRows.schema);
|
IBlueTableSchema outputSchema = myMapper.getOutputSchema(myLastArrivedPacket.newRows.schema);
|
||||||
myLastFiredPacket = new DataPacket();
|
myLastFiredPacket = new DataPacket();
|
||||||
myLastFiredPacket.newRows = new BlueTable(outputSchema);
|
myLastFiredPacket.newRows = new BlueTable(outputSchema);
|
||||||
@@ -85,10 +86,12 @@ namespace BCG {
|
|||||||
}
|
}
|
||||||
|
|
||||||
protected override void myHandleIncrementalAdd() {
|
protected override void myHandleIncrementalAdd() {
|
||||||
|
requireLastArrivedPacket();
|
||||||
if (myLastArrivedPacket.addedRows.Count == 0) {
|
if (myLastArrivedPacket.addedRows.Count == 0) {
|
||||||
Log.Gen.warn("MapStream.myHandleIncrementalAdd called with 0 addedRows");
|
Log.Gen.warn("MapStream.myHandleIncrementalAdd called with 0 addedRows");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
requireLastFiredPacket();
|
||||||
ArgumentNullException.ThrowIfNull(myMapper);
|
ArgumentNullException.ThrowIfNull(myMapper);
|
||||||
var addedRows = new BlueTable(myLastFiredPacket.newRows.schema);
|
var addedRows = new BlueTable(myLastFiredPacket.newRows.schema);
|
||||||
var newRows = ExceptionAssert.Cast(myLastFiredPacket.newRows).To<BlueTable>();
|
var newRows = ExceptionAssert.Cast(myLastFiredPacket.newRows).To<BlueTable>();
|
||||||
@@ -101,10 +104,12 @@ namespace BCG {
|
|||||||
}
|
}
|
||||||
|
|
||||||
protected override void myHandleIncrementalDelete() {
|
protected override void myHandleIncrementalDelete() {
|
||||||
|
requireLastArrivedPacket();
|
||||||
if (myLastArrivedPacket.deletedRows.Count == 0) {
|
if (myLastArrivedPacket.deletedRows.Count == 0) {
|
||||||
Log.Gen.warn("MapStream.myHandleIncrementalDelete called with 0 deletedRows");
|
Log.Gen.warn("MapStream.myHandleIncrementalDelete called with 0 deletedRows");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
requireLastFiredPacket();
|
||||||
var deletedRows = new BlueTable(myLastFiredPacket.newRows.schema);
|
var deletedRows = new BlueTable(myLastFiredPacket.newRows.schema);
|
||||||
var newRows = ExceptionAssert.Cast(myLastFiredPacket.newRows).To<BlueTable>();
|
var newRows = ExceptionAssert.Cast(myLastFiredPacket.newRows).To<BlueTable>();
|
||||||
foreach (IBlueRow row in myLastArrivedPacket.deletedRows) {
|
foreach (IBlueRow row in myLastArrivedPacket.deletedRows) {
|
||||||
@@ -127,6 +132,7 @@ namespace BCG {
|
|||||||
}
|
}
|
||||||
|
|
||||||
protected override void myOnTableClear() {
|
protected override void myOnTableClear() {
|
||||||
|
requireLastFiredPacket();
|
||||||
myLastFiredPacket.deletedRows = myLastFiredPacket.newRows;
|
myLastFiredPacket.deletedRows = myLastFiredPacket.newRows;
|
||||||
myLastFiredPacket.newRows = new BlueTable(myLastFiredPacket.deletedRows.schema);
|
myLastFiredPacket.newRows = new BlueTable(myLastFiredPacket.deletedRows.schema);
|
||||||
myLastFiredPacket.addedRows = new BlueTable(myLastFiredPacket.deletedRows.schema);
|
myLastFiredPacket.addedRows = new BlueTable(myLastFiredPacket.deletedRows.schema);
|
||||||
|
|||||||
@@ -47,14 +47,14 @@ namespace BCG {
|
|||||||
_map_rows = map_rows;
|
_map_rows = map_rows;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
event MapperChangeDelegate? ISuperStreamMapper.onMapperChange { add { } remove { } }
|
||||||
|
|
||||||
public IBlueTableSchema getOutputSchema(IBlueTableSchema schema) { return _get_schema(schema); }
|
public IBlueTableSchema getOutputSchema(IBlueTableSchema schema) { return _get_schema(schema); }
|
||||||
|
|
||||||
public IBlueRow[] map(IBlueRow r) {
|
public IBlueRow[] map(IBlueRow r) {
|
||||||
IEnumerable<IBlueRow> rows = _map_rows(r);
|
IEnumerable<IBlueRow> rows = _map_rows(r);
|
||||||
return rows == null ? new IBlueRow[] { } : new List<IBlueRow>(rows).ToArray();
|
return rows == null ? new IBlueRow[] { } : new List<IBlueRow>(rows).ToArray();
|
||||||
}
|
}
|
||||||
|
|
||||||
public event MapperChangeDelegate? onMapperChange;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//maps the id of the underlying stream to the
|
//maps the id of the underlying stream to the
|
||||||
|
|||||||
@@ -70,7 +70,7 @@ namespace bts
|
|||||||
private readonly int _msg_size;
|
private readonly int _msg_size;
|
||||||
private readonly TimeSpan _publish_period;
|
private readonly TimeSpan _publish_period;
|
||||||
private DateTime _last_publish_time = DateTime.MinValue;
|
private DateTime _last_publish_time = DateTime.MinValue;
|
||||||
private PublisherCore _pub_core = new PublisherCore();
|
private PublisherCore _pub_core = PublisherCore.Create();
|
||||||
private BlueTable _table;
|
private BlueTable _table;
|
||||||
private int _n_pubs = 0;
|
private int _n_pubs = 0;
|
||||||
private readonly int _max_pubs;
|
private readonly int _max_pubs;
|
||||||
@@ -224,4 +224,4 @@ namespace bts
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
using BCG;
|
using BCG;
|
||||||
using BCG.Utilities.General;
|
using BCG.Utilities.General;
|
||||||
|
|
||||||
|
using Bts.PubSub;
|
||||||
using Bts.PubSub.Routing;
|
using Bts.PubSub.Routing;
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
@@ -62,7 +63,9 @@ namespace bts
|
|||||||
|
|
||||||
public static PayloadMessage deserialize(byte[] ser_bytes)
|
public static PayloadMessage deserialize(byte[] ser_bytes)
|
||||||
{
|
{
|
||||||
var str = new MemoryStream(ser_bytes);
|
var str = new MemoryStream(ser_bytes) {
|
||||||
|
Position = 0
|
||||||
|
};
|
||||||
BinaryReader br = new BinaryReader(str);
|
BinaryReader br = new BinaryReader(str);
|
||||||
string guid = br.ReadString();
|
string guid = br.ReadString();
|
||||||
Int64 timestamp_ = br.ReadInt64();
|
Int64 timestamp_ = br.ReadInt64();
|
||||||
@@ -91,11 +94,17 @@ namespace bts
|
|||||||
};
|
};
|
||||||
IOState _state = IOState.SEND;
|
IOState _state = IOState.SEND;
|
||||||
|
|
||||||
public PubsubEchoTestStream(string server_url, TimeSpan publish_period, int payload_size, string tag_name, ViewStreamDatabase vsd) {
|
public PubsubEchoTestStream()
|
||||||
_router = new PubSubRouter(new PubSubRouterConfig() {
|
: this(new PubSubRouter(), TimeSpan.FromSeconds(1), 8, "ECHO_TEST", ViewStreamDatabase.instance) { }
|
||||||
PublisherRoutes = new() { new(server_url, ".*") },
|
|
||||||
SubscriberRoutes = new() { new(server_url, ".*") },
|
public PubsubEchoTestStream(string server_url, TimeSpan publish_period, int payload_size, string tag_name)
|
||||||
});
|
: this(server_url, publish_period, payload_size, tag_name, ViewStreamDatabase.instance) { }
|
||||||
|
|
||||||
|
public PubsubEchoTestStream(string server_url, TimeSpan publish_period, int payload_size, string tag_name, ViewStreamDatabase vsd)
|
||||||
|
: this(createRouter(server_url), publish_period, payload_size, tag_name, vsd) { }
|
||||||
|
|
||||||
|
public PubsubEchoTestStream(IPubSubRouter router, TimeSpan publish_period, int payload_size, string tag_name, ViewStreamDatabase vsd) {
|
||||||
|
_router = router;
|
||||||
_vsd = vsd;
|
_vsd = vsd;
|
||||||
_payload_sz = payload_size;
|
_payload_sz = payload_size;
|
||||||
var schema = BlueDataUtility.form_schema("PubSubTest",
|
var schema = BlueDataUtility.form_schema("PubSubTest",
|
||||||
@@ -116,7 +125,7 @@ namespace bts
|
|||||||
|
|
||||||
protected override void myOnFirstSubscriber()
|
protected override void myOnFirstSubscriber()
|
||||||
{
|
{
|
||||||
_pub_core = new PublisherCore(_router);
|
_pub_core = PublisherCore.Create(_router);
|
||||||
_sub_core = new SubscriberCore(_router);
|
_sub_core = new SubscriberCore(_router);
|
||||||
_sub_core.subscribe(_tag_name);
|
_sub_core.subscribe(_tag_name);
|
||||||
_vsd.addWorker(this);
|
_vsd.addWorker(this);
|
||||||
@@ -129,6 +138,12 @@ namespace bts
|
|||||||
Log.notnull(_sub_core).unsubscribe(_tag_name);
|
Log.notnull(_sub_core).unsubscribe(_tag_name);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static PubSubRouter createRouter(string serverUrl) =>
|
||||||
|
new(new PubSubRouterConfig() {
|
||||||
|
PublisherRoutes = new() { new(serverUrl, ".*") },
|
||||||
|
SubscriberRoutes = new() { new(serverUrl, ".*") },
|
||||||
|
});
|
||||||
|
|
||||||
private void _fire_dp_after_send()
|
private void _fire_dp_after_send()
|
||||||
{
|
{
|
||||||
Log.notnull(_last_sent_msg);
|
Log.notnull(_last_sent_msg);
|
||||||
@@ -136,7 +151,7 @@ namespace bts
|
|||||||
BlueRow r = new BlueRow(_table.schema, _table.Count, _last_sent_msg.msg_id, _last_sent_msg.timestamp, DBNull.Value, DBNull.Value,
|
BlueRow r = new BlueRow(_table.schema, _table.Count, _last_sent_msg.msg_id, _last_sent_msg.timestamp, DBNull.Value, DBNull.Value,
|
||||||
DBNull.Value, DBNull.Value);
|
DBNull.Value, DBNull.Value);
|
||||||
_table.addRow(r);
|
_table.addRow(r);
|
||||||
var dp_out = BlueDataUtility.build_dp_inc(_table, myLastValue as DataPacket);
|
var dp_out = BlueDataUtility.build_dp_inc(_table, (myLastValue as IDataPacket)?.newRows);
|
||||||
myFireEvent(dp_out);
|
myFireEvent(dp_out);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -152,8 +167,10 @@ namespace bts
|
|||||||
BlueRow nr = new BlueRow(_table.schema, id, _last_sent_msg.msg_id, _last_sent_msg.timestamp, _last_recvd_msg.msg_id, recv_ts,
|
BlueRow nr = new BlueRow(_table.schema, id, _last_sent_msg.msg_id, _last_sent_msg.timestamp, _last_recvd_msg.msg_id, recv_ts,
|
||||||
String.Compare(_last_recvd_msg.msg_id, _last_sent_msg.msg_id) == 0, recv_ts - _last_recvd_msg.timestamp);
|
String.Compare(_last_recvd_msg.msg_id, _last_sent_msg.msg_id) == 0, recv_ts - _last_recvd_msg.timestamp);
|
||||||
_table.addRow(nr);
|
_table.addRow(nr);
|
||||||
var dp_out = BlueDataUtility.build_dp_inc(_table, myLastValue as DataPacket);
|
var dp_out = BlueDataUtility.build_dp_inc(_table, (myLastValue as IDataPacket)?.newRows);
|
||||||
myFireEvent(dp_out);
|
if (dp_out.HasChanges()) {
|
||||||
|
myFireEvent(dp_out);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private string _get_next_id()
|
private string _get_next_id()
|
||||||
|
|||||||
@@ -608,8 +608,8 @@ namespace BCG {
|
|||||||
// 5. deserialize the state into a stream op
|
// 5. deserialize the state into a stream op
|
||||||
str_io_msg_p = deser.deserialize(content_p);
|
str_io_msg_p = deser.deserialize(content_p);
|
||||||
// 6. check to make sure the state's rows are good
|
// 6. check to make sure the state's rows are good
|
||||||
passes = passes && str_io_msg_p.op == bts.StreamIOMessage.StreamOp.CREATE &&
|
passes &= str_io_msg_p.op == StreamIOMessage.StreamOp.CREATE
|
||||||
BlueDataUtility.compute_equality(cr_rows, str_io_msg_p.create_message.rows);
|
&& BlueDataUtility.compute_equality(cr_rows, ExceptionAssert.NotNull(str_io_msg_p.create_message).rows);
|
||||||
return new TestResult {
|
return new TestResult {
|
||||||
test_result = passes,
|
test_result = passes,
|
||||||
test_name = "run_pubsub_server_stream_tag_handler_test"
|
test_name = "run_pubsub_server_stream_tag_handler_test"
|
||||||
@@ -692,7 +692,7 @@ namespace BCG {
|
|||||||
var content = st_data.get_current_content();
|
var content = st_data.get_current_content();
|
||||||
var msg_p = deser.deserialize(content);
|
var msg_p = deser.deserialize(content);
|
||||||
Log.assert(msg_p.op == bts.StreamIOMessage.StreamOp.CREATE);
|
Log.assert(msg_p.op == bts.StreamIOMessage.StreamOp.CREATE);
|
||||||
return msg_p.create_message.rows;
|
return ExceptionAssert.NotNull(msg_p.create_message).rows;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
using Bts.ColumnSortExpressions;
|
using Bts.ColumnSortExpressions;
|
||||||
|
|
||||||
|
using Spark.Core.Diagnostics;
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
using System.Collections;
|
using System.Collections;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
@@ -39,7 +41,7 @@ public class SortRow : IComparable, IBlueRow {
|
|||||||
var otherVal = otherRow[col.Name];
|
var otherVal = otherRow[col.Name];
|
||||||
int rv = myIsNull(this[col.Name]) ?
|
int rv = myIsNull(this[col.Name]) ?
|
||||||
(myIsNull(otherVal) ? 0 : -1) :
|
(myIsNull(otherVal) ? 0 : -1) :
|
||||||
(myIsNull(otherVal) ? 1 : ((IComparable)this[col.Name]).CompareTo(otherVal));
|
(myIsNull(otherVal) ? 1 : ExceptionAssert.Argument.Is<IComparable>(this[col.Name]).CompareTo(otherVal));
|
||||||
rv *= col.IsAscending ? 1 : -1;
|
rv *= col.IsAscending ? 1 : -1;
|
||||||
return rv;
|
return rv;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,6 @@
|
|||||||
using System;
|
using Spark.Core.Diagnostics;
|
||||||
|
|
||||||
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
|
|
||||||
@@ -60,13 +62,13 @@ namespace BCG
|
|||||||
List<string> columnInfoStrParts = new List<string>(columnInfoStr.Split(new char[] { ':' }, StringSplitOptions.None));
|
List<string> columnInfoStrParts = new List<string>(columnInfoStr.Split(new char[] { ':' }, StringSplitOptions.None));
|
||||||
if (columnInfoStrParts.Count != 2)
|
if (columnInfoStrParts.Count != 2)
|
||||||
{
|
{
|
||||||
throw (new Exception(String.Format("Unable to decode schema string '{0}'", schemaStr)));
|
throw new Exception($"Unable to decode schema string '{schemaStr}'");
|
||||||
}
|
}
|
||||||
|
|
||||||
columnInfos.Add(new ColumnInfo(columnInfoStrParts[0], i, Type.GetType(columnInfoStrParts[1])));
|
columnInfos.Add(new ColumnInfo(columnInfoStrParts[0], i, ExceptionAssert.NotNull(Type.GetType(columnInfoStrParts[1]))));
|
||||||
}
|
}
|
||||||
|
|
||||||
return (new BlueTableSchema(columnInfos.ToArray(), ""));
|
return new BlueTableSchema(columnInfos.ToArray(), string.Empty);
|
||||||
}
|
}
|
||||||
|
|
||||||
private IBlueRow myGetRow(IBlueTableSchema schema, string rowStr)
|
private IBlueRow myGetRow(IBlueTableSchema schema, string rowStr)
|
||||||
@@ -75,7 +77,7 @@ namespace BCG
|
|||||||
|
|
||||||
if (schema.columnInfo.Length != valueStrs.Count)
|
if (schema.columnInfo.Length != valueStrs.Count)
|
||||||
{
|
{
|
||||||
throw (new Exception(String.Format("Unable to decode row string '{0}'", rowStr)));
|
throw new Exception($"Unable to decode row string '{rowStr}'");
|
||||||
}
|
}
|
||||||
|
|
||||||
List<object> values = new List<object>();
|
List<object> values = new List<object>();
|
||||||
@@ -84,7 +86,7 @@ namespace BCG
|
|||||||
values.Add(Convert.ChangeType(valueStrs[i], schema.columnInfo[i].colType));
|
values.Add(Convert.ChangeType(valueStrs[i], schema.columnInfo[i].colType));
|
||||||
}
|
}
|
||||||
|
|
||||||
return (new BlueRow(schema, values.ToArray()));
|
return new BlueRow(schema, values.ToArray());
|
||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
using BCG.Utilities.General;
|
using BCG.Utilities.General;
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
|
|
||||||
namespace BCG
|
namespace BCG
|
||||||
@@ -97,7 +98,7 @@ namespace BCG
|
|||||||
// BlueEventLog2.instance().assert(Thread.CurrentThread.ManagedThreadId == _target_thread,
|
// BlueEventLog2.instance().assert(Thread.CurrentThread.ManagedThreadId == _target_thread,
|
||||||
// "onTargetDoWork should only be called from target thread");
|
// "onTargetDoWork should only be called from target thread");
|
||||||
var updates = _queued_updates.dequeueAll();
|
var updates = _queued_updates.dequeueAll();
|
||||||
foreach (var u in updates) {
|
foreach (var u in updates.ExceptNull()) {
|
||||||
if (u.subscription == _current_target_subscription)
|
if (u.subscription == _current_target_subscription)
|
||||||
myFireEvent(u.dp);
|
myFireEvent(u.dp);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,9 @@
|
|||||||
using System;
|
|
||||||
|
|
||||||
using BCG.Utilities.General;
|
using BCG.Utilities.General;
|
||||||
|
|
||||||
|
using Spark.Core.Diagnostics;
|
||||||
|
|
||||||
|
using System;
|
||||||
|
|
||||||
namespace BCG {
|
namespace BCG {
|
||||||
public abstract class TimeUnitStream : ViewStream, IWorker {
|
public abstract class TimeUnitStream : ViewStream, IWorker {
|
||||||
protected TimeSpan myOffset;
|
protected TimeSpan myOffset;
|
||||||
@@ -46,8 +48,8 @@ namespace BCG {
|
|||||||
myRoundTime(myZeroTime + new TimeSpan(myOffset.Ticks * periods));
|
myRoundTime(myZeroTime + new TimeSpan(myOffset.Ticks * periods));
|
||||||
|
|
||||||
|
|
||||||
if (myGetLatestRow() == null ||
|
var latestRow = myGetLatestRow();
|
||||||
!myGetLatestRow()["time"].Equals(dt)) {
|
if (latestRow is null || !ExceptionAssert.Argument.Is<DateTime>(latestRow["time"]).Equals(dt)) {
|
||||||
IBlueRow ar = new BlueRow(myCollection.schema,
|
IBlueRow ar = new BlueRow(myCollection.schema,
|
||||||
myId++, dt);
|
myId++, dt);
|
||||||
IBlueRow dr = myCollection.addRowWithReturn(ar);
|
IBlueRow dr = myCollection.addRowWithReturn(ar);
|
||||||
@@ -71,11 +73,10 @@ namespace BCG {
|
|||||||
|
|
||||||
#region Private Helper methods
|
#region Private Helper methods
|
||||||
|
|
||||||
private IBlueRow myGetLatestRow() {
|
IBlueRow? myGetLatestRow() =>
|
||||||
return myCollection.Count == 0 ?
|
myCollection.Count == 0
|
||||||
null :
|
? null
|
||||||
BlueDataUtility.extractRow(myCollection, myCollection.Count - 1);
|
: BlueDataUtility.extractRow(myCollection, myCollection.Count - 1);
|
||||||
}
|
|
||||||
|
|
||||||
private IBlueRowCollection myConvertToCollection(IBlueRow r) {
|
private IBlueRowCollection myConvertToCollection(IBlueRow r) {
|
||||||
BlueTable retVal = new BlueTable(myCollection.schema);
|
BlueTable retVal = new BlueTable(myCollection.schema);
|
||||||
|
|||||||
@@ -1,43 +1,42 @@
|
|||||||
using System;
|
namespace BCG;
|
||||||
|
|
||||||
namespace BCG {
|
public class TopStream : MethodDrivenStream {
|
||||||
public class TopStream : MethodDrivenStream {
|
int myTopCount;
|
||||||
private int myTopCount;
|
|
||||||
|
|
||||||
public TopStream(ViewStream stream, int topCount) : base(stream) { myTopCount = topCount; }
|
public TopStream(ViewStream stream, int topCount)
|
||||||
|
: base(stream) =>
|
||||||
|
myTopCount = topCount;
|
||||||
|
|
||||||
public TopStream(ViewStream stream,
|
public TopStream(ViewStream stream, int topCount, string sortExpression)
|
||||||
int topCount,
|
: this(sortExpression is null ? stream : new SortStream(stream, sortExpression), topCount) { }
|
||||||
string sortExpression)
|
|
||||||
:
|
|
||||||
this(sortExpression == null ?
|
|
||||||
stream :
|
|
||||||
new SortStream(stream, sortExpression), topCount) { }
|
|
||||||
|
|
||||||
protected override void myOnTableClear() {
|
protected override void myOnTableClear() {
|
||||||
myLastFiredPacket.deletedRows = myLastFiredPacket.newRows;
|
requireLastFiredPacket();
|
||||||
myLastFiredPacket.newRows = new OrderedBlueTable(myLastFiredPacket.deletedRows.schema);
|
myLastFiredPacket.deletedRows = myLastFiredPacket.newRows;
|
||||||
myLastFiredPacket.addedRows = new OrderedBlueTable(myLastFiredPacket.deletedRows.schema);
|
myLastFiredPacket.newRows = new OrderedBlueTable(myLastFiredPacket.deletedRows.schema);
|
||||||
}
|
myLastFiredPacket.addedRows = new OrderedBlueTable(myLastFiredPacket.deletedRows.schema);
|
||||||
|
}
|
||||||
|
|
||||||
protected override void myHandleFirstCall() {
|
protected override void myHandleFirstCall() {
|
||||||
myLastFiredPacket = new DataPacket();
|
requireLastArrivedPacket();
|
||||||
myLastFiredPacket.newRows = new OrderedBlueTable(myLastArrivedPacket.newRows, myTopCount);
|
myLastFiredPacket = new DataPacket();
|
||||||
myLastFiredPacket.addedRows = new OrderedBlueTable(myLastFiredPacket.newRows);
|
myLastFiredPacket.newRows = new OrderedBlueTable(myLastArrivedPacket.newRows, myTopCount);
|
||||||
myLastFiredPacket.deletedRows = new OrderedBlueTable(myLastFiredPacket.newRows.schema);
|
myLastFiredPacket.addedRows = new OrderedBlueTable(myLastFiredPacket.newRows);
|
||||||
}
|
myLastFiredPacket.deletedRows = new OrderedBlueTable(myLastFiredPacket.newRows.schema);
|
||||||
|
}
|
||||||
|
|
||||||
protected override void myHandleIncrementalAdd() { }
|
protected override void myHandleIncrementalAdd() { }
|
||||||
|
|
||||||
protected override void myHandleIncrementalDelete() {
|
protected override void myHandleIncrementalDelete() {
|
||||||
IBlueRowCollection oldRows = myLastFiredPacket.newRows;
|
requireLastArrivedPacket();
|
||||||
myLastFiredPacket.newRows = new OrderedBlueTable(myLastArrivedPacket.newRows, myTopCount);
|
requireLastFiredPacket();
|
||||||
BlueDataUtility.computeDifferences(myLastFiredPacket.newRows,
|
IBlueRowCollection oldRows = myLastFiredPacket.newRows;
|
||||||
oldRows,
|
myLastFiredPacket.newRows = new OrderedBlueTable(myLastArrivedPacket.newRows, myTopCount);
|
||||||
myLastFiredPacket.schema.columnNames,
|
BlueDataUtility.computeDifferences(myLastFiredPacket.newRows,
|
||||||
out myLastFiredPacket.deletedRows,
|
oldRows,
|
||||||
out myLastFiredPacket.addedRows);
|
myLastFiredPacket.schema.columnNames,
|
||||||
myFireSwitch = myLastFiredPacket.addedRows.Count + myLastFiredPacket.deletedRows.Count == 0 ? false : true;
|
out myLastFiredPacket.deletedRows,
|
||||||
}
|
out myLastFiredPacket.addedRows);
|
||||||
}
|
myFireSwitch = myLastFiredPacket.addedRows.Count + myLastFiredPacket.deletedRows.Count == 0 ? false : true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -1,12 +1,10 @@
|
|||||||
|
|
||||||
using System;
|
|
||||||
using System.Collections;
|
using System.Collections;
|
||||||
|
|
||||||
namespace BCG {
|
namespace BCG {
|
||||||
|
|
||||||
public class AlphabetizeColumnsStream : ViewStream {
|
public class AlphabetizeColumnsStream : ViewStream {
|
||||||
private ViewStream mySrc;
|
private ViewStream mySrc;
|
||||||
private IBlueTableSchema mySchema = null;
|
IBlueTableSchema? mySchema = null;
|
||||||
|
|
||||||
public AlphabetizeColumnsStream(ViewStream src) {
|
public AlphabetizeColumnsStream(ViewStream src) {
|
||||||
mySrc = src;
|
mySrc = src;
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
using System;
|
using System.Linq;
|
||||||
|
|
||||||
namespace BCG
|
namespace BCG
|
||||||
{
|
{
|
||||||
public class AppendStreamModified : ViewStream
|
public class AppendStreamModified : ViewStream
|
||||||
{
|
{
|
||||||
private AppendCollection myColl = new AppendCollection ();
|
private AppendCollection myColl = new AppendCollection ();
|
||||||
private ViewStream myLeftStream, myRightstream;
|
ViewStream? myLeftStream, myRightstream;
|
||||||
|
|
||||||
public AppendStreamModified (ViewStream leftStream, ViewStream rightStream)
|
public AppendStreamModified (ViewStream leftStream, ViewStream rightStream)
|
||||||
{
|
{
|
||||||
myLeftStream = leftStream;
|
myLeftStream = leftStream;
|
||||||
@@ -15,11 +15,24 @@ namespace BCG
|
|||||||
|
|
||||||
public AppendStreamModified (ViewStream[] vss)
|
public AppendStreamModified (ViewStream[] vss)
|
||||||
{
|
{
|
||||||
|
switch (vss.Length) {
|
||||||
|
case 0:
|
||||||
|
break;
|
||||||
|
case 1:
|
||||||
|
mySetRealSource (vss[0]);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
mySetRealSource(
|
||||||
|
vss[1..].Aggregate(
|
||||||
|
new AppendStreamModified(new[] { vss[0] }),
|
||||||
|
(asm, vs) => new AppendStreamModified(asm, vs)));
|
||||||
|
break;
|
||||||
|
}
|
||||||
if (vss.Length == 1)
|
if (vss.Length == 1)
|
||||||
mySetRealSource (vss[0]);
|
mySetRealSource (vss[0]);
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
AppendStreamModified rv = null;
|
AppendStreamModified? rv = null;
|
||||||
foreach (ViewStream s in vss)
|
foreach (ViewStream s in vss)
|
||||||
rv = rv == null ? new AppendStreamModified (new ViewStream[] {s}) : new AppendStreamModified (rv, s);
|
rv = rv == null ? new AppendStreamModified (new ViewStream[] {s}) : new AppendStreamModified (rv, s);
|
||||||
mySetRealSource (rv);
|
mySetRealSource (rv);
|
||||||
|
|||||||
@@ -15,7 +15,6 @@ using mbts;
|
|||||||
using BCG.Extensions;
|
using BCG.Extensions;
|
||||||
using System.Text.Json;
|
using System.Text.Json;
|
||||||
using System.Text.Json.Nodes;
|
using System.Text.Json.Nodes;
|
||||||
using Newtonsoft.Json;
|
|
||||||
using BCG;
|
using BCG;
|
||||||
using System.Runtime.CompilerServices;
|
using System.Runtime.CompilerServices;
|
||||||
using bts;
|
using bts;
|
||||||
@@ -295,7 +294,7 @@ namespace BCG {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static DataPacket build_dp_inc(IBlueRowCollection new_rows, IDataPacket last_fired_dp, bool deep_row_comapre = false) =>
|
public static DataPacket build_dp_inc(IBlueRowCollection new_rows, IDataPacket last_fired_dp, bool deep_row_comapre = false) =>
|
||||||
build_dp_inc(new_rows, last_fired_dp.newRows, deep_row_comapre);
|
build_dp_inc(new_rows, last_fired_dp?.newRows ?? new BlueTable(new_rows.schema), deep_row_comapre);
|
||||||
|
|
||||||
public static DataPacket build_dp_inc(IBlueRowCollection new_rows, IBlueRowCollection lastRows, bool deep_row_comapre = false) {
|
public static DataPacket build_dp_inc(IBlueRowCollection new_rows, IBlueRowCollection lastRows, bool deep_row_comapre = false) {
|
||||||
if (lastRows is null) {
|
if (lastRows is null) {
|
||||||
@@ -360,11 +359,11 @@ namespace BCG {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static Dictionary<string, string> convert_json_to_dictionary(string json_string) {
|
public static Dictionary<string, string> convert_json_to_dictionary(string json_string) {
|
||||||
Dictionary<string, string> dictionary = JsonConvert.DeserializeObject<Dictionary<string, string>>(json_string);
|
Dictionary<string, string> dictionary = JsonSerializer.Deserialize<Dictionary<string, string>>(json_string);
|
||||||
return dictionary;
|
return dictionary;
|
||||||
}
|
}
|
||||||
public static IBlueRow convert_json_to_row(string json_string, int id = 0) {
|
public static IBlueRow convert_json_to_row(string json_string, int id = 0) {
|
||||||
Dictionary<string, object> dictionary = JsonConvert.DeserializeObject<Dictionary<string, object>>(json_string);
|
Dictionary<string, object> dictionary = JsonSerializer.Deserialize<Dictionary<string, object>>(json_string);
|
||||||
if (!dictionary.ContainsKey("id")) {
|
if (!dictionary.ContainsKey("id")) {
|
||||||
dictionary.Add("id", id);
|
dictionary.Add("id", id);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,6 @@
|
|||||||
#nullable enable
|
#nullable enable
|
||||||
|
using Bts.DataStreamCore;
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
using System.Text.Json.Serialization;
|
using System.Text.Json.Serialization;
|
||||||
|
|
||||||
@@ -7,6 +9,7 @@ namespace BCG {
|
|||||||
/// Resprsents information about a column schema, ie its ordinal, the type, the name and constant value or expression. where applicable
|
/// Resprsents information about a column schema, ie its ordinal, the type, the name and constant value or expression. where applicable
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[Serializable]
|
[Serializable]
|
||||||
|
[JsonConverter(typeof(ColumnInfoJsonConverter))]
|
||||||
public class ColumnInfo : IComparable<ColumnInfo>, IComparable, IEquatable<ColumnInfo> {
|
public class ColumnInfo : IComparable<ColumnInfo>, IComparable, IEquatable<ColumnInfo> {
|
||||||
|
|
||||||
//the default column info does not cach values in a lookup table, therefore it is in group 0
|
//the default column info does not cach values in a lookup table, therefore it is in group 0
|
||||||
@@ -67,16 +70,12 @@ namespace BCG {
|
|||||||
private Type myColType;
|
private Type myColType;
|
||||||
private object? myColValue;
|
private object? myColValue;
|
||||||
|
|
||||||
[JsonPropertyName("colNo")]
|
|
||||||
public int colNo { get { return myColNo; } }
|
public int colNo { get { return myColNo; } }
|
||||||
|
|
||||||
[JsonPropertyName("colName")]
|
|
||||||
public string colName { get { return myColName; } }
|
public string colName { get { return myColName; } }
|
||||||
|
|
||||||
[JsonPropertyName("colType")]
|
|
||||||
public Type colType { get { return myColType; } }
|
public Type colType { get { return myColType; } }
|
||||||
|
|
||||||
[JsonIgnore]
|
|
||||||
public object? colValue {get{return myColValue;}}
|
public object? colValue {get{return myColValue;}}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
namespace Bts.DataStreamCore;
|
||||||
|
|
||||||
|
using BCG;
|
||||||
|
|
||||||
|
using Spark.Core.Json;
|
||||||
|
|
||||||
|
using System;
|
||||||
|
using System.Text.Json;
|
||||||
|
using System.Text.Json.Nodes;
|
||||||
|
using System.Text.Json.Serialization;
|
||||||
|
|
||||||
|
public class ColumnInfoJsonConverter : JsonConverter<ColumnInfo> {
|
||||||
|
public override ColumnInfo Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) {
|
||||||
|
var jobj = JsonSerializer.Deserialize<JsonObject>(ref reader);
|
||||||
|
return new(
|
||||||
|
jobj[nameof(ColumnInfo.colName)].GetValue<string>(),
|
||||||
|
jobj[nameof(ColumnInfo.colNo)].GetValue<int>(),
|
||||||
|
Type.GetType(jobj[nameof(ColumnInfo.colType)].GetValue<string>()));
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void Write(Utf8JsonWriter writer, ColumnInfo value, JsonSerializerOptions options) {
|
||||||
|
using var _ = writer.WriteObject();
|
||||||
|
writer.WriteString(nameof(ColumnInfo.colName), value.colName);
|
||||||
|
writer.WriteNumber(nameof(ColumnInfo.colNo), value.colNo);
|
||||||
|
writer.WriteString(nameof(ColumnInfo.colType), value.colType.ToString());
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -41,7 +41,7 @@ namespace BCG {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public IBlueRowCollection newRows, addedRows, deletedRows;
|
public IBlueRowCollection newRows, addedRows, deletedRows;
|
||||||
public IDictionary<string, object> meta_data = null;
|
public Dictionary<string, object> meta_data = null;
|
||||||
public DataPacket() { }
|
public DataPacket() { }
|
||||||
|
|
||||||
public DataPacket(IBlueTableSchema schema)
|
public DataPacket(IBlueTableSchema schema)
|
||||||
@@ -53,7 +53,7 @@ namespace BCG {
|
|||||||
this.deletedRows = deletedRows;
|
this.deletedRows = deletedRows;
|
||||||
}
|
}
|
||||||
public DataPacket(IBlueRowCollection newRows, IBlueRowCollection addedRows, IBlueRowCollection deletedRows,
|
public DataPacket(IBlueRowCollection newRows, IBlueRowCollection addedRows, IBlueRowCollection deletedRows,
|
||||||
IDictionary<string, object> meta_data) {
|
Dictionary<string, object> meta_data) {
|
||||||
this.newRows = newRows;
|
this.newRows = newRows;
|
||||||
this.addedRows = addedRows;
|
this.addedRows = addedRows;
|
||||||
this.deletedRows = deletedRows;
|
this.deletedRows = deletedRows;
|
||||||
@@ -63,6 +63,7 @@ namespace BCG {
|
|||||||
IBlueRowCollection IDataPacket.newRows => newRows;
|
IBlueRowCollection IDataPacket.newRows => newRows;
|
||||||
IBlueRowCollection IDataPacket.addedRows => addedRows;
|
IBlueRowCollection IDataPacket.addedRows => addedRows;
|
||||||
IBlueRowCollection IDataPacket.deletedRows => deletedRows;
|
IBlueRowCollection IDataPacket.deletedRows => deletedRows;
|
||||||
|
IReadOnlyDictionary<string, object> IDataPacket.Metadata => meta_data;
|
||||||
|
|
||||||
public void get_new_added_deleted(out ICollection new_rows, out ICollection added_rows, out ICollection deleted_rows) {
|
public void get_new_added_deleted(out ICollection new_rows, out ICollection added_rows, out ICollection deleted_rows) {
|
||||||
new_rows = newRows;
|
new_rows = newRows;
|
||||||
|
|||||||
@@ -8,7 +8,6 @@
|
|||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Google.Protobuf" Version="3.24.3" />
|
<PackageReference Include="Google.Protobuf" Version="3.24.3" />
|
||||||
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
|
|
||||||
<PackageReference Include="OpenAI" Version="2.0.0" />
|
<PackageReference Include="OpenAI" Version="2.0.0" />
|
||||||
<PackageReference Include="SimMetrics.Net" Version="1.0.5" />
|
<PackageReference Include="SimMetrics.Net" Version="1.0.5" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|||||||
@@ -44,11 +44,6 @@ namespace BCG {
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="assemblyName"></param>
|
/// <param name="assemblyName"></param>
|
||||||
public void loadAssembly(string assemblyName) {
|
public void loadAssembly(string assemblyName) {
|
||||||
Func<Type, bool> is_blue_orb = (t) => {
|
|
||||||
//if (!assemblyName.Contains("SharedStreams.dll"))
|
|
||||||
// return true;
|
|
||||||
return t.Namespace == "bts.BlueOrb";// || t.Namespace == "BCG";
|
|
||||||
};
|
|
||||||
bts.Log.Gen.info($"PrimitiveManager.loadAssembly assemblyName: {assemblyName}");
|
bts.Log.Gen.info($"PrimitiveManager.loadAssembly assemblyName: {assemblyName}");
|
||||||
if (myAssemblyNames.Contains(assemblyName))
|
if (myAssemblyNames.Contains(assemblyName))
|
||||||
return;
|
return;
|
||||||
@@ -58,7 +53,7 @@ namespace BCG {
|
|||||||
Assembly.LoadFrom(assemblyName);
|
Assembly.LoadFrom(assemblyName);
|
||||||
|
|
||||||
foreach (Type type in loadedAssembly.GetTypes())
|
foreach (Type type in loadedAssembly.GetTypes())
|
||||||
if (!type.IsInterface && is_blue_orb(type)
|
if (!type.IsInterface
|
||||||
&& !type.IsAbstract
|
&& !type.IsAbstract
|
||||||
&& type.IsSubclassOf(typeof(ViewStream))
|
&& type.IsSubclassOf(typeof(ViewStream))
|
||||||
&& type.IsPublic) {
|
&& type.IsPublic) {
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ namespace BCG {
|
|||||||
IBlueRowCollection newRows { get; }
|
IBlueRowCollection newRows { get; }
|
||||||
IBlueRowCollection addedRows { get; }
|
IBlueRowCollection addedRows { get; }
|
||||||
IBlueRowCollection deletedRows { get; }
|
IBlueRowCollection deletedRows { get; }
|
||||||
|
IReadOnlyDictionary<string, object> Metadata { get; }
|
||||||
//this is an ICollection of IDictionary
|
//this is an ICollection of IDictionary
|
||||||
void get_new_added_deleted(out ICollection new_rows, out ICollection added_rows, out ICollection deleted_rows);
|
void get_new_added_deleted(out ICollection new_rows, out ICollection added_rows, out ICollection deleted_rows);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,15 +1,10 @@
|
|||||||
using System;
|
|
||||||
using System.Collections;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq.Expressions;
|
|
||||||
using System.Xml.Serialization;
|
|
||||||
|
|
||||||
using BCG.Utilities;
|
|
||||||
|
|
||||||
using bts;
|
using bts;
|
||||||
|
|
||||||
using Bts.DataStreamCore;
|
using Bts.DataStreamCore;
|
||||||
|
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
|
||||||
namespace BCG {
|
namespace BCG {
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// This class will be used by the clients to publish tabular data to the pubsub
|
/// This class will be used by the clients to publish tabular data to the pubsub
|
||||||
@@ -22,7 +17,7 @@ namespace BCG {
|
|||||||
protected bool myWaitingForFirstOp = false;
|
protected bool myWaitingForFirstOp = false;
|
||||||
|
|
||||||
public PubTableBroker()
|
public PubTableBroker()
|
||||||
: this(new PublisherCore()) { }
|
: this(PublisherCore.Create()) { }
|
||||||
|
|
||||||
public PubTableBroker(IPublisherCore publisher) {
|
public PubTableBroker(IPublisherCore publisher) {
|
||||||
_publisher_core = publisher;
|
_publisher_core = publisher;
|
||||||
|
|||||||
@@ -11,10 +11,20 @@
|
|||||||
<PackageReference Include="CommandLineParser" Version="2.9.1" />
|
<PackageReference Include="CommandLineParser" Version="2.9.1" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<Choose>
|
||||||
<ProjectReference Include="..\Bts.Extensions.Hosting\Bts.Extensions.Hosting.csproj" />
|
<When Condition="'$(UseProjectRefs)' == 'true'">
|
||||||
<ProjectReference Include="..\SharedStreams\SharedStreams.csproj" />
|
<ItemGroup>
|
||||||
</ItemGroup>
|
<ProjectReference Include="..\..\cs\Bts.Extensions.Hosting\Bts.Extensions.Hosting.csproj" />
|
||||||
|
<ProjectReference Include="..\SharedStreams\SharedStreams.csproj" />
|
||||||
|
</ItemGroup>
|
||||||
|
</When>
|
||||||
|
<Otherwise>
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="Bts.Extensions.Hosting" Version="$(SparkVersion)" />
|
||||||
|
<PackageReference Include="SharedStreams" Version="$(SparkVersion)" />
|
||||||
|
</ItemGroup>
|
||||||
|
</Otherwise>
|
||||||
|
</Choose>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ConfigurationProfile Include="appsettings.Development.json" />
|
<ConfigurationProfile Include="appsettings.Development.json" />
|
||||||
|
|||||||
@@ -16,6 +16,12 @@
|
|||||||
<ProjectReference Include="..\BaseUtilities\BaseUtilities.csproj" />
|
<ProjectReference Include="..\BaseUtilities\BaseUtilities.csproj" />
|
||||||
<ProjectReference Include="..\GuiUtilities\GuiUtilities.csproj" />
|
<ProjectReference Include="..\GuiUtilities\GuiUtilities.csproj" />
|
||||||
<ProjectReference Include="..\SharedStreams\SharedStreams.csproj" />
|
<ProjectReference Include="..\SharedStreams\SharedStreams.csproj" />
|
||||||
|
<ProjectReference Include="..\..\cs\Bts.Extensions.Hosting\Bts.Extensions.Hosting.csproj" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<ConfigurationProfile Include="appsettings.json" />
|
||||||
|
<ConfigurationProfile Include="appsettings.*.json" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
@@ -2,21 +2,6 @@
|
|||||||
{
|
{
|
||||||
public partial class MainForm
|
public partial class MainForm
|
||||||
{
|
{
|
||||||
/// <summary>
|
|
||||||
/// Clean up any resources being used.
|
|
||||||
/// </summary>
|
|
||||||
protected override void Dispose(bool disposing)
|
|
||||||
{
|
|
||||||
if (disposing)
|
|
||||||
{
|
|
||||||
if (components != null)
|
|
||||||
{
|
|
||||||
components.Dispose();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
base.Dispose(disposing);
|
|
||||||
}
|
|
||||||
|
|
||||||
#region Windows Form Designer generated code
|
#region Windows Form Designer generated code
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Required method for Designer support - do not modify
|
/// Required method for Designer support - do not modify
|
||||||
|
|||||||
@@ -1,16 +1,25 @@
|
|||||||
using bts;
|
using bts;
|
||||||
|
|
||||||
|
using Bts.DataStream;
|
||||||
using Bts.DataStreamExpressions;
|
using Bts.DataStreamExpressions;
|
||||||
using Bts.PubSub;
|
using Bts.PubSub;
|
||||||
|
|
||||||
|
using Spark.Core.Disposables;
|
||||||
|
using Spark.Core.Reactive;
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Collections;
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
using System.ComponentModel;
|
using System.ComponentModel;
|
||||||
using System.Diagnostics;
|
using System.Diagnostics;
|
||||||
using System.Drawing;
|
using System.Drawing;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Reactive;
|
||||||
|
using System.Reactive.Linq;
|
||||||
|
using System.Reactive.Subjects;
|
||||||
using System.Text.RegularExpressions;
|
using System.Text.RegularExpressions;
|
||||||
|
using System.Threading;
|
||||||
using System.Windows.Forms;
|
using System.Windows.Forms;
|
||||||
|
|
||||||
namespace BCG
|
namespace BCG
|
||||||
@@ -35,8 +44,11 @@ namespace BCG
|
|||||||
private string mySite = "TODO";
|
private string mySite = "TODO";
|
||||||
private string myLastClassName = "MyView";
|
private string myLastClassName = "MyView";
|
||||||
private ViewStream? myAllTagsStream;
|
private ViewStream? myAllTagsStream;
|
||||||
|
IBlueRowCollection? tagRows;
|
||||||
private string myKQ;
|
private string myKQ;
|
||||||
private TextWriter? myConsoleOutput;
|
private TextWriter? myConsoleOutput;
|
||||||
|
IDataPacket? pendingData;
|
||||||
|
IDisposable? titleSub;
|
||||||
|
|
||||||
public MainForm()
|
public MainForm()
|
||||||
{
|
{
|
||||||
@@ -44,6 +56,17 @@ namespace BCG
|
|||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
// myKQ = ConfigurationRequester.getApplicationQualifier();
|
// myKQ = ConfigurationRequester.getApplicationQualifier();
|
||||||
myKQ = "TODO";
|
myKQ = "TODO";
|
||||||
|
var handleCreatedSubject = new Subject<bool>();
|
||||||
|
HandleCreated += (s, e) => handleCreatedSubject.OnNext(true);
|
||||||
|
titleSub = Disposable.Create(
|
||||||
|
handleCreatedSubject.SelectSeries(_ =>
|
||||||
|
Observable.FromEvent(
|
||||||
|
cb => Invoke(() => titleInvalidated += cb),
|
||||||
|
cb => Invoke(() => titleInvalidated -= cb))
|
||||||
|
.Prepend(Unit.Default)
|
||||||
|
.SelectSeries(_ => new PubsubRoutesStream().AsObservable().Take(1)))
|
||||||
|
.Subscribe(dp => BeginInvoke(() => refreshTitle(dp.newRows))),
|
||||||
|
handleCreatedSubject);
|
||||||
mySetText();
|
mySetText();
|
||||||
|
|
||||||
myWindowState = new PersistWindowState();
|
myWindowState = new PersistWindowState();
|
||||||
@@ -58,11 +81,25 @@ namespace BCG
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
event Action? titleInvalidated;
|
||||||
|
|
||||||
public string query_text
|
public string query_text
|
||||||
{
|
{
|
||||||
get { return myQueryTextBox.Text; }
|
get { return myQueryTextBox.Text; }
|
||||||
set { myQueryTextBox.Text = value; }
|
set { myQueryTextBox.Text = value; }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Clean up any resources being used.
|
||||||
|
/// </summary>
|
||||||
|
protected override void Dispose(bool disposing) {
|
||||||
|
if (disposing) {
|
||||||
|
Disposable.Dispose(ref titleSub);
|
||||||
|
components?.Dispose();
|
||||||
|
}
|
||||||
|
base.Dispose(disposing);
|
||||||
|
}
|
||||||
|
|
||||||
private ViewStream myGetAllTagsStream()
|
private ViewStream myGetAllTagsStream()
|
||||||
{
|
{
|
||||||
// TODO: Port PublishedTagsStream from edge (then we can uncomment impl below)
|
// TODO: Port PublishedTagsStream from edge (then we can uncomment impl below)
|
||||||
@@ -74,9 +111,10 @@ namespace BCG
|
|||||||
|
|
||||||
private void mySetText()
|
private void mySetText()
|
||||||
{
|
{
|
||||||
ViewStream routes = new PubsubRoutesStream();
|
titleInvalidated?.Invoke();
|
||||||
routes.onChange += (o) => { };
|
}
|
||||||
var rows = routes.rows;
|
|
||||||
|
void refreshTitle(IBlueRowCollection rows) {
|
||||||
string route_txt = String.Empty;
|
string route_txt = String.Empty;
|
||||||
foreach (IBlueRow r in rows)
|
foreach (IBlueRow r in rows)
|
||||||
{
|
{
|
||||||
@@ -144,8 +182,10 @@ namespace BCG
|
|||||||
|
|
||||||
private void myHandleTableListChange(object o)
|
private void myHandleTableListChange(object o)
|
||||||
{
|
{
|
||||||
IBlueRowCollection rows = (o as DataPacket).newRows;
|
BeginInvoke(() => {
|
||||||
myUpdateTableList();
|
tagRows = ((IDataPacket)o).newRows;
|
||||||
|
myUpdateTableList();
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -334,18 +374,24 @@ namespace BCG
|
|||||||
// this is the stream callback
|
// this is the stream callback
|
||||||
private void myCallback(object o)
|
private void myCallback(object o)
|
||||||
{
|
{
|
||||||
_stopwatch.Stop();
|
var dp = (IDataPacket)o;
|
||||||
var timer = Stopwatch.StartNew();
|
Log.Ui.diag(dp.GetIncrementalIdString());
|
||||||
DataPacket dp = o as DataPacket;
|
Volatile.Write(ref pendingData, dp);
|
||||||
myCrono.Stop();
|
}
|
||||||
Log.Ui.diag($"Received callback for {dp.schema.tableName}");
|
|
||||||
if (o == null)
|
private Stopwatch myCrono = new();
|
||||||
{
|
|
||||||
System.Windows.Forms.MessageBox.Show(this, "Received a Null Data packet",
|
private DataStreamExpression? myExp;
|
||||||
"Invalid Data", MessageBoxButtons.OK, MessageBoxIcon.Error);
|
|
||||||
|
private void myTimer_Tick(object sender, System.EventArgs e)
|
||||||
|
{
|
||||||
|
var dp = Interlocked.Exchange(ref pendingData, null);
|
||||||
|
if (dp is null) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
Log.Ui.diag(dp.toIncrementalIDString());
|
_stopwatch.Stop();
|
||||||
|
var timer = Stopwatch.StartNew();
|
||||||
|
myCrono.Stop();
|
||||||
myToolStripStatusLabelTime.BackColor = Color.Black;
|
myToolStripStatusLabelTime.BackColor = Color.Black;
|
||||||
myToolStripStatusLabelRows.BackColor = Color.Black;
|
myToolStripStatusLabelRows.BackColor = Color.Black;
|
||||||
myToolStripStatusLabelTime.ForeColor = Color.White;
|
myToolStripStatusLabelTime.ForeColor = Color.White;
|
||||||
@@ -362,7 +408,7 @@ namespace BCG
|
|||||||
{
|
{
|
||||||
myChangeStyle = false;
|
myChangeStyle = false;
|
||||||
myDataGrid.Columns.Clear();
|
myDataGrid.Columns.Clear();
|
||||||
myDataGrid.Columns.AddRange(Array.ConvertAll(dp.schema.columnInfo, _column_factory));
|
myDataGrid.Columns.AddRange(Array.ConvertAll(dp.Schema.columnInfo, _column_factory));
|
||||||
}
|
}
|
||||||
myCrono.Restart();
|
myCrono.Restart();
|
||||||
// myDataGrid.CaptionText = myCrono.time.TotalMilliseconds + " ms ";
|
// myDataGrid.CaptionText = myCrono.time.TotalMilliseconds + " ms ";
|
||||||
@@ -373,35 +419,13 @@ namespace BCG
|
|||||||
|
|
||||||
var varNames = new List<string>(0);
|
var varNames = new List<string>(0);
|
||||||
var code = myExp?.print(9, varNames);
|
var code = myExp?.print(9, varNames);
|
||||||
myPrintCode(dp.schema, varNames, code);
|
myPrintCode(dp.Schema, varNames, code);
|
||||||
myConsoleRichTextBox.Clear();
|
myConsoleRichTextBox.Clear();
|
||||||
// this was was very very slow
|
// this was was very very slow
|
||||||
//myConsoleRichTextBox.Text = BlueDataUtility.get_printed_rows(dp.newRows, (col) => 30);
|
//myConsoleRichTextBox.Text = BlueDataUtility.get_printed_rows(dp.newRows, (col) => 30);
|
||||||
timer.Stop();
|
timer.Stop();
|
||||||
Log.Gen.info(
|
Log.Gen.info(
|
||||||
$"DSQA MainForm.myCallback table: {dp.schema.tableName} rows: {dp.newRows.Count} time: {timer.Elapsed.TotalMilliseconds:0.00}ms");
|
$"DSQA MainForm.myCallback table: {dp.Schema.tableName} rows: {dp.newRows.Count} time: {timer.Elapsed.TotalMilliseconds:0.00}ms");
|
||||||
}
|
|
||||||
|
|
||||||
private Stopwatch myCrono = new();
|
|
||||||
|
|
||||||
private DataStreamExpression? myExp;
|
|
||||||
|
|
||||||
private void myTimer_Tick(object sender, System.EventArgs e)
|
|
||||||
{
|
|
||||||
// try
|
|
||||||
// {
|
|
||||||
ViewStreamDatabase.instance.doWork();
|
|
||||||
MasterWorker.getInstance(false).doWork();
|
|
||||||
//}
|
|
||||||
// catch (Exception exc) {
|
|
||||||
// Log.Ui.warn(exc.ToString());
|
|
||||||
|
|
||||||
// myDataGrid.DataSource = null;
|
|
||||||
// //myTabControl.SelectedIndex = 1;
|
|
||||||
// myTabControl.SelectedTab = myErrorTabPage;
|
|
||||||
// myErrorTextBox.Text = exc.Message;
|
|
||||||
// myErrorTextBox.Text += "\n" + exc.StackTrace;
|
|
||||||
// }
|
|
||||||
}
|
}
|
||||||
|
|
||||||
class StringWrapper
|
class StringWrapper
|
||||||
@@ -684,7 +708,7 @@ namespace BCG
|
|||||||
|
|
||||||
private void myUpdateTableList()
|
private void myUpdateTableList()
|
||||||
{
|
{
|
||||||
IBlueRowCollection rows = myAllTagsStream.rows;
|
var rows = tagRows;
|
||||||
if (rows == null)
|
if (rows == null)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
@@ -742,20 +766,25 @@ namespace BCG
|
|||||||
|
|
||||||
ViewStream s = new LoaderStream(@"P:\Dropbox\Data\spread_md_esoa_cme");
|
ViewStream s = new LoaderStream(@"P:\Dropbox\Data\spread_md_esoa_cme");
|
||||||
s = new MutableAppendStream(s, s);
|
s = new MutableAppendStream(s, s);
|
||||||
//s = new MutableAppendStream(s, s);
|
s.onChange += OnChange;
|
||||||
List<IBlueRow> rows = new List<IBlueRow>();
|
|
||||||
foreach (IBlueRow r in s.rows)
|
|
||||||
rows.Add(r);
|
|
||||||
|
|
||||||
for (int i = 0; i < 100; i++)
|
void OnChange(object? obj) {
|
||||||
{
|
s.onChange -= OnChange;
|
||||||
timer.Restart();
|
//s = new MutableAppendStream(s, s);
|
||||||
rows.Sort(delegate (IBlueRow r1, IBlueRow r2)
|
var rowCollection = ((IDataPacket)obj!).newRows;
|
||||||
|
var rows = new List<IBlueRow>(rowCollection.Count);
|
||||||
|
rows.AddRange(rowCollection.Cast<IBlueRow>());
|
||||||
|
|
||||||
|
for (int i = 0; i < 100; i++)
|
||||||
{
|
{
|
||||||
return _sort_dicts_index(r1, r2, 5, true);
|
timer.Restart();
|
||||||
});
|
rows.Sort(delegate (IBlueRow r1, IBlueRow r2)
|
||||||
timer.Stop();
|
{
|
||||||
Log.Ui.diag($"nrows = {rows.Count} sorting time = {timer.Elapsed.TotalMilliseconds:0.00}ms");
|
return _sort_dicts_index(r1, r2, 5, true);
|
||||||
|
});
|
||||||
|
timer.Stop();
|
||||||
|
Log.Ui.diag($"nrows = {rows.Count} sorting time = {timer.Elapsed.TotalMilliseconds:0.00}ms");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,59 +1,60 @@
|
|||||||
using BCG;
|
using BCG;
|
||||||
|
|
||||||
using bts;
|
using Bts.DataStream.Services;
|
||||||
using bts.api.core;
|
using Bts.DataStreamCore.Services;
|
||||||
|
using Bts.Extensions.Hosting;
|
||||||
|
using Bts.PubSub.Services;
|
||||||
|
|
||||||
using Bts.DataStreamQueryAnalyzer;
|
using Microsoft.Extensions.DependencyInjection;
|
||||||
using Bts.PubSub;
|
using Microsoft.Extensions.Hosting;
|
||||||
|
|
||||||
using CommandLine;
|
|
||||||
|
|
||||||
using Spark.Api.Services;
|
using Spark.Api.Services;
|
||||||
using Spark.Core.Services;
|
using Spark.Core.Services;
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
|
using System.Threading;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using System.Windows.Forms;
|
using System.Windows.Forms;
|
||||||
|
|
||||||
static class Program {
|
static class Program {
|
||||||
[STAThread]
|
static async Task<int> Main(string[] args) {
|
||||||
static async Task Main(string[] args) {
|
Console.Write("Starting DataStreamQueryAnalyzer");
|
||||||
await Parser.Default.ParseArguments<DataStreamQueryAnalyzerConfig>(args)
|
int exitCode = 0;
|
||||||
.MapResult(RunAsync, errs => Task.FromResult(1));
|
IHost? host = null;
|
||||||
|
try {
|
||||||
async Task<int> RunAsync(DataStreamQueryAnalyzerConfig cfg) {
|
host = HostBuilderExtensions.CreateBtsBuilder(args)
|
||||||
try {
|
.ConfigureServices(ConfigureServices)
|
||||||
cfg.MergeWithConfigFile();
|
.Build();
|
||||||
cfg.MergeWith(DataStreamQueryAnalyzerConfig.Default());
|
var mdClient = host.Services.GetService<IMarketDataClient>();
|
||||||
PubSubConfig.SetGlobalConfig(Log.notnull(cfg.PubSub));
|
if (mdClient is not null) {
|
||||||
var configLoader = new SparkConfigLoader(new SparkConfigLoaderOpts() { ConfigServer = cfg.Sparkd });
|
|
||||||
var serviceContext = new ServiceContext(configLoader);
|
|
||||||
var credentials = new SparkApiCredentials() {
|
|
||||||
User = cfg.User,
|
|
||||||
Password = cfg.Password
|
|
||||||
};
|
|
||||||
var loginService = new SparkdLoginService(serviceContext, credentials, configLoader);
|
|
||||||
var permissions = new UserDataPermissions(loginService);
|
|
||||||
var mdClientConfig = new MarketDataClientConfig() { HotPollInterval = TimeSpan.FromSeconds(0.5) };
|
|
||||||
var mdClient = new MarketDataClient(configLoader, loginService, permissions, mdClientConfig);
|
|
||||||
PrimitiveManager.SetMarketDataClient(mdClient);
|
PrimitiveManager.SetMarketDataClient(mdClient);
|
||||||
using var vsd = new ViewStreamDatabase(new SubscriberCoreFactory());
|
|
||||||
ViewStreamDatabase.SetGlobalInstance(new ViewStreamDatabase(new SubscriberCoreFactory()));
|
|
||||||
Log.Gen.info("Starting DataStreamQueryAnalyzer");
|
|
||||||
var mainForm = new MainForm();
|
|
||||||
if (cfg.StreamFile is not null) {
|
|
||||||
mainForm.loadFile(cfg.StreamFile);
|
|
||||||
}
|
|
||||||
Application.Run(mainForm);
|
|
||||||
} catch (Exception ex) {
|
|
||||||
// Write the error to console first, in case the logging system is compromised.
|
|
||||||
var error_msg = $"DataStreamPublisher threw exception:\n{ex}";
|
|
||||||
Console.Error.WriteLine(error_msg);
|
|
||||||
Console.Error.Flush();
|
|
||||||
bts.Log.Gen.error(error_msg);
|
|
||||||
return 1;
|
|
||||||
}
|
}
|
||||||
return 0;
|
await host.StartAsync();
|
||||||
|
var winFormsThread = new Thread(RunWinFormsApp);
|
||||||
|
winFormsThread.SetApartmentState(ApartmentState.STA);
|
||||||
|
winFormsThread.Start();
|
||||||
|
winFormsThread.Join();
|
||||||
|
} catch (Exception ex) {
|
||||||
|
Console.Error.Write($"DataStreamQueryAnalyzer crashed: {ex}");
|
||||||
|
exitCode = 1;
|
||||||
}
|
}
|
||||||
|
if (host is not null) {
|
||||||
|
await host.StopAsync();
|
||||||
|
}
|
||||||
|
return exitCode;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void RunWinFormsApp() {
|
||||||
|
var win = new MainForm();
|
||||||
|
Application.Run(win);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void ConfigureServices(HostBuilderContext context, IServiceCollection services) =>
|
||||||
|
services.AddSpark(context.Configuration.GetSection("Spark"))
|
||||||
|
.AddSparkApi(context.Configuration.GetSection("SparkApi"))
|
||||||
|
.AddMasterWorker(context.Configuration.GetSection("MasterWorker"))
|
||||||
|
.AddViewStreamDatabase()
|
||||||
|
.AddPubSubClient(context.Configuration.GetSection("PubSub"))
|
||||||
|
.AddPubTableBroker()
|
||||||
|
.AddRemoteQueryManager();
|
||||||
}
|
}
|
||||||
+1
-1
@@ -6,9 +6,9 @@
|
|||||||
"Interval": "00:00:00.1"
|
"Interval": "00:00:00.1"
|
||||||
},
|
},
|
||||||
"Spark": {
|
"Spark": {
|
||||||
"ConfigServer": "http://127.0.0.1:8000/config"
|
|
||||||
},
|
},
|
||||||
"SparkApi": {
|
"SparkApi": {
|
||||||
|
"IsEnabled": false,
|
||||||
"Credentials": {
|
"Credentials": {
|
||||||
"User": "bts",
|
"User": "bts",
|
||||||
"Password": ""
|
"Password": ""
|
||||||
@@ -37,9 +37,19 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bts.ColumnExpressions", "Bt
|
|||||||
EndProject
|
EndProject
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bts.ColumnSortExpressions", "Bts.ColumnSortExpressions\Bts.ColumnSortExpressions.csproj", "{B038CB72-4E81-4AF1-976F-ED8655C2C3D6}"
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bts.ColumnSortExpressions", "Bts.ColumnSortExpressions\Bts.ColumnSortExpressions.csproj", "{B038CB72-4E81-4AF1-976F-ED8655C2C3D6}"
|
||||||
EndProject
|
EndProject
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bts.Extensions.Hosting", "Bts.Extensions.Hosting\Bts.Extensions.Hosting.csproj", "{5C528A65-E43C-48A2-8CA9-ED2D0E356A37}"
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bts.Extensions.Hosting", "..\cs\Bts.Extensions.Hosting\Bts.Extensions.Hosting.csproj", "{5C528A65-E43C-48A2-8CA9-ED2D0E356A37}"
|
||||||
EndProject
|
EndProject
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bts.Net", "Bts.Net\Bts.Net.csproj", "{496333E0-E11D-45EE-B0D6-BBAA824A120D}"
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bts.Net", "..\cs\Bts.Net\Bts.Net.csproj", "{496333E0-E11D-45EE-B0D6-BBAA824A120D}"
|
||||||
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bts.IO.Compression", "..\cs\Bts.IO.Compression\Bts.IO.Compression.csproj", "{3BF059B0-51C0-44A8-8297-9B7464DC5BA3}"
|
||||||
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bts.Collections", "..\cs\Bts.Collections\Bts.Collections.csproj", "{ADBEBCB3-5367-431B-AFC8-F57CAF9F029D}"
|
||||||
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bts.Core", "..\cs\Bts.Core\Bts.Core.csproj", "{4E3D817D-9A0A-40F4-A1A1-4865375F40DD}"
|
||||||
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bts.Disposables", "..\cs\Bts.Disposables\Bts.Disposables.csproj", "{ED034E82-07F4-473D-9C3A-F5EF9C961CFD}"
|
||||||
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bts.Numerics", "..\cs\Bts.Numerics\Bts.Numerics.csproj", "{9A3E289A-3A88-4A76-AD0B-32C12EBA1B8B}"
|
||||||
EndProject
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
@@ -279,6 +289,66 @@ Global
|
|||||||
{496333E0-E11D-45EE-B0D6-BBAA824A120D}.Release|x64.Build.0 = Release|Any CPU
|
{496333E0-E11D-45EE-B0D6-BBAA824A120D}.Release|x64.Build.0 = Release|Any CPU
|
||||||
{496333E0-E11D-45EE-B0D6-BBAA824A120D}.Release|x86.ActiveCfg = Release|Any CPU
|
{496333E0-E11D-45EE-B0D6-BBAA824A120D}.Release|x86.ActiveCfg = Release|Any CPU
|
||||||
{496333E0-E11D-45EE-B0D6-BBAA824A120D}.Release|x86.Build.0 = Release|Any CPU
|
{496333E0-E11D-45EE-B0D6-BBAA824A120D}.Release|x86.Build.0 = Release|Any CPU
|
||||||
|
{3BF059B0-51C0-44A8-8297-9B7464DC5BA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{3BF059B0-51C0-44A8-8297-9B7464DC5BA3}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{3BF059B0-51C0-44A8-8297-9B7464DC5BA3}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||||
|
{3BF059B0-51C0-44A8-8297-9B7464DC5BA3}.Debug|x64.Build.0 = Debug|Any CPU
|
||||||
|
{3BF059B0-51C0-44A8-8297-9B7464DC5BA3}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||||
|
{3BF059B0-51C0-44A8-8297-9B7464DC5BA3}.Debug|x86.Build.0 = Debug|Any CPU
|
||||||
|
{3BF059B0-51C0-44A8-8297-9B7464DC5BA3}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{3BF059B0-51C0-44A8-8297-9B7464DC5BA3}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{3BF059B0-51C0-44A8-8297-9B7464DC5BA3}.Release|x64.ActiveCfg = Release|Any CPU
|
||||||
|
{3BF059B0-51C0-44A8-8297-9B7464DC5BA3}.Release|x64.Build.0 = Release|Any CPU
|
||||||
|
{3BF059B0-51C0-44A8-8297-9B7464DC5BA3}.Release|x86.ActiveCfg = Release|Any CPU
|
||||||
|
{3BF059B0-51C0-44A8-8297-9B7464DC5BA3}.Release|x86.Build.0 = Release|Any CPU
|
||||||
|
{ADBEBCB3-5367-431B-AFC8-F57CAF9F029D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{ADBEBCB3-5367-431B-AFC8-F57CAF9F029D}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{ADBEBCB3-5367-431B-AFC8-F57CAF9F029D}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||||
|
{ADBEBCB3-5367-431B-AFC8-F57CAF9F029D}.Debug|x64.Build.0 = Debug|Any CPU
|
||||||
|
{ADBEBCB3-5367-431B-AFC8-F57CAF9F029D}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||||
|
{ADBEBCB3-5367-431B-AFC8-F57CAF9F029D}.Debug|x86.Build.0 = Debug|Any CPU
|
||||||
|
{ADBEBCB3-5367-431B-AFC8-F57CAF9F029D}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{ADBEBCB3-5367-431B-AFC8-F57CAF9F029D}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{ADBEBCB3-5367-431B-AFC8-F57CAF9F029D}.Release|x64.ActiveCfg = Release|Any CPU
|
||||||
|
{ADBEBCB3-5367-431B-AFC8-F57CAF9F029D}.Release|x64.Build.0 = Release|Any CPU
|
||||||
|
{ADBEBCB3-5367-431B-AFC8-F57CAF9F029D}.Release|x86.ActiveCfg = Release|Any CPU
|
||||||
|
{ADBEBCB3-5367-431B-AFC8-F57CAF9F029D}.Release|x86.Build.0 = Release|Any CPU
|
||||||
|
{4E3D817D-9A0A-40F4-A1A1-4865375F40DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{4E3D817D-9A0A-40F4-A1A1-4865375F40DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{4E3D817D-9A0A-40F4-A1A1-4865375F40DD}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||||
|
{4E3D817D-9A0A-40F4-A1A1-4865375F40DD}.Debug|x64.Build.0 = Debug|Any CPU
|
||||||
|
{4E3D817D-9A0A-40F4-A1A1-4865375F40DD}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||||
|
{4E3D817D-9A0A-40F4-A1A1-4865375F40DD}.Debug|x86.Build.0 = Debug|Any CPU
|
||||||
|
{4E3D817D-9A0A-40F4-A1A1-4865375F40DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{4E3D817D-9A0A-40F4-A1A1-4865375F40DD}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{4E3D817D-9A0A-40F4-A1A1-4865375F40DD}.Release|x64.ActiveCfg = Release|Any CPU
|
||||||
|
{4E3D817D-9A0A-40F4-A1A1-4865375F40DD}.Release|x64.Build.0 = Release|Any CPU
|
||||||
|
{4E3D817D-9A0A-40F4-A1A1-4865375F40DD}.Release|x86.ActiveCfg = Release|Any CPU
|
||||||
|
{4E3D817D-9A0A-40F4-A1A1-4865375F40DD}.Release|x86.Build.0 = Release|Any CPU
|
||||||
|
{ED034E82-07F4-473D-9C3A-F5EF9C961CFD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{ED034E82-07F4-473D-9C3A-F5EF9C961CFD}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{ED034E82-07F4-473D-9C3A-F5EF9C961CFD}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||||
|
{ED034E82-07F4-473D-9C3A-F5EF9C961CFD}.Debug|x64.Build.0 = Debug|Any CPU
|
||||||
|
{ED034E82-07F4-473D-9C3A-F5EF9C961CFD}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||||
|
{ED034E82-07F4-473D-9C3A-F5EF9C961CFD}.Debug|x86.Build.0 = Debug|Any CPU
|
||||||
|
{ED034E82-07F4-473D-9C3A-F5EF9C961CFD}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{ED034E82-07F4-473D-9C3A-F5EF9C961CFD}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{ED034E82-07F4-473D-9C3A-F5EF9C961CFD}.Release|x64.ActiveCfg = Release|Any CPU
|
||||||
|
{ED034E82-07F4-473D-9C3A-F5EF9C961CFD}.Release|x64.Build.0 = Release|Any CPU
|
||||||
|
{ED034E82-07F4-473D-9C3A-F5EF9C961CFD}.Release|x86.ActiveCfg = Release|Any CPU
|
||||||
|
{ED034E82-07F4-473D-9C3A-F5EF9C961CFD}.Release|x86.Build.0 = Release|Any CPU
|
||||||
|
{9A3E289A-3A88-4A76-AD0B-32C12EBA1B8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{9A3E289A-3A88-4A76-AD0B-32C12EBA1B8B}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{9A3E289A-3A88-4A76-AD0B-32C12EBA1B8B}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||||
|
{9A3E289A-3A88-4A76-AD0B-32C12EBA1B8B}.Debug|x64.Build.0 = Debug|Any CPU
|
||||||
|
{9A3E289A-3A88-4A76-AD0B-32C12EBA1B8B}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||||
|
{9A3E289A-3A88-4A76-AD0B-32C12EBA1B8B}.Debug|x86.Build.0 = Debug|Any CPU
|
||||||
|
{9A3E289A-3A88-4A76-AD0B-32C12EBA1B8B}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{9A3E289A-3A88-4A76-AD0B-32C12EBA1B8B}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{9A3E289A-3A88-4A76-AD0B-32C12EBA1B8B}.Release|x64.ActiveCfg = Release|Any CPU
|
||||||
|
{9A3E289A-3A88-4A76-AD0B-32C12EBA1B8B}.Release|x64.Build.0 = Release|Any CPU
|
||||||
|
{9A3E289A-3A88-4A76-AD0B-32C12EBA1B8B}.Release|x86.ActiveCfg = Release|Any CPU
|
||||||
|
{9A3E289A-3A88-4A76-AD0B-32C12EBA1B8B}.Release|x86.Build.0 = Release|Any CPU
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
HideSolutionNode = FALSE
|
HideSolutionNode = FALSE
|
||||||
|
|||||||
@@ -17,11 +17,6 @@ public class PubSubTagHandlerFactoryConfig {
|
|||||||
public static PubSubTagHandlerFactoryConfig Default() {
|
public static PubSubTagHandlerFactoryConfig Default() {
|
||||||
return new() {
|
return new() {
|
||||||
Handlers = new() {
|
Handlers = new() {
|
||||||
new() {
|
|
||||||
TagType = string.Empty,
|
|
||||||
Assembly = "DataStreamCore",
|
|
||||||
Class = "bts.PubsubServerStreamTagHandler",
|
|
||||||
},
|
|
||||||
new() {
|
new() {
|
||||||
TagType = DSTagManager.DataStreamTagType,
|
TagType = DSTagManager.DataStreamTagType,
|
||||||
Assembly = "DataStreamCore",
|
Assembly = "DataStreamCore",
|
||||||
@@ -36,7 +31,12 @@ public class PubSubTagHandlerFactoryConfig {
|
|||||||
TagType = "System_Stats",
|
TagType = "System_Stats",
|
||||||
Assembly = "PubSub",
|
Assembly = "PubSub",
|
||||||
Class = "BCG.SystemStatsPublisher",
|
Class = "BCG.SystemStatsPublisher",
|
||||||
}
|
},
|
||||||
|
new() {
|
||||||
|
TagType = ".*",
|
||||||
|
Assembly = "DataStreamCore",
|
||||||
|
Class = "bts.PubsubServerGenericDataHandler",
|
||||||
|
},
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -22,7 +22,6 @@ namespace BCG {
|
|||||||
/// with PubSub, as some clients are still using ManagedSubcribers)
|
/// with PubSub, as some clients are still using ManagedSubcribers)
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public class ManagedSubscriber : IManagedSubscriber, IWorker, IDisposable {
|
public class ManagedSubscriber : IManagedSubscriber, IWorker, IDisposable {
|
||||||
private static ManagedSubscriber? _self;
|
|
||||||
private ISubscriberCore _subcore;
|
private ISubscriberCore _subcore;
|
||||||
// private IDictionary myTypedDispatchTable = new Hashtable(),
|
// private IDictionary myTypedDispatchTable = new Hashtable(),
|
||||||
// myRawDispatchTable = new Hashtable();
|
// myRawDispatchTable = new Hashtable();
|
||||||
@@ -34,7 +33,6 @@ namespace BCG {
|
|||||||
ManagedSubscriber(ISubscriberCore subsCore) { _subcore = subsCore; }
|
ManagedSubscriber(ISubscriberCore subsCore) { _subcore = subsCore; }
|
||||||
|
|
||||||
public void doWork() {
|
public void doWork() {
|
||||||
var msg_map = new Dictionary<string, List<bts.PubSubServerMessage>>();
|
|
||||||
var updates = _subcore.get_updates(TimeSpan.Zero);
|
var updates = _subcore.get_updates(TimeSpan.Zero);
|
||||||
if (updates.Count() == 0)
|
if (updates.Count() == 0)
|
||||||
return;
|
return;
|
||||||
|
|||||||
@@ -45,11 +45,7 @@ namespace BCG
|
|||||||
get { return myConnInfo; }
|
get { return myConnInfo; }
|
||||||
}
|
}
|
||||||
|
|
||||||
override public string ToString()
|
public override string ToString() =>
|
||||||
{
|
$"type: {myMsgType} conn: {myConnInfo} msg: {myMsg?.Length ?? 0}";
|
||||||
Func<byte[], int> len = (byte[] m) => { return m == null ? 0 : m.Length; };
|
|
||||||
return $"type: {myMsgType} conn: {myConnInfo} msg: {len(myMsg)}";
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -46,7 +46,7 @@ namespace bts {
|
|||||||
System.Threading.Thread.Sleep(TimeSpan.FromSeconds(5));
|
System.Threading.Thread.Sleep(TimeSpan.FromSeconds(5));
|
||||||
_accept_socket.BeginAccept(new AsyncCallback(_on_accept), new object[] { });
|
_accept_socket.BeginAccept(new AsyncCallback(_on_accept), new object[] { });
|
||||||
if (ex is OutOfMemoryException)
|
if (ex is OutOfMemoryException)
|
||||||
throw ex;
|
throw;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
new_sock.LingerState = new LingerOption(false, 0);
|
new_sock.LingerState = new LingerOption(false, 0);
|
||||||
|
|||||||
@@ -1,273 +0,0 @@
|
|||||||
<?xml version="1.0" ?>
|
|
||||||
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
<PropertyGroup>
|
|
||||||
<ProjectType>Local</ProjectType>
|
|
||||||
<ProductVersion>9.0.30729</ProductVersion>
|
|
||||||
<SchemaVersion>2.0</SchemaVersion>
|
|
||||||
<ProjectGuid>{41DBB1A3-1A4E-457D-BB2C-BFDE486E328B}</ProjectGuid>
|
|
||||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
|
||||||
<Platform Condition=" '$(Platform)' == '' ">x64</Platform>
|
|
||||||
<ApplicationIcon>
|
|
||||||
</ApplicationIcon>
|
|
||||||
<AssemblyKeyContainerName>
|
|
||||||
</AssemblyKeyContainerName>
|
|
||||||
<AssemblyName>CompressionUtilities</AssemblyName>
|
|
||||||
<AssemblyOriginatorKeyFile>..\..\StrongNameKeys\Builder.snk</AssemblyOriginatorKeyFile>
|
|
||||||
<DefaultClientScript>JScript</DefaultClientScript>
|
|
||||||
<DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
|
|
||||||
<DefaultTargetSchema>IE50</DefaultTargetSchema>
|
|
||||||
<DelaySign>false</DelaySign>
|
|
||||||
<OutputType>Library</OutputType>
|
|
||||||
<RootNamespace>CompressionUtilities</RootNamespace>
|
|
||||||
<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
|
|
||||||
<StartupObject>
|
|
||||||
</StartupObject>
|
|
||||||
<SignAssembly>false</SignAssembly>
|
|
||||||
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
|
|
||||||
<ApplicationRevision>0</ApplicationRevision>
|
|
||||||
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
|
||||||
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
|
|
||||||
<BaseAddress>285212672</BaseAddress>
|
|
||||||
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
|
|
||||||
<ConfigurationOverrideFile>
|
|
||||||
</ConfigurationOverrideFile>
|
|
||||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
|
||||||
<DocumentationFile>
|
|
||||||
</DocumentationFile>
|
|
||||||
<DebugSymbols>true</DebugSymbols>
|
|
||||||
<FileAlignment>4096</FileAlignment>
|
|
||||||
<NoStdLib>false</NoStdLib>
|
|
||||||
<NoWarn>
|
|
||||||
</NoWarn>
|
|
||||||
<Optimize>false</Optimize>
|
|
||||||
<RegisterForComInterop>false</RegisterForComInterop>
|
|
||||||
<RemoveIntegerChecks>false</RemoveIntegerChecks>
|
|
||||||
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
|
|
||||||
<WarningLevel>4</WarningLevel>
|
|
||||||
<DebugType>full</DebugType>
|
|
||||||
<ErrorReport>prompt</ErrorReport>
|
|
||||||
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
|
||||||
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
|
|
||||||
<BaseAddress>285212672</BaseAddress>
|
|
||||||
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
|
|
||||||
<ConfigurationOverrideFile>
|
|
||||||
</ConfigurationOverrideFile>
|
|
||||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
|
||||||
<DocumentationFile>
|
|
||||||
</DocumentationFile>
|
|
||||||
<DebugSymbols>true</DebugSymbols>
|
|
||||||
<FileAlignment>4096</FileAlignment>
|
|
||||||
<NoStdLib>false</NoStdLib>
|
|
||||||
<NoWarn>
|
|
||||||
</NoWarn>
|
|
||||||
<Optimize>false</Optimize>
|
|
||||||
<RegisterForComInterop>false</RegisterForComInterop>
|
|
||||||
<RemoveIntegerChecks>false</RemoveIntegerChecks>
|
|
||||||
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
|
|
||||||
<WarningLevel>4</WarningLevel>
|
|
||||||
<DebugType>full</DebugType>
|
|
||||||
<ErrorReport>prompt</ErrorReport>
|
|
||||||
<DefineDebug>true</DefineDebug>
|
|
||||||
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Test|AnyCPU' ">
|
|
||||||
<DebugSymbols>true</DebugSymbols>
|
|
||||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
|
||||||
<BaseAddress>285212672</BaseAddress>
|
|
||||||
<DebugType>full</DebugType>
|
|
||||||
<PlatformTarget>x64</PlatformTarget>
|
|
||||||
<ErrorReport>prompt</ErrorReport>
|
|
||||||
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
|
|
||||||
<DebugSymbols>true</DebugSymbols>
|
|
||||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
|
||||||
<BaseAddress>285212672</BaseAddress>
|
|
||||||
<FileAlignment>4096</FileAlignment>
|
|
||||||
<DebugType>full</DebugType>
|
|
||||||
<PlatformTarget>x64</PlatformTarget>
|
|
||||||
<ErrorReport>prompt</ErrorReport>
|
|
||||||
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
|
|
||||||
<DebugSymbols>true</DebugSymbols>
|
|
||||||
<DefineDebug>true</DefineDebug>
|
|
||||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
|
||||||
<BaseAddress>285212672</BaseAddress>
|
|
||||||
<FileAlignment>4096</FileAlignment>
|
|
||||||
<DebugType>full</DebugType>
|
|
||||||
<PlatformTarget>x64</PlatformTarget>
|
|
||||||
<ErrorReport>prompt</ErrorReport>
|
|
||||||
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Test|x64' ">
|
|
||||||
<DebugSymbols>true</DebugSymbols>
|
|
||||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
|
||||||
<BaseAddress>285212672</BaseAddress>
|
|
||||||
<DebugType>full</DebugType>
|
|
||||||
<PlatformTarget>x64</PlatformTarget>
|
|
||||||
<ErrorReport>prompt</ErrorReport>
|
|
||||||
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<Reference Include="System">
|
|
||||||
<Name>System</Name>
|
|
||||||
</Reference>
|
|
||||||
<Reference Include="System.Core">
|
|
||||||
<RequiredTargetFramework>4.0</RequiredTargetFramework>
|
|
||||||
</Reference>
|
|
||||||
<Reference Include="System.Data">
|
|
||||||
<Name>System.Data</Name>
|
|
||||||
</Reference>
|
|
||||||
<Reference Include="System.Xml">
|
|
||||||
<Name>System.XML</Name>
|
|
||||||
</Reference>
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<Compile Include="AssemblyInfo.cs">
|
|
||||||
<SubType>Code</SubType>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="BlueCompressUtilities\IBlueCompressor.cs">
|
|
||||||
<SubType>Code</SubType>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="BlueCompressUtilities\SharpZipCompressor.cs">
|
|
||||||
<SubType>Code</SubType>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="SharpZipLib\BZip2\BZip2.cs">
|
|
||||||
<SubType>Code</SubType>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="SharpZipLib\BZip2\BZip2Constants.cs">
|
|
||||||
<SubType>Code</SubType>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="SharpZipLib\BZip2\BZip2InputStream.cs">
|
|
||||||
<SubType>Code</SubType>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="SharpZipLib\BZip2\BZip2OutputStream.cs">
|
|
||||||
<SubType>Code</SubType>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="SharpZipLib\Checksums\Adler32.cs">
|
|
||||||
<SubType>Code</SubType>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="SharpZipLib\Checksums\Crc32.cs">
|
|
||||||
<SubType>Code</SubType>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="SharpZipLib\Checksums\IChecksum.cs">
|
|
||||||
<SubType>Code</SubType>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="SharpZipLib\Checksums\StrangeCrc.cs">
|
|
||||||
<SubType>Code</SubType>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="SharpZipLib\GZip\GZipConstants.cs">
|
|
||||||
<SubType>Code</SubType>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="SharpZipLib\GZip\GZipInputStream.cs">
|
|
||||||
<SubType>Code</SubType>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="SharpZipLib\GZip\GZipOutputStream.cs">
|
|
||||||
<SubType>Code</SubType>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="SharpZipLib\Tar\InvalidHeaderException.cs">
|
|
||||||
<SubType>Code</SubType>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="SharpZipLib\Tar\TarArchive.cs">
|
|
||||||
<SubType>Code</SubType>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="SharpZipLib\Tar\TarBuffer.cs">
|
|
||||||
<SubType>Code</SubType>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="SharpZipLib\Tar\TarEntry.cs">
|
|
||||||
<SubType>Code</SubType>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="SharpZipLib\Tar\TarHeader.cs">
|
|
||||||
<SubType>Code</SubType>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="SharpZipLib\Tar\TarInputStream.cs">
|
|
||||||
<SubType>Code</SubType>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="SharpZipLib\Tar\TarOutputStream.cs">
|
|
||||||
<SubType>Code</SubType>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="SharpZipLib\ZipException.cs">
|
|
||||||
<SubType>Code</SubType>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="SharpZipLib\Zip\Compression\Deflater.cs">
|
|
||||||
<SubType>Code</SubType>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="SharpZipLib\Zip\Compression\DeflaterConstants.cs">
|
|
||||||
<SubType>Code</SubType>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="SharpZipLib\Zip\Compression\DeflaterEngine.cs">
|
|
||||||
<SubType>Code</SubType>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="SharpZipLib\Zip\Compression\DeflaterHuffman.cs">
|
|
||||||
<SubType>Code</SubType>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="SharpZipLib\Zip\Compression\DeflaterPending.cs">
|
|
||||||
<SubType>Code</SubType>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="SharpZipLib\Zip\Compression\Inflater.cs">
|
|
||||||
<SubType>Code</SubType>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="SharpZipLib\Zip\Compression\InflaterDynHeader.cs">
|
|
||||||
<SubType>Code</SubType>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="SharpZipLib\Zip\Compression\InflaterHuffmanTree.cs">
|
|
||||||
<SubType>Code</SubType>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="SharpZipLib\Zip\Compression\PendingBuffer.cs">
|
|
||||||
<SubType>Code</SubType>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="SharpZipLib\Zip\Compression\Streams\DeflaterOutputStream.cs">
|
|
||||||
<SubType>Code</SubType>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="SharpZipLib\Zip\Compression\Streams\InflaterInputStream.cs">
|
|
||||||
<SubType>Code</SubType>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="SharpZipLib\Zip\Compression\Streams\OutputWindow.cs">
|
|
||||||
<SubType>Code</SubType>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="SharpZipLib\Zip\Compression\Streams\StreamManipulator.cs">
|
|
||||||
<SubType>Code</SubType>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="SharpZipLib\Zip\ZipConstants.cs">
|
|
||||||
<SubType>Code</SubType>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="SharpZipLib\Zip\ZipEntry.cs">
|
|
||||||
<SubType>Code</SubType>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="SharpZipLib\Zip\ZipFile.cs">
|
|
||||||
<SubType>Code</SubType>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="SharpZipLib\Zip\ZipInputStream.cs">
|
|
||||||
<SubType>Code</SubType>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="SharpZipLib\Zip\ZipOutputStream.cs">
|
|
||||||
<SubType>Code</SubType>
|
|
||||||
</Compile>
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
|
|
||||||
<Visible>False</Visible>
|
|
||||||
<ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
|
|
||||||
</BootstrapperPackage>
|
|
||||||
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
|
|
||||||
<Visible>False</Visible>
|
|
||||||
<ProductName>.NET Framework 3.5 SP1</ProductName>
|
|
||||||
</BootstrapperPackage>
|
|
||||||
<BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
|
|
||||||
<Visible>False</Visible>
|
|
||||||
<ProductName>Windows Installer 3.1</ProductName>
|
|
||||||
</BootstrapperPackage>
|
|
||||||
</ItemGroup>
|
|
||||||
<Import Project="..\..\build\blue2.cs.targets"/>
|
|
||||||
<PropertyGroup>
|
|
||||||
<PreBuildEvent>
|
|
||||||
</PreBuildEvent>
|
|
||||||
<PostBuildEvent>
|
|
||||||
</PostBuildEvent>
|
|
||||||
</PropertyGroup>
|
|
||||||
</Project>
|
|
||||||
@@ -1,9 +1,8 @@
|
|||||||
|
using bts;
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Collections;
|
using System.Text;
|
||||||
using bts;
|
|
||||||
using System.Threading;
|
|
||||||
using System.Reflection;
|
|
||||||
|
|
||||||
namespace BCG {
|
namespace BCG {
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -69,7 +68,8 @@ namespace BCG {
|
|||||||
|
|
||||||
public static byte[] getBytesFromStream(params Stream[] streams) {
|
public static byte[] getBytesFromStream(params Stream[] streams) {
|
||||||
long totalSize = 0;
|
long totalSize = 0;
|
||||||
BinaryWriter bw = new BinaryWriter(new MemoryStream());
|
using var ms = new MemoryStream();
|
||||||
|
using var bw = new BinaryWriter(ms, Encoding.UTF8, true);
|
||||||
foreach (Stream s in streams)
|
foreach (Stream s in streams)
|
||||||
totalSize += s.Length - s.Position;
|
totalSize += s.Length - s.Position;
|
||||||
bw.Write(Convert.ToInt32(totalSize));
|
bw.Write(Convert.ToInt32(totalSize));
|
||||||
@@ -78,7 +78,8 @@ namespace BCG {
|
|||||||
int lengthToReadForThisStream = Convert.ToInt32(s.Length - s.Position);
|
int lengthToReadForThisStream = Convert.ToInt32(s.Length - s.Position);
|
||||||
bw.Write(br.ReadBytes(lengthToReadForThisStream));
|
bw.Write(br.ReadBytes(lengthToReadForThisStream));
|
||||||
}
|
}
|
||||||
return (bw.BaseStream as MemoryStream).ToArray();
|
bw.Flush();
|
||||||
|
return ms.ToArray();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static byte[] read_bytes(Stream str) {
|
public static byte[] read_bytes(Stream str) {
|
||||||
|
|||||||
@@ -4,17 +4,20 @@
|
|||||||
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
||||||
<TargetFramework>net8.0</TargetFramework>
|
<TargetFramework>net8.0</TargetFramework>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
|
<PackageId>Bts.PubSub</PackageId>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<Choose>
|
<Choose>
|
||||||
<When Condition="'$(UseProjectRefs)' == 'true'">
|
<When Condition="'$(UseProjectRefs)' == 'true'">
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
<ProjectReference Include="..\..\cs\Bts.IO.Compression\Bts.IO.Compression.csproj" />
|
||||||
<ProjectReference Include="..\..\cs\Bts.Spark.Core\Bts.Spark.Core.csproj" />
|
<ProjectReference Include="..\..\cs\Bts.Spark.Core\Bts.Spark.Core.csproj" />
|
||||||
<ProjectReference Include="..\Bts.Net\Bts.Net.csproj" />
|
<ProjectReference Include="..\..\cs\Bts.Net\Bts.Net.csproj" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</When>
|
</When>
|
||||||
<Otherwise>
|
<Otherwise>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
<PackageReference Include="Bts.IO.Compression" Version="$(SparkVersion)" />
|
||||||
<PackageReference Include="Bts.Spark.Core" Version="$(SparkVersion)" />
|
<PackageReference Include="Bts.Spark.Core" Version="$(SparkVersion)" />
|
||||||
<PackageReference Include="Bts.Net" Version="$(SparkVersion)" />
|
<PackageReference Include="Bts.Net" Version="$(SparkVersion)" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|||||||
@@ -43,10 +43,7 @@ namespace BCG {
|
|||||||
|
|
||||||
#region constructors
|
#region constructors
|
||||||
|
|
||||||
public PublisherCore(IPubSubRouter? router = null, IPubSubTagHandlerFactory? tagHandlerFactory = null, IServiceProvider? serviceProvider = null) {
|
public PublisherCore(IPubSubRouter router, IPubSubTagHandlerFactory tagHandlerFactory) {
|
||||||
router ??= new PubSubRouter();
|
|
||||||
serviceProvider ??= PubSubServices.ServiceProvider;
|
|
||||||
tagHandlerFactory ??= new PubsubTagHandlerFactory(serviceProvider, PubSubTagHandlerFactoryConfig.Default());
|
|
||||||
_router = router;
|
_router = router;
|
||||||
_state = new(tagHandlerFactory);
|
_state = new(tagHandlerFactory);
|
||||||
Thread pump_thread = new Thread(new ThreadStart(_message_pump));
|
Thread pump_thread = new Thread(new ThreadStart(_message_pump));
|
||||||
@@ -54,6 +51,14 @@ namespace BCG {
|
|||||||
pump_thread.Start();
|
pump_thread.Start();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static PublisherCore Create(IPubSubRouter? router = null, IPubSubTagHandlerFactory? tagHandlerFactory = null, IServiceProvider? serviceProvider = null) {
|
||||||
|
router ??= new PubSubRouter();
|
||||||
|
tagHandlerFactory ??= new PubsubTagHandlerFactory(
|
||||||
|
serviceProvider ?? PubSubServices.ServiceProvider,
|
||||||
|
PubSubConfig.Instance.TagHandlerFactory ?? PubSubTagHandlerFactoryConfig.Default());
|
||||||
|
return new(router, tagHandlerFactory);
|
||||||
|
}
|
||||||
|
|
||||||
public void Dispose() { }
|
public void Dispose() { }
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
@@ -87,7 +92,7 @@ namespace BCG {
|
|||||||
|
|
||||||
public void publish(PubSubClientMessage msg) {
|
public void publish(PubSubClientMessage msg) {
|
||||||
Log.assert(msg.msg_type == PubSubMessageType.PUBLISH);
|
Log.assert(msg.msg_type == PubSubMessageType.PUBLISH);
|
||||||
Log.assert(!String.IsNullOrEmpty(msg.pub_msg.tag_type));
|
Log.assert(!string.IsNullOrEmpty(msg.pub_msg?.tag_type));
|
||||||
bts.Log.Gen.info($"PublisherCore.publish msg: {msg}");
|
bts.Log.Gen.info($"PublisherCore.publish msg: {msg}");
|
||||||
_main_queue.enqueue(msg);
|
_main_queue.enqueue(msg);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -143,7 +143,7 @@ namespace BCG {
|
|||||||
public void doWork() {
|
public void doWork() {
|
||||||
if (_connection_cb != null) {
|
if (_connection_cb != null) {
|
||||||
var conns = _conn_callback_queue.dequeueAll();
|
var conns = _conn_callback_queue.dequeueAll();
|
||||||
foreach (var ci in conns) {
|
foreach (var ci in conns.ExceptNull()) {
|
||||||
_connection_cb(ci.client_url, ci.status);
|
_connection_cb(ci.client_url, ci.status);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -175,7 +175,7 @@ namespace BCG {
|
|||||||
case RemoteMessageType.Data:
|
case RemoteMessageType.Data:
|
||||||
// if callback is registered fire it right away, else enqueue it
|
// if callback is registered fire it right away, else enqueue it
|
||||||
if (_data_cb != null)
|
if (_data_cb != null)
|
||||||
_data_cb(sender_rci.ToString(), message.message);
|
_data_cb(sender_rci.ToString(), message.message ?? Array.Empty<byte>());
|
||||||
else
|
else
|
||||||
_received_data_queue.enqueue(new Pair<string, byte[]>(sender_rci.ToString(), message.message));
|
_received_data_queue.enqueue(new Pair<string, byte[]>(sender_rci.ToString(), message.message));
|
||||||
break;
|
break;
|
||||||
@@ -258,7 +258,7 @@ namespace BCG {
|
|||||||
// (which gets called in another thread)
|
// (which gets called in another thread)
|
||||||
private void _handle_new_connections() {
|
private void _handle_new_connections() {
|
||||||
var new_conns = _new_connections.dequeueAll();
|
var new_conns = _new_connections.dequeueAll();
|
||||||
foreach (ITCPConnection conn in new_conns) {
|
foreach (var conn in new_conns.ExceptNull()) {
|
||||||
var peer_rci = conn.get_peer_address();
|
var peer_rci = conn.get_peer_address();
|
||||||
bts.Log.Gen.info($"ManagedTCPMessageHub._handle_new_connections conn: {conn}");
|
bts.Log.Gen.info($"ManagedTCPMessageHub._handle_new_connections conn: {conn}");
|
||||||
///to stop it from being garbabge collected immediatly
|
///to stop it from being garbabge collected immediatly
|
||||||
|
|||||||
@@ -16,8 +16,8 @@ public interface IPubSubState {
|
|||||||
|
|
||||||
ICollection<string> all_tags { get; }
|
ICollection<string> all_tags { get; }
|
||||||
|
|
||||||
byte[] get_content(string tag);
|
byte[]? get_content(string tag);
|
||||||
string getTagType(string tag);
|
string? getTagType(string tag);
|
||||||
void get_all_connections(
|
void get_all_connections(
|
||||||
string tag,
|
string tag,
|
||||||
out Dictionary<string, string> subscribers,
|
out Dictionary<string, string> subscribers,
|
||||||
|
|||||||
@@ -188,11 +188,11 @@ namespace BCG {
|
|||||||
_state.handle_sub(sub_msg); // state keeps the list of all subscribers
|
_state.handle_sub(sub_msg); // state keeps the list of all subscribers
|
||||||
///to all these new subscriber s, send the existing data
|
///to all these new subscriber s, send the existing data
|
||||||
foreach (string tag in sub_msg.tags.empty_if_null()) {
|
foreach (string tag in sub_msg.tags.empty_if_null()) {
|
||||||
byte[] data = _state.get_content(tag);
|
byte[]? data = _state.get_content(tag);
|
||||||
//ie data has been published once
|
//ie data has been published once
|
||||||
if (data != null) {
|
if (data != null) {
|
||||||
bts.Log.Gen.info($"ManagedTCPMessgeHub._handle_sub get_content tag: {tag} data len: {data.Length}");
|
bts.Log.Gen.info($"ManagedTCPMessgeHub._handle_sub get_content tag: {tag} data len: {data.Length}");
|
||||||
string tag_type_ = _state.getTagType(tag);
|
string? tag_type_ = _state.getTagType(tag);
|
||||||
var msg_to_send = new PubSubServerMessage() {
|
var msg_to_send = new PubSubServerMessage() {
|
||||||
tag = tag,
|
tag = tag,
|
||||||
tag_type = tag_type_,
|
tag_type = tag_type_,
|
||||||
|
|||||||
@@ -148,7 +148,7 @@ namespace BCG {
|
|||||||
return new string[] { };
|
return new string[] { };
|
||||||
}
|
}
|
||||||
|
|
||||||
public byte[] get_content(string tag) {
|
public byte[]? get_content(string tag) {
|
||||||
if (!_tag_to_data_map.ContainsKey(tag))
|
if (!_tag_to_data_map.ContainsKey(tag))
|
||||||
return null;
|
return null;
|
||||||
var rv = _tag_to_data_map[tag].get_current_content();
|
var rv = _tag_to_data_map[tag].get_current_content();
|
||||||
@@ -157,7 +157,7 @@ namespace BCG {
|
|||||||
return rv;
|
return rv;
|
||||||
}
|
}
|
||||||
|
|
||||||
public string getTagType(string tag) {
|
public string? getTagType(string tag) {
|
||||||
if (!_tag_to_data_map.ContainsKey(tag))
|
if (!_tag_to_data_map.ContainsKey(tag))
|
||||||
return null;
|
return null;
|
||||||
else
|
else
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ namespace bts {
|
|||||||
public class SingleTagData {
|
public class SingleTagData {
|
||||||
private readonly IPubSubServerTagHandler? _tag_handler;
|
private readonly IPubSubServerTagHandler? _tag_handler;
|
||||||
|
|
||||||
public SingleTagData(string tag, string tag_type, IPubSubServerTagHandler tag_handler) {
|
public SingleTagData(string tag, string tag_type, IPubSubServerTagHandler? tag_handler) {
|
||||||
bts.Log.Gen.info($"SingleTagData constructed for tag: {tag} tag_type: {tag_type}");
|
bts.Log.Gen.info($"SingleTagData constructed for tag: {tag} tag_type: {tag_type}");
|
||||||
this.tag = tag;
|
this.tag = tag;
|
||||||
this.tag_type = tag_type;
|
this.tag_type = tag_type;
|
||||||
|
|||||||
@@ -114,6 +114,7 @@ public static class PubSubServices {
|
|||||||
PubSubConfig.SetGlobalConfig(configurationSection.Get<PubSubConfig>() ?? PubSubConfig.Default());
|
PubSubConfig.SetGlobalConfig(configurationSection.Get<PubSubConfig>() ?? PubSubConfig.Default());
|
||||||
return services.AddGlobalServiceProvider()
|
return services.AddGlobalServiceProvider()
|
||||||
.AddPubSubRouter(configurationSection.GetSection(nameof(PubSubConfig.Routing)))
|
.AddPubSubRouter(configurationSection.GetSection(nameof(PubSubConfig.Routing)))
|
||||||
|
.AddTagHandlerFactory(configurationSection.GetSection(nameof(PubSubConfig.TagHandlerFactory)))
|
||||||
.AddPublisherCore()
|
.AddPublisherCore()
|
||||||
.AddSubscriberCore()
|
.AddSubscriberCore()
|
||||||
.AddManagedSubscriber();
|
.AddManagedSubscriber();
|
||||||
|
|||||||
@@ -46,7 +46,6 @@ namespace BCG {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void onConnection(ITCPConnection connection) {
|
public void onConnection(ITCPConnection connection) {
|
||||||
string ip; int port;
|
|
||||||
var peer_rci = connection.get_peer_address();
|
var peer_rci = connection.get_peer_address();
|
||||||
bts.Log.Gen.info($"SimpleTCPClient.onConnection connected to server: {peer_rci}, starting task to send data in a loop");
|
bts.Log.Gen.info($"SimpleTCPClient.onConnection connected to server: {peer_rci}, starting task to send data in a loop");
|
||||||
if (_listener != null) {
|
if (_listener != null) {
|
||||||
|
|||||||
@@ -1,10 +1,5 @@
|
|||||||
using BCG;
|
|
||||||
|
|
||||||
using bts;
|
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Runtime.Serialization;
|
|
||||||
|
|
||||||
namespace BCG {
|
namespace BCG {
|
||||||
public class TestPubItem : IPubItem {
|
public class TestPubItem : IPubItem {
|
||||||
@@ -24,7 +19,7 @@ namespace BCG {
|
|||||||
}
|
}
|
||||||
public class TestPublisher {
|
public class TestPublisher {
|
||||||
TestPubItem _tbi = new TestPubItem();
|
TestPubItem _tbi = new TestPubItem();
|
||||||
IPublisherCore pcore = new PublisherCore();
|
IPublisherCore pcore = PublisherCore.Create();
|
||||||
bool _hit_key_to_send = false;
|
bool _hit_key_to_send = false;
|
||||||
public TestPublisher(bool hit_key_to_send) {
|
public TestPublisher(bool hit_key_to_send) {
|
||||||
_hit_key_to_send = hit_key_to_send;
|
_hit_key_to_send = hit_key_to_send;
|
||||||
@@ -50,4 +45,4 @@ namespace BCG {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -6,10 +6,20 @@
|
|||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<Choose>
|
||||||
<ProjectReference Include="..\Bts.Extensions.Hosting\Bts.Extensions.Hosting.csproj" />
|
<When Condition="'$(UseProjectRefs)' == 'true'">
|
||||||
<ProjectReference Include="..\PubSub\PubSub.csproj" />
|
<ItemGroup>
|
||||||
</ItemGroup>
|
<ProjectReference Include="..\..\cs\Bts.Extensions.Hosting\Bts.Extensions.Hosting.csproj" />
|
||||||
|
<ProjectReference Include="..\PubSub\PubSub.csproj" />
|
||||||
|
</ItemGroup>
|
||||||
|
</When>
|
||||||
|
<Otherwise>
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="Bts.PubSub" Version="$(SparkVersion)" />
|
||||||
|
<PackageReference Include="Bts.Extensions.Hosting" Version="$(SparkVersion)" />
|
||||||
|
</ItemGroup>
|
||||||
|
</Otherwise>
|
||||||
|
</Choose>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ConfigurationProfile Include="appsettings.Development.json" />
|
<ConfigurationProfile Include="appsettings.Development.json" />
|
||||||
|
|||||||
@@ -80,7 +80,7 @@ r = TimeSeriesStream(r)
|
|||||||
"left_sec", "left_venue","right_sec", "right_venue"
|
"left_sec", "left_venue","right_sec", "right_venue"
|
||||||
);
|
);
|
||||||
r = new NewProjectStream (r,
|
r = new NewProjectStream (r,
|
||||||
" spread_bid_qty spread_bid_price spread_bid_notional spread_ask_qty spread_ask_price spread_ask_notional left_qm right_qm left_bid_qty left_bid_price left_ask_qty left_ask_price right_bid_qty right_bid_price right_ask_qty right_ask_price left_sec_name right_sec_name left_cpp right_cpp left_venue right_venue ");
|
" spread_name spread_bid_qty spread_bid_price spread_bid_notional spread_ask_qty spread_ask_price spread_ask_notional left_qm right_qm left_bid_qty left_bid_price left_ask_qty left_ask_price right_bid_qty right_bid_price right_ask_qty right_ask_price left_sec_name right_sec_name left_cpp right_cpp left_venue right_venue ");
|
||||||
r = new MathStream (r,
|
r = new MathStream (r,
|
||||||
"arb = Max( Abs(Min(0,spread_ask_notional)),spread_bid_notional )");
|
"arb = Max( Abs(Min(0,spread_ask_notional)),spread_bid_notional )");
|
||||||
|
|
||||||
|
|||||||
-2
@@ -215,8 +215,6 @@ namespace bts.BlueOrb {
|
|||||||
|
|
||||||
using bts.api;
|
using bts.api;
|
||||||
|
|
||||||
using Newtonsoft.Json.Serialization;
|
|
||||||
|
|
||||||
[DataStreamUserRespresentation("FuturesContinousContract")]
|
[DataStreamUserRespresentation("FuturesContinousContract")]
|
||||||
public class FuturesContinousContractStream : ViewStream {
|
public class FuturesContinousContractStream : ViewStream {
|
||||||
// the argument is symbol, like "ES" etc and not the contract itself
|
// the argument is symbol, like "ES" etc and not the contract itself
|
||||||
|
|||||||
@@ -1,10 +1,13 @@
|
|||||||
namespace bts.BlueOrb {
|
namespace bts.BlueOrb {
|
||||||
using System;
|
using System;
|
||||||
|
using System.Security.Cryptography;
|
||||||
|
|
||||||
using BCG;
|
using BCG;
|
||||||
|
|
||||||
using Bts.DataStreamCore;
|
using Bts.DataStreamCore;
|
||||||
using Bts.PubSub;
|
using Bts.PubSub;
|
||||||
|
|
||||||
|
using IronPython.Runtime.Operations;
|
||||||
|
|
||||||
using Spark.Api.MarketData;
|
using Spark.Api.MarketData;
|
||||||
|
|
||||||
@@ -64,12 +67,22 @@ namespace bts.BlueOrb {
|
|||||||
[LiveMarketDataStream]
|
[LiveMarketDataStream]
|
||||||
[DataStreamUserRespresentation("SyntheticSpreadBBOStream")]
|
[DataStreamUserRespresentation("SyntheticSpreadBBOStream")]
|
||||||
public class SyntheticSpreadBBOStream : ViewStream {
|
public class SyntheticSpreadBBOStream : ViewStream {
|
||||||
public SyntheticSpreadBBOStream(string leg_1, string venue_1,string leg_2, string venue_2, [MarketDataClientParam] IMarketDataClient mdClient, IWorkScheduler scheduler) : this(leg_1, venue_1, leg_2, venue_2, 1, -1, 1, 1, mdClient, scheduler) { }
|
public SyntheticSpreadBBOStream(string leg_1, string venue_1, string leg_2, string venue_2,
|
||||||
public SyntheticSpreadBBOStream(string leg_1, string venue_1, string leg_2, string venue_2, double pm1, double pm2, double cpp1, double cpp2, [MarketDataClientParam] IMarketDataClient mdClient, IWorkScheduler scheduler) : this(new LiveBBOStream(mdClient, scheduler, venue_1,leg_1), new LiveBBOStream(mdClient, scheduler, venue_2,leg_2), pm1, pm2, cpp1, cpp2) { }
|
[MarketDataClientParam] IMarketDataClient mdClient, IWorkScheduler scheduler) :
|
||||||
public SyntheticSpreadBBOStream(ViewStream bbo_leg_1, ViewStream bbo_leg_2, double pm1, double pm2, double cpp1, double cpp2) {
|
this(leg_1, venue_1, leg_2, venue_2, 1, -1, 1, 1, mdClient, scheduler) { }
|
||||||
|
public SyntheticSpreadBBOStream(string leg_1, string venue_1, string leg_2, string venue_2,
|
||||||
|
double pm1, double pm2, double cpp1, double cpp2,
|
||||||
|
[MarketDataClientParam] IMarketDataClient mdClient, IWorkScheduler scheduler) :
|
||||||
|
this(
|
||||||
|
new LiveBBOStream(mdClient, scheduler, venue_1, leg_1),
|
||||||
|
new LiveBBOStream(mdClient, scheduler, venue_2, leg_2),
|
||||||
|
pm1, pm2, cpp1, cpp2,
|
||||||
|
leg_1,venue_1,leg_2,venue_2) { }
|
||||||
|
public SyntheticSpreadBBOStream(ViewStream bbo_leg_1, ViewStream bbo_leg_2, double pm1, double pm2,
|
||||||
|
double cpp1, double cpp2, string leg_1, string venue_1, string leg_2, string venue_2) {
|
||||||
ViewStream r;
|
ViewStream r;
|
||||||
double qm1 =1;
|
double qm1 = 1;
|
||||||
double qm2 = cpp1/cpp2;
|
double qm2 = cpp1 / cpp2;
|
||||||
bbo_leg_1 = new AddColumnsStream(bbo_leg_1,
|
bbo_leg_1 = new AddColumnsStream(bbo_leg_1,
|
||||||
"pm:" + pm1.ToString());
|
"pm:" + pm1.ToString());
|
||||||
bbo_leg_1 = new AddColumnsStream(bbo_leg_1,
|
bbo_leg_1 = new AddColumnsStream(bbo_leg_1,
|
||||||
@@ -78,12 +91,14 @@ namespace bts.BlueOrb {
|
|||||||
"pm:" + pm2.ToString());
|
"pm:" + pm2.ToString());
|
||||||
bbo_leg_2 = new AddColumnsStream(bbo_leg_2,
|
bbo_leg_2 = new AddColumnsStream(bbo_leg_2,
|
||||||
"qm:" + qm2.ToString());
|
"qm:" + qm2.ToString());
|
||||||
|
var name = leg_1.replace("$","") + "-" + (qm2==1?"":qm2.ToString())+leg_2.replace("$","");
|
||||||
r = new SimpleJoinStream(bbo_leg_1,
|
r = new SimpleJoinStream(bbo_leg_1,
|
||||||
"",
|
"",
|
||||||
bbo_leg_2,
|
bbo_leg_2,
|
||||||
"");
|
"");
|
||||||
|
r = new AddColumnsStream(r,"spread_name:"+name);
|
||||||
r = new MathStream(r,
|
r = new MathStream(r,
|
||||||
"""
|
$"""
|
||||||
spread_bid_price = left_bid_price*left_pm + right_ask_price*right_pm;
|
spread_bid_price = left_bid_price*left_pm + right_ask_price*right_pm;
|
||||||
spread_ask_price = left_ask_price*left_pm + right_bid_price*right_pm;
|
spread_ask_price = left_ask_price*left_pm + right_bid_price*right_pm;
|
||||||
spread_ask_qty = Min((left_ask_qty/left_qm),(right_bid_qty/right_qm));
|
spread_ask_qty = Min((left_ask_qty/left_qm),(right_bid_qty/right_qm));
|
||||||
@@ -99,7 +114,7 @@ namespace bts.BlueOrb {
|
|||||||
+ (right_bid_price * spread_ask_qty * {cpp1} * right_pm);
|
+ (right_bid_price * spread_ask_qty * {cpp1} * right_pm);
|
||||||
|
|
||||||
""");
|
""");
|
||||||
|
|
||||||
|
|
||||||
mySetRealSource(r);
|
mySetRealSource(r);
|
||||||
|
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ using bts.config;
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections;
|
using System.Collections;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using System.Diagnostics.CodeAnalysis;
|
||||||
|
|
||||||
namespace BCG {
|
namespace BCG {
|
||||||
|
|
||||||
@@ -21,7 +22,9 @@ namespace BCG {
|
|||||||
}
|
}
|
||||||
public class RenkoCalculator {
|
public class RenkoCalculator {
|
||||||
public readonly double brick_size;
|
public readonly double brick_size;
|
||||||
public RenkoBrick current_brick = null;
|
public RenkoBrick? current_brick;
|
||||||
|
|
||||||
|
[MemberNotNull(nameof(current_brick))]
|
||||||
private bool _add_price(double price) {
|
private bool _add_price(double price) {
|
||||||
if (current_brick == null) {
|
if (current_brick == null) {
|
||||||
current_brick = new RenkoBrick {
|
current_brick = new RenkoBrick {
|
||||||
@@ -309,4 +312,4 @@ namespace BCG {
|
|||||||
return wma_values;
|
return wma_values;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -80,7 +80,7 @@ namespace BCG {
|
|||||||
int id = Convert.ToInt32(skey);
|
int id = Convert.ToInt32(skey);
|
||||||
PriceStats pstats = kv.Value;
|
PriceStats pstats = kv.Value;
|
||||||
var today = DateTime.Now.Date;
|
var today = DateTime.Now.Date;
|
||||||
IBlueRow r = new BlueRow(_pstats_scheam, id, skey, pstats.security.ToString(), today, pstats.open, pstats.close, pstats.settlement);
|
IBlueRow r = new BlueRow(_pstats_scheam, id, skey, pstats.Security.ToString(), today, pstats.Open, pstats.Close, pstats.Settlement);
|
||||||
new_state.addRow(r);
|
new_state.addRow(r);
|
||||||
}
|
}
|
||||||
DataPacket dp;
|
DataPacket dp;
|
||||||
|
|||||||
@@ -10,7 +10,7 @@
|
|||||||
[DataStreamUserRespresentation("nl")]
|
[DataStreamUserRespresentation("nl")]
|
||||||
public class BlueOrbNLStream : ViewStream {
|
public class BlueOrbNLStream : ViewStream {
|
||||||
private readonly string _nl_prompt;
|
private readonly string _nl_prompt;
|
||||||
private ViewStream _nl_to_dsl_stream, _dsl_stream;
|
private ViewStream? _nl_to_dsl_stream, _dsl_stream;
|
||||||
private IDictionary<string, object> _dp_metadata = new Dictionary<string, object>();
|
private IDictionary<string, object> _dp_metadata = new Dictionary<string, object>();
|
||||||
public BlueOrbNLStream(string nl_prompt) {
|
public BlueOrbNLStream(string nl_prompt) {
|
||||||
_nl_prompt = nl_prompt;
|
_nl_prompt = nl_prompt;
|
||||||
|
|||||||
@@ -85,7 +85,8 @@ namespace bts.BlueOrb {
|
|||||||
.GetProperty("choices")[0]
|
.GetProperty("choices")[0]
|
||||||
.GetProperty("message")
|
.GetProperty("message")
|
||||||
.GetProperty("content")
|
.GetProperty("content")
|
||||||
.GetString();
|
.GetString()
|
||||||
|
?? string.Empty;
|
||||||
|
|
||||||
//return gpt_response;
|
//return gpt_response;
|
||||||
DateTime t1 = DateTime.Now;
|
DateTime t1 = DateTime.Now;
|
||||||
|
|||||||
@@ -76,33 +76,45 @@ public <#= propType #> <#= name #> <#= getter #>
|
|||||||
#>
|
#>
|
||||||
|
|
||||||
// Indexer by column name
|
// Indexer by column name
|
||||||
public object? this[string col] => col switch {
|
public object? this[string col] {
|
||||||
<#
|
get {
|
||||||
// Generate case statements for each column name
|
switch (col) {
|
||||||
for (int i = 0; i < columns.Count; i++) {
|
<#
|
||||||
var name = columns[i].Item1;
|
// Generate case statements for each column name
|
||||||
var key = columns[i].Item3;
|
for (int i = 0; i < columns.Count; i++) {
|
||||||
#>
|
var name = columns[i].Item1;
|
||||||
"<#= key #>" => <#= name #>,
|
var key = columns[i].Item3;
|
||||||
<#
|
#>
|
||||||
}
|
case "<#= key #>":
|
||||||
#>
|
return <#= name #>;
|
||||||
_ => throw new KeyNotFoundException()
|
<#
|
||||||
};
|
}
|
||||||
|
#>
|
||||||
|
default:
|
||||||
|
throw new KeyNotFoundException();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Indexer by column index
|
// Indexer by column index
|
||||||
public object? this[int col] => col switch {
|
public object? this[int col] {
|
||||||
<#
|
get {
|
||||||
// Generate case statements for each column index
|
switch (col) {
|
||||||
for (int i = 0; i < columns.Count; i++) {
|
<#
|
||||||
var name = columns[i].Item1;
|
// Generate case statements for each column name
|
||||||
#>
|
for (int i = 0; i < columns.Count; i++) {
|
||||||
<#= i #> => <#= name #>,
|
var name = columns[i].Item1;
|
||||||
<#
|
#>
|
||||||
}
|
case <#= i #>:
|
||||||
#>
|
return <#= name #>;
|
||||||
_ => throw new IndexOutOfRangeException()
|
<#
|
||||||
};
|
}
|
||||||
|
#>
|
||||||
|
default:
|
||||||
|
throw new KeyNotFoundException();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public bool Equals(<#= TypeName #>? other) =>
|
public bool Equals(<#= TypeName #>? other) =>
|
||||||
other is not null
|
other is not null
|
||||||
|
|||||||
@@ -76,33 +76,45 @@ public <#= propType #> <#= name #> <#= getter #>
|
|||||||
#>
|
#>
|
||||||
|
|
||||||
// Indexer by column name
|
// Indexer by column name
|
||||||
public readonly object? this[string col] => col switch {
|
public readonly object? this[string col] {
|
||||||
<#
|
get {
|
||||||
// Generate case statements for each column name
|
switch (col) {
|
||||||
for (int i = 0; i < columns.Count; i++) {
|
<#
|
||||||
var name = columns[i].Item1;
|
// Generate case statements for each column name
|
||||||
var key = columns[i].Item3;
|
for (int i = 0; i < columns.Count; i++) {
|
||||||
#>
|
var name = columns[i].Item1;
|
||||||
"<#= key #>" => <#= name #>,
|
var key = columns[i].Item3;
|
||||||
<#
|
#>
|
||||||
}
|
case "<#= key #>":
|
||||||
#>
|
return <#= name #>;
|
||||||
_ => throw new KeyNotFoundException()
|
<#
|
||||||
};
|
}
|
||||||
|
#>
|
||||||
|
default:
|
||||||
|
throw new KeyNotFoundException();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Indexer by column index
|
// Indexer by column index
|
||||||
public readonly object? this[int col] => col switch {
|
public readonly object? this[int col] {
|
||||||
<#
|
get {
|
||||||
// Generate case statements for each column index
|
switch (col) {
|
||||||
for (int i = 0; i < columns.Count; i++) {
|
<#
|
||||||
var name = columns[i].Item1;
|
// Generate case statements for each column name
|
||||||
#>
|
for (int i = 0; i < columns.Count; i++) {
|
||||||
<#= i #> => <#= name #>,
|
var name = columns[i].Item1;
|
||||||
<#
|
#>
|
||||||
}
|
case <#= i #>:
|
||||||
#>
|
return <#= name #>;
|
||||||
_ => throw new IndexOutOfRangeException()
|
<#
|
||||||
};
|
}
|
||||||
|
#>
|
||||||
|
default:
|
||||||
|
throw new KeyNotFoundException();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public bool Equals(<#= TypeName #> other) =>
|
public bool Equals(<#= TypeName #> other) =>
|
||||||
<#
|
<#
|
||||||
|
|||||||
@@ -4,6 +4,8 @@ using BCG.Utilities.General;
|
|||||||
using Bts.PubSub;
|
using Bts.PubSub;
|
||||||
using Bts.SharedStreams.Tables;
|
using Bts.SharedStreams.Tables;
|
||||||
|
|
||||||
|
using Spark.Core.Diagnostics;
|
||||||
|
|
||||||
namespace bts {
|
namespace bts {
|
||||||
// TODO: Use dependency injection to instantiate this stream, and others like it that depend on
|
// TODO: Use dependency injection to instantiate this stream, and others like it that depend on
|
||||||
// ISubscriberCore(Factory). Until then, hide it from DSQA.
|
// ISubscriberCore(Factory). Until then, hide it from DSQA.
|
||||||
@@ -40,7 +42,7 @@ namespace bts {
|
|||||||
foreach (var u in updates) {
|
foreach (var u in updates) {
|
||||||
if (u.tag != "System_AllStatistics")
|
if (u.tag != "System_AllStatistics")
|
||||||
continue;
|
continue;
|
||||||
var tag_infos = TagStatsInfo.deserialize(u.data);
|
var tag_infos = TagStatsInfo.deserialize(ExceptionAssert.NotNull(u.data));
|
||||||
foreach (var ti in tag_infos) {
|
foreach (var ti in tag_infos) {
|
||||||
_tag_map[ti.tag] = ti;
|
_tag_map[ti.tag] = ti;
|
||||||
}
|
}
|
||||||
|
|||||||
+6
-3
@@ -12,8 +12,8 @@ namespace bts {
|
|||||||
/// server.
|
/// server.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
// TODO: Use dependency injection to instantiate this stream, and others like it that depend on
|
// TODO: Use dependency injection to instantiate this stream, and others like it that depend on
|
||||||
// ISubscriberCore(Factory). Until then, hide it from DSQA.
|
// ISubscriberCore(Factory).
|
||||||
[DataStreamUserRespresentation(/*"pss_state"*/ false)]
|
[DataStreamUserRespresentation("pss_state")]
|
||||||
public class PubSubServerStateStream : ViewStream, IWorker {
|
public class PubSubServerStateStream : ViewStream, IWorker {
|
||||||
private IDictionary<string, TagPubSubInfo> _tag_map = new Dictionary<string, TagPubSubInfo>();
|
private IDictionary<string, TagPubSubInfo> _tag_map = new Dictionary<string, TagPubSubInfo>();
|
||||||
private readonly string _tag = "System_AllSubscriptions";
|
private readonly string _tag = "System_AllSubscriptions";
|
||||||
@@ -21,6 +21,9 @@ namespace bts {
|
|||||||
readonly ISubscriberCore _sub_core;
|
readonly ISubscriberCore _sub_core;
|
||||||
private ViewStreamDatabase _vsd;
|
private ViewStreamDatabase _vsd;
|
||||||
|
|
||||||
|
public PubSubServerStateStream()
|
||||||
|
: this(new SubscriberCoreFactory(), ViewStreamDatabase.instance) { }
|
||||||
|
|
||||||
public PubSubServerStateStream(ISubscriberCoreFactory subscriberCoreFactory, ViewStreamDatabase vsd)
|
public PubSubServerStateStream(ISubscriberCoreFactory subscriberCoreFactory, ViewStreamDatabase vsd)
|
||||||
: this(subscriberCoreFactory.Create(), vsd) { }
|
: this(subscriberCoreFactory.Create(), vsd) { }
|
||||||
|
|
||||||
@@ -77,7 +80,7 @@ namespace bts {
|
|||||||
DeadPublishers = tsi.dead_publishers_as_string,
|
DeadPublishers = tsi.dead_publishers_as_string,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
var dp = BlueDataUtility.build_dp_inc(bt, myLastValue as IDataPacket, true);
|
var dp = BlueDataUtility.build_dp_inc(bt, (myLastValue as IDataPacket)?.newRows, true);
|
||||||
if (dp.addedRows.Count + dp.deletedRows.Count > 0)
|
if (dp.addedRows.Count + dp.deletedRows.Count > 0)
|
||||||
myFireEvent(dp);
|
myFireEvent(dp);
|
||||||
|
|
||||||
|
|||||||
+69
-69
@@ -1,81 +1,81 @@
|
|||||||
namespace bts {
|
namespace bts;
|
||||||
using BCG;
|
|
||||||
using BCG.Utilities.General;
|
|
||||||
|
|
||||||
using Bts.PubSub;
|
using BCG;
|
||||||
using Bts.SharedStreams.Tables;
|
using BCG.Utilities.General;
|
||||||
|
|
||||||
// TODO: Use dependency injection to instantiate this stream, and others like it that depend on
|
using Bts.PubSub;
|
||||||
// ISubscriberCore(Factory). Until then, hide it from DSQA.
|
using Bts.SharedStreams.Tables;
|
||||||
[DataStreamUserRespresentation(/*"pss_hb"*/ false)]
|
|
||||||
public class PubsubHeartbeatStream : ViewStream, IWorker {
|
|
||||||
private ViewStreamDatabase _vsd;
|
|
||||||
readonly ISubscriberCore _subcore;
|
|
||||||
PubSubHeartbeatRow? _row = null;
|
|
||||||
|
|
||||||
public PubsubHeartbeatStream(ISubscriberCoreFactory subscriberCore, ViewStreamDatabase vsd)
|
// TODO: Use dependency injection to instantiate this stream, and others like it that depend on
|
||||||
: this(subscriberCore.Create(), vsd) { }
|
// ISubscriberCore(Factory).
|
||||||
|
[DataStreamUserRespresentation("pss_hb")]
|
||||||
|
public class PubsubHeartbeatStream : ViewStream, IWorker {
|
||||||
|
private ViewStreamDatabase _vsd;
|
||||||
|
readonly ISubscriberCore _subcore;
|
||||||
|
PubSubHeartbeatRow? _row = null;
|
||||||
|
|
||||||
PubsubHeartbeatStream(ISubscriberCore subscriberCore, ViewStreamDatabase vsd) {
|
public PubsubHeartbeatStream()
|
||||||
_subcore = subscriberCore;
|
: this(new SubscriberCoreFactory(), ViewStreamDatabase.instance) { }
|
||||||
_vsd = vsd;
|
|
||||||
}
|
|
||||||
|
|
||||||
static IBlueTableSchema _schema => PubSubHeartbeatRow.Schema;
|
public PubsubHeartbeatStream(ISubscriberCoreFactory subscriberCore, ViewStreamDatabase vsd)
|
||||||
|
: this(subscriberCore.Create(), vsd) { }
|
||||||
|
|
||||||
protected override void myOnFirstSubscriber() {
|
PubsubHeartbeatStream(ISubscriberCore subscriberCore, ViewStreamDatabase vsd) {
|
||||||
_subcore.subscribe("pss_hb");
|
_subcore = subscriberCore;
|
||||||
_vsd.addWorker(this);
|
_vsd = vsd;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
static IBlueTableSchema _schema => PubSubHeartbeatRow.Schema;
|
||||||
|
|
||||||
protected override void myOnLastSubscriber() {
|
protected override void myOnFirstSubscriber() {
|
||||||
_vsd.removeWorker(this);
|
_subcore.subscribe("pss_hb");
|
||||||
_subcore.unsubscribe("pss_hb");
|
_vsd.addWorker(this);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
protected override void myOnLastSubscriber() {
|
||||||
|
_vsd.removeWorker(this);
|
||||||
|
_subcore.unsubscribe("pss_hb");
|
||||||
|
}
|
||||||
|
|
||||||
public void doWork() {
|
public void doWork() {
|
||||||
var updates = _subcore.get_updates(TimeSpan.FromMilliseconds(1));
|
var updates = _subcore.get_updates(TimeSpan.FromMilliseconds(1));
|
||||||
if (updates.Count() > 0) {
|
if (updates.Count() > 0) {
|
||||||
foreach (var m in updates) {
|
foreach (var m in updates) {
|
||||||
if (m.data != null && m.data.Length > 0) {
|
if (m.data != null && m.data.Length > 0) {
|
||||||
BinaryReader br = new BinaryReader(new MemoryStream(m.data));
|
BinaryReader br = new BinaryReader(new MemoryStream(m.data));
|
||||||
Int64 hb_sent_time = br.ReadInt64();
|
Int64 hb_sent_time = br.ReadInt64();
|
||||||
Int64 hb_recv_time = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
|
Int64 hb_recv_time = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
|
||||||
// _row = _row == null ? new MutableBlueRow(_schema) : _row;
|
// _row = _row == null ? new MutableBlueRow(_schema) : _row;
|
||||||
var now = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
|
var now = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
|
||||||
_row = new() {
|
_row = new() {
|
||||||
Id = 0,
|
Id = 0,
|
||||||
SendTime = hb_sent_time,
|
SendTime = hb_sent_time,
|
||||||
RecvTime = hb_recv_time,
|
RecvTime = hb_recv_time,
|
||||||
Latency = hb_recv_time - hb_sent_time,
|
Latency = hb_recv_time - hb_sent_time,
|
||||||
RecvElapsed = now - hb_recv_time,
|
RecvElapsed = now - hb_recv_time,
|
||||||
};
|
};
|
||||||
// TODO, add to table and fire
|
// TODO, add to table and fire
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
if (_row != null) {
|
|
||||||
var now = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
|
|
||||||
_row = new() {
|
|
||||||
Id = _row.Id,
|
|
||||||
SendTime = _row.SendTime,
|
|
||||||
RecvTime = _row.RecvTime,
|
|
||||||
Latency = _row.Latency,
|
|
||||||
RecvElapsed = now - _row.RecvTime,
|
|
||||||
};
|
|
||||||
// TODO, add to table and fire
|
|
||||||
}
|
|
||||||
// update the row
|
|
||||||
}
|
}
|
||||||
if (_row != null) {
|
}
|
||||||
var bt = new BlueTable(_schema);
|
} else {
|
||||||
bt.addRow(_row);
|
if (_row != null) {
|
||||||
var dp = BlueDataUtility.build_dp_inc(bt, myLastValue as IDataPacket, true);
|
var now = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
|
||||||
myFireEvent(dp);
|
_row = new() {
|
||||||
}
|
Id = _row.Id,
|
||||||
}
|
SendTime = _row.SendTime,
|
||||||
|
RecvTime = _row.RecvTime,
|
||||||
}
|
Latency = _row.Latency,
|
||||||
|
RecvElapsed = now - _row.RecvTime,
|
||||||
|
};
|
||||||
|
// TODO, add to table and fire
|
||||||
|
}
|
||||||
|
// update the row
|
||||||
|
}
|
||||||
|
if (_row != null) {
|
||||||
|
var bt = new BlueTable(_schema);
|
||||||
|
bt.addRow(_row);
|
||||||
|
var dp = BlueDataUtility.build_dp_inc(bt, myLastValue as IDataPacket, true);
|
||||||
|
myFireEvent(dp);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -17,7 +17,7 @@
|
|||||||
<ShowMissingItemTypes>false</ShowMissingItemTypes>
|
<ShowMissingItemTypes>false</ShowMissingItemTypes>
|
||||||
<Configuration Condition="'$(configuration)'==''">Debug</Configuration>
|
<Configuration Condition="'$(configuration)'==''">Debug</Configuration>
|
||||||
<EnablePreviewFeatures>true</EnablePreviewFeatures>
|
<EnablePreviewFeatures>true</EnablePreviewFeatures>
|
||||||
<LangVersion>11</LangVersion>
|
<LangVersion>12</LangVersion>
|
||||||
<UseProjectRefs Condition="'$(UseProjectRefs)' == ''">true</UseProjectRefs>
|
<UseProjectRefs Condition="'$(UseProjectRefs)' == ''">true</UseProjectRefs>
|
||||||
<SparkVersion Condition="'$(SparkVersion)' == ''">3.2.0-preview</SparkVersion>
|
<SparkVersion Condition="'$(SparkVersion)' == ''">3.2.0-preview</SparkVersion>
|
||||||
<Version>$(SparkVersion)</Version>
|
<Version>$(SparkVersion)</Version>
|
||||||
|
|||||||
@@ -187,4 +187,32 @@
|
|||||||
Name="Test"
|
Name="Test"
|
||||||
DependsOnTargets="Build"></Target>
|
DependsOnTargets="Build"></Target>
|
||||||
|
|
||||||
|
<ItemGroup Condition="Exists('@(NativeWindowsAsset)')">
|
||||||
|
<Content Include="@(NativeWindowsAsset)">
|
||||||
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
|
<TargetPath>%(FileName)%(Extension)</TargetPath>
|
||||||
|
<Pack>false</Pack>
|
||||||
|
</Content>
|
||||||
|
<Content Include="@(NativeWindowsAsset)">
|
||||||
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
|
<TargetPath>runtimes/win-x64/native/%(FileName)%(Extension)</TargetPath>
|
||||||
|
<Pack>true</Pack>
|
||||||
|
<PackagePath>runtimes/win-x64/native</PackagePath>
|
||||||
|
</Content>
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
<ItemGroup Condition="Exists('@(NativeLinuxAsset)')">
|
||||||
|
<Content Include="@(NativeLinuxAsset)">
|
||||||
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
|
<TargetPath>%(FileName)%(Extension)</TargetPath>
|
||||||
|
<Pack>false</Pack>
|
||||||
|
</Content>
|
||||||
|
<Content Include="@(NativeLinuxAsset)">
|
||||||
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
|
<TargetPath>runtimes/linux-x64/native/%(FileName)%(Extension)</TargetPath>
|
||||||
|
<Pack>true</Pack>
|
||||||
|
<PackagePath>runtimes/linux-x64/native</PackagePath>
|
||||||
|
</Content>
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
Loaded 100 of 677 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user