Compare commits
910
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
84351460b5 | ||
|
|
9a1fee4e83 | ||
|
|
dd55866056 | ||
|
|
8f6e2b8512 | ||
|
|
b9a36f5d51 | ||
|
|
3a3bec5821 | ||
|
|
05a5e9dcf8 | ||
|
|
b1211ed590 | ||
|
|
d9a2ab00f8 | ||
|
|
22ea8a7070 | ||
|
|
1b7543e94b | ||
|
|
c66d8c1f99 | ||
|
|
87d6a97198 | ||
|
|
cf05d07692 | ||
|
|
9ccc4467ba | ||
|
|
9c2223b4da | ||
|
|
b09a39ceb6 | ||
|
|
8ebf437c9e | ||
|
|
160dbb624f | ||
|
|
da945b39c7 | ||
|
|
bfede66c31 | ||
|
|
bc39b8fda9 | ||
|
|
12fadab839 | ||
|
|
bcbfc56e7d | ||
|
|
efd389ea46 | ||
|
|
ce236da67b | ||
|
|
e91fb32207 | ||
|
|
0cf576a055 | ||
|
|
7213b05c9e | ||
|
|
19a6f53cfa | ||
|
|
7a53bf4b01 | ||
|
|
965186874e | ||
|
|
f8704dd083 | ||
|
|
93c2770abe | ||
|
|
f422b752a4 | ||
|
|
d6f7031716 | ||
|
|
5d34bdbecf | ||
|
|
0c96c3bc06 | ||
|
|
1da06732e2 | ||
|
|
641f00b4e0 | ||
|
|
d860573910 | ||
|
|
fa8f623263 | ||
|
|
706d9235ca | ||
|
|
03c99cc3df | ||
|
|
fc050f4bd3 | ||
|
|
39b3490f5a | ||
|
|
a0ef2c3348 | ||
|
|
acb420d4cc | ||
|
|
ab07697985 | ||
|
|
6ad7418931 | ||
|
|
783764fc1f | ||
|
|
5771b19c18 | ||
|
|
ee5b78ed9c | ||
|
|
d609dcd3c2 | ||
|
|
7b266cd4d0 | ||
|
|
de8593af5a | ||
|
|
ab6f6e1790 | ||
|
|
51e38ca793 | ||
|
|
7b2bc4b10c | ||
|
|
05cae5c959 | ||
|
|
aaca8f0f3a | ||
|
|
59a16677d1 | ||
|
|
50e7bba3d7 | ||
|
|
6026ca0c62 | ||
|
|
253512cef8 | ||
|
|
ae050d9401 | ||
|
|
eb0f386328 | ||
|
|
b5aca5637c | ||
|
|
685507eed4 | ||
|
|
6567baa7d5 | ||
|
|
39dc6c24ed | ||
|
|
317a8cee60 | ||
|
|
9bb7beabc2 | ||
|
|
2364c82254 | ||
|
|
b3114f2a62 | ||
|
|
b64a8ba214 | ||
|
|
b257b673fb | ||
|
|
43df2bbdc5 | ||
|
|
5f80492c93 | ||
|
|
5a63b25a8f | ||
|
|
5647beed40 | ||
|
|
d3900e3149 | ||
|
|
221505e243 | ||
|
|
d16c696ecf | ||
|
|
c371fd8e99 | ||
|
|
16fb295a37 | ||
|
|
bb157c768c | ||
|
|
8c9ac51bb6 | ||
|
|
39d04285d0 | ||
|
|
41db558841 | ||
|
|
cdebdd5765 | ||
|
|
bb7a000689 | ||
|
|
d62816ac0b | ||
|
|
964ec5b565 | ||
|
|
46247b6439 | ||
|
|
10e862074c | ||
|
|
9ce0bd1e35 | ||
|
|
6d93cf856f | ||
|
|
fd68164eef | ||
|
|
863efdd53f | ||
|
|
3d94eabab7 | ||
|
|
450ef9985a | ||
|
|
0bf7e209a0 | ||
|
|
b5c666c505 | ||
|
|
198cda76a8 | ||
|
|
dc17774e07 | ||
|
|
c9c33045f4 | ||
|
|
e36b3bf115 | ||
|
|
a6383c08a4 | ||
|
|
ee651061b9 | ||
|
|
2a497b460d | ||
|
|
ac5edfb0ce | ||
|
|
54cf46e926 | ||
|
|
116778a0cc | ||
|
|
f7b835997e | ||
|
|
c920c6f3a9 | ||
|
|
36de4d1578 | ||
|
|
0571cb40a0 | ||
|
|
1ca6acdd23 | ||
|
|
f4f3c881db | ||
|
|
36e150f6c7 | ||
|
|
f98b435e0b | ||
|
|
dce4c5f543 | ||
|
|
d4d696e135 | ||
|
|
bb818d9dcc | ||
|
|
14e838de6a | ||
|
|
6fe35e2692 | ||
|
|
08f9784ed0 | ||
|
|
bde4ee6308 | ||
|
|
03116a2973 | ||
|
|
d0d6d587d7 | ||
|
|
765e45d95a | ||
|
|
cd833ceb36 | ||
|
|
a148a03175 | ||
|
|
338edfd732 | ||
|
|
2a9ca60654 | ||
|
|
03a677df4c | ||
|
|
07b32e4da4 | ||
|
|
3b1b74a1bf | ||
|
|
645a447248 | ||
|
|
4580a1af21 | ||
|
|
85a68a14c6 | ||
|
|
3476bbca02 | ||
|
|
fdb1811f03 | ||
|
|
7db9f9368b | ||
|
|
983eb24584 | ||
|
|
312aa9c669 | ||
|
|
a11b0959bb | ||
|
|
4c6702b506 | ||
|
|
e0e0c408a5 | ||
|
|
db2bd425be | ||
|
|
2af3c6e98d | ||
|
|
74c1ef8dab | ||
|
|
e3bcfa792c | ||
|
|
8f55916fe0 | ||
|
|
9fbf509b30 | ||
|
|
2004b76ebc | ||
|
|
614e4de884 | ||
|
|
0ba34da70e | ||
|
|
826c1164be | ||
|
|
7b41dbb19a | ||
|
|
e6a3116327 | ||
|
|
86ce16790a | ||
|
|
897cf10be6 | ||
|
|
ca27903f63 | ||
|
|
1b5f1bfb27 | ||
|
|
217db51cbc | ||
|
|
c08a893ecf | ||
|
|
a022f08b49 | ||
|
|
5af98658d8 | ||
|
|
933511f430 | ||
|
|
63291d7374 | ||
|
|
30276066f8 | ||
|
|
809a66323d | ||
|
|
5c4ee1a262 | ||
|
|
504f441d2e | ||
|
|
fd51025b00 | ||
|
|
f4afd92db2 | ||
|
|
b1fe5b52f6 | ||
|
|
164ca306f5 | ||
|
|
a6d23ef4ef | ||
|
|
c0f4090d70 | ||
|
|
63c94e09e7 | ||
|
|
fc94ec4d46 | ||
|
|
e2fdb569c6 | ||
|
|
804c27eb49 | ||
|
|
6448b4cf90 | ||
|
|
e01a825aff | ||
|
|
00649e0c14 | ||
|
|
ae1e9ecb29 | ||
|
|
ff65acba05 | ||
|
|
dc08945719 | ||
|
|
a739ca9a75 | ||
|
|
ed7b187876 | ||
|
|
53e1e92a6a | ||
|
|
eee7af494a | ||
|
|
91a7c35edf | ||
|
|
3eaef1a1b6 | ||
|
|
4a70b4910d | ||
|
|
7697f73ada | ||
|
|
029875e0a0 | ||
|
|
9dc7611c0a | ||
|
|
782cdd7430 | ||
|
|
4184278d94 | ||
|
|
0b3fa813f1 | ||
|
|
e60f2159e1 | ||
|
|
610861be20 | ||
|
|
1787460c35 | ||
|
|
588b86710f | ||
|
|
3022a25a10 | ||
|
|
cf30649dd2 | ||
|
|
afb8444815 | ||
|
|
fc59247958 | ||
|
|
14c417eeec | ||
|
|
62a6e4340f | ||
|
|
cce85e45b7 | ||
|
|
ff584ee19a | ||
|
|
f146859677 | ||
|
|
cf55e4bc1d | ||
|
|
a0b1078572 | ||
|
|
afd229b7c7 | ||
|
|
bfc7615c9a | ||
|
|
0023574905 | ||
|
|
7e79a21cd4 | ||
|
|
6b0030559b | ||
|
|
77caef2640 | ||
|
|
edb8a9d516 | ||
|
|
153631191a | ||
|
|
026a8af893 | ||
|
|
3739532947 | ||
|
|
0cb3cadc11 | ||
|
|
36db69dc67 | ||
|
|
c7c755a964 | ||
|
|
0e460353a7 | ||
|
|
5198236b45 | ||
|
|
767fa25d61 | ||
|
|
0858eaac23 | ||
|
|
593601551d | ||
|
|
036df46b1c | ||
|
|
84697a6d65 | ||
|
|
bb550d3f88 | ||
|
|
85bd2da414 | ||
|
|
cc55fe1acf | ||
|
|
bb64760c62 | ||
|
|
8b9525f503 | ||
|
|
eccfd1ee30 | ||
|
|
7b933026bb | ||
|
|
ffe859703a | ||
|
|
4756e243fa | ||
|
|
0133159296 | ||
|
|
38afd3055f | ||
|
|
4f184c2566 | ||
|
|
f608497094 | ||
|
|
9035b95612 | ||
|
|
7483665b5a | ||
|
|
5f141a8030 | ||
|
|
83f1b5b567 | ||
|
|
06ad3a1d9e | ||
|
|
01de13bb43 | ||
|
|
155a396af5 | ||
|
|
399f9e61e2 | ||
|
|
1f67456cc5 | ||
|
|
9ff7821b59 | ||
|
|
c598f831d0 | ||
|
|
3ca4cedf54 | ||
|
|
d919ec5474 | ||
|
|
98c2d738b2 | ||
|
|
cf3f7e6862 | ||
|
|
ae868ab74d | ||
|
|
bd22f4779d | ||
|
|
27cbd51b1c | ||
|
|
02626ce35c | ||
|
|
d219804caf | ||
|
|
1e0ec5bb46 | ||
|
|
c281bc49b5 | ||
|
|
b3566155a3 | ||
|
|
a4e39afbb9 | ||
|
|
efce01d28e | ||
|
|
d362022b89 | ||
|
|
e7d751fb68 | ||
|
|
50eefc65d4 | ||
|
|
8770de4a87 | ||
|
|
e799b6e24b | ||
|
|
69e338c1ca | ||
|
|
e8bb64a80f | ||
|
|
8e2ede596f | ||
|
|
9772d0eb77 | ||
|
|
687e2477c0 | ||
|
|
1bd0ba9950 | ||
|
|
ddabc744f2 | ||
|
|
74b88b003e | ||
|
|
aaf1be09c2 | ||
|
|
e3bd9a457c | ||
|
|
59f62b6ec9 | ||
|
|
b46e75f7d7 | ||
|
|
3f100feaca | ||
|
|
093da2a938 | ||
|
|
2f17c2b8c5 | ||
|
|
33bfdc517a | ||
|
|
d17be48e6d | ||
|
|
cbaa1df641 | ||
|
|
8c23665d65 | ||
|
|
c7db105533 | ||
|
|
3f9923239e | ||
|
|
9ae9451359 | ||
|
|
c33e5ddb02 | ||
|
|
54388d3b92 | ||
|
|
17ada3c57c | ||
|
|
046f412ec4 | ||
|
|
c94d11f525 | ||
|
|
2b69846381 | ||
|
|
bdd5e08b60 | ||
|
|
7c9330650d | ||
|
|
98fca5ad7f | ||
|
|
8a0fcce90d | ||
|
|
112527f9ed | ||
|
|
fc1e20538d | ||
|
|
83acbecf55 | ||
|
|
06c494291c | ||
|
|
fe74aed048 | ||
|
|
b94cdb561e | ||
|
|
06bd8791c0 | ||
|
|
b5850cdb02 | ||
|
|
545d76142f | ||
|
|
edc2cea60e | ||
|
|
e6466f8309 | ||
|
|
501be8d6a5 | ||
|
|
7dea9b3792 | ||
|
|
a3f49b1ce8 | ||
|
|
765237d701 | ||
|
|
97c52410a2 | ||
|
|
8b43d93e26 | ||
|
|
14baa7d62e | ||
|
|
a054f4cc63 | ||
|
|
5311128607 | ||
|
|
075acdc8eb | ||
|
|
e1fdf6306b | ||
|
|
3b9fb2759b | ||
|
|
3f89d3b7f7 | ||
|
|
a6dd0d842d | ||
|
|
d050d2d19a | ||
|
|
942d00a8b1 | ||
|
|
31cb25ac2e | ||
|
|
cbb43a22de | ||
|
|
9e7b4849f0 | ||
|
|
6e72890153 | ||
|
|
c238fce057 | ||
|
|
b8f5db4ee2 | ||
|
|
87c8b9862a | ||
|
|
fbc2d8633d | ||
|
|
d12d798fa5 | ||
|
|
e75be2da2f | ||
|
|
3ae3a7094e | ||
|
|
bafa2f71ba | ||
|
|
63bd29a49e | ||
|
|
5fdc9ca48b | ||
|
|
a19e7bc7b4 | ||
|
|
04b0a89644 | ||
|
|
363a43cb8b | ||
|
|
c9f9c5f0f6 | ||
|
|
ab84a05644 | ||
|
|
4681f22e71 | ||
|
|
a25e055e35 | ||
|
|
2386612b51 | ||
|
|
3606dac145 | ||
|
|
bf936c9d13 | ||
|
|
1aeeb7170e | ||
|
|
78ad8a3aed | ||
|
|
5ca8dbafaf | ||
|
|
b464b9466e | ||
|
|
7a5c676e99 | ||
|
|
1e8d699dd1 | ||
|
|
aadd2dd594 | ||
|
|
5163ca4cae | ||
|
|
b5d520d568 | ||
|
|
83e4465a3b | ||
|
|
54cfb343a8 | ||
|
|
4e9b360e23 | ||
|
|
16bc93b1a0 | ||
|
|
f56d4d9062 | ||
|
|
36cc186626 | ||
|
|
2e78af1756 | ||
|
|
70fae06a30 | ||
|
|
07b59559a2 | ||
|
|
cd1709563b | ||
|
|
94f22ddf40 | ||
|
|
7f6c08f956 | ||
|
|
1d737cdf82 | ||
|
|
b645192355 | ||
|
|
5ad7755b28 | ||
|
|
df4ca124c3 | ||
|
|
2c8b9ee288 | ||
|
|
f02f28e347 | ||
|
|
c8a89c1e8d | ||
|
|
7ae9e07a30 | ||
|
|
a130e47218 | ||
|
|
a377f6de7f | ||
|
|
855373c9e6 | ||
|
|
e1b535b633 | ||
|
|
3b9ac71460 | ||
|
|
9a5075daaf | ||
|
|
4e7fe811a8 | ||
|
|
0a6733180d | ||
|
|
f2169c6bd4 | ||
|
|
23ef478391 | ||
|
|
236a5a9362 | ||
|
|
cb560bbe33 | ||
|
|
248f2644ca | ||
|
|
b87d86f4d6 | ||
|
|
8515196dcb | ||
|
|
e5e042f016 | ||
|
|
da3593326d | ||
|
|
313d3a2377 | ||
|
|
22f0e126d0 | ||
|
|
c76b061e20 | ||
|
|
0107b65281 | ||
|
|
6b5496b799 | ||
|
|
42f9daf9cb | ||
|
|
bc5ddade7f | ||
|
|
d8d198f7f4 | ||
|
|
af9eb670c1 | ||
|
|
d91837c377 | ||
|
|
7725ae33ef | ||
|
|
9f56abaa38 | ||
|
|
95444d4a4c | ||
|
|
a7e1c18fe2 | ||
|
|
d11fd23cb0 | ||
|
|
8499ac0dfb | ||
|
|
f4afe348e6 | ||
|
|
096424b60b | ||
|
|
b4f5e66466 | ||
|
|
69a0bcc9cd | ||
|
|
d72ebdf421 | ||
|
|
8e93856767 | ||
|
|
19dae6cd34 | ||
|
|
24f42550dd | ||
|
|
c2150ae450 | ||
|
|
40dbfaa068 | ||
|
|
3756a8a8b7 | ||
|
|
46c8dcb18f | ||
|
|
024480f32e | ||
|
|
ba525372bb | ||
|
|
8aa0f1b674 | ||
|
|
fc14215d9b | ||
|
|
091ed5a327 | ||
|
|
30bb9d0837 | ||
|
|
9cb2c580d6 | ||
|
|
2e2150ac1a | ||
|
|
21d9435a67 | ||
|
|
e7e334fb5a | ||
|
|
61f04c4605 | ||
|
|
24fb2e1e39 | ||
|
|
ece141c448 | ||
|
|
617bac8e74 | ||
|
|
ab217401eb | ||
|
|
77e5c1481b | ||
|
|
a0f77f92a3 | ||
|
|
0acdcb150d | ||
|
|
ac2f3b9bc6 | ||
|
|
0e522f90e5 | ||
|
|
40ad1f1b48 | ||
|
|
1cb75d399f | ||
|
|
cddecc0543 | ||
|
|
484e36b330 | ||
|
|
8a9c22fa2a | ||
|
|
a6e8853cb9 | ||
|
|
dafa193283 | ||
|
|
23651970c9 | ||
|
|
043efab5a2 | ||
|
|
5476466d55 | ||
|
|
54cb5a2ab2 | ||
|
|
29bf7d8d7e | ||
|
|
855d2fd790 | ||
|
|
8a6a652882 | ||
|
|
3f288704bf | ||
|
|
98bc78463d | ||
|
|
6d271ad7cd | ||
|
|
2a17d656a5 | ||
|
|
10436f0f3b | ||
|
|
86b19f0ef0 | ||
|
|
502024dd10 | ||
|
|
623012b0b0 | ||
|
|
5859f0f2d1 | ||
|
|
eeffb735ae | ||
|
|
b602997f3a | ||
|
|
3530a77b38 | ||
|
|
afdf635b31 | ||
|
|
4d4aefc0a7 | ||
|
|
960a8af77a | ||
|
|
89828659a4 | ||
|
|
76f83fd7f5 | ||
|
|
d4e40948d2 | ||
|
|
912ab512d2 | ||
|
|
5d3eb92175 | ||
|
|
924386084b | ||
|
|
acab3ac392 | ||
|
|
d06a62f6ee | ||
|
|
14e3eee0bc | ||
|
|
7277bf52f5 | ||
|
|
b81dc7f5cf | ||
|
|
b1a4635345 | ||
|
|
7c7c689170 | ||
|
|
116506c8da | ||
|
|
3feda49ef1 | ||
|
|
10318be7bc | ||
|
|
f7d525a527 | ||
|
|
d2fe9f167a | ||
|
|
696d91a5af | ||
|
|
d575ba0ea8 | ||
|
|
058b131760 | ||
|
|
57f8f3ff58 | ||
|
|
775df2850d | ||
|
|
cb2b15f10b | ||
|
|
60362a4c95 | ||
|
|
c6d7a8f38c | ||
|
|
7931c62b46 | ||
|
|
58518451c8 | ||
|
|
e3bad78aef | ||
|
|
8e9ab8f2eb | ||
|
|
8512f414d6 | ||
|
|
513fc353cf | ||
|
|
4a04beafd2 | ||
|
|
79a3251f26 | ||
|
|
8785e0fecd | ||
|
|
04251c96b6 | ||
|
|
c2d400af1a | ||
|
|
133cc16628 | ||
|
|
16f7aede93 | ||
|
|
2b9488faff | ||
|
|
51b6d592d3 | ||
|
|
1eb4ceba0a | ||
|
|
dbf5cadb44 | ||
|
|
90f1bb0851 | ||
|
|
547d83e1b8 | ||
|
|
e888149c41 | ||
|
|
b944c3980f | ||
|
|
c2a8266106 | ||
|
|
4277ba61b9 | ||
|
|
35cfe9533b | ||
|
|
d49efef93d | ||
|
|
502ed13456 | ||
|
|
716c4dd674 | ||
|
|
4a2b189a07 | ||
|
|
a42edaf9fa | ||
|
|
cbc142ab15 | ||
|
|
3980f2d030 | ||
|
|
00f6d269c9 | ||
|
|
10b2d38de8 | ||
|
|
6d4d8f6ac1 | ||
|
|
5db89e1e8d | ||
|
|
379a46afa2 | ||
|
|
d9eff37184 | ||
|
|
3d055de139 | ||
|
|
648be7dd97 | ||
|
|
2cac9affe4 | ||
|
|
30ff3ba707 | ||
|
|
9d3afd68aa | ||
|
|
8c3de1789b | ||
|
|
b251e1d47e | ||
|
|
6ccd48a8ba | ||
|
|
41d84f7f73 | ||
|
|
795062864d | ||
|
|
1ff72e9444 | ||
|
|
e13b5066a3 | ||
|
|
5ba7901258 | ||
|
|
bc6eb59110 | ||
|
|
5ae5a5dcbf | ||
|
|
7966bcce77 | ||
|
|
ff86b10895 | ||
|
|
ea3c0717d8 | ||
|
|
d0abca3fd9 | ||
|
|
7895fe7357 | ||
|
|
6f5f4f5cc2 | ||
|
|
066a0ba693 | ||
|
|
c2b67b4813 | ||
|
|
ecad456a2d | ||
|
|
2cb3cfdcdd | ||
|
|
0ebc8e5b4b | ||
|
|
2072105c0f | ||
|
|
d663c86aa0 | ||
|
|
4a2dfa46a1 | ||
|
|
6e35db6a24 | ||
|
|
b45dc3bc2d | ||
|
|
a1912907b8 | ||
|
|
b1b3dcdeb8 | ||
|
|
03dc8ef767 | ||
|
|
975bf56c2a | ||
|
|
3f58c2ce84 | ||
|
|
96f28acf91 | ||
|
|
c2c2658e21 | ||
|
|
d6b8e359cd | ||
|
|
84a0850d95 | ||
|
|
4effdc4160 | ||
|
|
b9fe39f6e3 | ||
|
|
b555850015 | ||
|
|
23794fa30d | ||
|
|
90b5a309a3 | ||
|
|
07beda3fc6 | ||
|
|
e3c1ea70f2 | ||
|
|
93b93969f5 | ||
|
|
0a10111846 | ||
|
|
eee00cc407 | ||
|
|
0eb58eaba8 | ||
|
|
12f6733d1e | ||
|
|
93a0984ed1 | ||
|
|
b7e9c393a0 | ||
|
|
aa602b3fd6 | ||
|
|
b4b8cabdae | ||
|
|
cfe06869b3 | ||
|
|
b177ed1cc0 | ||
|
|
ff17a64933 | ||
|
|
81a1fe11f6 | ||
|
|
ad5bf88fcf | ||
|
|
e15f155ac9 | ||
|
|
6d6822cd65 | ||
|
|
ace0c70516 | ||
|
|
e9e5059bc2 | ||
|
|
cde72f51a0 | ||
|
|
e1fd49ae32 | ||
|
|
274f3f98e4 | ||
|
|
a4b7d84318 | ||
|
|
be17205094 | ||
|
|
6ef9bee8e4 | ||
|
|
2c8b3563f1 | ||
|
|
71f7e64ccb | ||
|
|
c31b44ecfb | ||
|
|
19efb77e07 | ||
|
|
76de640421 | ||
|
|
fb030742d3 | ||
|
|
73608f1b45 | ||
|
|
58aebe7002 | ||
|
|
299cb0b29e | ||
|
|
06663f711e | ||
|
|
51479f4885 | ||
|
|
5b520ba241 | ||
|
|
f0651a5341 | ||
|
|
897e0990a2 | ||
|
|
30e1ae5c3c | ||
|
|
efe83f81ec | ||
|
|
5fb21ada97 | ||
|
|
58edd07f6b | ||
|
|
9d81354c3a | ||
|
|
0f37be89a4 | ||
|
|
f6586fe636 | ||
|
|
7827ccc0e7 | ||
|
|
af6a2acc0a | ||
|
|
84abf59a55 | ||
|
|
2fc1d30bf1 | ||
|
|
4dcd5d63a1 | ||
|
|
63e5697b20 | ||
|
|
8e5cb100a7 | ||
|
|
938bee1817 | ||
|
|
d48af15480 | ||
|
|
e3b2e98cd9 | ||
|
|
ee53fb854c | ||
|
|
d36e2d61f6 | ||
|
|
bfff3ea5fe | ||
|
|
059c03d289 | ||
|
|
8c561f7886 | ||
|
|
288567d1eb | ||
|
|
ecfc5405fe | ||
|
|
8db34a2a11 | ||
|
|
91094c4d84 | ||
|
|
dae8c85d73 | ||
|
|
abdd98082f | ||
|
|
2f6aa785ab | ||
|
|
7acf1f7043 | ||
|
|
1c3c7a078a | ||
|
|
93ace52bfa | ||
|
|
b5d97c0b1b | ||
|
|
284aa53ad4 | ||
|
|
8a9952f52d | ||
|
|
748aafaab3 | ||
|
|
3ba30c70de | ||
|
|
e72f465999 | ||
|
|
f3d93f7749 | ||
|
|
8d142b8a74 | ||
|
|
8210b9f35f | ||
|
|
12b20b05ce | ||
|
|
72efbccdbd | ||
|
|
33643e9eab | ||
|
|
0f6dc6f40b | ||
|
|
8c778f5e41 | ||
|
|
f308654200 | ||
|
|
bdf5b980fc | ||
|
|
914ac597cd | ||
|
|
4aa6a77680 | ||
|
|
6b59dd84ee | ||
|
|
4e2c5f2d17 | ||
|
|
9a1b94a1b0 | ||
|
|
13b3c55771 | ||
|
|
d0a6fcdb9c | ||
|
|
1eb13028c1 | ||
|
|
424e5ff16b | ||
|
|
bed389885b | ||
|
|
85cf25a57a | ||
|
|
61471d4675 | ||
|
|
d83435d49d | ||
|
|
582fc10dce | ||
|
|
5969985d24 | ||
|
|
fabe7d665c | ||
|
|
7ce75bb8e7 | ||
|
|
b8e1c3cd60 | ||
|
|
4909944694 | ||
|
|
7258af09b4 | ||
|
|
7f2ce6c1a9 | ||
|
|
4835725e1c | ||
|
|
6a9e8de475 | ||
|
|
4639951acc | ||
|
|
d8de211aac | ||
|
|
87394bc60b | ||
|
|
beba30f65c | ||
|
|
2d58424d8f | ||
|
|
d1bbfa3791 | ||
|
|
aab17f460f | ||
|
|
461ef53322 | ||
|
|
2486bc90b2 | ||
|
|
1c5cbaf60b | ||
|
|
b8de447cfb | ||
|
|
8bfc2d40f9 | ||
|
|
c09fd71c94 | ||
|
|
f3b037553e | ||
|
|
d386d93166 | ||
|
|
5217742c71 | ||
|
|
c59ec95460 | ||
|
|
70f01583ec | ||
|
|
66d2f9eb63 | ||
|
|
4625bed8b8 | ||
|
|
f18fb332b5 | ||
|
|
8746a6f5ca | ||
|
|
702d47abb5 | ||
|
|
bf2a54717c | ||
|
|
9db779fb25 | ||
|
|
f55ddec708 | ||
|
|
6e942dd2d4 | ||
|
|
142310a17a | ||
|
|
7f99a89a95 | ||
|
|
bfce663b4b | ||
|
|
33c743643d | ||
|
|
858e0a389b | ||
|
|
9c3bb85674 | ||
|
|
f4930e8cd4 | ||
|
|
f21e7f3602 | ||
|
|
b56c35aca4 | ||
|
|
e6ac83196e | ||
|
|
7b6f74fc4a | ||
|
|
f754953fac | ||
|
|
2dd1143d9f | ||
|
|
e1ee3275d8 | ||
|
|
2549e406f3 | ||
|
|
d5024f1858 | ||
|
|
3623ac96db | ||
|
|
19834625f9 | ||
|
|
c8fc649b6b | ||
|
|
6b1fc1c413 | ||
|
|
6f086532ac | ||
|
|
dc66282225 | ||
|
|
e2c74c0bb3 | ||
|
|
e89d50eec1 | ||
|
|
8bebbc278d | ||
|
|
2e6d12c9c1 | ||
|
|
102a5e23ea | ||
|
|
582dc791db | ||
|
|
afb35d8c25 | ||
|
|
3a32ed5fe6 | ||
|
|
4e01697327 | ||
|
|
22032c1742 | ||
|
|
0a9bce317c | ||
|
|
40e44db597 | ||
|
|
4a447e44e1 | ||
|
|
b1f4654b3c | ||
|
|
9d350334c0 | ||
|
|
ac597f505f | ||
|
|
147d9ceb1f | ||
|
|
377804dfb9 | ||
|
|
0d26401961 | ||
|
|
889e226151 | ||
|
|
986d53f4e0 | ||
|
|
d13ba2968a | ||
|
|
1a192c8117 | ||
|
|
5e36d4801c | ||
|
|
2cf6411ca7 | ||
|
|
e99df129d5 | ||
|
|
d07c01bd17 | ||
|
|
d69673c524 | ||
|
|
4ee595cdaf | ||
|
|
6fcaf07df0 | ||
|
|
492d48d886 | ||
|
|
b6a56e768b | ||
|
|
3e2b5976a8 | ||
|
|
edd3f6cbd6 | ||
|
|
2e9347341b | ||
|
|
2061e38349 | ||
|
|
650dd57b6d | ||
|
|
82747f7dc0 | ||
|
|
04b26904a3 | ||
|
|
f123e4c72c | ||
|
|
b887cbebab | ||
|
|
14e975bc7e | ||
|
|
064f557057 | ||
|
|
4d106b5e6c | ||
|
|
9fbeaf0d68 | ||
|
|
4018ac8b78 | ||
|
|
81c9503300 | ||
|
|
477210926d | ||
|
|
0aa48a79a9 | ||
|
|
9e71c7af02 | ||
|
|
4647751409 | ||
|
|
a3087b874b | ||
|
|
5b2f5c5c8f | ||
|
|
479227090e | ||
|
|
2dfcf320f5 | ||
|
|
b4c7213cb2 | ||
|
|
c7dfd69b90 | ||
|
|
4fdc866485 | ||
|
|
f5d5ca9a1c | ||
|
|
cfafcf77b9 | ||
|
|
8ebe783139 | ||
|
|
1851a96a58 | ||
|
|
0b334ef870 | ||
|
|
ee811a729a | ||
|
|
cb15be276d | ||
|
|
7d5af6729b | ||
|
|
e5679cf082 | ||
|
|
98f89b9ad4 | ||
|
|
ba4f8f67e3 | ||
|
|
9c78380490 | ||
|
|
f6166f0674 | ||
|
|
6334a902e7 | ||
|
|
082ca62fff | ||
|
|
9dbd8dd7c6 | ||
|
|
8f7a4d0df6 | ||
|
|
f372dd56b3 | ||
|
|
86eba20d61 | ||
|
|
35a985280d | ||
|
|
f5e1b3319c | ||
|
|
65c3948e4f | ||
|
|
002bdff9a3 | ||
|
|
bb6e5dd548 | ||
|
|
7c1aed3339 | ||
|
|
22ae51fb99 | ||
|
|
a53d347f81 | ||
|
|
838dbcd886 | ||
|
|
5ed2309d22 | ||
|
|
4d41704dd2 | ||
|
|
bd1000e518 | ||
|
|
dd4aa3c2ed | ||
|
|
fee9d3f597 | ||
|
|
416f9aef31 | ||
|
|
48f5e4c201 | ||
|
|
4438b4ca8d | ||
|
|
73356e0d61 | ||
|
|
4a285fa581 | ||
|
|
cfa82c2177 | ||
|
|
0410a0431a | ||
|
|
02843f14ff | ||
|
|
f1f1d4259c | ||
|
|
71fc43af68 | ||
|
|
350144ffd5 | ||
|
|
da227a5550 | ||
|
|
0c92cf3a87 | ||
|
|
1188af391e | ||
|
|
0bb85cf915 | ||
|
|
d77f5996fe | ||
|
|
940c41a274 | ||
|
|
e671960dc3 | ||
|
|
8fa34b6b39 | ||
|
|
f9d5429b5b | ||
|
|
2c342482eb | ||
|
|
3aefac26c2 | ||
|
|
1554594cdd | ||
|
|
727a0f38b5 | ||
|
|
7a0e8cdb26 | ||
|
|
a4e97b04d7 | ||
|
|
463980a6ef | ||
|
|
9b25857042 | ||
|
|
ef19e7d76b | ||
|
|
471faec2cb | ||
|
|
ce96d42db8 | ||
|
|
187894ca84 | ||
|
|
63492c4575 | ||
|
|
e150c611f6 | ||
|
|
bb837d6c26 | ||
|
|
965e541ac8 | ||
|
|
1b232aa610 | ||
|
|
25439b094a | ||
|
|
f927ef2c5e | ||
|
|
d42389b75a | ||
|
|
671cbcf03a | ||
|
|
e589e23f41 | ||
|
|
11fadc0a3e | ||
|
|
b8c2d93866 | ||
|
|
67a23dd196 | ||
|
|
ff22c4eb5f | ||
|
|
5addff4c50 | ||
|
|
142e1bd2da | ||
|
|
d05d91bbe7 | ||
|
|
3a90ca9cb5 | ||
|
|
85a46727be | ||
|
|
624fd2c976 | ||
|
|
16d599d2d6 | ||
|
|
c00e4fcb6b | ||
|
|
03e19afe1d | ||
|
|
058e11eadc | ||
|
|
6ff52e7107 | ||
|
|
ee4c28ed41 | ||
|
|
50d26f0060 | ||
|
|
36378e6074 | ||
|
|
420b46741e | ||
|
|
e8f65f95bd |
No files matched your search
@@ -9,7 +9,7 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"fable": {
|
"fable": {
|
||||||
"version": "4.0.6",
|
"version": "4.24.0",
|
||||||
"commands": [
|
"commands": [
|
||||||
"fable"
|
"fable"
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -65,7 +65,7 @@ RUN \
|
|||||||
&& apt-get install -y cmake
|
&& apt-get install -y cmake
|
||||||
|
|
||||||
# Dotnet
|
# Dotnet
|
||||||
RUN apt-get update && apt-get install -y dotnet7
|
RUN apt-get update && apt-get install -y dotnet8
|
||||||
|
|
||||||
# Node
|
# Node
|
||||||
ARG node_major=18
|
ARG node_major=18
|
||||||
@@ -129,5 +129,3 @@ RUN \
|
|||||||
-G sudo \
|
-G sudo \
|
||||||
--password "$(openssl passwd -1 "$docker_pass")" \
|
--password "$(openssl passwd -1 "$docker_pass")" \
|
||||||
"$docker_user"
|
"$docker_user"
|
||||||
|
|
||||||
RUN usermod -aG docker "$docker_user"
|
|
||||||
@@ -1,15 +1,10 @@
|
|||||||
{
|
{
|
||||||
"dockerFile": "Dockerfile",
|
"dockerFile": "Dockerfile",
|
||||||
// Creates local dir to mount to HOME in docker
|
|
||||||
"initializeCommand": "mkdir -p ${localEnv:HOME}/.bts/devcontainer-mounts/${devcontainerId}",
|
|
||||||
"hostRequirements": {
|
"hostRequirements": {
|
||||||
"memory": "4gb",
|
"memory": "8gb",
|
||||||
"storage": "6gb"
|
"storage": "10gb"
|
||||||
},
|
},
|
||||||
"postCreateCommand": "/home/bts/spark/docker/sparkd/dev/devcontainer_post_create.sh",
|
|
||||||
"containerUser": "bts",
|
"containerUser": "bts",
|
||||||
"workspaceMount": "source=${localWorkspaceFolder},target=/home/bts/spark,type=bind",
|
|
||||||
"workspaceFolder": "/home/bts/spark",
|
|
||||||
"updateRemoteUserUID": true,
|
"updateRemoteUserUID": true,
|
||||||
"shutdownAction": "none",
|
"shutdownAction": "none",
|
||||||
// Note: If running multiple containers on the same host, each must use a
|
// Note: If running multiple containers on the same host, each must use a
|
||||||
@@ -17,26 +12,20 @@
|
|||||||
// example, if 8000-8003 is taken, go with 9000-9003, then 10000-10003, etc.
|
// example, if 8000-8003 is taken, go with 9000-9003, then 10000-10003, etc.
|
||||||
"runArgs": [
|
"runArgs": [
|
||||||
"--shm-size",
|
"--shm-size",
|
||||||
"2gb",
|
"8gb"
|
||||||
"--network",
|
|
||||||
"host"
|
|
||||||
],
|
],
|
||||||
"mounts": [
|
"mounts": [
|
||||||
"source=${localEnv:HOME}/.bts/devcontainer-mounts/${devcontainerId},target=/home/bts,type=bind",
|
|
||||||
"source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind"
|
"source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind"
|
||||||
],
|
],
|
||||||
"customizations": {
|
"customizations": {
|
||||||
"vscode": {
|
"vscode": {
|
||||||
"settings": {
|
|
||||||
"clangd.arguments": [
|
|
||||||
"--compile-commands-dir=${workspaceFolder}/build/clang/debug"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"extensions": [
|
"extensions": [
|
||||||
"eamodio.gitlens",
|
"eamodio.gitlens",
|
||||||
"llvm-vs-code-extensions.vscode-clangd",
|
"llvm-vs-code-extensions.vscode-clangd",
|
||||||
|
"ms-python.python",
|
||||||
"ms-vscode.cmake-tools",
|
"ms-vscode.cmake-tools",
|
||||||
"ms-vscode.cpptools"
|
"ms-vscode.cpptools",
|
||||||
|
"xaver.clang-format"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,10 +7,10 @@
|
|||||||
# We use Docker Compose to build images and launch containers for various services
|
# We use Docker Compose to build images and launch containers for various services
|
||||||
# that make up our software suite:
|
# that make up our software suite:
|
||||||
# - sparkd
|
# - sparkd
|
||||||
# - pubsub
|
# - TODO: pubsub
|
||||||
# - md-publisher
|
# - TODO: md-publisher
|
||||||
# - webapp (DSQA on the web)
|
# - TODO: webapp (DSQA on the web)
|
||||||
# - api-server (websocket based)
|
# - TODO: api-server (websocket based)
|
||||||
# From inside a devcontainer, you can launch all services in separate containers
|
# From inside a devcontainer, you can launch all services in separate containers
|
||||||
# on your machine by running:
|
# on your machine by running:
|
||||||
#
|
#
|
||||||
@@ -31,51 +31,19 @@
|
|||||||
|
|
||||||
### 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/app_sparkd/Dockerfile
|
# src/server/sparkd/Dockerfile
|
||||||
SPARKD__IMAGE=sparkd
|
SPARKD__IMAGE=sparkd
|
||||||
# The 'spark.conf' for this service to use
|
# The config dir for this service to use
|
||||||
SPARKD__CONF_FILE=src/app_sparkd/spark.conf
|
SPARKD__CONFIG_DIR=src/app_sparkd/configurations/dev
|
||||||
# To run replay md, put recorded md files in SPARKD__MD_RECORDING_DIR, and use:
|
# Mount a specific volume or dir to "~/sparkdata/data" inside the docker.
|
||||||
# SPARKD__IMAGE=sparkd_md_replay
|
# Defaults to a volume named "sparkd_<config_port>" (e.g., sparkd_8000).
|
||||||
# SPARKD__CONF_FILE=src/app_sparkd/spark.local.conf
|
# SPARKD__DATA_DIR=/home/bts/sparkdata/data
|
||||||
# (configure which md to replay in the new SPARKD__CONF_FILE)
|
|
||||||
SPARKD__MD_RECORDING_DIR=.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__CONFIG_PORT=8000
|
SPARKD__CONFIG_PORT=8000
|
||||||
SPARKD__QUICKBUS_PORT=8001
|
SPARKD__QUICKBUS_PORT=8001
|
||||||
SPARKD__SIM_FIX_PORT=8002
|
SPARKD__SIM_FIX_PORT=8002
|
||||||
|
SPARKD__SHM_SIZE=4gb
|
||||||
|
SPARKD__PYTHON_REQUIREMENTS=requirements.txt
|
||||||
|
|
||||||
### Pubsub ###
|
# TODO: add config for other services (pubsub, md-publisher, webapp, api-server, etc.)
|
||||||
# The 'spark.conf' for this service to use
|
|
||||||
PUBSUB__CONF_FILE=src/DataStreamSuite/PubSubServer/spark.conf
|
|
||||||
PUBSUB__CS_SOURCE_DIR=build/Release/bin/net7.0/linux-x64/publish
|
|
||||||
PUBSUB__CPP_SOURCE_DIR=install/data-stream-suite-linux
|
|
||||||
# The appsettings to load at runtime. Expects a file named:
|
|
||||||
# src/DataStreamSuite/PubSub/appsettings.${PUBSUB__DOTNET_ENVIRONMENT}.json
|
|
||||||
PUBSUB__DOTNET_ENVIRONMENT=Staging
|
|
||||||
|
|
||||||
### Md Publisher ###
|
|
||||||
# The 'spark.conf' for this service to use
|
|
||||||
MD_PUBLISHER__CONF_FILE=src/DataStreamSuite/DataStreamPublisher/spark.conf
|
|
||||||
MD_PUBLISHER__SOURCE_DIR=build/Release/bin/net7.0/linux-x64/publish
|
|
||||||
# Determines which appsettings to load at runtime. Expects a file named:
|
|
||||||
# src/DataStreamSuite/DataStreamPublisher/appsettings.${MD_PUBLISHER__DOTNET_ENVIRONMENT}.json
|
|
||||||
MD_PUBLISHER__DOTNET_ENVIRONMENT=MarketData
|
|
||||||
|
|
||||||
### Webapp (DSQA on the web) ###
|
|
||||||
# The 'spark.conf' for this service to use
|
|
||||||
WEBAPP__CONF_FILE=src/client/spark_api_server/spark.conf
|
|
||||||
WEBAPP__SOURCE_DIR=build/Release/bin/net7.0/linux-x64/publish
|
|
||||||
WEBAPP__WEB_ROOT=build/Bts.DataStreamWebApp.Client/production/dist
|
|
||||||
# Determines which appsettings to load at runtime. Expects a file named:
|
|
||||||
# src/DataStreamSuite/Bts.DataStreamWebApp.Server/appsettings.${WEBAPP__ASPNETCORE_ENVIRONMENT}.json
|
|
||||||
WEBAPP__ASPNETCORE_ENVIRONMENT=Staging
|
|
||||||
|
|
||||||
### Api Server ###
|
|
||||||
# The 'spark.conf' for this service to use
|
|
||||||
API_SERVER__CONF_FILE=src/client/spark_api_server/spark.conf
|
|
||||||
API_SERVER__CS_SOURCE_DIR=build/Release/bin/net7.0/linux-x64/publish
|
|
||||||
API_SERVER__CPP_SOURCE_DIR=install/spark-api-server-linux
|
|
||||||
# Determines which appsettings to load at runtime. Expects a file named:
|
|
||||||
# src/client/spark_api_server/appsettings.${API_SERVER__ASPNETCORE_ENVIRONMENT}.json
|
|
||||||
API_SERVER__ASPNETCORE_ENVIRONMENT=Staging
|
|
||||||
@@ -1,4 +1,3 @@
|
|||||||
*.cmd text=auto eol=crlf
|
*.cmd text=auto eol=crlf
|
||||||
*.cs text=auto eol=crlf
|
*.cs text=auto eol=crlf
|
||||||
*.sh text=auto eol=lf
|
*.sh text=auto eol=lf
|
||||||
*.py text=auto eol=lf
|
|
||||||
+2
-2
@@ -11,6 +11,7 @@ cmake-build-debug/
|
|||||||
**.vscode/*
|
**.vscode/*
|
||||||
!.vscode/launch.json
|
!.vscode/launch.json
|
||||||
!.vscode/tasks.json
|
!.vscode/tasks.json
|
||||||
|
!.vscode/*.env
|
||||||
.vs
|
.vs
|
||||||
obj/
|
obj/
|
||||||
*.csproj.user
|
*.csproj.user
|
||||||
@@ -59,6 +60,5 @@ trace_data/
|
|||||||
.devcontainer/
|
.devcontainer/
|
||||||
*.Generated.cs
|
*.Generated.cs
|
||||||
*.lst
|
*.lst
|
||||||
src/app_sparkd/spark.local.conf
|
|
||||||
.env.local
|
.env.local
|
||||||
.md_recording
|
.secrets
|
||||||
Vendored
+156
-73
@@ -1,6 +1,14 @@
|
|||||||
{
|
{
|
||||||
"version": "0.2.0",
|
"version": "0.2.0",
|
||||||
"configurations": [
|
"configurations": [
|
||||||
|
{
|
||||||
|
"name": "Python Debugger: Current File with Arguments",
|
||||||
|
"type": "debugpy",
|
||||||
|
"request": "launch",
|
||||||
|
"program": "${file}",
|
||||||
|
"console": "integratedTerminal",
|
||||||
|
"args": "${command:pickArgs}"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"name": ".NET Core Attach",
|
"name": ".NET Core Attach",
|
||||||
"type": "coreclr",
|
"type": "coreclr",
|
||||||
@@ -16,19 +24,10 @@
|
|||||||
"program": "spark_api_server.exe",
|
"program": "spark_api_server.exe",
|
||||||
"args": [
|
"args": [
|
||||||
"run",
|
"run",
|
||||||
|
"--sparkd",
|
||||||
|
"http://127.0.0.1:8000/config"
|
||||||
],
|
],
|
||||||
"cwd": "build/Debug/bin/net7.0",
|
"cwd": "build/Debug/bin/net8.0",
|
||||||
},
|
|
||||||
"linux": {
|
|
||||||
"preLaunchTask": "Build Api Server (Debug)",
|
|
||||||
"program": "spark_api_server",
|
|
||||||
"args": [
|
|
||||||
"run",
|
|
||||||
],
|
|
||||||
"cwd": "build/Debug/bin/net7.0",
|
|
||||||
},
|
|
||||||
"env": {
|
|
||||||
"ASPNETCORE_ENVIRONMENT": "Development",
|
|
||||||
},
|
},
|
||||||
"stopAtEntry": false,
|
"stopAtEntry": false,
|
||||||
"console": "integratedTerminal"
|
"console": "integratedTerminal"
|
||||||
@@ -42,18 +41,10 @@
|
|||||||
"program": "spark_api_server.exe",
|
"program": "spark_api_server.exe",
|
||||||
"args": [
|
"args": [
|
||||||
"run",
|
"run",
|
||||||
|
"--sparkd",
|
||||||
|
"http://127.0.0.1:8000/config"
|
||||||
],
|
],
|
||||||
"cwd": "build/Debug/bin/net7.0",
|
"cwd": "build/Debug/bin/net8.0",
|
||||||
},
|
|
||||||
"linux": {
|
|
||||||
"program": "spark_api_server",
|
|
||||||
"args": [
|
|
||||||
"run",
|
|
||||||
],
|
|
||||||
"cwd": "build/Debug/bin/net7.0",
|
|
||||||
},
|
|
||||||
"env": {
|
|
||||||
"ASPNETCORE_ENVIRONMENT": "Development",
|
|
||||||
},
|
},
|
||||||
"stopAtEntry": false,
|
"stopAtEntry": false,
|
||||||
"console": "integratedTerminal"
|
"console": "integratedTerminal"
|
||||||
@@ -62,9 +53,9 @@
|
|||||||
"name": "Bts.DataStreamWebApp.Server",
|
"name": "Bts.DataStreamWebApp.Server",
|
||||||
"type": "coreclr",
|
"type": "coreclr",
|
||||||
"request": "launch",
|
"request": "launch",
|
||||||
"preLaunchTask": "Build DataStream (Debug)",
|
"preLaunchTask": "Build DataStream WebApp (Debug)",
|
||||||
"program": "${workspaceFolder}/build/Debug/bin/net7.0/Bts.DataStreamWebApp.Server.dll",
|
"program": "${workspaceFolder}/build/Debug/bin/net8.0/Bts.DataStreamWebApp.Server.dll",
|
||||||
"cwd": "${workspaceFolder}/build/Debug/bin/net7.0",
|
"cwd": "${workspaceFolder}/build/Debug/bin/net8.0",
|
||||||
"env": {
|
"env": {
|
||||||
"ASPNETCORE_HTTP_PORT": "8080",
|
"ASPNETCORE_HTTP_PORT": "8080",
|
||||||
"ASPNETCORE_HTTPS_PORT": "8443",
|
"ASPNETCORE_HTTPS_PORT": "8443",
|
||||||
@@ -76,8 +67,8 @@
|
|||||||
"name": "Bts.DataStreamWebApp.Server (Skip Build)",
|
"name": "Bts.DataStreamWebApp.Server (Skip Build)",
|
||||||
"type": "coreclr",
|
"type": "coreclr",
|
||||||
"request": "launch",
|
"request": "launch",
|
||||||
"program": "${workspaceFolder}/build/Debug/bin/net7.0/Bts.DataStreamWebApp.Server.dll",
|
"program": "${workspaceFolder}/build/Debug/bin/net8.0/Bts.DataStreamWebApp.Server.dll",
|
||||||
"cwd": "${workspaceFolder}/build/Debug/bin/net7.0",
|
"cwd": "${workspaceFolder}/build/Debug/bin/net8.0",
|
||||||
"env": {
|
"env": {
|
||||||
"ASPNETCORE_HTTP_PORT": "8080",
|
"ASPNETCORE_HTTP_PORT": "8080",
|
||||||
"ASPNETCORE_HTTPS_PORT": "8443",
|
"ASPNETCORE_HTTPS_PORT": "8443",
|
||||||
@@ -97,10 +88,10 @@
|
|||||||
"windows": {
|
"windows": {
|
||||||
"program": "DataStreamPublisher.exe",
|
"program": "DataStreamPublisher.exe",
|
||||||
},
|
},
|
||||||
|
"cwd": "build/Debug/bin/net8.0",
|
||||||
"env": {
|
"env": {
|
||||||
"DOTNET_ENVIRONMENT": "${input:dataStreamPublisherEnvironment}",
|
"DOTNET_ENVIRONMENT": "${input:dataStreamPublisherEnvironment}",
|
||||||
},
|
},
|
||||||
"cwd": "${workspaceFolder}/build/Debug/bin/net7.0",
|
|
||||||
"stopAtEntry": false,
|
"stopAtEntry": false,
|
||||||
"console": "integratedTerminal"
|
"console": "integratedTerminal"
|
||||||
},
|
},
|
||||||
@@ -115,10 +106,10 @@
|
|||||||
"windows": {
|
"windows": {
|
||||||
"program": "DataStreamPublisher.exe",
|
"program": "DataStreamPublisher.exe",
|
||||||
},
|
},
|
||||||
|
"cwd": "${workspaceFolder}/build/Debug/bin/net8.0",
|
||||||
"env": {
|
"env": {
|
||||||
"DOTNET_ENVIRONMENT": "${input:dataStreamPublisherEnvironment}",
|
"DOTNET_ENVIRONMENT": "${input:dataStreamPublisherEnvironment}",
|
||||||
},
|
},
|
||||||
"cwd": "${workspaceFolder}/build/Debug/bin/net7.0",
|
|
||||||
"stopAtEntry": false,
|
"stopAtEntry": false,
|
||||||
"console": "integratedTerminal"
|
"console": "integratedTerminal"
|
||||||
},
|
},
|
||||||
@@ -127,7 +118,39 @@
|
|||||||
"type": "cppdbg",
|
"type": "cppdbg",
|
||||||
"request": "launch",
|
"request": "launch",
|
||||||
"program": "/home/bts/spark/build/sparkd-debug-clang/server/sparkd",
|
"program": "/home/bts/spark/build/sparkd-debug-clang/server/sparkd",
|
||||||
"args": ["run"],
|
"args": [
|
||||||
|
"run"
|
||||||
|
],
|
||||||
|
"stopAtEntry": false,
|
||||||
|
"cwd": "/home/bts/spark/build/sparkd-debug-clang/server",
|
||||||
|
"environment": [],
|
||||||
|
"externalConsole": false,
|
||||||
|
"MIMode": "gdb",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "spreader tests2",
|
||||||
|
"type": "cppdbg",
|
||||||
|
"request": "launch",
|
||||||
|
"program": "/home/bts/spark/build/sparkd-debug-clang/server/sparkd",
|
||||||
|
"args": [
|
||||||
|
"test",
|
||||||
|
"[spreader2]"
|
||||||
|
],
|
||||||
|
"stopAtEntry": false,
|
||||||
|
"cwd": "/home/bts/spark/build/sparkd-debug-clang/server",
|
||||||
|
"environment": [],
|
||||||
|
"externalConsole": false,
|
||||||
|
"MIMode": "gdb",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "spreader tests",
|
||||||
|
"type": "cppdbg",
|
||||||
|
"request": "launch",
|
||||||
|
"program": "/home/bts/spark/build/sparkd-debug-clang/server/sparkd",
|
||||||
|
"args": [
|
||||||
|
"test",
|
||||||
|
"[spreader]"
|
||||||
|
],
|
||||||
"stopAtEntry": false,
|
"stopAtEntry": false,
|
||||||
"cwd": "/home/bts/spark/build/sparkd-debug-clang/server",
|
"cwd": "/home/bts/spark/build/sparkd-debug-clang/server",
|
||||||
"environment": [],
|
"environment": [],
|
||||||
@@ -142,12 +165,25 @@
|
|||||||
"program": "",
|
"program": "",
|
||||||
"windows": {
|
"windows": {
|
||||||
"program": "DataStreamQueryAnalyzer.exe",
|
"program": "DataStreamQueryAnalyzer.exe",
|
||||||
"args": [
|
"cwd": "build/Debug/bin/net8.0-windows",
|
||||||
"--config",
|
|
||||||
"${workspaceFolder}/src/DataStreamSuite/DataStreamQueryAnalyzer/Configurations/DataStreamQueryAnalyzer.json"
|
|
||||||
],
|
|
||||||
"cwd": "build/Debug/bin/net7.0-windows",
|
|
||||||
"env": {
|
"env": {
|
||||||
|
"DOTNET_ENVIRONMENT": "${input:dataStreamQueryAnalyzerEnvironment}",
|
||||||
|
"PYTHON_EXE": "${workspaceFolder}/.venv/Scripts/python.exe"
|
||||||
|
},
|
||||||
|
},
|
||||||
|
"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": {
|
||||||
|
"DOTNET_ENVIRONMENT": "${input:dataStreamQueryAnalyzerEnvironment}",
|
||||||
"PYTHON_EXE": "${workspaceFolder}/.venv/Scripts/python.exe"
|
"PYTHON_EXE": "${workspaceFolder}/.venv/Scripts/python.exe"
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@@ -166,7 +202,7 @@
|
|||||||
"windows": {
|
"windows": {
|
||||||
"program": "PubSubServer.exe",
|
"program": "PubSubServer.exe",
|
||||||
},
|
},
|
||||||
"cwd": "build/Debug/bin/net7.0",
|
"cwd": "build/Debug/bin/net8.0",
|
||||||
"env": {
|
"env": {
|
||||||
"DOTNET_ENVIRONMENT": "${input:pubSubServerEnvironment}",
|
"DOTNET_ENVIRONMENT": "${input:pubSubServerEnvironment}",
|
||||||
},
|
},
|
||||||
@@ -184,7 +220,7 @@
|
|||||||
"windows": {
|
"windows": {
|
||||||
"program": "PubSubServer.exe",
|
"program": "PubSubServer.exe",
|
||||||
},
|
},
|
||||||
"cwd": "build/Debug/bin/net7.0",
|
"cwd": "build/Debug/bin/net8.0",
|
||||||
"env": {
|
"env": {
|
||||||
"DOTNET_ENVIRONMENT": "${input:pubSubServerEnvironment}",
|
"DOTNET_ENVIRONMENT": "${input:pubSubServerEnvironment}",
|
||||||
},
|
},
|
||||||
@@ -199,11 +235,25 @@
|
|||||||
"windows": {
|
"windows": {
|
||||||
"preLaunchTask": "Build Spark (Debug)",
|
"preLaunchTask": "Build Spark (Debug)",
|
||||||
"program": "Spark.exe",
|
"program": "Spark.exe",
|
||||||
"args": [
|
"cwd": "build/Debug/bin/net8.0-windows",
|
||||||
"--sparkd",
|
"env": {
|
||||||
"http://127.0.0.1:8000/config"
|
"DOTNET_ENVIRONMENT": "${input:sparkEnvironment}",
|
||||||
],
|
}
|
||||||
"cwd": "build/Debug/bin/net7.0-windows",
|
},
|
||||||
|
"stopAtEntry": false,
|
||||||
|
"console": "integratedTerminal"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Spark (Skip Build)",
|
||||||
|
"type": "coreclr",
|
||||||
|
"request": "launch",
|
||||||
|
"program": "",
|
||||||
|
"windows": {
|
||||||
|
"program": "Spark.exe",
|
||||||
|
"cwd": "build/Debug/bin/net8.0-windows",
|
||||||
|
"env": {
|
||||||
|
"DOTNET_ENVIRONMENT": "${input:sparkEnvironment}",
|
||||||
|
}
|
||||||
},
|
},
|
||||||
"stopAtEntry": false,
|
"stopAtEntry": false,
|
||||||
"console": "integratedTerminal"
|
"console": "integratedTerminal"
|
||||||
@@ -220,7 +270,40 @@
|
|||||||
"--sparkd",
|
"--sparkd",
|
||||||
"${input:sparkConfigServer}"
|
"${input:sparkConfigServer}"
|
||||||
],
|
],
|
||||||
"cwd": "build/Debug/bin/net7.0-windows",
|
"cwd": "build/Debug/bin/net8.0-windows",
|
||||||
|
},
|
||||||
|
"stopAtEntry": false,
|
||||||
|
"console": "integratedTerminal"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Spark Test",
|
||||||
|
"type": "coreclr",
|
||||||
|
"request": "launch",
|
||||||
|
"program": "",
|
||||||
|
"windows": {
|
||||||
|
"preLaunchTask": "Build Spark (Debug)",
|
||||||
|
"program": "Spark.Console.exe",
|
||||||
|
"cwd": "build/Debug/bin/net8.0",
|
||||||
|
"args": [
|
||||||
|
"test",
|
||||||
|
"${input:sparkTest}"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"stopAtEntry": false,
|
||||||
|
"console": "integratedTerminal"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Spark Test (Skip Build)",
|
||||||
|
"type": "coreclr",
|
||||||
|
"request": "launch",
|
||||||
|
"program": "",
|
||||||
|
"windows": {
|
||||||
|
"program": "Spark.Console.exe",
|
||||||
|
"cwd": "build/Debug/bin/net8.0",
|
||||||
|
"args": [
|
||||||
|
"test",
|
||||||
|
"${input:sparkTest}"
|
||||||
|
]
|
||||||
},
|
},
|
||||||
"stopAtEntry": false,
|
"stopAtEntry": false,
|
||||||
"console": "integratedTerminal"
|
"console": "integratedTerminal"
|
||||||
@@ -229,7 +312,6 @@
|
|||||||
"name": "Sparkd",
|
"name": "Sparkd",
|
||||||
"type": "cppdbg",
|
"type": "cppdbg",
|
||||||
"request": "launch",
|
"request": "launch",
|
||||||
"preLaunchTask": "Build Sparkd (Debug | Clang)",
|
|
||||||
"program": "",
|
"program": "",
|
||||||
"linux": {
|
"linux": {
|
||||||
"program": "${workspaceFolder}/build/sparkd-debug-clang/src/app_sparkd/sparkd",
|
"program": "${workspaceFolder}/build/sparkd-debug-clang/src/app_sparkd/sparkd",
|
||||||
@@ -282,34 +364,6 @@
|
|||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"name": "Sparkd Web (Skip Build)",
|
|
||||||
"type": "cppdbg",
|
|
||||||
"request": "launch",
|
|
||||||
"program": "",
|
|
||||||
"linux": {
|
|
||||||
"program": "${workspaceFolder}/build/sparkd-debug-clang/src/app_sparkd/sparkd",
|
|
||||||
},
|
|
||||||
"args": [
|
|
||||||
"web"
|
|
||||||
],
|
|
||||||
"cwd": "${workspaceFolder}/build/sparkd-debug-clang/src/app_sparkd",
|
|
||||||
"stopAtEntry": false,
|
|
||||||
"externalConsole": false,
|
|
||||||
"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": [
|
||||||
{
|
{
|
||||||
@@ -349,12 +403,41 @@
|
|||||||
"Staging",
|
"Staging",
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"id": "dataStreamQueryAnalyzerEnvironment",
|
||||||
|
"type": "pickString",
|
||||||
|
"description": "DataStreamQueryAnalyzer Configuration",
|
||||||
|
"options": [
|
||||||
|
"Development",
|
||||||
|
],
|
||||||
|
"default": "Development",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "sparkEnvironment",
|
||||||
|
"type": "pickString",
|
||||||
|
"description": "Spark Configuration",
|
||||||
|
"options": [
|
||||||
|
"Development",
|
||||||
|
"Local",
|
||||||
|
],
|
||||||
|
"default": "Development",
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"id": "sparkConfigServer",
|
"id": "sparkConfigServer",
|
||||||
"type": "promptString",
|
"type": "promptString",
|
||||||
"description": "Config Server URL",
|
"description": "Config Server URL",
|
||||||
"default": "http://localhost:8000/config",
|
"default": "http://localhost:8000/config",
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"id": "sparkTest",
|
||||||
|
"type": "promptString",
|
||||||
|
"description": "Test to run",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "sparkdTest",
|
||||||
|
"type": "promptString",
|
||||||
|
"description": "Test to run",
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"id": "isSparkApiEnabled",
|
"id": "isSparkApiEnabled",
|
||||||
"type": "pickString",
|
"type": "pickString",
|
||||||
|
|||||||
Vendored
+1
@@ -0,0 +1 @@
|
|||||||
|
PYTHONPATH=/workspaces/spark/build/sparkd-debug-clang/src/lib_python_interop;/workspaces/spark/src/lib_python_interop/python_interop_plugins
|
||||||
Vendored
+155
-57
@@ -490,7 +490,7 @@
|
|||||||
"${workspaceFolder}/src/DataStreamSuite/DataStreamQueryAnalyzer/Configurations/DataStreamQueryAnalyzer.json",
|
"${workspaceFolder}/src/DataStreamSuite/DataStreamQueryAnalyzer/Configurations/DataStreamQueryAnalyzer.json",
|
||||||
],
|
],
|
||||||
"options": {
|
"options": {
|
||||||
"cwd": "${workspaceFolder}/build/${input:buildConfiguration}/bin/net7.0-windows"
|
"cwd": "${workspaceFolder}/build/${input:buildConfiguration}/bin/net8.0-windows"
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
"icon": {
|
"icon": {
|
||||||
@@ -510,7 +510,7 @@
|
|||||||
"${workspaceFolder}/src/DataStreamSuite/DataStreamQueryAnalyzer/Configurations/DataStreamQueryAnalyzer.json",
|
"${workspaceFolder}/src/DataStreamSuite/DataStreamQueryAnalyzer/Configurations/DataStreamQueryAnalyzer.json",
|
||||||
],
|
],
|
||||||
"options": {
|
"options": {
|
||||||
"cwd": "${workspaceFolder}/build/Debug/bin/net7.0-windows"
|
"cwd": "${workspaceFolder}/build/Debug/bin/net8.0-windows"
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
"icon": {
|
"icon": {
|
||||||
@@ -530,7 +530,7 @@
|
|||||||
"${workspaceFolder}/src/DataStreamSuite/DataStreamQueryAnalyzer/Configurations/DataStreamQueryAnalyzer.json",
|
"${workspaceFolder}/src/DataStreamSuite/DataStreamQueryAnalyzer/Configurations/DataStreamQueryAnalyzer.json",
|
||||||
],
|
],
|
||||||
"options": {
|
"options": {
|
||||||
"cwd": "${workspaceFolder}/build/Release/bin/net7.0-windows"
|
"cwd": "${workspaceFolder}/build/Release/bin/net8.0-windows"
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
"icon": {
|
"icon": {
|
||||||
@@ -549,12 +549,11 @@
|
|||||||
"windows": {
|
"windows": {
|
||||||
"command": "DataStreamPublisher.exe",
|
"command": "DataStreamPublisher.exe",
|
||||||
},
|
},
|
||||||
"args": [
|
|
||||||
"--config",
|
|
||||||
"${workspaceFolder}/src/DataStreamSuite/DataStreamPublisher/Configurations/${input:dataStreamPublisherConfig}.json",
|
|
||||||
],
|
|
||||||
"options": {
|
"options": {
|
||||||
"cwd": "${workspaceFolder}/build/${input:buildConfiguration}/bin/net7.0"
|
"cwd": "${workspaceFolder}/build/${input:buildConfiguration}/bin/net8.0",
|
||||||
|
"env": {
|
||||||
|
"DOTNET_ENVIRONMENT": "${input:dataStreamPublisherEnvironment}",
|
||||||
|
},
|
||||||
},
|
},
|
||||||
"icon": {
|
"icon": {
|
||||||
"id": "run",
|
"id": "run",
|
||||||
@@ -572,12 +571,11 @@
|
|||||||
"windows": {
|
"windows": {
|
||||||
"command": "DataStreamPublisher.exe",
|
"command": "DataStreamPublisher.exe",
|
||||||
},
|
},
|
||||||
"args": [
|
|
||||||
"--config",
|
|
||||||
"${workspaceFolder}/src/DataStreamSuite/DataStreamPublisher/Configurations/${input:dataStreamPublisherConfig}.json",
|
|
||||||
],
|
|
||||||
"options": {
|
"options": {
|
||||||
"cwd": "${workspaceFolder}/build/Debug/bin/net7.0"
|
"cwd": "${workspaceFolder}/build/Debug/bin/net8.0",
|
||||||
|
"env": {
|
||||||
|
"DOTNET_ENVIRONMENT": "${input:dataStreamPublisherEnvironment}",
|
||||||
|
},
|
||||||
},
|
},
|
||||||
"icon": {
|
"icon": {
|
||||||
"id": "run",
|
"id": "run",
|
||||||
@@ -595,12 +593,11 @@
|
|||||||
"windows": {
|
"windows": {
|
||||||
"command": "DataStreamPublisher.exe",
|
"command": "DataStreamPublisher.exe",
|
||||||
},
|
},
|
||||||
"args": [
|
|
||||||
"--config",
|
|
||||||
"${workspaceFolder}/src/DataStreamSuite/DataStreamPublisher/Configurations/${input:dataStreamPublisherConfig}.json",
|
|
||||||
],
|
|
||||||
"options": {
|
"options": {
|
||||||
"cwd": "${workspaceFolder}/build/Release/bin/net7.0"
|
"cwd": "${workspaceFolder}/build/Release/bin/net8.0",
|
||||||
|
"env": {
|
||||||
|
"DOTNET_ENVIRONMENT": "${input:dataStreamPublisherEnvironment}",
|
||||||
|
},
|
||||||
},
|
},
|
||||||
"icon": {
|
"icon": {
|
||||||
"id": "run",
|
"id": "run",
|
||||||
@@ -701,12 +698,11 @@
|
|||||||
"windows": {
|
"windows": {
|
||||||
"command": "PubSubServer.exe",
|
"command": "PubSubServer.exe",
|
||||||
},
|
},
|
||||||
"args": [
|
|
||||||
"--config",
|
|
||||||
"${workspaceFolder}/src/DataStreamSuite/PubSubServer/Configurations/${input:pubSubServerConfig}.json",
|
|
||||||
],
|
|
||||||
"options": {
|
"options": {
|
||||||
"cwd": "${workspaceFolder}/build/${input:buildConfiguration}/bin/net7.0"
|
"cwd": "${workspaceFolder}/build/${input:buildConfiguration}/bin/net8.0",
|
||||||
|
"env": {
|
||||||
|
"DOTNET_ENVIRONMENT": "${input:pubSubServerEnvironment}",
|
||||||
|
},
|
||||||
},
|
},
|
||||||
"icon": {
|
"icon": {
|
||||||
"id": "run",
|
"id": "run",
|
||||||
@@ -724,12 +720,11 @@
|
|||||||
"windows": {
|
"windows": {
|
||||||
"command": "PubSubServer.exe",
|
"command": "PubSubServer.exe",
|
||||||
},
|
},
|
||||||
"args": [
|
|
||||||
"--config",
|
|
||||||
"${workspaceFolder}/src/DataStreamSuite/PubSubServer/Configurations/${input:pubSubServerConfig}.json",
|
|
||||||
],
|
|
||||||
"options": {
|
"options": {
|
||||||
"cwd": "${workspaceFolder}/build/Debug/bin/net7.0"
|
"cwd": "${workspaceFolder}/build/Debug/bin/net8.0",
|
||||||
|
"env": {
|
||||||
|
"DOTNET_ENVIRONMENT": "${input:pubSubServerEnvironment}",
|
||||||
|
},
|
||||||
},
|
},
|
||||||
"icon": {
|
"icon": {
|
||||||
"id": "run",
|
"id": "run",
|
||||||
@@ -746,12 +741,11 @@
|
|||||||
"windows": {
|
"windows": {
|
||||||
"command": "PubSubServer.exe",
|
"command": "PubSubServer.exe",
|
||||||
},
|
},
|
||||||
"args": [
|
|
||||||
"--config",
|
|
||||||
"${workspaceFolder}/src/DataStreamSuite/PubSubServer/Configurations/${input:pubSubServerConfig}.json",
|
|
||||||
],
|
|
||||||
"options": {
|
"options": {
|
||||||
"cwd": "${workspaceFolder}/build/Debug/bin/net7.0"
|
"cwd": "${workspaceFolder}/build/Debug/bin/net8.0",
|
||||||
|
"env": {
|
||||||
|
"DOTNET_ENVIRONMENT": "${input:pubSubServerEnvironment}",
|
||||||
|
},
|
||||||
},
|
},
|
||||||
"icon": {
|
"icon": {
|
||||||
"id": "run",
|
"id": "run",
|
||||||
@@ -769,12 +763,11 @@
|
|||||||
"windows": {
|
"windows": {
|
||||||
"command": "PubSubServer.exe",
|
"command": "PubSubServer.exe",
|
||||||
},
|
},
|
||||||
"args": [
|
|
||||||
"--config",
|
|
||||||
"${workspaceFolder}/src/DataStreamSuite/PubSubServer/Configurations/${input:pubSubServerConfig}.json",
|
|
||||||
],
|
|
||||||
"options": {
|
"options": {
|
||||||
"cwd": "${workspaceFolder}/build/Release/bin/net7.0"
|
"cwd": "${workspaceFolder}/build/Release/bin/net8.0",
|
||||||
|
"env": {
|
||||||
|
"DOTNET_ENVIRONMENT": "${input:pubSubServerEnvironment}",
|
||||||
|
},
|
||||||
},
|
},
|
||||||
"icon": {
|
"icon": {
|
||||||
"id": "run",
|
"id": "run",
|
||||||
@@ -791,12 +784,11 @@
|
|||||||
"windows": {
|
"windows": {
|
||||||
"command": "PubSubServer.exe",
|
"command": "PubSubServer.exe",
|
||||||
},
|
},
|
||||||
"args": [
|
|
||||||
"--config",
|
|
||||||
"${workspaceFolder}/src/DataStreamSuite/PubSubServer/Configurations/${input:pubSubServerConfig}.json",
|
|
||||||
],
|
|
||||||
"options": {
|
"options": {
|
||||||
"cwd": "${workspaceFolder}/build/Release/bin/net7.0"
|
"cwd": "${workspaceFolder}/build/Release/bin/net8.0",
|
||||||
|
"env": {
|
||||||
|
"DOTNET_ENVIRONMENT": "${input:pubSubServerEnvironment}",
|
||||||
|
},
|
||||||
},
|
},
|
||||||
"icon": {
|
"icon": {
|
||||||
"id": "run",
|
"id": "run",
|
||||||
@@ -811,7 +803,7 @@
|
|||||||
"windows": {
|
"windows": {
|
||||||
"command": "Spark.exe",
|
"command": "Spark.exe",
|
||||||
"options": {
|
"options": {
|
||||||
"cwd": "${workspaceFolder}/build/${input:buildConfiguration}/bin/net7.0-windows"
|
"cwd": "${workspaceFolder}/build/${input:buildConfiguration}/bin/net8.0-windows"
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
"icon": {
|
"icon": {
|
||||||
@@ -827,7 +819,7 @@
|
|||||||
"windows": {
|
"windows": {
|
||||||
"command": "Spark.exe",
|
"command": "Spark.exe",
|
||||||
"options": {
|
"options": {
|
||||||
"cwd": "${workspaceFolder}/build/Debug/bin/net7.0-windows"
|
"cwd": "${workspaceFolder}/build/Debug/bin/net8.0-windows"
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
"icon": {
|
"icon": {
|
||||||
@@ -843,7 +835,22 @@
|
|||||||
"windows": {
|
"windows": {
|
||||||
"command": "Spark.exe",
|
"command": "Spark.exe",
|
||||||
"options": {
|
"options": {
|
||||||
"cwd": "${workspaceFolder}/build/Release/bin/net7.0-windows"
|
"cwd": "${workspaceFolder}/build/Release/bin/net8.0-windows"
|
||||||
|
},
|
||||||
|
},
|
||||||
|
"icon": {
|
||||||
|
"id": "run",
|
||||||
|
"color": "terminal.ansiGreen",
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"label": "Run Spark (Skip Build)",
|
||||||
|
"type": "process",
|
||||||
|
"command": "",
|
||||||
|
"windows": {
|
||||||
|
"command": "Spark.exe",
|
||||||
|
"options": {
|
||||||
|
"cwd": "${workspaceFolder}/build/${input:buildConfiguration}/bin/net8.0-windows"
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
"icon": {
|
"icon": {
|
||||||
@@ -868,7 +875,7 @@
|
|||||||
"${input:sparkConfigQuery}",
|
"${input:sparkConfigQuery}",
|
||||||
],
|
],
|
||||||
"options": {
|
"options": {
|
||||||
"cwd": "${workspaceFolder}/build/${input:buildConfiguration}/bin/net7.0"
|
"cwd": "${workspaceFolder}/build/${input:buildConfiguration}/bin/net8.0"
|
||||||
},
|
},
|
||||||
"icon": {
|
"icon": {
|
||||||
"id": "run",
|
"id": "run",
|
||||||
@@ -894,6 +901,24 @@
|
|||||||
"color": "terminal.ansiGreen",
|
"color": "terminal.ansiGreen",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"label": "Run Sparkd (Skip Build)",
|
||||||
|
"type": "process",
|
||||||
|
"command": "",
|
||||||
|
"linux": {
|
||||||
|
"command": "sparkd",
|
||||||
|
},
|
||||||
|
"args": [
|
||||||
|
"run"
|
||||||
|
],
|
||||||
|
"options": {
|
||||||
|
"cwd": "${workspaceFolder}/build/${input:sparkdCmakePreset}/server"
|
||||||
|
},
|
||||||
|
"icon": {
|
||||||
|
"id": "run",
|
||||||
|
"color": "terminal.ansiGreen",
|
||||||
|
},
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"label": "Run Sparkd Config Query",
|
"label": "Run Sparkd Config Query",
|
||||||
"dependsOn": "Build Sparkd",
|
"dependsOn": "Build Sparkd",
|
||||||
@@ -915,6 +940,65 @@
|
|||||||
"color": "terminal.ansiGreen",
|
"color": "terminal.ansiGreen",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"label": "Test Spark (Debug)",
|
||||||
|
"dependsOn": "Build Spark (Debug)",
|
||||||
|
"type": "process",
|
||||||
|
"icon": {
|
||||||
|
"id": "coverage",
|
||||||
|
"color": "terminal.ansiYellow",
|
||||||
|
},
|
||||||
|
"command": "",
|
||||||
|
"windows": {
|
||||||
|
"command": "Spark.Console.exe",
|
||||||
|
"args": [
|
||||||
|
"test",
|
||||||
|
"${input:sparkTest}"
|
||||||
|
],
|
||||||
|
"options": {
|
||||||
|
"cwd": "${workspaceFolder}/build/Debug/bin/net8.0",
|
||||||
|
}
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"label": "Test Sparkd",
|
||||||
|
"dependsOn": "Build Sparkd",
|
||||||
|
"type": "process",
|
||||||
|
"command": "",
|
||||||
|
"linux": {
|
||||||
|
"command": "sparkd",
|
||||||
|
},
|
||||||
|
"args": [
|
||||||
|
"test",
|
||||||
|
"${input:sparkdTest}",
|
||||||
|
],
|
||||||
|
"options": {
|
||||||
|
"cwd": "${workspaceFolder}/build/${input:sparkdCmakePreset}/server"
|
||||||
|
},
|
||||||
|
"icon": {
|
||||||
|
"id": "coverage",
|
||||||
|
"color": "terminal.ansiYellow",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"label": "Test Sparkd (Skip Build)",
|
||||||
|
"type": "process",
|
||||||
|
"command": "",
|
||||||
|
"linux": {
|
||||||
|
"command": "sparkd",
|
||||||
|
},
|
||||||
|
"args": [
|
||||||
|
"test",
|
||||||
|
"${input:sparkdTest}",
|
||||||
|
],
|
||||||
|
"options": {
|
||||||
|
"cwd": "${workspaceFolder}/build/${input:sparkdCmakePreset}/server"
|
||||||
|
},
|
||||||
|
"icon": {
|
||||||
|
"id": "coverage",
|
||||||
|
"color": "terminal.ansiYellow",
|
||||||
|
},
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"label": "View DataStreamQueryAnalyzer Logs (Last Run)",
|
"label": "View DataStreamQueryAnalyzer Logs (Last Run)",
|
||||||
"type": "process",
|
"type": "process",
|
||||||
@@ -1003,26 +1087,30 @@
|
|||||||
"default": "sparkd-debug-clang",
|
"default": "sparkd-debug-clang",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "dataStreamPublisherConfig",
|
"id": "dataStreamPublisherEnvironment",
|
||||||
"type": "pickString",
|
"type": "pickString",
|
||||||
"description": "Publisher Configuration",
|
"description": "Publisher Configuration",
|
||||||
"options": [
|
"options": [
|
||||||
"MarketDataPublisher",
|
"Development",
|
||||||
"SimpleEchoClient",
|
"MarketData",
|
||||||
"SimpleTestDataPublisher",
|
"Production",
|
||||||
"TestDataPublisher",
|
"ProductionAws",
|
||||||
|
"Staging",
|
||||||
],
|
],
|
||||||
"default": "MarketDataPublisher",
|
"default": "MarketDataPublisher",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "pubSubServerConfig",
|
"id": "pubSubServerEnvironment",
|
||||||
"type": "pickString",
|
"type": "pickString",
|
||||||
"description": "PubSub Configuration",
|
"description": "PubSub Configuration",
|
||||||
"options": [
|
"options": [
|
||||||
"PubSubServer",
|
"Development",
|
||||||
"SimpleEchoClient",
|
"EchoServer",
|
||||||
|
"Production",
|
||||||
|
"ProductionAws",
|
||||||
|
"Staging",
|
||||||
],
|
],
|
||||||
"default": "PubSubServer",
|
"default": "Development",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "sparkConfigQuery",
|
"id": "sparkConfigQuery",
|
||||||
@@ -1033,6 +1121,16 @@
|
|||||||
"id": "sparkdConfigQuery",
|
"id": "sparkdConfigQuery",
|
||||||
"type": "promptString",
|
"type": "promptString",
|
||||||
"description": "Config Type(s)"
|
"description": "Config Type(s)"
|
||||||
}
|
},
|
||||||
|
{
|
||||||
|
"id": "sparkTest",
|
||||||
|
"type": "promptString",
|
||||||
|
"description": "Test to run",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "sparkdTest",
|
||||||
|
"type": "promptString",
|
||||||
|
"description": "Test to run",
|
||||||
|
},
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
+82
-66
@@ -1,7 +1,10 @@
|
|||||||
cmake_minimum_required(VERSION 3.12)
|
cmake_minimum_required(VERSION 3.12)
|
||||||
project(spark)
|
project(spark)
|
||||||
|
include(GNUInstallDirs)
|
||||||
|
include(${CMAKE_SOURCE_DIR}/cmake/GitVersion.cmake)
|
||||||
set(CMAKE_CXX_STANDARD 20)
|
set(CMAKE_CXX_STANDARD 20)
|
||||||
|
|
||||||
|
get_version_from_git()
|
||||||
if(WIN32)
|
if(WIN32)
|
||||||
set(platform "windows")
|
set(platform "windows")
|
||||||
else()
|
else()
|
||||||
@@ -33,85 +36,98 @@ else()
|
|||||||
set(BUILD_ADMIN_WEB_APP ON CACHE BOOL "Build the Admin WebApp")
|
set(BUILD_ADMIN_WEB_APP ON CACHE BOOL "Build the Admin WebApp")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
include_directories(BEFORE SYSTEM ${EXTERNALS_INCLUDE} ${EXTERNALS_ROOT}/include/zlib)
|
||||||
|
link_directories(${EXTERNALS_LIB})
|
||||||
|
|
||||||
add_compile_definitions(SHARED_MEMORY_PREFIX="${SHARED_MEMORY_PREFIX}")
|
add_compile_definitions(SHARED_MEMORY_PREFIX="${SHARED_MEMORY_PREFIX}")
|
||||||
if(DEFINED APP_DATA_DIR)
|
if(DEFINED APP_DATA_DIR)
|
||||||
add_compile_definitions(APP_DATA_DIR="${APP_DATA_DIR}")
|
add_compile_definitions(APP_DATA_DIR="${APP_DATA_DIR}")
|
||||||
endif()
|
endif()
|
||||||
add_compile_definitions(EXPORT_MD_CONSUMER="${EXPORT_MD_CONSUMER}")
|
add_compile_definitions(EXPORT_MD_CONSUMER="${EXPORT_MD_CONSUMER}")
|
||||||
|
if(WIN32)
|
||||||
|
# subdirs
|
||||||
|
add_subdirectory(src/lib_spark)
|
||||||
|
else()
|
||||||
|
if(BUILD_SPARKD)
|
||||||
|
# Note: All macros that begin w/ 'CCAPI' are ccapi's macros (defined and/or
|
||||||
|
# read by their code). We override some below.
|
||||||
|
add_compile_definitions(SPARK_ENABLE_CCAPI)
|
||||||
|
|
||||||
if(BUILD_SPARKD)
|
# This allows us to override hardcoded exchange-urls with ones read from
|
||||||
# Note: All macros that begin w/ 'CCAPI' are ccapi's macros (defined and/or
|
# config (i.e., resolved at runtime rather than compile-time)
|
||||||
# read by their code). We override some below.
|
add_compile_definitions(CCAPI_EXPOSE_INTERNAL)
|
||||||
add_compile_definitions(SPARK_ENABLE_CCAPI)
|
|
||||||
|
|
||||||
# This allows us to override hardcoded exchange-urls with ones read from
|
# Enable ccapi services
|
||||||
# config (i.e., resolved at runtime rather than compile-time)
|
add_compile_definitions(CCAPI_ENABLE_SERVICE_MARKET_DATA)
|
||||||
add_compile_definitions(CCAPI_EXPOSE_INTERNAL)
|
add_compile_definitions(CCAPI_ENABLE_SERVICE_EXECUTION_MANAGEMENT)
|
||||||
|
# Enable ccapi exchanges
|
||||||
|
add_compile_definitions(CCAPI_ENABLE_EXCHANGE_BINANCE)
|
||||||
|
add_compile_definitions(CCAPI_ENABLE_EXCHANGE_BINANCE_COIN_FUTURES)
|
||||||
|
add_compile_definitions(CCAPI_ENABLE_EXCHANGE_BINANCE_US)
|
||||||
|
add_compile_definitions(CCAPI_ENABLE_EXCHANGE_BINANCE_USDS_FUTURES)
|
||||||
|
add_compile_definitions(CCAPI_ENABLE_EXCHANGE_COINBASE)
|
||||||
|
add_compile_definitions(CCAPI_ENABLE_EXCHANGE_DERIBIT)
|
||||||
|
add_compile_definitions(CCAPI_ENABLE_EXCHANGE_OKX)
|
||||||
|
|
||||||
# Enable ccapi services
|
set(CCAPI_LOG_LEVEL
|
||||||
add_compile_definitions(CCAPI_ENABLE_SERVICE_MARKET_DATA)
|
"Warn"
|
||||||
add_compile_definitions(CCAPI_ENABLE_SERVICE_EXECUTION_MANAGEMENT)
|
CACHE STRING "<Fatal|Error|Warn|Info|Debug|Trace> Log level for ccapi")
|
||||||
# Enable ccapi exchanges
|
string(TOUPPER "${CCAPI_LOG_LEVEL}" _ccapi_log_level_upper)
|
||||||
add_compile_definitions(CCAPI_ENABLE_EXCHANGE_BINANCE)
|
add_compile_definitions("CCAPI_ENABLE_LOG_${_ccapi_log_level_upper}")
|
||||||
add_compile_definitions(CCAPI_ENABLE_EXCHANGE_BINANCE_COIN_FUTURES)
|
|
||||||
add_compile_definitions(CCAPI_ENABLE_EXCHANGE_BINANCE_US)
|
|
||||||
add_compile_definitions(CCAPI_ENABLE_EXCHANGE_BINANCE_USDS_FUTURES)
|
|
||||||
add_compile_definitions(CCAPI_ENABLE_EXCHANGE_COINBASE)
|
|
||||||
add_compile_definitions(CCAPI_ENABLE_EXCHANGE_DERIBIT)
|
|
||||||
add_compile_definitions(CCAPI_ENABLE_EXCHANGE_OKX)
|
|
||||||
|
|
||||||
set(CCAPI_LOG_LEVEL
|
# ** Binance **
|
||||||
"Warn"
|
add_compile_definitions(CCAPI_BINANCE_URL_REST_BASE="https://api.binance.com")
|
||||||
CACHE STRING "<Fatal|Error|Warn|Info|Debug|Trace> Log level for ccapi")
|
add_compile_definitions(BINANCE_INSTRUMENTS_PATH="/api/v3/exchangeInfo")
|
||||||
string(TOUPPER "${CCAPI_LOG_LEVEL}" _ccapi_log_level_upper)
|
add_compile_definitions(BINANCE_PRICE_STATS_PATH="/api/v3/ticker/24hr")
|
||||||
add_compile_definitions("CCAPI_ENABLE_LOG_${_ccapi_log_level_upper}")
|
|
||||||
|
|
||||||
# ** Binance **
|
# ** Binance US **
|
||||||
add_compile_definitions(CCAPI_BINANCE_URL_REST_BASE="https://api.binance.com")
|
add_compile_definitions(BINANCE_US_INSTRUMENTS_PATH="/api/v3/exchangeInfo")
|
||||||
add_compile_definitions(BINANCE_INSTRUMENTS_PATH="/api/v3/exchangeInfo")
|
add_compile_definitions(BINANCE_US_PRICE_STATS_PATH="/api/v3/ticker/24hr")
|
||||||
add_compile_definitions(BINANCE_PRICE_STATS_PATH="/api/v3/ticker/24hr")
|
|
||||||
|
|
||||||
# ** Binance US **
|
# ** Binance USDS Futures **
|
||||||
add_compile_definitions(BINANCE_US_INSTRUMENTS_PATH="/api/v3/exchangeInfo")
|
add_compile_definitions(CCAPI_BINANCE_USDS_FUTURES_URL_REST_BASE="https://fapi.binance.com")
|
||||||
add_compile_definitions(BINANCE_US_PRICE_STATS_PATH="/api/v3/ticker/24hr")
|
add_compile_definitions(BINANCE_USDS_FUTURES_INSTRUMENTS_PATH="/fapi/v1/exchangeInfo")
|
||||||
|
add_compile_definitions(BINANCE_USDS_FUTURES_PRICE_STATS_PATH="/fapi/v1/ticker/24hr")
|
||||||
|
add_compile_definitions(BINANCE_USDS_FUTURES_USER_DATA_PATH="/api/v3/userDataStream")
|
||||||
|
|
||||||
# ** Binance USDS Futures **
|
# ** Binance Coin Futures **
|
||||||
add_compile_definitions(CCAPI_BINANCE_USDS_FUTURES_URL_REST_BASE="https://dapi.binance.com")
|
add_compile_definitions(CCAPI_BINANCE_COIN_FUTURES_URL_REST_BASE="https://dapi.binance.com")
|
||||||
add_compile_definitions(BINANCE_USDS_FUTURES_INSTRUMENTS_PATH="/dapi/v1/exchangeInfo")
|
add_compile_definitions(BINANCE_COIN_FUTURES_INSTRUMENTS_PATH="/dapi/v1/exchangeInfo")
|
||||||
add_compile_definitions(BINANCE_USDS_FUTURES_PRICE_STATS_PATH="/dapi/v1/ticker/24hr")
|
add_compile_definitions(BINANCE_COIN_FUTURES_PRICE_STATS_PATH="/dapi/v1/ticker/24hr")
|
||||||
|
|
||||||
# ** Deribit **
|
# ** Deribit **
|
||||||
add_compile_definitions(DERIBIT_INSTRUMENT_PATH="/api/v2/public/get_instrument")
|
add_compile_definitions(DERIBIT_INSTRUMENT_PATH="/api/v2/public/get_instrument")
|
||||||
add_compile_definitions(DERIBIT_INSTRUMENTS_PATH="/api/v2/public/get_instruments")
|
add_compile_definitions(DERIBIT_INSTRUMENTS_PATH="/api/v2/public/get_instruments")
|
||||||
add_compile_definitions(DERIBIT_COMBOS_PATH="/api/v2/public/get_combos")
|
add_compile_definitions(DERIBIT_COMBOS_PATH="/api/v2/public/get_combos")
|
||||||
add_compile_definitions(DERIBIT_TICKER_PATH="/api/v2/public/ticker")
|
add_compile_definitions(DERIBIT_TICKER_PATH="/api/v2/public/ticker")
|
||||||
add_compile_definitions(DERIBIT_CURRENCIES_METHOD="public/get_currencies")
|
add_compile_definitions(DERIBIT_CURRENCIES_METHOD="public/get_currencies")
|
||||||
add_compile_definitions(DERIBIT_INSTRUMENT_METHOD="public/get_instrument")
|
add_compile_definitions(DERIBIT_INSTRUMENT_METHOD="public/get_instrument")
|
||||||
add_compile_definitions(DERIBIT_INSTRUMENTS_METHOD="public/get_instruments")
|
add_compile_definitions(DERIBIT_INSTRUMENTS_METHOD="public/get_instruments")
|
||||||
add_compile_definitions(DERIBIT_COMBO_DETAILS_METHOD="public/get_combo_details")
|
add_compile_definitions(DERIBIT_COMBO_DETAILS_METHOD="public/get_combo_details")
|
||||||
add_compile_definitions(DERIBIT_COMBOS_METHOD="public/get_combos")
|
add_compile_definitions(DERIBIT_COMBOS_METHOD="public/get_combos")
|
||||||
|
|
||||||
# ** Okx **
|
# ** Okx **
|
||||||
add_compile_definitions(OKX_INSTRUMENTS_PATH="/api/v5/public/instruments")
|
add_compile_definitions(OKX_INSTRUMENTS_PATH="/api/v5/public/instruments")
|
||||||
add_compile_definitions(OKX_UNDERLYING_PATH="/api/v5/public/underlying")
|
add_compile_definitions(OKX_UNDERLYING_PATH="/api/v5/public/underlying")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# subdirs
|
# subdirs
|
||||||
add_subdirectory(src/lib_system)
|
add_subdirectory(src/lib_spark)
|
||||||
add_subdirectory(src/lib_domain)
|
if (BUILD_SPARKD)
|
||||||
add_subdirectory(src/lib_http)
|
add_subdirectory(src/lib_python_interop)
|
||||||
if (BUILD_SPARKD)
|
add_subdirectory(src/lib_onixs_fix)
|
||||||
add_subdirectory(src/lib_python_md)
|
add_subdirectory(src/lib_binance)
|
||||||
add_subdirectory(src/app_sparkd)
|
add_subdirectory(src/lib_okx_execution)
|
||||||
add_subdirectory(src/data_files)
|
add_subdirectory(src/app_sparkd)
|
||||||
endif()
|
add_subdirectory(src/data_files)
|
||||||
add_subdirectory(src/lib_spark)
|
endif()
|
||||||
if (BUILD_ADMIN_WEB_APP)
|
if (BUILD_ADMIN_WEB_APP)
|
||||||
add_subdirectory(src/Spark.Admin.WebApp)
|
add_subdirectory(src/Spark.Admin.WebApp)
|
||||||
endif()
|
endif()
|
||||||
if(BUILD_DOCS)
|
if(BUILD_DOCS)
|
||||||
add_subdirectory(doc/user)
|
add_subdirectory(doc/user)
|
||||||
endif()
|
endif()
|
||||||
if(BUILD_SDK)
|
if(BUILD_SDK)
|
||||||
add_subdirectory(src/sdk)
|
add_subdirectory(src/sdk)
|
||||||
|
endif()
|
||||||
endif()
|
endif()
|
||||||
+15
-12
@@ -24,12 +24,13 @@
|
|||||||
"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_CXX_STANDARD": "20",
|
"CMAKE_CXX_STANDARD": "20",
|
||||||
|
"CMAKE_INSTALL_PREFIX": "${sourceDir}/install/${presetName}",
|
||||||
"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",
|
||||||
"CMAKE_TOOLCHAIN_FILE": "${sourceDir}/vcpkg/scripts/buildsystems/vcpkg.cmake",
|
"CMAKE_TOOLCHAIN_FILE": "${sourceDir}/vcpkg/scripts/buildsystems/vcpkg.cmake",
|
||||||
"EXTERNALS_ROOT": "${sourceDir}/externals/windows",
|
"EXTERNALS_ROOT": "${sourceDir}/externals/windows",
|
||||||
"CONFIG_DEFAULTS_PATH": "spark/config/profiles/default/*.conf",
|
"CONFIG_DEFAULTS_PATH": "spark/config/profiles/default/*.conf",
|
||||||
"DOTNET_BINARY_DIR": "${sourceDir}/build/$<CONFIG>/bin/net7.0;${sourceDir}/build/$<CONFIG>/bin/net7.0-windows",
|
"DOTNET_BINARY_DIR": "${sourceDir}/build/$<CONFIG>/bin/net8.0;${sourceDir}/build/$<CONFIG>/bin/net8.0-windows",
|
||||||
"EXPORT_MD_CONSUMER": {
|
"EXPORT_MD_CONSUMER": {
|
||||||
"type": "BOOL",
|
"type": "BOOL",
|
||||||
"value": "ON"
|
"value": "ON"
|
||||||
@@ -49,11 +50,20 @@
|
|||||||
"binaryDir": "${sourceDir}/build/${presetName}",
|
"binaryDir": "${sourceDir}/build/${presetName}",
|
||||||
"cacheVariables": {
|
"cacheVariables": {
|
||||||
"platform": "",
|
"platform": "",
|
||||||
|
"CMAKE_BUILD_WITH_INSTALL_RPATH": {
|
||||||
|
"type": "BOOL",
|
||||||
|
"value": "OFF"
|
||||||
|
},
|
||||||
"CMAKE_CXX_STANDARD": "20",
|
"CMAKE_CXX_STANDARD": "20",
|
||||||
|
"CMAKE_INSTALL_RPATH": ".",
|
||||||
"CMAKE_INSTALL_PREFIX": "${sourceDir}/install/${presetName}",
|
"CMAKE_INSTALL_PREFIX": "${sourceDir}/install/${presetName}",
|
||||||
"CMAKE_PREFIX_PATH": "${sourceDir}/cmake/;${sourceDir}/.venv/lib/python3.10/site-packages/pybind11/share/cmake/pybind11",
|
"CMAKE_PREFIX_PATH": "${sourceDir}/cmake/;${sourceDir}/.venv/lib/python3.10/site-packages/pybind11/share/cmake/pybind11",
|
||||||
"CMAKE_EXE_LINKER_FLAGS": "-Wno-undef",
|
"CMAKE_EXE_LINKER_FLAGS": "-Wno-undef",
|
||||||
"CMAKE_TOOLCHAIN_FILE": "${sourceDir}/vcpkg/scripts/buildsystems/vcpkg.cmake",
|
"CMAKE_TOOLCHAIN_FILE": "${sourceDir}/vcpkg/scripts/buildsystems/vcpkg.cmake",
|
||||||
|
"DATABENTO_USE_EXTERNAL_JSON": {
|
||||||
|
"type": "BOOL",
|
||||||
|
"value": "ON"
|
||||||
|
},
|
||||||
"EXTERNALS_ROOT": "${sourceDir}/externals/linux",
|
"EXTERNALS_ROOT": "${sourceDir}/externals/linux",
|
||||||
"BUILD_SDK": {
|
"BUILD_SDK": {
|
||||||
"type": "BOOL",
|
"type": "BOOL",
|
||||||
@@ -164,12 +174,13 @@
|
|||||||
"CMAKE_CXX_COMPILER": "clang++",
|
"CMAKE_CXX_COMPILER": "clang++",
|
||||||
"CMAKE_CXX_FLAGS_DEBUG": "-g -fPIC -Wall -pedantic -Wextra -Werror -Wno-missing-braces -Wno-ignored-qualifiers --std=c++20 -fdiagnostics-color -DDEBUG",
|
"CMAKE_CXX_FLAGS_DEBUG": "-g -fPIC -Wall -pedantic -Wextra -Werror -Wno-missing-braces -Wno-ignored-qualifiers --std=c++20 -fdiagnostics-color -DDEBUG",
|
||||||
"CMAKE_CXX_FLAGS_RELEASE": "-fPIC -Wall -pedantic -Wextra -Werror -Wno-missing-braces -Wno-ignored-qualifiers --std=c++20 -fdiagnostics-color -fno-omit-frame-pointer -DNDEBUG -O3",
|
"CMAKE_CXX_FLAGS_RELEASE": "-fPIC -Wall -pedantic -Wextra -Werror -Wno-missing-braces -Wno-ignored-qualifiers --std=c++20 -fdiagnostics-color -fno-omit-frame-pointer -DNDEBUG -O3",
|
||||||
|
"CMAKE_INSTALL_PREFIX": "${sourceDir}/install/${presetName}",
|
||||||
"CMAKE_EXPORT_COMPILE_COMMANDS": {
|
"CMAKE_EXPORT_COMPILE_COMMANDS": {
|
||||||
"type": "BOOL",
|
"type": "BOOL",
|
||||||
"value": "ON"
|
"value": "ON"
|
||||||
},
|
},
|
||||||
"CONFIG_DEFAULTS_PATH": "spark/config/profiles/default/*.conf",
|
"CONFIG_DEFAULTS_PATH": "spark/config/profiles/default/*.conf",
|
||||||
"DOTNET_BINARY_DIR": "${sourceDir}/build/$<CONFIG>/bin/net7.0",
|
"DOTNET_BINARY_DIR": "${sourceDir}/build/Spark.Api.Server/$<CONFIG>/bin/net8.0",
|
||||||
"EXPORT_MD_CONSUMER": {
|
"EXPORT_MD_CONSUMER": {
|
||||||
"type": "BOOL",
|
"type": "BOOL",
|
||||||
"value": "ON"
|
"value": "ON"
|
||||||
@@ -208,7 +219,7 @@
|
|||||||
"binaryDir": "${sourceDir}/build/${presetName}",
|
"binaryDir": "${sourceDir}/build/${presetName}",
|
||||||
"cacheVariables": {
|
"cacheVariables": {
|
||||||
"CONFIG_DEFAULTS_PATH": "spark/config/profiles/default/*.conf;spark/config/profiles/data_stream/*.conf",
|
"CONFIG_DEFAULTS_PATH": "spark/config/profiles/default/*.conf;spark/config/profiles/data_stream/*.conf",
|
||||||
"DOTNET_BINARY_DIR": "${sourceDir}/build/$<CONFIG>/bin/net7.0;${sourceDir}/build/$<CONFIG>/bin/net7.0-windows"
|
"DOTNET_BINARY_DIR": "${sourceDir}/build/$<CONFIG>/bin/net8.0;${sourceDir}/build/$<CONFIG>/bin/net8.0-windows"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -241,7 +252,7 @@
|
|||||||
"CMAKE_CXX_FLAGS_DEBUG": "-g -fPIC -Wall -pedantic -Wextra -Werror -Wno-missing-braces -Wno-ignored-qualifiers --std=c++20 -fdiagnostics-color -DDEBUG",
|
"CMAKE_CXX_FLAGS_DEBUG": "-g -fPIC -Wall -pedantic -Wextra -Werror -Wno-missing-braces -Wno-ignored-qualifiers --std=c++20 -fdiagnostics-color -DDEBUG",
|
||||||
"CMAKE_CXX_FLAGS_RELEASE": "-fPIC -Wall -pedantic -Wextra -Werror -Wno-missing-braces -Wno-ignored-qualifiers --std=c++20 -fdiagnostics-color -fno-omit-frame-pointer -DNDEBUG -O3",
|
"CMAKE_CXX_FLAGS_RELEASE": "-fPIC -Wall -pedantic -Wextra -Werror -Wno-missing-braces -Wno-ignored-qualifiers --std=c++20 -fdiagnostics-color -fno-omit-frame-pointer -DNDEBUG -O3",
|
||||||
"CONFIG_DEFAULTS_PATH": "spark/config/profiles/default/*.conf;spark/config/profiles/data_stream/*.conf",
|
"CONFIG_DEFAULTS_PATH": "spark/config/profiles/default/*.conf;spark/config/profiles/data_stream/*.conf",
|
||||||
"DOTNET_BINARY_DIR": "${sourceDir}/build/$<CONFIG>/bin/net7.0;${sourceDir}/build/$<CONFIG>/bin/net8.0",
|
"DOTNET_BINARY_DIR": "${sourceDir}/build/$<CONFIG>/bin/net7.0",
|
||||||
"EXPORT_MD_CONSUMER": {
|
"EXPORT_MD_CONSUMER": {
|
||||||
"type": "BOOL",
|
"type": "BOOL",
|
||||||
"value": "ON"
|
"value": "ON"
|
||||||
@@ -294,14 +305,6 @@
|
|||||||
"inherits": "sparkd"
|
"inherits": "sparkd"
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
|
||||||
"name": "sparkd-debug-clang-j6",
|
|
||||||
"configurePreset": "sparkd-debug-clang",
|
|
||||||
"displayName": "Sparkd (Debug | Clang | jobs=6)",
|
|
||||||
"inherits": "sparkd",
|
|
||||||
"jobs": 6
|
|
||||||
},
|
|
||||||
|
|
||||||
{
|
{
|
||||||
"name": "sparkd-debug-gcc",
|
"name": "sparkd-debug-gcc",
|
||||||
"configurePreset": "sparkd-debug-gcc",
|
"configurePreset": "sparkd-debug-gcc",
|
||||||
|
|||||||
@@ -42,8 +42,6 @@ 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.Net", "src\DataStreamSuite\Bts.Net\Bts.Net.csproj", "{CCDCB00A-CABF-4D82-8A5F-33EEC8ACE51D}"
|
|
||||||
EndProject
|
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
Debug|x64 = Debug|x64
|
Debug|x64 = Debug|x64
|
||||||
@@ -196,14 +194,6 @@ Global
|
|||||||
{6BD3F6D8-B6FC-44E8-B8FE-06352F638B9B}.Release|x64.Build.0 = Release|Any CPU
|
{6BD3F6D8-B6FC-44E8-B8FE-06352F638B9B}.Release|x64.Build.0 = Release|Any CPU
|
||||||
{6BD3F6D8-B6FC-44E8-B8FE-06352F638B9B}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU
|
{6BD3F6D8-B6FC-44E8-B8FE-06352F638B9B}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU
|
||||||
{6BD3F6D8-B6FC-44E8-B8FE-06352F638B9B}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU
|
{6BD3F6D8-B6FC-44E8-B8FE-06352F638B9B}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU
|
||||||
{CCDCB00A-CABF-4D82-8A5F-33EEC8ACE51D}.Debug|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{CCDCB00A-CABF-4D82-8A5F-33EEC8ACE51D}.Debug|x64.Build.0 = Debug|Any CPU
|
|
||||||
{CCDCB00A-CABF-4D82-8A5F-33EEC8ACE51D}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{CCDCB00A-CABF-4D82-8A5F-33EEC8ACE51D}.MinSizeRel|x64.Build.0 = Debug|Any CPU
|
|
||||||
{CCDCB00A-CABF-4D82-8A5F-33EEC8ACE51D}.Release|x64.ActiveCfg = Release|Any CPU
|
|
||||||
{CCDCB00A-CABF-4D82-8A5F-33EEC8ACE51D}.Release|x64.Build.0 = Release|Any CPU
|
|
||||||
{CCDCB00A-CABF-4D82-8A5F-33EEC8ACE51D}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{CCDCB00A-CABF-4D82-8A5F-33EEC8ACE51D}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU
|
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
HideSolutionNode = FALSE
|
HideSolutionNode = FALSE
|
||||||
|
|||||||
@@ -0,0 +1,48 @@
|
|||||||
|
include_guard(GLOBAL)
|
||||||
|
|
||||||
|
function(get_version_from_git)
|
||||||
|
find_package(Git QUIET)
|
||||||
|
if(NOT Git_FOUND)
|
||||||
|
message(WARNING "Git not found")
|
||||||
|
return()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
execute_process(
|
||||||
|
COMMAND ${GIT_EXECUTABLE} describe --tags --always
|
||||||
|
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
|
||||||
|
OUTPUT_VARIABLE GIT_TAG
|
||||||
|
OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||||
|
RESULT_VARIABLE GIT_RESULT
|
||||||
|
)
|
||||||
|
|
||||||
|
if(NOT GIT_RESULT EQUAL 0)
|
||||||
|
message(WARNING "Failed to get git tag")
|
||||||
|
return()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
execute_process(
|
||||||
|
COMMAND ${GIT_EXECUTABLE} rev-parse --short=7 HEAD
|
||||||
|
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
|
||||||
|
OUTPUT_VARIABLE GIT_COMMIT_SHORT_HASH
|
||||||
|
OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||||
|
)
|
||||||
|
set(PROJECT_VERSION_BUILD_METADATA ${GIT_COMMIT_SHORT_HASH})
|
||||||
|
set(PROJECT_VERSION_BUILD_METADATA ${GIT_COMMIT_SHORT_HASH} PARENT_SCOPE)
|
||||||
|
|
||||||
|
string(REGEX REPLACE "^v" "" CLEAN_TAG "${GIT_TAG}")
|
||||||
|
if(CLEAN_TAG MATCHES "^([0-9]+)\\.([0-9]+)\\.([0-9]+)(-.*)?$")
|
||||||
|
set(PROJECT_VERSION_MAJOR ${CMAKE_MATCH_1})
|
||||||
|
set(PROJECT_VERSION_MAJOR ${CMAKE_MATCH_1} PARENT_SCOPE)
|
||||||
|
set(PROJECT_VERSION_MINOR ${CMAKE_MATCH_2})
|
||||||
|
set(PROJECT_VERSION_MINOR ${CMAKE_MATCH_2} PARENT_SCOPE)
|
||||||
|
set(PROJECT_VERSION_PATCH ${CMAKE_MATCH_3})
|
||||||
|
set(PROJECT_VERSION_PATCH ${CMAKE_MATCH_3} PARENT_SCOPE)
|
||||||
|
|
||||||
|
set(PROJECT_VERSION "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}.${CMAKE_MATCH_3}")
|
||||||
|
set(PROJECT_VERSION "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}.${CMAKE_MATCH_3}" PARENT_SCOPE)
|
||||||
|
set(PROJECT_VERSION_FULL "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}.${CMAKE_MATCH_3}+${GIT_COMMIT_SHORT_HASH}")
|
||||||
|
set(PROJECT_VERSION_FULL "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}.${CMAKE_MATCH_3}+${GIT_COMMIT_SHORT_HASH}" PARENT_SCOPE)
|
||||||
|
else()
|
||||||
|
message(WARNING "Tag '${CLEAN_TAG}' does not match semver format")
|
||||||
|
endif()
|
||||||
|
endfunction()
|
||||||
@@ -0,0 +1,71 @@
|
|||||||
|
include_guard(DIRECTORY)
|
||||||
|
include(GNUInstallDirs)
|
||||||
|
include(${CMAKE_SOURCE_DIR}/cmake/ExportToParent.cmake)
|
||||||
|
include(${CMAKE_SOURCE_DIR}/cmake/SetFirstDefined.cmake)
|
||||||
|
|
||||||
|
function(init_python_module)
|
||||||
|
set(_options)
|
||||||
|
set(_one_value_args
|
||||||
|
NAME
|
||||||
|
)
|
||||||
|
set(_multi_value_args
|
||||||
|
SOURCES
|
||||||
|
)
|
||||||
|
cmake_parse_arguments(_ARGS "${_options}" "${_one_value_args}" "${_multi_value_args}" ${ARGN})
|
||||||
|
set_first_defined(_name _ARGS_NAME PROJECT_NAME)
|
||||||
|
set_first_defined(_sources _ARGS_SOURCES ${_name}_SOURCES)
|
||||||
|
|
||||||
|
set(module_proj ${_name}_module)
|
||||||
|
set(${module_proj}_SOURCES ${_sources})
|
||||||
|
pybind11_add_module(${module_proj} SHARED ${_sources})
|
||||||
|
target_link_libraries(
|
||||||
|
${module_proj}
|
||||||
|
PUBLIC
|
||||||
|
pybind11::embed
|
||||||
|
spark
|
||||||
|
${_name}
|
||||||
|
)
|
||||||
|
target_include_directories(
|
||||||
|
${module_proj}
|
||||||
|
PRIVATE
|
||||||
|
$<BUILD_INTERFACE:${pybind11_INCLUDE_DIRS}>
|
||||||
|
)
|
||||||
|
target_include_directories(
|
||||||
|
${module_proj}
|
||||||
|
PUBLIC
|
||||||
|
${Python3_INCLUDE_DIRS}
|
||||||
|
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
|
||||||
|
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
|
||||||
|
)
|
||||||
|
add_custom_command(
|
||||||
|
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/stubs/${_name}.pyi
|
||||||
|
DEPENDS ${_name} ${module_proj}
|
||||||
|
COMMAND PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR} pybind11-stubgen --numpy-array-use-type-var --ignore-invalid-expressions '.*' ${_name}_module
|
||||||
|
COMMENT "Generating py stubs"
|
||||||
|
)
|
||||||
|
add_custom_target(
|
||||||
|
"${_name}_py_stubs"
|
||||||
|
ALL
|
||||||
|
DEPENDS
|
||||||
|
${CMAKE_CURRENT_BINARY_DIR}/stubs/${_name}.pyi
|
||||||
|
)
|
||||||
|
install(
|
||||||
|
TARGETS ${module_proj}
|
||||||
|
EXPORT ${module_proj}Targets
|
||||||
|
RUNTIME
|
||||||
|
DESTINATION ${CMAKE_INSTALL_BINDIR}
|
||||||
|
LIBRARY
|
||||||
|
DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||||
|
ARCHIVE
|
||||||
|
DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||||
|
)
|
||||||
|
foreach(dir ${pybind11_INCLUDE_DIRS})
|
||||||
|
install(DIRECTORY ${dir} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
|
||||||
|
endforeach()
|
||||||
|
install(
|
||||||
|
EXPORT ${module_proj}Targets
|
||||||
|
FILE ${module_proj}Targets.cmake
|
||||||
|
NAMESPACE ${_name}::
|
||||||
|
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${_name}
|
||||||
|
)
|
||||||
|
endfunction()
|
||||||
@@ -0,0 +1,65 @@
|
|||||||
|
include_guard(DIRECTORY)
|
||||||
|
include(GNUInstallDirs)
|
||||||
|
|
||||||
|
function(init_python_plugin)
|
||||||
|
set(_options)
|
||||||
|
set(_one_value_args NAME PLUGIN_NAME)
|
||||||
|
set(_multi_value_args SOURCES)
|
||||||
|
cmake_parse_arguments(_ARGS "${_options}" "${_one_value_args}" "${_multi_value_args}" ${ARGN})
|
||||||
|
set_first_defined(_name _ARGS_NAME PROJECT_NAME)
|
||||||
|
set(_plugin_name ${_ARGS_PLUGIN_NAME})
|
||||||
|
if (NOT DEFINED _ARGS_PLUGIN_NAME)
|
||||||
|
set(_plugin_name ${_name}_plugins)
|
||||||
|
endif()
|
||||||
|
set(${_plugin_name}_SOURCES ${_ARGS_SOURCES})
|
||||||
|
if (NOT DEFINED _ARGS_SOURCES)
|
||||||
|
file(
|
||||||
|
GLOB_RECURSE ${_plugin_name}_SOURCES
|
||||||
|
RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
|
||||||
|
${_plugin_name}/*.py)
|
||||||
|
endif()
|
||||||
|
set(src_outs)
|
||||||
|
foreach(_src ${${_plugin_name}_SOURCES})
|
||||||
|
set(_src_in ${CMAKE_CURRENT_SOURCE_DIR}/${_src})
|
||||||
|
set(_src_out ${CMAKE_CURRENT_BINARY_DIR}/${_src})
|
||||||
|
add_custom_command(
|
||||||
|
OUTPUT ${_src_out}
|
||||||
|
COMMAND ${CMAKE_COMMAND} -E copy ${_src_in} ${_src_out}
|
||||||
|
DEPENDS ${_src_in}
|
||||||
|
COMMENT "Copying ${_plugin_name} plugin ${_src} to ${_src_out}"
|
||||||
|
)
|
||||||
|
list(APPEND src_outs ${_src_out})
|
||||||
|
endforeach()
|
||||||
|
|
||||||
|
add_custom_target(copy_${_plugin_name} ALL DEPENDS ${src_outs})
|
||||||
|
|
||||||
|
add_library(${_plugin_name} INTERFACE)
|
||||||
|
add_library(${_name}::${_plugin_name} ALIAS ${_plugin_name})
|
||||||
|
|
||||||
|
set_target_properties(
|
||||||
|
${_plugin_name}
|
||||||
|
PROPERTIES
|
||||||
|
INTERFACE_PYTHON_SCRIPTS_DIR
|
||||||
|
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/${_plugin_name}>$<INSTALL_INTERFACE:${CMAKE_INSTALL_BINDIR}/${_plugin_name}>
|
||||||
|
)
|
||||||
|
|
||||||
|
set_target_properties(
|
||||||
|
${_plugin_name}
|
||||||
|
PROPERTIES
|
||||||
|
INTERFACE_PYTHON_SCRIPTS $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/${${_plugin_name}_SOURCES}>$<INSTALL_INTERFACE:${CMAKE_INSTALL_BINDIR}/${${_plugin_name}_SOURCES}>
|
||||||
|
)
|
||||||
|
|
||||||
|
install(
|
||||||
|
TARGETS ${_plugin_name}
|
||||||
|
EXPORT ${_plugin_name}Targets
|
||||||
|
DESTINATION ${CMAKE_INSTALL_BINDIR}
|
||||||
|
)
|
||||||
|
|
||||||
|
install(
|
||||||
|
EXPORT ${_plugin_name}Targets
|
||||||
|
FILE ${_plugin_name}Targets.cmake
|
||||||
|
NAMESPACE ${_name}::
|
||||||
|
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${_name}
|
||||||
|
)
|
||||||
|
install(DIRECTORY ${_plugin_name} DESTINATION ${CMAKE_INSTALL_BINDIR})
|
||||||
|
endfunction()
|
||||||
@@ -0,0 +1,182 @@
|
|||||||
|
set(Protobuf_PROTOC_EXECUTABLE "${EXTERNALS_BIN}/protoc")
|
||||||
|
set(PROTOBUF_INCLUDE_DIRS "${EXTERNALS_INCLUDE}")
|
||||||
|
set(PROTOBUF_STATIC_LIB "libprotobuf")
|
||||||
|
set(_protobuf_src_dir ${CMAKE_SOURCE_DIR}/src/lib_spark)
|
||||||
|
set(_protobuf_bin_dir ${CMAKE_BINARY_DIR}/src/lib_spark)
|
||||||
|
|
||||||
|
function(Protobuf_Generate_Cpp)
|
||||||
|
set(_options)
|
||||||
|
set(_one_value_args CXX_SOURCES CXX_HEADERS CXX_OUT_DIR)
|
||||||
|
set(_multi_value_args PROTO_INCLUDE_DIRS PROTO_SOURCES)
|
||||||
|
cmake_parse_arguments(_ARGS "${_options}" "${_one_value_args}" "${_multi_value_args}" ${ARGN})
|
||||||
|
set(${_ARGS_CXX_SOURCES})
|
||||||
|
set(${_ARGS_CXX_HEADERS})
|
||||||
|
|
||||||
|
set(_proto_include_cli_args)
|
||||||
|
foreach(_dir ${_ARGS_PROTO_INCLUDE_DIRS})
|
||||||
|
list(APPEND _proto_include_cli_args -I ${_dir})
|
||||||
|
endforeach()
|
||||||
|
|
||||||
|
foreach(FIL ${_ARGS_PROTO_SOURCES})
|
||||||
|
get_filename_component(ABS_FIL ${FIL} ABSOLUTE)
|
||||||
|
get_filename_component(FIL_WE ${FIL} NAME_WE)
|
||||||
|
get_filename_component(FIL_DIR ${FIL} DIRECTORY)
|
||||||
|
if(FIL_DIR)
|
||||||
|
set(FIL_WE "${FIL_DIR}/${FIL_WE}")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
list(APPEND ${_ARGS_CXX_SOURCES} "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.pb.cc")
|
||||||
|
list(APPEND ${_ARGS_CXX_HEADERS} "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.pb.h")
|
||||||
|
|
||||||
|
add_custom_command(
|
||||||
|
OUTPUT
|
||||||
|
"${_ARGS_CXX_OUT_DIR}/${FIL_WE}.pb.cc"
|
||||||
|
"${_ARGS_CXX_OUT_DIR}/${FIL_WE}.pb.h"
|
||||||
|
COMMAND
|
||||||
|
${Protobuf_PROTOC_EXECUTABLE}
|
||||||
|
ARGS
|
||||||
|
--cpp_out=${_ARGS_CXX_OUT_DIR} ${_proto_include_cli_args} ${ABS_FIL}
|
||||||
|
DEPENDS ${ABS_FIL}
|
||||||
|
COMMENT "Running C++ protocol buffer compiler on ${FIL}"
|
||||||
|
VERBATIM
|
||||||
|
)
|
||||||
|
endforeach()
|
||||||
|
|
||||||
|
set_source_files_properties(
|
||||||
|
${${_ARGS_CXX_SOURCES}}
|
||||||
|
${${_ARGS_CXX_HEADERS}}
|
||||||
|
PROPERTIES
|
||||||
|
GENERATED TRUE
|
||||||
|
)
|
||||||
|
|
||||||
|
# remove some warnings from protobuf generated files
|
||||||
|
if(WIN32)
|
||||||
|
set_source_files_properties(
|
||||||
|
${${_ARGS_CXX_SOURCES}}
|
||||||
|
PROPERTIES
|
||||||
|
COMPILE_FLAGS "/wd4309 /wd4838"
|
||||||
|
)
|
||||||
|
else()
|
||||||
|
set_source_files_properties(
|
||||||
|
${${_ARGS_CXX_SOURCES}}
|
||||||
|
PROPERTIES
|
||||||
|
COMPILE_FLAGS "-Wno-unused-parameter -Wno-effc++ -Wno-pedantic -Wno-sign-compare -Wno-uninitialized"
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
set(${_ARGS_CXX_SOURCES} ${${_ARGS_CXX_SOURCES}} PARENT_SCOPE)
|
||||||
|
set(${_ARGS_CXX_HEADERS} ${${_ARGS_CXX_HEADERS}} PARENT_SCOPE)
|
||||||
|
endfunction()
|
||||||
|
|
||||||
|
function(Service_Compiler_Generate_Cpp)
|
||||||
|
set(_options)
|
||||||
|
set(_one_value_args CXX_SOURCES CXX_HEADERS CXX_OUT_DIR)
|
||||||
|
set(_multi_value_args PROTO_INCLUDE_DIRS PROTO_SOURCES)
|
||||||
|
cmake_parse_arguments(_ARGS "${_options}" "${_one_value_args}" "${_multi_value_args}" ${ARGN})
|
||||||
|
set(${_ARGS_CXX_SOURCES})
|
||||||
|
set(${_ARGS_CXX_HEADERS})
|
||||||
|
|
||||||
|
set(_proto_include_cli_args)
|
||||||
|
foreach(_dir ${_ARGS_PROTO_INCLUDE_DIRS})
|
||||||
|
list(APPEND _proto_include_cli_args -I ${_dir})
|
||||||
|
endforeach()
|
||||||
|
|
||||||
|
foreach(FIL ${_ARGS_PROTO_SOURCES})
|
||||||
|
get_filename_component(ABS_FIL ${FIL} ABSOLUTE)
|
||||||
|
get_filename_component(FIL_WE ${FIL} NAME_WE)
|
||||||
|
get_filename_component(FIL_DIR ${FIL} DIRECTORY)
|
||||||
|
if(FIL_DIR)
|
||||||
|
set(FIL_WE "${FIL_DIR}/${FIL_WE}")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
list(APPEND ${_ARGS_CXX_SOURCES} "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.pb.cc")
|
||||||
|
list(APPEND ${_ARGS_CXX_HEADERS} "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.pb.h")
|
||||||
|
|
||||||
|
list(APPEND ${_ARGS_CXX_SOURCES} "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.client.pb.cc")
|
||||||
|
list(APPEND ${_ARGS_CXX_HEADERS} "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.client.pb.h")
|
||||||
|
|
||||||
|
list(APPEND ${_ARGS_CXX_SOURCES} "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.server.pb.cc")
|
||||||
|
list(APPEND ${_ARGS_CXX_HEADERS} "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.server.pb.h")
|
||||||
|
|
||||||
|
set(TEMPLATES
|
||||||
|
${CMAKE_SOURCE_DIR}/src/lib_spark/spark/api/service_compiler/templates/cpp/client.pb.cc
|
||||||
|
${CMAKE_SOURCE_DIR}/src/lib_spark/spark/api/service_compiler/templates/cpp/client.pb.h
|
||||||
|
${CMAKE_SOURCE_DIR}/src/lib_spark/spark/api/service_compiler/templates/cpp/server.pb.cc
|
||||||
|
${CMAKE_SOURCE_DIR}/src/lib_spark/spark/api/service_compiler/templates/cpp/server.pb.h
|
||||||
|
)
|
||||||
|
|
||||||
|
set(_plugin_py ${CMAKE_SOURCE_DIR}/src/lib_spark/spark/api/service_compiler/plugin.py)
|
||||||
|
if(WIN32)
|
||||||
|
set(_plugin_cmd ${CMAKE_SOURCE_DIR}/src/lib_spark/spark/api/service_compiler/plugin.cmd)
|
||||||
|
add_custom_command(
|
||||||
|
OUTPUT
|
||||||
|
"${_ARGS_CXX_OUT_DIR}/${FIL_WE}.pb.cc"
|
||||||
|
"${_ARGS_CXX_OUT_DIR}/${FIL_WE}.pb.h"
|
||||||
|
"${_ARGS_CXX_OUT_DIR}/${FIL_WE}.client.pb.cc"
|
||||||
|
"${_ARGS_CXX_OUT_DIR}/${FIL_WE}.client.pb.h"
|
||||||
|
"${_ARGS_CXX_OUT_DIR}/${FIL_WE}.server.pb.cc"
|
||||||
|
"${_ARGS_CXX_OUT_DIR}/${FIL_WE}.server.pb.h"
|
||||||
|
COMMAND SET PYTHONPATH=${SPARK_PYTHON}
|
||||||
|
COMMAND ${CMAKE_SOURCE_DIR}/.venv/Scripts/activate.bat
|
||||||
|
COMMAND
|
||||||
|
${Protobuf_PROTOC_EXECUTABLE}
|
||||||
|
ARGS
|
||||||
|
--cpp_out=${_ARGS_CXX_OUT_DIR}
|
||||||
|
--plugin=protoc-gen-service=${_plugin_cmd}
|
||||||
|
--service_out=lang=cpp:${_ARGS_CXX_OUT_DIR}
|
||||||
|
-I ${PROTOBUF_INCLUDE_DIRS}
|
||||||
|
-I ${_protobuf_src_dir}
|
||||||
|
${ABS_FIL}
|
||||||
|
DEPENDS
|
||||||
|
${ABS_FIL}
|
||||||
|
${TEMPLATES}
|
||||||
|
${_plugin_cmd}
|
||||||
|
${_plugin_py}
|
||||||
|
COMMENT "Running C++ service compiler on ${FIL}"
|
||||||
|
VERBATIM
|
||||||
|
)
|
||||||
|
else()
|
||||||
|
add_custom_command(
|
||||||
|
OUTPUT
|
||||||
|
"${_ARGS_CXX_OUT_DIR}/${FIL_WE}.pb.cc"
|
||||||
|
"${_ARGS_CXX_OUT_DIR}/${FIL_WE}.pb.h"
|
||||||
|
"${_ARGS_CXX_OUT_DIR}/${FIL_WE}.client.pb.cc"
|
||||||
|
"${_ARGS_CXX_OUT_DIR}/${FIL_WE}.client.pb.h"
|
||||||
|
"${_ARGS_CXX_OUT_DIR}/${FIL_WE}.server.pb.cc"
|
||||||
|
"${_ARGS_CXX_OUT_DIR}/${FIL_WE}.server.pb.h"
|
||||||
|
COMMAND ${CMAKE_SOURCE_DIR}/tools/venv_exec.sh
|
||||||
|
ARGS
|
||||||
|
${Protobuf_PROTOC_EXECUTABLE}
|
||||||
|
--cpp_out=${_ARGS_CXX_OUT_DIR}
|
||||||
|
--plugin=protoc-gen-service=${_plugin_py}
|
||||||
|
--service_out=lang=cpp,make_file_name=${ABS_FIL}:${_ARGS_CXX_OUT_DIR}
|
||||||
|
${_proto_include_cli_args} ${ABS_FIL}
|
||||||
|
DEPENDS
|
||||||
|
${ABS_FIL}
|
||||||
|
${TEMPLATES}
|
||||||
|
${_plugin_py}
|
||||||
|
COMMENT "Running C++ service compiler on ${FIL}"
|
||||||
|
VERBATIM
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
endforeach()
|
||||||
|
|
||||||
|
# remove some warnings from protobuf generated files
|
||||||
|
if(WIN32)
|
||||||
|
set_source_files_properties(
|
||||||
|
${${_ARGS_CXX_SOURCES}}
|
||||||
|
PROPERTIES
|
||||||
|
COMPILE_FLAGS "/wd4309 /wd4838"
|
||||||
|
)
|
||||||
|
else()
|
||||||
|
set_source_files_properties(
|
||||||
|
${${_ARGS_CXX_SOURCES}}
|
||||||
|
PROPERTIES
|
||||||
|
COMPILE_FLAGS "-Wno-unused-parameter -Wno-effc++ -Wno-pedantic -Wno-sign-compare -Wno-uninitialized"
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
set(${_ARGS_CXX_SOURCES} ${${_ARGS_CXX_SOURCES}} PARENT_SCOPE)
|
||||||
|
set(${_ARGS_CXX_HEADERS} ${${_ARGS_CXX_HEADERS}} PARENT_SCOPE)
|
||||||
|
endfunction()
|
||||||
|
|
||||||
@@ -39,6 +39,8 @@ function(protobuf_generate_cpp)
|
|||||||
list(APPEND ${_ARGS_CXX_SOURCES} "${_ARGS_CXX_OUT_DIR}/${_fil_we}.pb.cc")
|
list(APPEND ${_ARGS_CXX_SOURCES} "${_ARGS_CXX_OUT_DIR}/${_fil_we}.pb.cc")
|
||||||
list(APPEND ${_ARGS_CXX_HEADERS} "${_ARGS_CXX_OUT_DIR}/${_fil_we}.pb.h")
|
list(APPEND ${_ARGS_CXX_HEADERS} "${_ARGS_CXX_OUT_DIR}/${_fil_we}.pb.h")
|
||||||
message(STATUS "add_custom_command for ${_fil} -> ${_ARGS_CXX_OUT_DIR}/${_fil_we}.pb.h")
|
message(STATUS "add_custom_command for ${_fil} -> ${_ARGS_CXX_OUT_DIR}/${_fil_we}.pb.h")
|
||||||
|
# TODO: Pass proto sources by relative path (so this fn can be called from
|
||||||
|
# arbitrary subdirs).
|
||||||
add_custom_command(
|
add_custom_command(
|
||||||
OUTPUT
|
OUTPUT
|
||||||
"${_ARGS_CXX_OUT_DIR}/${_fil_we}.pb.cc"
|
"${_ARGS_CXX_OUT_DIR}/${_fil_we}.pb.cc"
|
||||||
@@ -46,7 +48,7 @@ function(protobuf_generate_cpp)
|
|||||||
COMMAND
|
COMMAND
|
||||||
${_ARGS_PROTOC}
|
${_ARGS_PROTOC}
|
||||||
ARGS
|
ARGS
|
||||||
--cpp_out=${_ARGS_CXX_OUT_DIR} ${_proto_include_cli_args} ${_fil}
|
--cpp_out=${_ARGS_CXX_OUT_DIR} ${_proto_include_cli_args} ${_abs_fil}
|
||||||
DEPENDS ${_abs_fil}
|
DEPENDS ${_abs_fil}
|
||||||
COMMENT "Running C++ protocol buffer compiler on ${_fil}"
|
COMMENT "Running C++ protocol buffer compiler on ${_fil}"
|
||||||
VERBATIM
|
VERBATIM
|
||||||
@@ -78,3 +80,4 @@ function(protobuf_generate_cpp)
|
|||||||
set(${_ARGS_CXX_SOURCES} ${${_ARGS_CXX_SOURCES}} PARENT_SCOPE)
|
set(${_ARGS_CXX_SOURCES} ${${_ARGS_CXX_SOURCES}} PARENT_SCOPE)
|
||||||
set(${_ARGS_CXX_HEADERS} ${${_ARGS_CXX_HEADERS}} PARENT_SCOPE)
|
set(${_ARGS_CXX_HEADERS} ${${_ARGS_CXX_HEADERS}} PARENT_SCOPE)
|
||||||
endfunction()
|
endfunction()
|
||||||
|
|
||||||
@@ -1,3 +1,5 @@
|
|||||||
|
include_guard(GLOBAL)
|
||||||
|
|
||||||
function(protobuf_generate_cpp_config)
|
function(protobuf_generate_cpp_config)
|
||||||
set(_options)
|
set(_options)
|
||||||
set(_one_value_args
|
set(_one_value_args
|
||||||
@@ -56,3 +58,4 @@ function(protobuf_generate_cpp_config)
|
|||||||
file(WRITE "${_ARGS_PROTO_DEFAULTS_HEADER}" "${_cfg_defaults_str}")
|
file(WRITE "${_ARGS_PROTO_DEFAULTS_HEADER}" "${_cfg_defaults_str}")
|
||||||
endif()
|
endif()
|
||||||
endfunction()
|
endfunction()
|
||||||
|
|
||||||
@@ -0,0 +1,39 @@
|
|||||||
|
include_guard(DIRECTORY)
|
||||||
|
include(${CMAKE_SOURCE_DIR}/cmake/SymLink.cmake)
|
||||||
|
|
||||||
|
function(sym_link_python_module)
|
||||||
|
set(_options)
|
||||||
|
set(_one_value_args LIB_NAME MODULE_NAME PLUGIN_NAME)
|
||||||
|
set(_multi_value_args)
|
||||||
|
cmake_parse_arguments(_ARGS "${_options}" "${_one_value_args}"
|
||||||
|
"${_multi_value_args}" ${ARGN})
|
||||||
|
if(NOT DEFINED _ARGS_LIB_NAME)
|
||||||
|
message(
|
||||||
|
FATAL_ERROR "LIB_NAME must be specified for sym_link_python_module()")
|
||||||
|
endif()
|
||||||
|
set(_lib_name ${_ARGS_LIB_NAME})
|
||||||
|
set(_module_name ${_ARGS_MODULE_NAME})
|
||||||
|
if(NOT DEFINED _ARGS_MODULE_NAME)
|
||||||
|
set(_module_name ${_lib_name}_module)
|
||||||
|
endif()
|
||||||
|
set(_plugin_name ${_ARGS_PLUGIN_NAME})
|
||||||
|
set(_deps ${_lib_name} ${_module_name})
|
||||||
|
if(DEFINED _ARGS_PLUGIN_NAME)
|
||||||
|
list(APPEND _deps ${_plugin_name} copy_${_plugin_name})
|
||||||
|
endif()
|
||||||
|
add_dependencies(${PROJECT_NAME} ${_deps})
|
||||||
|
sym_link_local_lib(${_lib_name})
|
||||||
|
set(_module_suffix cpython-310-x86_64-linux-gnu.so)
|
||||||
|
sym_link_file(
|
||||||
|
SOURCE
|
||||||
|
${CMAKE_BINARY_DIR}/src/lib_${_lib_name}/${_module_name}.${_module_suffix}
|
||||||
|
DEST
|
||||||
|
${CMAKE_CURRENT_BINARY_DIR}/${_module_name}.${_module_suffix}
|
||||||
|
INSTALL_DEST
|
||||||
|
${CMAKE_INSTALL_BINDIR}/)
|
||||||
|
if(DEFINED _ARGS_PLUGIN_NAME)
|
||||||
|
get_target_property(plugins ${_plugin_name} INTERFACE_PYTHON_SCRIPTS_DIR)
|
||||||
|
sym_link_dir(TARGET_NAME ${PROJECT_NAME}_link_${_plugin_name} SOURCE
|
||||||
|
${plugins} DEST ${CMAKE_CURRENT_BINARY_DIR}/${_plugin_name})
|
||||||
|
endif()
|
||||||
|
endfunction()
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
#ifndef BTS_SPARK_VERSION_H
|
||||||
|
#define BTS_SPARK_VERSION_H
|
||||||
|
|
||||||
|
#define BTS_SPARK_VERSION_MAJOR @PROJECT_VERSION_MAJOR@
|
||||||
|
#define BTS_SPARK_VERSION_MINOR @PROJECT_VERSION_MINOR@
|
||||||
|
#define BTS_SPARK_VERSION_PATCH @PROJECT_VERSION_PATCH@
|
||||||
|
#define BTS_SPARK_VERSION_BUILD_METADATA @PROJECT_VERSION_BUILD_METADATA@
|
||||||
|
#define BTS_SPARK_VERSION "@PROJECT_VERSION@"
|
||||||
|
#define BTS_SPARK_VERSION_FULL "@PROJECT_VERSION_FULL@"
|
||||||
|
|
||||||
|
#endif
|
||||||
@@ -1,24 +0,0 @@
|
|||||||
cmake_minimum_required(VERSION 3.5)
|
|
||||||
|
|
||||||
# Explicitly set policy to convert relative paths to absolute (although this is a default policy,
|
|
||||||
# setting it explicitly prevents a compile-warning)
|
|
||||||
cmake_policy(SET CMP0076 NEW)
|
|
||||||
|
|
||||||
# add protos to the library to facilitate source_group
|
|
||||||
target_sources(spark PUBLIC ${Config_Protos} ${NonConfig_Protos} ${Service_Protos})
|
|
||||||
|
|
||||||
function(assign_source_group)
|
|
||||||
foreach(_source IN ITEMS ${ARGN})
|
|
||||||
if(IS_ABSOLUTE "${_source}")
|
|
||||||
file(RELATIVE_PATH _source_rel "${CMAKE_CURRENT_SOURCE_DIR}" "${_source}")
|
|
||||||
else()
|
|
||||||
set(_source_rel "${_source}")
|
|
||||||
endif()
|
|
||||||
get_filename_component(_source_path "${_source_rel}" PATH)
|
|
||||||
string(REPLACE "/" "\\" _source_path_msvc "${_source_path}")
|
|
||||||
source_group("${_source_path_msvc}" FILES "${_source}")
|
|
||||||
set(SOURCE_FILES "${_source}")
|
|
||||||
endforeach()
|
|
||||||
endfunction(assign_source_group)
|
|
||||||
|
|
||||||
assign_source_group(${SparkLib_Sources} ${Config_Protos} ${NonConfig_Protos} ${Service_Protos})
|
|
||||||
@@ -1,51 +0,0 @@
|
|||||||
services:
|
|
||||||
sparkd:
|
|
||||||
build:
|
|
||||||
dockerfile: Dockerfile
|
|
||||||
context: ./sparkd
|
|
||||||
command: [ "./sparkd", "run" ]
|
|
||||||
ports: [ "8000:8000", "8001:8001", "8002:8002" ]
|
|
||||||
|
|
||||||
pubsub:
|
|
||||||
build:
|
|
||||||
dockerfile: pubsub.Dockerfile
|
|
||||||
context: ./DataStream
|
|
||||||
command: [ "./PubSubServer" ]
|
|
||||||
environment:
|
|
||||||
- DOTNET_ENVIRONMENT=Production
|
|
||||||
ports:
|
|
||||||
- 22019:22019
|
|
||||||
|
|
||||||
md-publisher:
|
|
||||||
build:
|
|
||||||
dockerfile: md-publisher.Dockerfile
|
|
||||||
context: ./DataStream
|
|
||||||
depends_on:
|
|
||||||
- pubsub
|
|
||||||
- sparkd
|
|
||||||
command:
|
|
||||||
[
|
|
||||||
"dockerize",
|
|
||||||
"-wait",
|
|
||||||
"tcp://pubsub:22019",
|
|
||||||
"-wait",
|
|
||||||
"tcp://sparkd:8000",
|
|
||||||
"-timeout",
|
|
||||||
"10s",
|
|
||||||
"./DataStreamPublisher"
|
|
||||||
]
|
|
||||||
environment:
|
|
||||||
- DOTNET_ENVIRONMENT=MarketData
|
|
||||||
|
|
||||||
webapp:
|
|
||||||
ports:
|
|
||||||
- 8080:8080
|
|
||||||
- 8443:8443
|
|
||||||
build:
|
|
||||||
dockerfile: webapp.Dockerfile
|
|
||||||
context: ./DataStream
|
|
||||||
command: [ "./Bts.DataStreamWebApp.Server" ]
|
|
||||||
environment:
|
|
||||||
- ASPNETCORE_HTTP_PORT=8080
|
|
||||||
- ASPNETCORE_HTTPS_PORT=8443
|
|
||||||
- ASPNETCORE_ENVIRONMENT=Staging
|
|
||||||
+137
-53
@@ -1,69 +1,100 @@
|
|||||||
services:
|
services:
|
||||||
sparkd:
|
sparkd:
|
||||||
|
volumes:
|
||||||
|
- ${SPARKD__DATA_DIR:-sparkd_data}:/home/bts/sparkdata/data
|
||||||
build:
|
build:
|
||||||
dockerfile: src/app_sparkd/Dockerfile
|
dockerfile: src/app_sparkd/Dockerfile
|
||||||
args:
|
args:
|
||||||
- IMAGE=${SPARKD__IMAGE}
|
- IMAGE=${SPARKD__IMAGE}
|
||||||
- SOURCE_DIR=${SPARKD__SOURCE_DIR}
|
- SOURCE_DIR=${SPARKD__SOURCE_DIR}
|
||||||
- CONF_FILE=${SPARKD__CONF_FILE}
|
- CONFIG_DIR=${SPARKD__CONFIG_DIR}
|
||||||
- MD_RECORDING_DIR=${SPARKD__MD_RECORDING_DIR}
|
- PYTHON_REQUIREMENTS=${SPARKD__PYTHON_REQUIREMENTS}
|
||||||
command: [ "./sparkd", "run" ]
|
shm_size: "${SPARKD__SHM_SIZE:-512mb}"
|
||||||
|
command: >
|
||||||
|
sh -c "
|
||||||
|
echo bts | sudo -S chown -R bts:bts /home/bts/sparkdata/data
|
||||||
|
if [ -e "/home/bts/sparkdata/data/logging.sparkd/log" ]; then
|
||||||
|
mv "/home/bts/sparkdata/data/logging.sparkd/log" "/home/bts/sparkdata/data/logging.sparkd/log_$(date '+%Y%m%d-%H%M')"
|
||||||
|
fi
|
||||||
|
if [ -e "/home/bts/sparkdata/conf/.env.local" ]; then
|
||||||
|
echo 'Sourcing /home/bts/sparkdata/conf/.env.local'
|
||||||
|
set -a
|
||||||
|
. /home/bts/sparkdata/conf/.env.local
|
||||||
|
set +a
|
||||||
|
fi
|
||||||
|
if [ -d /home/bts/sparkdata/conf/plugins ]; then
|
||||||
|
echo 'Copying /home/bts/sparkdata/conf/plugins to runtime dir (/home/bts/bin)'
|
||||||
|
cp -r /home/bts/sparkdata/conf/plugins /home/bts/bin/
|
||||||
|
fi
|
||||||
|
./sparkd run"
|
||||||
|
env_file:
|
||||||
|
- .env
|
||||||
|
- ${SPARKD__CONFIG_DIR}/.env
|
||||||
ports:
|
ports:
|
||||||
- "8000:8000"
|
- "${SPARKD__CONFIG_PORT}:${SPARKD__CONFIG_PORT}"
|
||||||
- "8001:8001"
|
- "${SPARKD__QUICKBUS_PORT}:${SPARKD__QUICKBUS_PORT}"
|
||||||
- "8002:8002"
|
- "${SPARKD__SIM_FIX_PORT}:${SPARKD__SIM_FIX_PORT}"
|
||||||
|
deploy:
|
||||||
|
resources:
|
||||||
|
limits:
|
||||||
|
memory: "${SPARKD__MEMORY:-4gb}"
|
||||||
|
|
||||||
pubsub:
|
sparkd-symbols:
|
||||||
environment:
|
volumes:
|
||||||
- DOTNET_ENVIRONMENT=${PUBSUB__DOTNET_ENVIRONMENT}
|
- ${SPARKD__DATA_DIR:-sparkd_data}:/home/bts/sparkdata/data
|
||||||
|
- ${SPARKD__RUNTIME_CONF_DIR:-sparkd_conf}:/home/bts/sparkdata/conf
|
||||||
build:
|
build:
|
||||||
dockerfile: src/DataStreamSuite/PubSubServer/Dockerfile
|
dockerfile: src/app_sparkd/Dockerfile
|
||||||
args:
|
args:
|
||||||
- CS_SOURCE_DIR=${PUBSUB__CS_SOURCE_DIR}
|
- IMAGE=${SPARKD__IMAGE}
|
||||||
- CPP_SOURCE_DIR=${PUBSUB__CPP_SOURCE_DIR}
|
- SOURCE_DIR=${SPARKD__SOURCE_DIR}
|
||||||
- CONF_FILE=${PUBSUB__CONF_FILE}
|
- CONFIG_DIR=${SPARKD__CONFIG_DIR}
|
||||||
|
- PYTHON_REQUIREMENTS=${SPARKD__PYTHON_REQUIREMENTS}
|
||||||
|
shm_size: "${SPARKD__SHM_SIZE:-512mb}"
|
||||||
|
command: >
|
||||||
|
sh -c "
|
||||||
|
echo bts | sudo -S chown -R bts:bts /home/bts/sparkdata
|
||||||
|
if [ -e "/home/bts/sparkdata/data/logging.sparkd/log" ]; then
|
||||||
|
mv "/home/bts/sparkdata/data/logging.sparkd/log" "/home/bts/sparkdata/data/logging.sparkd/log_$(date '+%Y%m%d-%H%M')"
|
||||||
|
fi
|
||||||
|
ls -alh /home/bts/sparkdata/conf/
|
||||||
|
cat /home/bts/sparkdata/conf/.env.local
|
||||||
|
if [ -e "/home/bts/sparkdata/conf/.env.local" ]; then
|
||||||
|
echo 'Sourcing /home/bts/sparkdata/conf/.env.local'
|
||||||
|
set -a
|
||||||
|
. /home/bts/sparkdata/conf/.env.local
|
||||||
|
set +a
|
||||||
|
fi
|
||||||
|
if [ -d /home/bts/sparkdata/conf/plugins ]; then
|
||||||
|
echo 'Copying /home/bts/sparkdata/conf/plugins to runtime dir (/home/bts/bin)'
|
||||||
|
cp -r /home/bts/sparkdata/conf/plugins /home/bts/bin/
|
||||||
|
fi
|
||||||
|
./sparkd run"
|
||||||
|
env_file:
|
||||||
|
- .env
|
||||||
|
- ${SPARKD__CONFIG_DIR}/.env
|
||||||
ports:
|
ports:
|
||||||
- "22019:22019"
|
- "${SPARKD__CONFIG_PORT}:${SPARKD__CONFIG_PORT}"
|
||||||
command: [ "./PubSubServer" ]
|
- "${SPARKD__QUICKBUS_PORT}:${SPARKD__QUICKBUS_PORT}"
|
||||||
|
- "${SPARKD__SIM_FIX_PORT}:${SPARKD__SIM_FIX_PORT}"
|
||||||
|
deploy:
|
||||||
|
restart_policy:
|
||||||
|
condition: any
|
||||||
|
delay: 3s
|
||||||
|
resources:
|
||||||
|
limits:
|
||||||
|
memory: "${SPARKD__MEMORY:-4gb}"
|
||||||
|
|
||||||
md-publisher:
|
sparkd-tail:
|
||||||
build:
|
image: bluetradingsystems/linux_dotnet7
|
||||||
dockerfile: src/DataStreamSuite/DataStreamPublisher/Dockerfile
|
volumes:
|
||||||
args:
|
- type: volume
|
||||||
- SOURCE_DIR=${MD_PUBLISHER__SOURCE_DIR}
|
read_only: true
|
||||||
- CONF_FILE=${MD_PUBLISHER__CONF_FILE}
|
source: sparkd_data
|
||||||
depends_on:
|
target: /home/bts/sparkdata/data/logging.sparkd
|
||||||
- pubsub
|
volume:
|
||||||
- sparkd
|
subpath: logging.sparkd
|
||||||
command: [ "dockerize", "-wait", "tcp://pubsub:22019", "-wait", "tcp://sparkd:8000", "-timeout", "10s", "./DataStreamPublisher" ]
|
command: ["tail", "-f", "/home/bts/sparkdata/data/logging.sparkd/log"]
|
||||||
environment:
|
|
||||||
- DOTNET_ENVIRONMENT=${MD_PUBLISHER__DOTNET_ENVIRONMENT}
|
|
||||||
|
|
||||||
webapp:
|
|
||||||
ports:
|
|
||||||
- "8080:8080"
|
|
||||||
- "8443:8443"
|
|
||||||
build:
|
|
||||||
dockerfile: src/DataStreamSuite/Bts.DataStreamWebApp.Server/Dockerfile
|
|
||||||
args:
|
|
||||||
- SOURCE_DIR=${WEBAPP__SOURCE_DIR}
|
|
||||||
- WEB_ROOT=${WEBAPP__WEB_ROOT}
|
|
||||||
- CONF_FILE=${WEBAPP__CONF_FILE}
|
|
||||||
command: [ "./Bts.DataStreamWebApp.Server" ]
|
|
||||||
environment:
|
|
||||||
- ASPNETCORE_ENVIRONMENT=${WEBAPP__ASPNETCORE_ENVIRONMENT}
|
|
||||||
|
|
||||||
api-server:
|
|
||||||
depends_on:
|
|
||||||
- sparkd
|
|
||||||
ports:
|
|
||||||
- 8008:8008
|
|
||||||
- 9443:9443
|
|
||||||
build:
|
|
||||||
dockerfile: src/client/spark_api_server/Dockerfile
|
|
||||||
command: [ "dockerize", "-wait", "tcp://sparkd:8000", "-timeout", "10s", "./spark_api_server", "run" ]
|
|
||||||
environment:
|
|
||||||
- ASPNETCORE_ENVIRONMENT=${API_SERVER__ASPNETCORE_ENVIRONMENT}
|
|
||||||
|
|
||||||
sparkd-ping-test:
|
sparkd-ping-test:
|
||||||
depends_on:
|
depends_on:
|
||||||
@@ -77,3 +108,56 @@ services:
|
|||||||
USER "root"
|
USER "root"
|
||||||
RUN apt-get update && apt-get -y install iputils-ping
|
RUN apt-get update && apt-get -y install iputils-ping
|
||||||
command: [ "ping", "sparkd" ]
|
command: [ "ping", "sparkd" ]
|
||||||
|
|
||||||
|
pubsub:
|
||||||
|
environment:
|
||||||
|
- DOTNET_ENVIRONMENT=Staging
|
||||||
|
build:
|
||||||
|
dockerfile: src/DataStreamSuite/PubSubServer/Dockerfile
|
||||||
|
args:
|
||||||
|
- SOURCE_DIR=build/Release/bin/net8.0/linux-x64/publish
|
||||||
|
- CONF_FILE=src/DataStreamSuite/PubSubServer/spark.conf
|
||||||
|
ports:
|
||||||
|
- 22019:22019
|
||||||
|
command: [ "./PubSubServer" ]
|
||||||
|
|
||||||
|
md-publisher:
|
||||||
|
build:
|
||||||
|
dockerfile: src/DataStreamSuite/DataStreamPublisher/Dockerfile
|
||||||
|
args:
|
||||||
|
- SOURCE_DIR=build/Release/bin/net8.0/linux-x64/publish
|
||||||
|
- CONF_FILE=src/DataStreamSuite/DataStreamPublisher/spark.conf
|
||||||
|
depends_on:
|
||||||
|
- pubsub
|
||||||
|
- sparkd
|
||||||
|
command: [ "dockerize", "-wait", "tcp://pubsub:22019", "-wait", "tcp://sparkd:8000", "-timeout", "10s", "./DataStreamPublisher" ]
|
||||||
|
environment:
|
||||||
|
- DOTNET_ENVIRONMENT=MarketData
|
||||||
|
|
||||||
|
api-server:
|
||||||
|
depends_on:
|
||||||
|
- sparkd
|
||||||
|
ports:
|
||||||
|
- 8008:8008
|
||||||
|
- 9443:9443
|
||||||
|
build:
|
||||||
|
dockerfile: src/client/spark_api_server/Dockerfile
|
||||||
|
command: [ "dockerize", "-wait", "tcp://sparkd:8000", "-timeout", "10s", "./spark_api_server", "run" ]
|
||||||
|
|
||||||
|
webapp:
|
||||||
|
ports:
|
||||||
|
- 8080:8080
|
||||||
|
- 8443:8443
|
||||||
|
build:
|
||||||
|
dockerfile: src/DataStreamSuite/Bts.DataStreamWebApp.Server/Dockerfile
|
||||||
|
args:
|
||||||
|
- SOURCE_DIR=build/Release/bin/net8.0/linux-x64/publish
|
||||||
|
- WEB_ROOT=build/Bts.DataStreamWebApp.Client/production/dist
|
||||||
|
- CONF_FILE=src/DataStreamSuite/Bts.DataStreamWebApp.Server/spark.conf
|
||||||
|
command: [ "./Bts.DataStreamWebApp.Server" ]
|
||||||
|
environment:
|
||||||
|
- ASPNETCORE_ENVIRONMENT=Staging
|
||||||
|
|
||||||
|
volumes:
|
||||||
|
sparkd_data:
|
||||||
|
name: "sparkd_${SPARKD__CONFIG_PORT:-8000}"
|
||||||
@@ -124,8 +124,8 @@ service OrderService {
|
|||||||
```
|
```
|
||||||
### C++ Example
|
### C++ Example
|
||||||
```cpp
|
```cpp
|
||||||
#include "lib/api/public/ServiceContext.h"
|
#include "spark/api/public/ServiceContext.h"
|
||||||
#include "lib/api/services/OrderService.client.pb.h"
|
#include "spark/api/services/OrderService.client.pb.h"
|
||||||
using namespace bts::api;
|
using namespace bts::api;
|
||||||
ServiceContext ctx;
|
ServiceContext ctx;
|
||||||
auto orders = ctx.locate<orderman::OrderService>();
|
auto orders = ctx.locate<orderman::OrderService>();
|
||||||
|
|||||||
@@ -29,9 +29,9 @@ namespace sample {
|
|||||||
```
|
```
|
||||||
|
|
||||||
```cpp
|
```cpp
|
||||||
#include "lib/api/public/ServiceContext.h"
|
#include "spark/api/public/ServiceContext.h"
|
||||||
#include "spark/lib/domain_model/Security.h"
|
#include "spark/domain_model/Security.h"
|
||||||
#include "lib/api/services/MarketDataService.client.pb.h"
|
#include "spark/api/services/MarketDataService.client.pb.h"
|
||||||
#include <thread>
|
#include <thread>
|
||||||
|
|
||||||
using namespace bts::api;
|
using namespace bts::api;
|
||||||
|
|||||||
@@ -53,7 +53,7 @@ The status callback is called when the market for this security opens, closes, o
|
|||||||
// Subscribe to security trading status
|
// Subscribe to security trading status
|
||||||
void IAlgoServices::subscribe_status(SecurityKey);
|
void IAlgoServices::subscribe_status(SecurityKey);
|
||||||
// You implement
|
// You implement
|
||||||
virtual void on_status(SecurityKey, domain::protobufs::TradingStatus) override;
|
virtual void on_status(SecurityKey, co2::TradingStatus) override;
|
||||||
```
|
```
|
||||||
|
|
||||||
# Child Orders
|
# Child Orders
|
||||||
|
|||||||
@@ -0,0 +1,38 @@
|
|||||||
|
FROM ubuntu:22.04
|
||||||
|
|
||||||
|
ARG DEBIAN_FRONTEND=noninteractive
|
||||||
|
|
||||||
|
RUN apt-get update && apt-get install -y pkg-config
|
||||||
|
RUN apt-get update && apt-get install -y locales
|
||||||
|
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 software-properties-common
|
||||||
|
RUN apt-get update && apt-get install -y sudo
|
||||||
|
|
||||||
|
# GCC
|
||||||
|
ARG gcc_major=13
|
||||||
|
RUN add-apt-repository ppa:ubuntu-toolchain-r/test \
|
||||||
|
&& apt-get update \
|
||||||
|
&& apt-get install -y g++-$gcc_major
|
||||||
|
|
||||||
|
RUN apt-get update \
|
||||||
|
&& apt-get install -y dotnet7
|
||||||
|
|
||||||
|
RUN locale-gen en_US.UTF-8
|
||||||
|
|
||||||
|
ARG docker_user="bts"
|
||||||
|
ARG docker_uid="1000"
|
||||||
|
ARG docker_pass="bts"
|
||||||
|
|
||||||
|
RUN \
|
||||||
|
groupadd -g "$docker_uid" "$docker_user" \
|
||||||
|
&& useradd \
|
||||||
|
-m \
|
||||||
|
-u "$docker_uid" \
|
||||||
|
-g "$docker_uid" \
|
||||||
|
-G sudo \
|
||||||
|
--password "$(openssl passwd -1 "$docker_pass")" \
|
||||||
|
"$docker_user"
|
||||||
|
|
||||||
|
USER bts
|
||||||
|
WORKDIR /home/bts
|
||||||
+1
-1
Submodule externals updated: 4f5e385556...4f6734703c.
@@ -1,6 +0,0 @@
|
|||||||
{
|
|
||||||
"sdk": {
|
|
||||||
"version": "6.0.200",
|
|
||||||
"rollForward": "latestMajor"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,22 +1,42 @@
|
|||||||
astroid==2.7.3
|
astroid==2.7.3
|
||||||
autopep8==1.5.7
|
autopep8==1.5.7
|
||||||
|
blinker==1.9.0
|
||||||
|
boto3==1.37.9
|
||||||
|
botocore==1.37.9
|
||||||
certifi==2023.5.7
|
certifi==2023.5.7
|
||||||
charset-normalizer==3.1.0
|
charset-normalizer==3.1.0
|
||||||
|
click==8.1.8
|
||||||
colorama==0.4.4
|
colorama==0.4.4
|
||||||
|
Flask==3.1.0
|
||||||
idna==3.4
|
idna==3.4
|
||||||
isort==5.9.3
|
isort==5.9.3
|
||||||
|
itsdangerous==2.2.0
|
||||||
|
Jinja2==3.1.6
|
||||||
|
jmespath==1.0.1
|
||||||
lazy-object-proxy==1.6.0
|
lazy-object-proxy==1.6.0
|
||||||
|
MarkupSafe==3.0.2
|
||||||
mccabe==0.6.1
|
mccabe==0.6.1
|
||||||
|
numpy==2.2.6
|
||||||
platformdirs==2.3.0
|
platformdirs==2.3.0
|
||||||
protobuf==4.21.12
|
protobuf==4.21.12
|
||||||
pybars3==0.9.7
|
pybars3==0.9.7
|
||||||
|
pybind11==2.13.6
|
||||||
|
pybind11-stubgen==2.5.3
|
||||||
|
pybit==5.11.0
|
||||||
pycodestyle==2.7.0
|
pycodestyle==2.7.0
|
||||||
pycparser==2.20
|
pycparser==2.20
|
||||||
|
pycryptodome==3.23.0
|
||||||
pylint==2.10.2
|
pylint==2.10.2
|
||||||
PyMeta3==0.5.1
|
PyMeta3==0.5.1
|
||||||
|
python-dateutil==2.9.0.post0
|
||||||
|
python-dotenv==1.0.1
|
||||||
requests==2.31.0
|
requests==2.31.0
|
||||||
|
s3transfer==0.11.4
|
||||||
|
six==1.17.0
|
||||||
termcolor==1.1.0
|
termcolor==1.1.0
|
||||||
toml==0.10.2
|
toml==0.10.2
|
||||||
urllib3==2.0.3
|
urllib3==2.0.3
|
||||||
|
websocket-client==1.8.0
|
||||||
|
Werkzeug==3.1.3
|
||||||
wrapt==1.12.1
|
wrapt==1.12.1
|
||||||
yapf==0.31.0
|
yapf==0.31.0
|
||||||
+164
-103
@@ -1,103 +1,164 @@
|
|||||||
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.3.32922.545
|
||||||
MinimumVisualStudioVersion = 15.0.26124.0
|
MinimumVisualStudioVersion = 15.0.26124.0
|
||||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_api", "src\client\spark_api\spark_api.csproj", "{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}"
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_api", "src\client\spark_api\spark_api.csproj", "{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}"
|
||||||
EndProject
|
EndProject
|
||||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spark", "src\client\spark\Spark.csproj", "{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}"
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spark", "src\client\spark\Spark.csproj", "{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}"
|
||||||
EndProject
|
EndProject
|
||||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spark.Console", "src\client\Spark.Console\Spark.Console.csproj", "{387566C6-C6F6-412C-A30C-9855BBCB4816}"
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spark.Console", "src\client\Spark.Console\Spark.Console.csproj", "{387566C6-C6F6-412C-A30C-9855BBCB4816}"
|
||||||
EndProject
|
EndProject
|
||||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_core", "src\client\spark_core\spark_core.csproj", "{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}"
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_core", "src\client\spark_core\spark_core.csproj", "{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}"
|
||||||
EndProject
|
EndProject
|
||||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_sdk", "src\client\spark_sdk\spark_sdk.csproj", "{6963C314-83C4-4667-B0D0-C2F7AE208C29}"
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_sdk", "src\client\spark_sdk\spark_sdk.csproj", "{6963C314-83C4-4667-B0D0-C2F7AE208C29}"
|
||||||
EndProject
|
EndProject
|
||||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_test", "src\client\spark_test\spark_test.csproj", "{ECD78CC5-138F-4809-A764-2358C2AC2E82}"
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_test", "src\client\spark_test\spark_test.csproj", "{ECD78CC5-138F-4809-A764-2358C2AC2E82}"
|
||||||
EndProject
|
EndProject
|
||||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_websocket", "src\client\spark_websocket\spark_websocket.csproj", "{3201359D-C071-4089-9EDE-B04D759F1508}"
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_websocket", "src\client\spark_websocket\spark_websocket.csproj", "{3201359D-C071-4089-9EDE-B04D759F1508}"
|
||||||
EndProject
|
EndProject
|
||||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_api_server", "src\client\spark_api_server\spark_api_server.csproj", "{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}"
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_api_server", "src\client\spark_api_server\spark_api_server.csproj", "{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}"
|
||||||
EndProject
|
EndProject
|
||||||
Global
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataStreamCore", "src\DataStreamSuite\DataStreamCore\DataStreamCore.csproj", "{4E4F491F-C688-43C4-88DA-AC92BC5FA1B8}"
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
EndProject
|
||||||
Debug|x64 = Debug|x64
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataStream", "src\DataStreamSuite\DataStream\DataStream.csproj", "{2AC54ADC-3246-427E-9CA9-FEA2DBCB9432}"
|
||||||
MinSizeRel|x64 = MinSizeRel|x64
|
EndProject
|
||||||
Release|x64 = Release|x64
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharedStreams", "src\DataStreamSuite\SharedStreams\SharedStreams.csproj", "{4E96E5CC-7791-40B3-A8A1-C34FBB736B3B}"
|
||||||
RelWithDebInfo|x64 = RelWithDebInfo|x64
|
EndProject
|
||||||
EndGlobalSection
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PubSub", "src\DataStreamSuite\PubSub\PubSub.csproj", "{51C40BA9-F226-4A35-939D-1ED6F5FF7299}"
|
||||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
EndProject
|
||||||
{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Debug|x64.ActiveCfg = Debug|x64
|
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{4564E677-343A-46CB-AF02-AFC4E38BF94B}"
|
||||||
{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Debug|x64.Build.0 = Debug|x64
|
EndProject
|
||||||
{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.MinSizeRel|x64.ActiveCfg = Release|x64
|
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "client", "client", "{56A8A70A-DA03-4CED-A144-EC10F1379FD8}"
|
||||||
{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.MinSizeRel|x64.Build.0 = Release|x64
|
EndProject
|
||||||
{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Release|x64.ActiveCfg = Release|x64
|
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DataStreamSuite", "DataStreamSuite", "{915EF238-CA0D-4E73-AF50-88CB3F29C7AD}"
|
||||||
{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Release|x64.Build.0 = Release|x64
|
EndProject
|
||||||
{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.RelWithDebInfo|x64.ActiveCfg = Release|x64
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bts.Extensions.Hosting", "src\DataStreamSuite\Bts.Extensions.Hosting\Bts.Extensions.Hosting.csproj", "{4E0E51AA-7B59-4808-B7CC-9EAEDF397460}"
|
||||||
{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.RelWithDebInfo|x64.Build.0 = Release|x64
|
EndProject
|
||||||
{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.Debug|x64.ActiveCfg = Debug|x64
|
Global
|
||||||
{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.Debug|x64.Build.0 = Debug|x64
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.MinSizeRel|x64.ActiveCfg = Release|x64
|
Debug|x64 = Debug|x64
|
||||||
{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.MinSizeRel|x64.Build.0 = Release|x64
|
MinSizeRel|x64 = MinSizeRel|x64
|
||||||
{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.Release|x64.ActiveCfg = Release|x64
|
Release|x64 = Release|x64
|
||||||
{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.Release|x64.Build.0 = Release|x64
|
RelWithDebInfo|x64 = RelWithDebInfo|x64
|
||||||
{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.RelWithDebInfo|x64.ActiveCfg = Release|x64
|
EndGlobalSection
|
||||||
{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.RelWithDebInfo|x64.Build.0 = Release|x64
|
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||||
{387566C6-C6F6-412C-A30C-9855BBCB4816}.Debug|x64.ActiveCfg = Debug|x64
|
{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Debug|x64.ActiveCfg = Debug|x64
|
||||||
{387566C6-C6F6-412C-A30C-9855BBCB4816}.Debug|x64.Build.0 = Debug|x64
|
{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Debug|x64.Build.0 = Debug|x64
|
||||||
{387566C6-C6F6-412C-A30C-9855BBCB4816}.MinSizeRel|x64.ActiveCfg = Debug|x64
|
{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.MinSizeRel|x64.ActiveCfg = Release|x64
|
||||||
{387566C6-C6F6-412C-A30C-9855BBCB4816}.MinSizeRel|x64.Build.0 = Debug|x64
|
{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.MinSizeRel|x64.Build.0 = Release|x64
|
||||||
{387566C6-C6F6-412C-A30C-9855BBCB4816}.Release|x64.ActiveCfg = Release|x64
|
{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Release|x64.ActiveCfg = Release|x64
|
||||||
{387566C6-C6F6-412C-A30C-9855BBCB4816}.Release|x64.Build.0 = Release|x64
|
{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Release|x64.Build.0 = Release|x64
|
||||||
{387566C6-C6F6-412C-A30C-9855BBCB4816}.RelWithDebInfo|x64.ActiveCfg = Release|x64
|
{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.RelWithDebInfo|x64.ActiveCfg = Release|x64
|
||||||
{387566C6-C6F6-412C-A30C-9855BBCB4816}.RelWithDebInfo|x64.Build.0 = Release|x64
|
{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.RelWithDebInfo|x64.Build.0 = Release|x64
|
||||||
{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Debug|x64.ActiveCfg = Debug|x64
|
{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.Debug|x64.ActiveCfg = Debug|x64
|
||||||
{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Debug|x64.Build.0 = Debug|x64
|
{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.Debug|x64.Build.0 = Debug|x64
|
||||||
{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.MinSizeRel|x64.ActiveCfg = Release|x64
|
{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.MinSizeRel|x64.ActiveCfg = Release|x64
|
||||||
{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.MinSizeRel|x64.Build.0 = Release|x64
|
{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.MinSizeRel|x64.Build.0 = Release|x64
|
||||||
{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Release|x64.ActiveCfg = Release|x64
|
{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.Release|x64.ActiveCfg = Release|x64
|
||||||
{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Release|x64.Build.0 = Release|x64
|
{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.Release|x64.Build.0 = Release|x64
|
||||||
{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.RelWithDebInfo|x64.ActiveCfg = Release|x64
|
{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.RelWithDebInfo|x64.ActiveCfg = Release|x64
|
||||||
{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.RelWithDebInfo|x64.Build.0 = Release|x64
|
{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.RelWithDebInfo|x64.Build.0 = Release|x64
|
||||||
{6963C314-83C4-4667-B0D0-C2F7AE208C29}.Debug|x64.ActiveCfg = Debug|x64
|
{387566C6-C6F6-412C-A30C-9855BBCB4816}.Debug|x64.ActiveCfg = Debug|x64
|
||||||
{6963C314-83C4-4667-B0D0-C2F7AE208C29}.Debug|x64.Build.0 = Debug|x64
|
{387566C6-C6F6-412C-A30C-9855BBCB4816}.Debug|x64.Build.0 = Debug|x64
|
||||||
{6963C314-83C4-4667-B0D0-C2F7AE208C29}.MinSizeRel|x64.ActiveCfg = Release|x64
|
{387566C6-C6F6-412C-A30C-9855BBCB4816}.MinSizeRel|x64.ActiveCfg = Debug|x64
|
||||||
{6963C314-83C4-4667-B0D0-C2F7AE208C29}.MinSizeRel|x64.Build.0 = Release|x64
|
{387566C6-C6F6-412C-A30C-9855BBCB4816}.MinSizeRel|x64.Build.0 = Debug|x64
|
||||||
{6963C314-83C4-4667-B0D0-C2F7AE208C29}.Release|x64.ActiveCfg = Release|x64
|
{387566C6-C6F6-412C-A30C-9855BBCB4816}.Release|x64.ActiveCfg = Release|x64
|
||||||
{6963C314-83C4-4667-B0D0-C2F7AE208C29}.Release|x64.Build.0 = Release|x64
|
{387566C6-C6F6-412C-A30C-9855BBCB4816}.Release|x64.Build.0 = Release|x64
|
||||||
{6963C314-83C4-4667-B0D0-C2F7AE208C29}.RelWithDebInfo|x64.ActiveCfg = Release|x64
|
{387566C6-C6F6-412C-A30C-9855BBCB4816}.RelWithDebInfo|x64.ActiveCfg = Release|x64
|
||||||
{6963C314-83C4-4667-B0D0-C2F7AE208C29}.RelWithDebInfo|x64.Build.0 = Release|x64
|
{387566C6-C6F6-412C-A30C-9855BBCB4816}.RelWithDebInfo|x64.Build.0 = Release|x64
|
||||||
{ECD78CC5-138F-4809-A764-2358C2AC2E82}.Debug|x64.ActiveCfg = Debug|x64
|
{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Debug|x64.ActiveCfg = Debug|x64
|
||||||
{ECD78CC5-138F-4809-A764-2358C2AC2E82}.Debug|x64.Build.0 = Debug|x64
|
{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Debug|x64.Build.0 = Debug|x64
|
||||||
{ECD78CC5-138F-4809-A764-2358C2AC2E82}.MinSizeRel|x64.ActiveCfg = Debug|x64
|
{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.MinSizeRel|x64.ActiveCfg = Release|x64
|
||||||
{ECD78CC5-138F-4809-A764-2358C2AC2E82}.MinSizeRel|x64.Build.0 = Debug|x64
|
{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.MinSizeRel|x64.Build.0 = Release|x64
|
||||||
{ECD78CC5-138F-4809-A764-2358C2AC2E82}.Release|x64.ActiveCfg = Release|x64
|
{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Release|x64.ActiveCfg = Release|x64
|
||||||
{ECD78CC5-138F-4809-A764-2358C2AC2E82}.Release|x64.Build.0 = Release|x64
|
{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Release|x64.Build.0 = Release|x64
|
||||||
{ECD78CC5-138F-4809-A764-2358C2AC2E82}.RelWithDebInfo|x64.ActiveCfg = Release|x64
|
{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.RelWithDebInfo|x64.ActiveCfg = Release|x64
|
||||||
{ECD78CC5-138F-4809-A764-2358C2AC2E82}.RelWithDebInfo|x64.Build.0 = Release|x64
|
{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.RelWithDebInfo|x64.Build.0 = Release|x64
|
||||||
{3201359D-C071-4089-9EDE-B04D759F1508}.Debug|x64.ActiveCfg = Debug|x64
|
{6963C314-83C4-4667-B0D0-C2F7AE208C29}.Debug|x64.ActiveCfg = Debug|x64
|
||||||
{3201359D-C071-4089-9EDE-B04D759F1508}.Debug|x64.Build.0 = Debug|x64
|
{6963C314-83C4-4667-B0D0-C2F7AE208C29}.Debug|x64.Build.0 = Debug|x64
|
||||||
{3201359D-C071-4089-9EDE-B04D759F1508}.MinSizeRel|x64.ActiveCfg = Debug|x64
|
{6963C314-83C4-4667-B0D0-C2F7AE208C29}.MinSizeRel|x64.ActiveCfg = Release|x64
|
||||||
{3201359D-C071-4089-9EDE-B04D759F1508}.MinSizeRel|x64.Build.0 = Debug|x64
|
{6963C314-83C4-4667-B0D0-C2F7AE208C29}.MinSizeRel|x64.Build.0 = Release|x64
|
||||||
{3201359D-C071-4089-9EDE-B04D759F1508}.Release|x64.ActiveCfg = Release|x64
|
{6963C314-83C4-4667-B0D0-C2F7AE208C29}.Release|x64.ActiveCfg = Release|x64
|
||||||
{3201359D-C071-4089-9EDE-B04D759F1508}.Release|x64.Build.0 = Release|x64
|
{6963C314-83C4-4667-B0D0-C2F7AE208C29}.Release|x64.Build.0 = Release|x64
|
||||||
{3201359D-C071-4089-9EDE-B04D759F1508}.RelWithDebInfo|x64.ActiveCfg = Release|x64
|
{6963C314-83C4-4667-B0D0-C2F7AE208C29}.RelWithDebInfo|x64.ActiveCfg = Release|x64
|
||||||
{3201359D-C071-4089-9EDE-B04D759F1508}.RelWithDebInfo|x64.Build.0 = Release|x64
|
{6963C314-83C4-4667-B0D0-C2F7AE208C29}.RelWithDebInfo|x64.Build.0 = Release|x64
|
||||||
{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.Debug|x64.ActiveCfg = Debug|x64
|
{ECD78CC5-138F-4809-A764-2358C2AC2E82}.Debug|x64.ActiveCfg = Debug|x64
|
||||||
{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.Debug|x64.Build.0 = Debug|x64
|
{ECD78CC5-138F-4809-A764-2358C2AC2E82}.Debug|x64.Build.0 = Debug|x64
|
||||||
{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.MinSizeRel|x64.ActiveCfg = Debug|x64
|
{ECD78CC5-138F-4809-A764-2358C2AC2E82}.MinSizeRel|x64.ActiveCfg = Debug|x64
|
||||||
{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.MinSizeRel|x64.Build.0 = Debug|x64
|
{ECD78CC5-138F-4809-A764-2358C2AC2E82}.MinSizeRel|x64.Build.0 = Debug|x64
|
||||||
{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.Release|x64.ActiveCfg = Release|x64
|
{ECD78CC5-138F-4809-A764-2358C2AC2E82}.Release|x64.ActiveCfg = Release|x64
|
||||||
{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.Release|x64.Build.0 = Release|x64
|
{ECD78CC5-138F-4809-A764-2358C2AC2E82}.Release|x64.Build.0 = Release|x64
|
||||||
{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.RelWithDebInfo|x64.ActiveCfg = Release|x64
|
{ECD78CC5-138F-4809-A764-2358C2AC2E82}.RelWithDebInfo|x64.ActiveCfg = Release|x64
|
||||||
{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.RelWithDebInfo|x64.Build.0 = Release|x64
|
{ECD78CC5-138F-4809-A764-2358C2AC2E82}.RelWithDebInfo|x64.Build.0 = Release|x64
|
||||||
EndGlobalSection
|
{3201359D-C071-4089-9EDE-B04D759F1508}.Debug|x64.ActiveCfg = Debug|x64
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
{3201359D-C071-4089-9EDE-B04D759F1508}.Debug|x64.Build.0 = Debug|x64
|
||||||
HideSolutionNode = FALSE
|
{3201359D-C071-4089-9EDE-B04D759F1508}.MinSizeRel|x64.ActiveCfg = Debug|x64
|
||||||
EndGlobalSection
|
{3201359D-C071-4089-9EDE-B04D759F1508}.MinSizeRel|x64.Build.0 = Debug|x64
|
||||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
{3201359D-C071-4089-9EDE-B04D759F1508}.Release|x64.ActiveCfg = Release|x64
|
||||||
SolutionGuid = {422D1620-0166-4C26-9A81-CA8A2EB1AB58}
|
{3201359D-C071-4089-9EDE-B04D759F1508}.Release|x64.Build.0 = Release|x64
|
||||||
EndGlobalSection
|
{3201359D-C071-4089-9EDE-B04D759F1508}.RelWithDebInfo|x64.ActiveCfg = Release|x64
|
||||||
GlobalSection(Performance) = preSolution
|
{3201359D-C071-4089-9EDE-B04D759F1508}.RelWithDebInfo|x64.Build.0 = Release|x64
|
||||||
HasPerformanceSessions = true
|
{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.Debug|x64.ActiveCfg = Debug|x64
|
||||||
EndGlobalSection
|
{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.Debug|x64.Build.0 = Debug|x64
|
||||||
EndGlobal
|
{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.MinSizeRel|x64.ActiveCfg = Debug|x64
|
||||||
|
{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.MinSizeRel|x64.Build.0 = Debug|x64
|
||||||
|
{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.Release|x64.ActiveCfg = Release|x64
|
||||||
|
{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.Release|x64.Build.0 = Release|x64
|
||||||
|
{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.RelWithDebInfo|x64.ActiveCfg = Release|x64
|
||||||
|
{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.RelWithDebInfo|x64.Build.0 = Release|x64
|
||||||
|
{4E4F491F-C688-43C4-88DA-AC92BC5FA1B8}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||||
|
{4E4F491F-C688-43C4-88DA-AC92BC5FA1B8}.Debug|x64.Build.0 = Debug|Any CPU
|
||||||
|
{4E4F491F-C688-43C4-88DA-AC92BC5FA1B8}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
|
||||||
|
{4E4F491F-C688-43C4-88DA-AC92BC5FA1B8}.MinSizeRel|x64.Build.0 = Debug|Any CPU
|
||||||
|
{4E4F491F-C688-43C4-88DA-AC92BC5FA1B8}.Release|x64.ActiveCfg = Release|Any CPU
|
||||||
|
{4E4F491F-C688-43C4-88DA-AC92BC5FA1B8}.Release|x64.Build.0 = Release|Any CPU
|
||||||
|
{4E4F491F-C688-43C4-88DA-AC92BC5FA1B8}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU
|
||||||
|
{4E4F491F-C688-43C4-88DA-AC92BC5FA1B8}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU
|
||||||
|
{2AC54ADC-3246-427E-9CA9-FEA2DBCB9432}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||||
|
{2AC54ADC-3246-427E-9CA9-FEA2DBCB9432}.Debug|x64.Build.0 = Debug|Any CPU
|
||||||
|
{2AC54ADC-3246-427E-9CA9-FEA2DBCB9432}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
|
||||||
|
{2AC54ADC-3246-427E-9CA9-FEA2DBCB9432}.MinSizeRel|x64.Build.0 = Debug|Any CPU
|
||||||
|
{2AC54ADC-3246-427E-9CA9-FEA2DBCB9432}.Release|x64.ActiveCfg = Release|Any CPU
|
||||||
|
{2AC54ADC-3246-427E-9CA9-FEA2DBCB9432}.Release|x64.Build.0 = Release|Any CPU
|
||||||
|
{2AC54ADC-3246-427E-9CA9-FEA2DBCB9432}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU
|
||||||
|
{2AC54ADC-3246-427E-9CA9-FEA2DBCB9432}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU
|
||||||
|
{4E96E5CC-7791-40B3-A8A1-C34FBB736B3B}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||||
|
{4E96E5CC-7791-40B3-A8A1-C34FBB736B3B}.Debug|x64.Build.0 = Debug|Any CPU
|
||||||
|
{4E96E5CC-7791-40B3-A8A1-C34FBB736B3B}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
|
||||||
|
{4E96E5CC-7791-40B3-A8A1-C34FBB736B3B}.MinSizeRel|x64.Build.0 = Debug|Any CPU
|
||||||
|
{4E96E5CC-7791-40B3-A8A1-C34FBB736B3B}.Release|x64.ActiveCfg = Release|Any CPU
|
||||||
|
{4E96E5CC-7791-40B3-A8A1-C34FBB736B3B}.Release|x64.Build.0 = Release|Any CPU
|
||||||
|
{4E96E5CC-7791-40B3-A8A1-C34FBB736B3B}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU
|
||||||
|
{4E96E5CC-7791-40B3-A8A1-C34FBB736B3B}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU
|
||||||
|
{51C40BA9-F226-4A35-939D-1ED6F5FF7299}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||||
|
{51C40BA9-F226-4A35-939D-1ED6F5FF7299}.Debug|x64.Build.0 = Debug|Any CPU
|
||||||
|
{51C40BA9-F226-4A35-939D-1ED6F5FF7299}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
|
||||||
|
{51C40BA9-F226-4A35-939D-1ED6F5FF7299}.MinSizeRel|x64.Build.0 = Debug|Any CPU
|
||||||
|
{51C40BA9-F226-4A35-939D-1ED6F5FF7299}.Release|x64.ActiveCfg = Release|Any CPU
|
||||||
|
{51C40BA9-F226-4A35-939D-1ED6F5FF7299}.Release|x64.Build.0 = Release|Any CPU
|
||||||
|
{51C40BA9-F226-4A35-939D-1ED6F5FF7299}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU
|
||||||
|
{51C40BA9-F226-4A35-939D-1ED6F5FF7299}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU
|
||||||
|
{4E0E51AA-7B59-4808-B7CC-9EAEDF397460}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||||
|
{4E0E51AA-7B59-4808-B7CC-9EAEDF397460}.Debug|x64.Build.0 = Debug|Any CPU
|
||||||
|
{4E0E51AA-7B59-4808-B7CC-9EAEDF397460}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
|
||||||
|
{4E0E51AA-7B59-4808-B7CC-9EAEDF397460}.MinSizeRel|x64.Build.0 = Debug|Any CPU
|
||||||
|
{4E0E51AA-7B59-4808-B7CC-9EAEDF397460}.Release|x64.ActiveCfg = Release|Any CPU
|
||||||
|
{4E0E51AA-7B59-4808-B7CC-9EAEDF397460}.Release|x64.Build.0 = Release|Any CPU
|
||||||
|
{4E0E51AA-7B59-4808-B7CC-9EAEDF397460}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU
|
||||||
|
{4E0E51AA-7B59-4808-B7CC-9EAEDF397460}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU
|
||||||
|
EndGlobalSection
|
||||||
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
|
HideSolutionNode = FALSE
|
||||||
|
EndGlobalSection
|
||||||
|
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||||
|
SolutionGuid = {422D1620-0166-4C26-9A81-CA8A2EB1AB58}
|
||||||
|
EndGlobalSection
|
||||||
|
GlobalSection(Performance) = preSolution
|
||||||
|
HasPerformanceSessions = true
|
||||||
|
EndGlobalSection
|
||||||
|
GlobalSection(NestedProjects) = preSolution
|
||||||
|
{56A8A70A-DA03-4CED-A144-EC10F1379FD8} = {4564E677-343A-46CB-AF02-AFC4E38BF94B}
|
||||||
|
{915EF238-CA0D-4E73-AF50-88CB3F29C7AD} = {4564E677-343A-46CB-AF02-AFC4E38BF94B}
|
||||||
|
{4E0E51AA-7B59-4808-B7CC-9EAEDF397460} = {915EF238-CA0D-4E73-AF50-88CB3F29C7AD}
|
||||||
|
EndGlobalSection
|
||||||
|
EndGlobal
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>net7.0</TargetFramework>
|
<TargetFramework>net8.0</TargetFramework>
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>net7.0</TargetFramework>
|
<TargetFramework>net8.0</TargetFramework>
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>net7.0</TargetFramework>
|
<TargetFramework>net8.0</TargetFramework>
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|||||||
@@ -41,7 +41,6 @@ Identifier {Letter}({Letter}*[0-9]*_*)*
|
|||||||
OpenParenthesis \(
|
OpenParenthesis \(
|
||||||
CloseParenthesis \)
|
CloseParenthesis \)
|
||||||
Comma ,
|
Comma ,
|
||||||
Negate '!'
|
|
||||||
MapsTo ':'
|
MapsTo ':'
|
||||||
IsOfType '/'
|
IsOfType '/'
|
||||||
|
|
||||||
@@ -94,10 +93,6 @@ IsOfType '/'
|
|||||||
return (int)Token.COMMA;
|
return (int)Token.COMMA;
|
||||||
}
|
}
|
||||||
|
|
||||||
{Negate} {
|
|
||||||
return (int)Token.NEGATE;
|
|
||||||
}
|
|
||||||
|
|
||||||
{MapsTo} {
|
{MapsTo} {
|
||||||
return (int)Token.MAPS_TO;
|
return (int)Token.MAPS_TO;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,14 +1,14 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>net7.0</TargetFramework>
|
<TargetFramework>net8.0</TargetFramework>
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Google.Protobuf" Version="3.24.3" />
|
<PackageReference Include="Google.Protobuf" Version="3.24.3" />
|
||||||
<PackageReference Include="YaccLexTools" Version="1.2.0" />
|
<PackageReference Include="YaccLexTools" Version="1.2.3" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
@@ -24,8 +24,6 @@ namespace QUT.GplexBuffers
|
|||||||
public BufferException(string message) : base(message) { }
|
public BufferException(string message) : base(message) { }
|
||||||
public BufferException(string message, Exception innerException)
|
public BufferException(string message, Exception innerException)
|
||||||
: base(message, innerException) { }
|
: base(message, innerException) { }
|
||||||
protected BufferException(SerializationInfo info, StreamingContext context)
|
|
||||||
: base(info, context) { }
|
|
||||||
}
|
}
|
||||||
|
|
||||||
internal abstract class ScanBuff
|
internal abstract class ScanBuff
|
||||||
@@ -60,12 +58,10 @@ namespace QUT.GplexBuffers
|
|||||||
return new BuildBuffer(source);
|
return new BuildBuffer(source);
|
||||||
}
|
}
|
||||||
|
|
||||||
#if (!BYTEMODE)
|
|
||||||
public static ScanBuff GetBuffer(Stream source, int fallbackCodePage)
|
public static ScanBuff GetBuffer(Stream source, int fallbackCodePage)
|
||||||
{
|
{
|
||||||
return new BuildBuffer(source, fallbackCodePage);
|
return new BuildBuffer(source, fallbackCodePage);
|
||||||
}
|
}
|
||||||
#endif // !BYTEMODE
|
|
||||||
#endif // !NOFILES
|
#endif // !NOFILES
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -353,17 +349,15 @@ namespace QUT.GplexBuffers
|
|||||||
{
|
{
|
||||||
FileStream fStrm = (stream as FileStream);
|
FileStream fStrm = (stream as FileStream);
|
||||||
if (fStrm != null) FileName = fStrm.Name;
|
if (fStrm != null) FileName = fStrm.Name;
|
||||||
NextBlk = BlockReaderFactory.Raw(stream);
|
NextBlk = BlockReaderFactory.Get(stream);
|
||||||
}
|
}
|
||||||
|
|
||||||
#if (!BYTEMODE)
|
|
||||||
public BuildBuffer(Stream stream, int fallbackCodePage)
|
public BuildBuffer(Stream stream, int fallbackCodePage)
|
||||||
{
|
{
|
||||||
FileStream fStrm = (stream as FileStream);
|
FileStream fStrm = (stream as FileStream);
|
||||||
if (fStrm != null) FileName = fStrm.Name;
|
if (fStrm != null) FileName = fStrm.Name;
|
||||||
NextBlk = BlockReaderFactory.Get(stream, fallbackCodePage);
|
NextBlk = BlockReaderFactory.Get(stream, fallbackCodePage);
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Marks a conservative lower bound for the buffer,
|
/// Marks a conservative lower bound for the buffer,
|
||||||
@@ -434,43 +428,19 @@ namespace QUT.GplexBuffers
|
|||||||
//
|
//
|
||||||
internal static class BlockReaderFactory
|
internal static class BlockReaderFactory
|
||||||
{
|
{
|
||||||
public static BlockReader Raw(Stream stream)
|
|
||||||
{
|
|
||||||
return delegate(char[] block, int index, int number)
|
|
||||||
{
|
|
||||||
byte[] b = new byte[number];
|
|
||||||
int count = stream.Read(b, 0, number);
|
|
||||||
int i = 0;
|
|
||||||
int j = index;
|
|
||||||
for (; i < count; i++, j++)
|
|
||||||
block[j] = (char)b[i];
|
|
||||||
return count;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
#if (!BYTEMODE)
|
public static BlockReader Get(Stream stream, int fallbackCodePage = -2)
|
||||||
public static BlockReader Get(Stream stream, int fallbackCodePage)
|
|
||||||
{
|
{
|
||||||
Encoding encoding;
|
Encoding encoding;
|
||||||
int preamble = Preamble(stream);
|
int preamble = Preamble(stream);
|
||||||
|
|
||||||
if (preamble != 0) // There is a valid BOM here!
|
if (preamble != 0) // There is a valid BOM here!
|
||||||
encoding = Encoding.GetEncoding(preamble);
|
encoding = Encoding.GetEncoding(preamble);
|
||||||
else if (fallbackCodePage == -1) // Fallback is "raw" bytes
|
else if (fallbackCodePage >= 0) // Anything but "guess"
|
||||||
return Raw(stream);
|
|
||||||
else if (fallbackCodePage != -2) // Anything but "guess"
|
|
||||||
encoding = Encoding.GetEncoding(fallbackCodePage);
|
encoding = Encoding.GetEncoding(fallbackCodePage);
|
||||||
else // This is the "guess" option
|
else // This is the "guess" option
|
||||||
{
|
encoding = GuessEncoding(stream);
|
||||||
int guess = new Guesser(stream).GuessCodePage();
|
|
||||||
stream.Seek(0, SeekOrigin.Begin);
|
|
||||||
if (guess == -1) // ==> this is a 7-bit file
|
|
||||||
encoding = Encoding.ASCII;
|
|
||||||
else if (guess == 65001)
|
|
||||||
encoding = Encoding.UTF8;
|
|
||||||
else // ==> use the machine default
|
|
||||||
encoding = Encoding.Default;
|
|
||||||
}
|
|
||||||
StreamReader reader = new StreamReader(stream, encoding);
|
StreamReader reader = new StreamReader(stream, encoding);
|
||||||
return reader.Read;
|
return reader.Read;
|
||||||
}
|
}
|
||||||
@@ -488,6 +458,14 @@ namespace QUT.GplexBuffers
|
|||||||
int b2 = stream.ReadByte();
|
int b2 = stream.ReadByte();
|
||||||
if (b0 == 0xef && b1 == 0xbb && b2 == 0xbf)
|
if (b0 == 0xef && b1 == 0xbb && b2 == 0xbf)
|
||||||
return 65001; // UTF8
|
return 65001; // UTF8
|
||||||
|
|
||||||
|
int b3 = stream.ReadByte();
|
||||||
|
// Check for UTF-32 BOM (Byte Order Mark)
|
||||||
|
if (b0 == 0x00 && b1 == 0x00 && b2 == 0xFE && b3 == 0xFF)
|
||||||
|
return 12001; // UTF-32BE
|
||||||
|
if (b0 == 0xFF && b1 == 0xFE && b2 == 0x00 && b3 == 0x00)
|
||||||
|
return 12000; // UTF-32LE
|
||||||
|
|
||||||
//
|
//
|
||||||
// There is no unicode preamble, so we
|
// There is no unicode preamble, so we
|
||||||
// return denoter for the machine default.
|
// return denoter for the machine default.
|
||||||
@@ -495,7 +473,150 @@ namespace QUT.GplexBuffers
|
|||||||
stream.Seek(0, SeekOrigin.Begin);
|
stream.Seek(0, SeekOrigin.Begin);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
#endif // !BYTEMODE
|
|
||||||
|
private static Encoding GuessEncoding(Stream stream)
|
||||||
|
{
|
||||||
|
stream.Seek(0, SeekOrigin.Begin);
|
||||||
|
if (IsUtf16(stream, out Encoding encoding))
|
||||||
|
{
|
||||||
|
stream.Seek(0, SeekOrigin.Begin);
|
||||||
|
return encoding;
|
||||||
|
}
|
||||||
|
|
||||||
|
stream.Seek(0, SeekOrigin.Begin);
|
||||||
|
if (IsUtf8(stream))
|
||||||
|
{
|
||||||
|
stream.Seek(0, SeekOrigin.Begin);
|
||||||
|
return Encoding.UTF8;
|
||||||
|
}
|
||||||
|
|
||||||
|
stream.Seek(0, SeekOrigin.Begin);
|
||||||
|
if (IsAscii(stream))
|
||||||
|
{
|
||||||
|
stream.Seek(0, SeekOrigin.Begin);
|
||||||
|
return Encoding.ASCII;
|
||||||
|
}
|
||||||
|
|
||||||
|
#if !NET462_OR_GREATER
|
||||||
|
stream.Seek(0, SeekOrigin.Begin);
|
||||||
|
if (IsLatin1(stream))
|
||||||
|
{
|
||||||
|
stream.Seek(0, SeekOrigin.Begin);
|
||||||
|
return Encoding.Latin1;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
stream.Seek(0, SeekOrigin.Begin);
|
||||||
|
return Encoding.Default;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static bool IsUtf8(Stream stream)
|
||||||
|
{
|
||||||
|
int b;
|
||||||
|
while ((b = stream.ReadByte()) != -1)
|
||||||
|
{
|
||||||
|
if ((b & 0x80) == 0) // 0xxxxxxx
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
else if ((b & 0xE0) == 0xC0) // 110xxxxx 10xxxxxx
|
||||||
|
{
|
||||||
|
if (!IsValidUtf8ContinuationByte(stream)) return false;
|
||||||
|
}
|
||||||
|
else if ((b & 0xF0) == 0xE0) // 1110xxxx 10xxxxxx 10xxxxxx
|
||||||
|
{
|
||||||
|
if (!IsValidUtf8ContinuationByte(stream) || !IsValidUtf8ContinuationByte(stream)) return false;
|
||||||
|
}
|
||||||
|
else if ((b & 0xF8) == 0xF0) // 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
|
||||||
|
{
|
||||||
|
if (!IsValidUtf8ContinuationByte(stream) || !IsValidUtf8ContinuationByte(stream) || !IsValidUtf8ContinuationByte(stream)) return false;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static bool IsValidUtf8ContinuationByte(Stream stream)
|
||||||
|
{
|
||||||
|
int b = stream.ReadByte();
|
||||||
|
return b != -1 && (b & 0xC0) == 0x80; // 10xxxxxx
|
||||||
|
}
|
||||||
|
|
||||||
|
private static bool IsUtf16(Stream stream, out Encoding encoding)
|
||||||
|
{
|
||||||
|
encoding = Encoding.Default;
|
||||||
|
|
||||||
|
if (stream.Length >= 2)
|
||||||
|
{
|
||||||
|
// Read the first two bytes
|
||||||
|
int b0 = stream.ReadByte();
|
||||||
|
int b1 = stream.ReadByte();
|
||||||
|
|
||||||
|
// Check for UTF-16 BOM (Byte Order Mark)
|
||||||
|
if (b0 == 0xFF && b1 == 0xFE)
|
||||||
|
{
|
||||||
|
encoding = Encoding.Unicode;
|
||||||
|
return true; // UTF-16LE
|
||||||
|
}
|
||||||
|
if (b0 == 0xFE && b1 == 0xFF)
|
||||||
|
{
|
||||||
|
encoding = Encoding.BigEndianUnicode;
|
||||||
|
return true; // UTF-16BE
|
||||||
|
}
|
||||||
|
|
||||||
|
// Reset the stream position
|
||||||
|
stream.Seek(0, SeekOrigin.Begin);
|
||||||
|
|
||||||
|
// Check for common UTF-16 patterns
|
||||||
|
byte[] buffer = new byte[2];
|
||||||
|
while (stream.Read(buffer, 0, 2) == 2)
|
||||||
|
{
|
||||||
|
if (buffer[0] == 0x00 && buffer[1] != 0x00)
|
||||||
|
{
|
||||||
|
encoding = Encoding.BigEndianUnicode;
|
||||||
|
return true; // Likely UTF-16BE
|
||||||
|
}
|
||||||
|
if (buffer[0] != 0x00 && buffer[1] == 0x00)
|
||||||
|
{
|
||||||
|
encoding = Encoding.Unicode;
|
||||||
|
return true; // Likely UTF-16LE
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static bool IsAscii(Stream stream)
|
||||||
|
{
|
||||||
|
int b;
|
||||||
|
while ((b = stream.ReadByte()) != -1)
|
||||||
|
{
|
||||||
|
// Latin1 includes byte values from 0x00 to 0xFF
|
||||||
|
if (b > 0x7F)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static bool IsLatin1(Stream stream)
|
||||||
|
{
|
||||||
|
int b;
|
||||||
|
while ((b = stream.ReadByte()) != -1)
|
||||||
|
{
|
||||||
|
// Latin1 includes byte values from 0x00 to 0xFF
|
||||||
|
if (b > 0xFF)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
#endif // !NOFILES
|
#endif // !NOFILES
|
||||||
#endregion Buffer classes
|
#endregion Buffer classes
|
||||||
@@ -540,180 +661,6 @@ namespace QUT.GplexBuffers
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#region guesser
|
|
||||||
#if (!BYTEMODE)
|
|
||||||
// ==============================================================
|
|
||||||
// ============ Encoding Guesser =============
|
|
||||||
// ==============================================================
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// This class provides a simple finite state automaton that
|
|
||||||
/// scans the file looking for (1) valid UTF-8 byte patterns,
|
|
||||||
/// (2) bytes >= 0x80 which are not part of a UTF-8 sequence.
|
|
||||||
/// The method then guesses whether it is UTF-8 or maybe some
|
|
||||||
/// local machine default encoding. This works well for the
|
|
||||||
/// various Latin encodings.
|
|
||||||
/// </summary>
|
|
||||||
internal class Guesser
|
|
||||||
{
|
|
||||||
ScanBuff buffer;
|
|
||||||
|
|
||||||
public int GuessCodePage() { return Scan(); }
|
|
||||||
|
|
||||||
const int maxAccept = 10;
|
|
||||||
const int initial = 0;
|
|
||||||
const int eofNum = 0;
|
|
||||||
const int goStart = -1;
|
|
||||||
const int INITIAL = 0;
|
|
||||||
const int EndToken = 0;
|
|
||||||
|
|
||||||
#region user code
|
|
||||||
/*
|
|
||||||
* Reads the bytes of a file to determine if it is
|
|
||||||
* UTF-8 or a single-byte code page file.
|
|
||||||
*/
|
|
||||||
public long utfX;
|
|
||||||
public long uppr;
|
|
||||||
#endregion user code
|
|
||||||
|
|
||||||
int state;
|
|
||||||
int currentStart = startState[0];
|
|
||||||
int code;
|
|
||||||
|
|
||||||
#region ScannerTables
|
|
||||||
static int[] startState = new int[] { 11, 0 };
|
|
||||||
|
|
||||||
#region CharacterMap
|
|
||||||
static sbyte[] map = new sbyte[256] {
|
|
||||||
/* '\0' */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
|
||||||
/* '\x10' */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
|
||||||
/* '\x20' */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
|
||||||
/* '0' */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
|
||||||
/* '@' */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
|
||||||
/* 'P' */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
|
||||||
/* '`' */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
|
||||||
/* 'p' */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
|
||||||
/* '\x80' */ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
|
|
||||||
/* '\x90' */ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
|
|
||||||
/* '\xA0' */ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
|
|
||||||
/* '\xB0' */ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
|
|
||||||
/* '\xC0' */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
|
|
||||||
/* '\xD0' */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
|
|
||||||
/* '\xE0' */ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
|
|
||||||
/* '\xF0' */ 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5 };
|
|
||||||
#endregion
|
|
||||||
|
|
||||||
static sbyte[][] nextState = new sbyte[][] {
|
|
||||||
new sbyte[] {0, 0, 0, 0, 0, 0},
|
|
||||||
new sbyte[] {-1, -1, 10, -1, -1, -1},
|
|
||||||
new sbyte[] {-1, -1, -1, -1, -1, -1},
|
|
||||||
new sbyte[] {-1, -1, 8, -1, -1, -1},
|
|
||||||
new sbyte[] {-1, -1, 5, -1, -1, -1},
|
|
||||||
new sbyte[] {-1, -1, 6, -1, -1, -1},
|
|
||||||
new sbyte[] {-1, -1, 7, -1, -1, -1},
|
|
||||||
null,
|
|
||||||
new sbyte[] {-1, -1, 9, -1, -1, -1},
|
|
||||||
null,
|
|
||||||
null,
|
|
||||||
new sbyte[] {-1, 1, 2, 3, 4, 2}
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
[SuppressMessage("Microsoft.Performance", "CA1810:InitializeReferenceTypeStaticFieldsInline")]
|
|
||||||
// Reason for suppression: cannot have self-reference in array initializer.
|
|
||||||
static Guesser()
|
|
||||||
{
|
|
||||||
nextState[7] = nextState[2];
|
|
||||||
nextState[9] = nextState[2];
|
|
||||||
nextState[10] = nextState[2];
|
|
||||||
}
|
|
||||||
|
|
||||||
int NextState()
|
|
||||||
{
|
|
||||||
if (code == ScanBuff.EndOfFile)
|
|
||||||
return eofNum;
|
|
||||||
else
|
|
||||||
return nextState[state][map[code]];
|
|
||||||
}
|
|
||||||
#endregion
|
|
||||||
|
|
||||||
public Guesser(System.IO.Stream file) { SetSource(file); }
|
|
||||||
|
|
||||||
public void SetSource(System.IO.Stream source)
|
|
||||||
{
|
|
||||||
this.buffer = new BuildBuffer(source);
|
|
||||||
code = buffer.Read();
|
|
||||||
}
|
|
||||||
|
|
||||||
int Scan()
|
|
||||||
{
|
|
||||||
for (; ; )
|
|
||||||
{
|
|
||||||
int next;
|
|
||||||
state = currentStart;
|
|
||||||
while ((next = NextState()) == goStart)
|
|
||||||
code = buffer.Read();
|
|
||||||
|
|
||||||
state = next;
|
|
||||||
code = buffer.Read();
|
|
||||||
|
|
||||||
while ((next = NextState()) > eofNum)
|
|
||||||
{
|
|
||||||
state = next;
|
|
||||||
code = buffer.Read();
|
|
||||||
}
|
|
||||||
if (state <= maxAccept)
|
|
||||||
{
|
|
||||||
#region ActionSwitch
|
|
||||||
#pragma warning disable 162
|
|
||||||
switch (state)
|
|
||||||
{
|
|
||||||
case eofNum:
|
|
||||||
switch (currentStart)
|
|
||||||
{
|
|
||||||
case 11:
|
|
||||||
if (utfX == 0 && uppr == 0) return -1; /* raw ascii */
|
|
||||||
else if (uppr * 10 > utfX) return 0; /* default code page */
|
|
||||||
else return 65001; /* UTF-8 encoding */
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
return EndToken;
|
|
||||||
case 1: // Recognized '{Upper128}', Shortest string "\xC0"
|
|
||||||
case 2: // Recognized '{Upper128}', Shortest string "\x80"
|
|
||||||
case 3: // Recognized '{Upper128}', Shortest string "\xE0"
|
|
||||||
case 4: // Recognized '{Upper128}', Shortest string "\xF0"
|
|
||||||
uppr++;
|
|
||||||
break;
|
|
||||||
case 5: // Recognized '{Utf8pfx4}{Utf8cont}', Shortest string "\xF0\x80"
|
|
||||||
uppr += 2;
|
|
||||||
break;
|
|
||||||
case 6: // Recognized '{Utf8pfx4}{Utf8cont}{2}', Shortest string "\xF0\x80\x80"
|
|
||||||
uppr += 3;
|
|
||||||
break;
|
|
||||||
case 7: // Recognized '{Utf8pfx4}{Utf8cont}{3}', Shortest string "\xF0\x80\x80\x80"
|
|
||||||
utfX += 3;
|
|
||||||
break;
|
|
||||||
case 8: // Recognized '{Utf8pfx3}{Utf8cont}', Shortest string "\xE0\x80"
|
|
||||||
uppr += 2;
|
|
||||||
break;
|
|
||||||
case 9: // Recognized '{Utf8pfx3}{Utf8cont}{2}', Shortest string "\xE0\x80\x80"
|
|
||||||
utfX += 2;
|
|
||||||
break;
|
|
||||||
case 10: // Recognized '{Utf8pfx2}{Utf8cont}', Shortest string "\xC0\x80"
|
|
||||||
utfX++;
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
#pragma warning restore 162
|
|
||||||
#endregion
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} // end class Guesser
|
|
||||||
|
|
||||||
#endif // !BYTEMODE
|
|
||||||
#endregion
|
|
||||||
#endif // !NOFILES
|
#endif // !NOFILES
|
||||||
|
|
||||||
// End of code copied from embedded resource
|
// End of code copied from embedded resource
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>net7.0</TargetFramework>
|
<TargetFramework>net8.0</TargetFramework>
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>net7.0</TargetFramework>
|
<TargetFramework>net8.0</TargetFramework>
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|||||||
@@ -0,0 +1,20 @@
|
|||||||
|
module.exports = {
|
||||||
|
root: true,
|
||||||
|
env: { browser: true, es2020: true },
|
||||||
|
extends: [
|
||||||
|
'eslint:recommended',
|
||||||
|
'plugin:react/recommended',
|
||||||
|
'plugin:react/jsx-runtime',
|
||||||
|
'plugin:react-hooks/recommended',
|
||||||
|
],
|
||||||
|
ignorePatterns: ['dist', '.eslintrc.cjs'],
|
||||||
|
parserOptions: { ecmaVersion: 'latest', sourceType: 'module' },
|
||||||
|
settings: { react: { version: '18.3.1' } },
|
||||||
|
plugins: ['react-refresh'],
|
||||||
|
rules: {
|
||||||
|
'react-refresh/only-export-components': [
|
||||||
|
'warn',
|
||||||
|
{ allowConstantExport: true },
|
||||||
|
],
|
||||||
|
},
|
||||||
|
}
|
||||||
@@ -1,36 +0,0 @@
|
|||||||
import importPlugin from "eslint-plugin-import";
|
|
||||||
import reactPkg from "eslint-plugin-react";
|
|
||||||
const { configs: reactConfigs } = reactPkg;
|
|
||||||
import js from "@eslint/js";
|
|
||||||
import defineConfig from "./vite.config.js";
|
|
||||||
|
|
||||||
export default [
|
|
||||||
js.configs.recommended,
|
|
||||||
importPlugin.flatConfigs.recommended,
|
|
||||||
reactConfigs.flat.recommended,
|
|
||||||
reactConfigs.flat["jsx-runtime"],
|
|
||||||
{
|
|
||||||
files: ["**/*.{js,jsx}"],
|
|
||||||
languageOptions: {
|
|
||||||
ecmaVersion: "latest",
|
|
||||||
sourceType: "module",
|
|
||||||
globals: {
|
|
||||||
console: "readonly"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
settings: {
|
|
||||||
"import/resolver": {
|
|
||||||
vite: {
|
|
||||||
viteConfig: defineConfig({ mode: "development" })
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
rules: {
|
|
||||||
semi: "error",
|
|
||||||
"prefer-const": "error",
|
|
||||||
"no-unused-vars": "warn",
|
|
||||||
"import/no-dynamic-require": "warn",
|
|
||||||
"import/no-nodejs-modules": "warn",
|
|
||||||
}
|
|
||||||
}
|
|
||||||
];
|
|
||||||
+1885
-1431
File diff suppressed because it is too large.
Load diff
@@ -10,37 +10,34 @@
|
|||||||
"preview": "vite preview"
|
"preview": "vite preview"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@angular/material": "^18.2.8",
|
"@angular/material": "^18.0.4",
|
||||||
"@emotion/react": "^11.13.3",
|
"@emotion/react": "^11.11.4",
|
||||||
"@emotion/styled": "^11.13.0",
|
"@emotion/styled": "^11.11.5",
|
||||||
"@fontsource/noto-sans": "^5.1.0",
|
"@fontsource/noto-sans": "^5.0.22",
|
||||||
"@material/data-table": "^15.0.0-canary.423edc3dc.0",
|
"@material/data-table": "^15.0.0-canary.7f224ddd4.0",
|
||||||
"@mui/icons-material": "^6.1.4",
|
"@mui/icons-material": "^5.15.20",
|
||||||
"@mui/material": "^6.1.4",
|
"@mui/material": "^5.15.20",
|
||||||
"@mui/x-data-grid": "^7.20.0",
|
"@mui/x-data-grid": "^7.7.1",
|
||||||
"bulma": "^1.0.2",
|
"bulma": "^1.0.1",
|
||||||
"classnames": "^2.5.1",
|
"classnames": "^2.5.1",
|
||||||
"react": "^18.3.1",
|
"react": "^18.3.1",
|
||||||
"react-data-grid": "^7.0.0-beta.47",
|
"react-data-grid": "^7.0.0-beta.44",
|
||||||
"react-data-table-component": "^7.6.2",
|
"react-data-table-component": "^7.6.2",
|
||||||
"react-dom": "^18.3.1",
|
"react-dom": "^18.3.1",
|
||||||
"react-json-view-lite": "^1.5.0",
|
"react-json-view-lite": "^1.4.0",
|
||||||
"react-pro-sidebar": "^1.1.0",
|
"react-pro-sidebar": "^1.1.0",
|
||||||
"react-use-websocket": "^4.9.0",
|
"react-use-websocket": "^4.8.1",
|
||||||
"rpc-websockets": "^9.0.4"
|
"rpc-websockets": "^7.11.2"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@types/react": "^18.3.11",
|
"@types/react": "^18.3.3",
|
||||||
"@types/react-dom": "^18.3.1",
|
"@types/react-dom": "^18.3.0",
|
||||||
"@vitejs/plugin-react": "^4.3.2",
|
"@vitejs/plugin-react": "^4.3.1",
|
||||||
"eslint": "^9.12.0",
|
"eslint": "^8.57.0",
|
||||||
"@eslint/js": "^9.12.0",
|
"eslint-plugin-react": "^7.34.2",
|
||||||
"eslint-plugin-import": "^2.31.0",
|
"eslint-plugin-react-hooks": "^4.6.2",
|
||||||
"eslint-plugin-react": "^7.37.1",
|
"eslint-plugin-react-refresh": "^0.4.7",
|
||||||
"eslint-plugin-react-hooks": "^5.0.0",
|
"react-mui-sidebar": "^1.3.5",
|
||||||
"eslint-plugin-react-refresh": "^0.4.12",
|
"vite": "^5.2.13"
|
||||||
"eslint-import-resolver-vite": "^2.0.1",
|
|
||||||
"react-mui-sidebar": "^1.3.8",
|
|
||||||
"vite": "^5.4.9"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -12,7 +12,7 @@ const QueryStatusView = ({ queryState, details, error }) => {
|
|||||||
|
|
||||||
let header = queryState;
|
let header = queryState;
|
||||||
let headerContent = null;
|
let headerContent = null;
|
||||||
const detailElements = [];
|
let detailElements = [];
|
||||||
let severity = queryState == "Subscribed" ? "success" : "info";
|
let severity = queryState == "Subscribed" ? "success" : "info";
|
||||||
let cursor = details == null ? "default" : "pointer";
|
let cursor = details == null ? "default" : "pointer";
|
||||||
if (error != null) {
|
if (error != null) {
|
||||||
@@ -20,14 +20,14 @@ const QueryStatusView = ({ queryState, details, error }) => {
|
|||||||
cursor = "pointer";
|
cursor = "pointer";
|
||||||
header = `Error Code: ${error.code}`;
|
header = `Error Code: ${error.code}`;
|
||||||
headerContent = error.message;
|
headerContent = error.message;
|
||||||
detailElements.push(<Typography key="error-msg" variant="body1">{error.data.error_message}</Typography>);
|
detailElements.push(<Typography variant="body1">{error.data.error_message}</Typography>);
|
||||||
detailElements.push(<Typography key="error-details" variant="subtitle1">Stack Trace:</Typography>);
|
detailElements.push(<Typography variant="subtitle1">Stack Trace:</Typography>);
|
||||||
(error.data.stack_trace ?? []).forEach((line, idx) => detailElements.push(
|
(error.data.stack_trace ?? []).forEach(line => detailElements.push(
|
||||||
<Typography key={`stacktrace-${idx}`} variant="body2" component="pre" sx={{ whiteSpace: 'pre-wrap' }}>
|
<Typography variant="body2" component="pre" sx={{ whiteSpace: 'pre-wrap' }}>
|
||||||
{line}
|
{line}
|
||||||
</Typography>));
|
</Typography>));
|
||||||
} else if (details != null) {
|
} else if (details != null) {
|
||||||
detailElements.push(<Typography key="status-msg" variant="body1">{details}</Typography>);
|
detailElements.push(<Typography variant="body1">{details}</Typography>);
|
||||||
}
|
}
|
||||||
return (
|
return (
|
||||||
<Box sx={{ margin: theme.spacing(2, 0, 0, 0) }}>
|
<Box sx={{ margin: theme.spacing(2, 0, 0, 0) }}>
|
||||||
|
|||||||
@@ -29,12 +29,13 @@ if (!fs.existsSync(certFilePath) || !fs.existsSync(keyFilePath)) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const target = env.ASPNETCORE_HTTPS_PORT
|
||||||
|
? `https://localhost:${env.ASPNETCORE_HTTPS_PORT}`
|
||||||
|
: env.ASPNETCORE_URLS
|
||||||
|
? env.ASPNETCORE_URLS.split(';')[0]
|
||||||
|
: 'https://localhost:8443';
|
||||||
|
|
||||||
export default defineConfig(({ $$command, mode, $$isSsrBuild, $$isPreview }) => {
|
export default defineConfig(({ $$command, mode, $$isSsrBuild, $$isPreview }) => {
|
||||||
const target = env.ASPNETCORE_HTTPS_PORT
|
|
||||||
? `https://localhost:${env.ASPNETCORE_HTTPS_PORT}`
|
|
||||||
: env.ASPNETCORE_URLS
|
|
||||||
? env.ASPNETCORE_URLS.split(';')[0]
|
|
||||||
: 'https://localhost:8443';
|
|
||||||
return {
|
return {
|
||||||
plugins: [plugin()],
|
plugins: [plugin()],
|
||||||
resolve: {
|
resolve: {
|
||||||
@@ -67,10 +68,6 @@ export default defineConfig(({ $$command, mode, $$isSsrBuild, $$isPreview }) =>
|
|||||||
'^/ws': {
|
'^/ws': {
|
||||||
target,
|
target,
|
||||||
secure: false
|
secure: false
|
||||||
},
|
|
||||||
'^/browse': {
|
|
||||||
target,
|
|
||||||
secure: false
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
port: 5173,
|
port: 5173,
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk.Web">
|
<Project Sdk="Microsoft.NET.Sdk.Web">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>net7.0</TargetFramework>
|
<TargetFramework>net8.0</TargetFramework>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
<InvariantGlobalization>true</InvariantGlobalization>
|
<InvariantGlobalization>true</InvariantGlobalization>
|
||||||
@@ -12,10 +12,10 @@
|
|||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="CommandLineParser" Version="2.9.1" />
|
<PackageReference Include="CommandLineParser" Version="2.9.1" />
|
||||||
<PackageReference Include="Microsoft.AspNetCore.SpaProxy" Version="7.0.20" />
|
<PackageReference Include="Microsoft.AspNetCore.SpaProxy" Version="8.0.18" />
|
||||||
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="7.0.20" />
|
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="8.0.18" />
|
||||||
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
|
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
|
||||||
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
|
<PackageReference Include="Swashbuckle.AspNetCore" Version="9.0.3" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
+37
-37
@@ -1,37 +1,37 @@
|
|||||||
namespace Bts.DataStreamWebApp.Server.Controllers;
|
namespace Bts.DataStreamWebApp.Server.Controllers;
|
||||||
|
|
||||||
using Bts.DataStream;
|
using Bts.DataStreamCore;
|
||||||
|
|
||||||
using Microsoft.AspNetCore.Mvc;
|
using Microsoft.AspNetCore.Mvc;
|
||||||
|
|
||||||
[Route("/ws")]
|
[Route("/ws")]
|
||||||
public class DataStreamSubscriptionController : ControllerBase {
|
public class DataStreamSubscriptionController : ControllerBase {
|
||||||
readonly ILogger logger;
|
readonly ILogger logger;
|
||||||
readonly IDataStreamFactory streamFactory;
|
readonly IDataStreamFactory streamFactory;
|
||||||
|
|
||||||
public DataStreamSubscriptionController(ILogger<DataStreamSubscriptionController> logger, IEnumerable<IDataStreamFactory> streamFactories) {
|
public DataStreamSubscriptionController(ILogger<DataStreamSubscriptionController> logger, IEnumerable<IDataStreamFactory> streamFactories) {
|
||||||
this.logger = logger;
|
this.logger = logger;
|
||||||
logger.LogInformation("Creating {ControllerType}", GetType().Name);
|
logger.LogInformation("Creating {ControllerType}", GetType().Name);
|
||||||
var streamFactoryList = streamFactories.ToList();
|
var streamFactoryList = streamFactories.ToList();
|
||||||
streamFactory = streamFactoryList.Count == 1
|
streamFactory = streamFactoryList.Count == 1
|
||||||
? streamFactoryList[0]
|
? streamFactoryList[0]
|
||||||
: new CompositeDataStreamFactory(streamFactoryList);
|
: new CompositeDataStreamFactory(streamFactoryList);
|
||||||
}
|
}
|
||||||
|
|
||||||
[Route("/ws")]
|
[Route("/ws")]
|
||||||
public async Task Get(CancellationToken cancellationToken) {
|
public async Task Get(CancellationToken cancellationToken) {
|
||||||
if (!HttpContext.WebSockets.IsWebSocketRequest) {
|
if (!HttpContext.WebSockets.IsWebSocketRequest) {
|
||||||
logger.LogError("Expected websocket request on path '{}'", HttpContext.Request.Path);
|
logger.LogError("Expected websocket request on path '{}'", HttpContext.Request.Path);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
logger.LogInformation("Establishing websocket connection...");
|
logger.LogInformation("Establishing websocket connection...");
|
||||||
try {
|
try {
|
||||||
using var webSocket = await HttpContext.WebSockets.AcceptWebSocketAsync();
|
using var webSocket = await HttpContext.WebSockets.AcceptWebSocketAsync();
|
||||||
logger.LogInformation("Websocket connection established.");
|
logger.LogInformation("Websocket connection established.");
|
||||||
using var server = new DataStreamWebSocketServer(webSocket, streamFactory, logger);
|
using var server = new DataStreamWebSocketServer(webSocket, streamFactory, logger);
|
||||||
await server.Run(cancellationToken);
|
await server.Run(cancellationToken);
|
||||||
} catch (Exception ex) {
|
} catch (Exception ex) {
|
||||||
logger.LogError("DataStreamSubscriptionController.Run threw exception: {Exception}", ex);
|
logger.LogError("DataStreamSubscriptionController.Run threw exception: {Exception}", ex);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -2,7 +2,7 @@ namespace Bts.DataStreamWebApp.Server.Controllers;
|
|||||||
|
|
||||||
using bts.websocket_core.json_rpc;
|
using bts.websocket_core.json_rpc;
|
||||||
|
|
||||||
using Bts.DataStream;
|
using Bts.DataStreamCore;
|
||||||
using Bts.DataStreamWebApp.Server.Messages;
|
using Bts.DataStreamWebApp.Server.Messages;
|
||||||
|
|
||||||
using System.Net.WebSockets;
|
using System.Net.WebSockets;
|
||||||
|
|||||||
@@ -1,13 +1,11 @@
|
|||||||
FROM bluetradingsystems/linux_dotnet7
|
FROM bluetradingsystems/linux_dotnet7
|
||||||
|
|
||||||
ARG CS_SOURCE_DIR="build/Release/bin/net7.0/linux-x64/publish"
|
ARG SOURCE_DIR="build/Release/bin/net7.0/linux-x64/publish"
|
||||||
ARG CPP_SOURCE_DIR="install/data-stream-suite-linux"
|
|
||||||
ARG WEB_ROOT="build/Bts.DataStreamWebApp.Client/production/dist"
|
ARG WEB_ROOT="build/Bts.DataStreamWebApp.Client/production/dist"
|
||||||
ARG CONF_FILE="src/DataStreamSuite/Bts.DataStreamWebApp.Server/spark.conf"
|
ARG CONF_FILE="src/DataStreamSuite/Bts.DataStreamWebApp.Server/spark.conf"
|
||||||
|
|
||||||
RUN dotnet dev-certs https --trust
|
RUN dotnet dev-certs https --trust
|
||||||
COPY --chown=bts:bts "${CPP_SOURCE_DIR}/lib" "bin"
|
COPY --chown=bts:bts "${SOURCE_DIR}" "bin"
|
||||||
COPY --chown=bts:bts "${CS_SOURCE_DIR}" "bin"
|
|
||||||
COPY --chown=bts:bts "${WEB_ROOT}" "bin/wwwroot"
|
COPY --chown=bts:bts "${WEB_ROOT}" "bin/wwwroot"
|
||||||
COPY --chown=bts:bts "${CONF_FILE}" ".local/share/bts/Bts.DataStreamWebApp.Server/conf/spark.conf"
|
COPY --chown=bts:bts "${CONF_FILE}" ".local/share/DataStream/conf/spark.conf"
|
||||||
WORKDIR "/home/bts/bin"
|
WORKDIR "/home/bts/bin"
|
||||||
@@ -4,7 +4,7 @@ using BCG;
|
|||||||
|
|
||||||
using bts.websocket_core.json_rpc;
|
using bts.websocket_core.json_rpc;
|
||||||
|
|
||||||
using Bts.DataStream;
|
using Bts.DataStreamCore;
|
||||||
using Bts.DataStreamExpressions;
|
using Bts.DataStreamExpressions;
|
||||||
|
|
||||||
using System.Diagnostics.CodeAnalysis;
|
using System.Diagnostics.CodeAnalysis;
|
||||||
|
|||||||
@@ -79,8 +79,8 @@ static void ConfigureServices(IServiceCollection services, IConfiguration config
|
|||||||
.AddSparkApi(config.GetSection("SparkApi"))
|
.AddSparkApi(config.GetSection("SparkApi"))
|
||||||
.AddMasterWorker(config.GetSection("MasterWorker"))
|
.AddMasterWorker(config.GetSection("MasterWorker"))
|
||||||
.AddViewStreamDatabase()
|
.AddViewStreamDatabase()
|
||||||
.AddPrimitiveDataStreamFactory(config.GetSection("PrimitiveStreams"))
|
.AddPrimitiveStreams(config.GetSection("PrimitiveStreams"))
|
||||||
.AddOhlcvStreams(config.GetSection("StreamDatabase"))
|
.AddMarketDataStreams()
|
||||||
.AddNaturalLanguageStreams(config.GetSection("NaturalLanguageStream"))
|
.AddNaturalLanguageStreams(config.GetSection("NaturalLanguageStream"))
|
||||||
.AddCompositeDataStreamFactory()
|
.AddCompositeDataStreamFactory()
|
||||||
.AddPubSubClient(config.GetSection("PubSub"));
|
.AddPubSubClient(config.GetSection("PubSub"));
|
||||||
|
|||||||
@@ -116,7 +116,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"natural_language": "Get bbo for 10 year T-Notes in the first minute after the market opened yesterday.",
|
"natural_language": "Get bbo for 10 year T-Notes in the first minute after the market opened yesterday.",
|
||||||
"dsl": "Bbo(symbol: \"ES\", venue: \"CME\", begin: \"2024-10-10T17:00:00-06:00\", end: \"2024-10-10T17:01:00-06:00\")"
|
"dsl": "Bbo(symbol: \"ES\", venue: \"CME\", begin: \"2024-10-10T17:00:00-06:00\", end: \"2024-10-10T17:01:00-06:00\", exclusive_end: true)"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"natural_language": "Retrieve NVIDIA L1 books from Oct 3",
|
"natural_language": "Retrieve NVIDIA L1 books from Oct 3",
|
||||||
@@ -147,10 +147,10 @@
|
|||||||
"interval (sample frequency of the data), ",
|
"interval (sample frequency of the data), ",
|
||||||
"levels (the number of price levels to examine)",
|
"levels (the number of price levels to examine)",
|
||||||
"begin and end (inclusive beginning and end of the time window to query, respectively), ",
|
"begin and end (inclusive beginning and end of the time window to query, respectively), ",
|
||||||
|
"inclusive_end (a bool flag that, when true, makes the end time inclusive). ",
|
||||||
"Arguments are specified by name, for example: OrderImbalance(symbol: \"ZN\", venue: \"CME\", interval: \"PT1M\", begin: \"2024-10-10\", end: \"2024-10-11\"). ",
|
"Arguments are specified by name, for example: OrderImbalance(symbol: \"ZN\", venue: \"CME\", interval: \"PT1M\", begin: \"2024-10-10\", end: \"2024-10-11\"). ",
|
||||||
"Depending on the wording of the request, some arguments may be omitted. ",
|
"Depending on the wording of the request, some arguments may be omitted. ",
|
||||||
"The begin, end, and interval args should be expressed in iso 8601 format. ",
|
"The begin, end, and interval args should be expressed in iso 8601 format. ",
|
||||||
"If the prompt doesn't contain an explicit interval, please choose a reasonable value depending on the duration between begin and end.",
|
|
||||||
"Interpret dates according to the trading schedule rather than calendar date whenever possible. ",
|
"Interpret dates according to the trading schedule rather than calendar date whenever possible. ",
|
||||||
"In some prompts, the time window will be expressed in relative terms (e.g., \"last Monday\", or \"yesterday\") ",
|
"In some prompts, the time window will be expressed in relative terms (e.g., \"last Monday\", or \"yesterday\") ",
|
||||||
"which must be translated to exact dates. To correctly interpret the dsl in the examples, assume the current time is 2024-10-11T12:00-05:00."
|
"which must be translated to exact dates. To correctly interpret the dsl in the examples, assume the current time is 2024-10-11T12:00-05:00."
|
||||||
|
|||||||
@@ -1,13 +1,13 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>net7.0</TargetFramework>
|
<TargetFramework>net8.0</TargetFramework>
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
|
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.7" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>net7.0</TargetFramework>
|
<TargetFramework>net8.0</TargetFramework>
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>net7.0</TargetFramework>
|
<TargetFramework>net8.0</TargetFramework>
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|||||||
@@ -0,0 +1,11 @@
|
|||||||
|
namespace bts.BlueOrb {
|
||||||
|
using BCG;
|
||||||
|
|
||||||
|
[DataStreamUserRespresentation("AddColumnsStream")]
|
||||||
|
public class AddColumnsStream: ViewStream {
|
||||||
|
public AddColumnsStream(ViewStream parent_str, string add_col_expr) {
|
||||||
|
ViewStream rs = new BCG.AddColumnsStream(parent_str, add_col_expr);
|
||||||
|
mySetRealSource(rs);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,46 @@
|
|||||||
|
using System;
|
||||||
|
|
||||||
|
namespace BCG {
|
||||||
|
[DataStreamUserRespresentation("CountStream")]
|
||||||
|
public class CountStream : ViewStream {
|
||||||
|
private DataPacket myLastFiredDataPacket;
|
||||||
|
private IBlueTableSchema mySchema = new BlueTableSchema("count",
|
||||||
|
new ColumnInfo("id", 0, typeof(int)),
|
||||||
|
new ColumnInfo("count", 1, typeof(int)));
|
||||||
|
private int myId = 0;
|
||||||
|
private ViewStream myVS;
|
||||||
|
|
||||||
|
public CountStream(ViewStream vs) {
|
||||||
|
myVS = vs;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override void myOnFirstSubscriber() {
|
||||||
|
myVS.onChange += myHandleChanges;
|
||||||
|
}
|
||||||
|
protected override void myOnLastSubscriber() {
|
||||||
|
myVS.onChange -= myHandleChanges;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
private void myHandleChanges(object newValue) {
|
||||||
|
myFireEvent(
|
||||||
|
myLastFiredDataPacket =
|
||||||
|
myLastFiredDataPacket == null ?
|
||||||
|
new DataPacket(myGetRows(newValue, ++myId), myGetRows(newValue, myId),
|
||||||
|
new BlueTable(mySchema))
|
||||||
|
:
|
||||||
|
new DataPacket(myGetRows(newValue, ++myId), myGetRows(newValue, myId),
|
||||||
|
myLastFiredDataPacket.newRows)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
private IBlueRowCollection myGetRows(object dp, int id) {
|
||||||
|
BlueTable retVal = new BlueTable(mySchema);
|
||||||
|
retVal.addRow
|
||||||
|
(new BlueRow(mySchema, id, (dp as DataPacket).newRows.Count));
|
||||||
|
return retVal;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
+7
-7
@@ -1,19 +1,19 @@
|
|||||||
namespace bts.SilverPine {
|
namespace bts.BlueOrb {
|
||||||
using bts;
|
using bts;
|
||||||
|
|
||||||
using BCG;
|
using BCG;
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
|
[DataStreamUserRespresentation("DateTimeExpanderStream")]
|
||||||
public class DateTimeExpanstionStream : ViewStream {
|
public class DateTimeExpanstionStream : ViewStream {
|
||||||
public DateTimeExpanstionStream(ViewStream parent_stream, string inp_col) {
|
public DateTimeExpanstionStream(ViewStream parent_stream, string inp_col) {
|
||||||
Func<IBlueTableSchema, IBlueTableSchema> get_schema = (s) => {
|
Func<IBlueTableSchema, IBlueTableSchema> get_schema = (s) => {
|
||||||
IBlueTableSchema rv = s.add_column(System.TypeCode.DateTime, $"{inp_col}_date");
|
IBlueTableSchema rv = s.add_column(System.TypeCode.DateTime, $"{inp_col}_date");
|
||||||
rv = rv.add_column(System.TypeCode.String, $"{inp_col}_day");
|
rv = rv.add_column(System.TypeCode.String, $"{inp_col}_day_of_week");
|
||||||
rv = rv.add_column(System.TypeCode.Int32, $"{inp_col}_day_of_month");
|
rv = rv.add_column(System.TypeCode.Int32, $"{inp_col}_day_of_month");
|
||||||
rv = rv.add_column(System.TypeCode.Int32, $"{inp_col}_month");
|
rv = rv.add_column(System.TypeCode.Int32, $"{inp_col}_month");
|
||||||
rv = rv.add_column(System.TypeCode.Int32, $"{inp_col}_hour");
|
rv = rv.add_column(System.TypeCode.Int32, $"{inp_col}_hour");
|
||||||
rv = rv.add_column(System.TypeCode.Int32, $"{inp_col}_min");
|
rv = rv.add_column(System.TypeCode.Int32, $"{inp_col}_minute");
|
||||||
rv = rv.add_column(System.TypeCode.Int32, $"{inp_col}_seconds_of_day");
|
rv = rv.add_column(System.TypeCode.Int32, $"{inp_col}_seconds_of_day");
|
||||||
return rv;
|
return rv;
|
||||||
};
|
};
|
||||||
@@ -24,15 +24,15 @@ namespace bts.SilverPine {
|
|||||||
IBlueTableSchema s = get_schema(r.schema);
|
IBlueTableSchema s = get_schema(r.schema);
|
||||||
MutableBlueRow rv = new MutableBlueRow(s, r);
|
MutableBlueRow rv = new MutableBlueRow(s, r);
|
||||||
rv.setValue($"{inp_col}_date", dt.Date);
|
rv.setValue($"{inp_col}_date", dt.Date);
|
||||||
rv.setValue($"{inp_col}_day", dt.DayOfWeek.ToString());
|
rv.setValue($"{inp_col}_day_of_week", dt.DayOfWeek.ToString());
|
||||||
rv.setValue($"{inp_col}_day_of_month", dt.Day);
|
rv.setValue($"{inp_col}_day_of_month", dt.Day);
|
||||||
rv.setValue($"{inp_col}_month", dt.Date.Month);
|
rv.setValue($"{inp_col}_month", dt.Date.Month);
|
||||||
rv.setValue($"{inp_col}_hour", dt.Hour);
|
rv.setValue($"{inp_col}_hour", dt.Hour);
|
||||||
rv.setValue($"{inp_col}_min", dt.Minute);
|
rv.setValue($"{inp_col}_minute", dt.Minute);
|
||||||
rv.setValue($"{inp_col}_seconds_of_day", (dt - dt.Date).TotalSeconds);
|
rv.setValue($"{inp_col}_seconds_of_day", (dt - dt.Date).TotalSeconds);
|
||||||
return rv;
|
return rv;
|
||||||
});
|
});
|
||||||
mySetRealSource(rs);
|
mySetRealSource(rs);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,157 @@
|
|||||||
|
namespace bts.BlueOrb {
|
||||||
|
using BCG;
|
||||||
|
using System;
|
||||||
|
using System.Text.RegularExpressions;
|
||||||
|
|
||||||
|
[DataStreamUserRespresentation("FilterStream")]
|
||||||
|
public class FilterStream : ViewStream {
|
||||||
|
public class RegExpFilter : IStreamFilter {
|
||||||
|
private Regex[] myRegExps;
|
||||||
|
private string[] myCols;
|
||||||
|
|
||||||
|
public RegExpFilter(string col, string regExp)
|
||||||
|
: this(new string[] { col }, new string[] { regExp }) { }
|
||||||
|
|
||||||
|
public RegExpFilter(string[] cols, string[] regExps) {
|
||||||
|
myCols = cols;
|
||||||
|
myRegExps = new Regex[regExps.Length];
|
||||||
|
for (int i = 0; i < regExps.Length; i++)
|
||||||
|
myRegExps[i] = new Regex(regExps[i]);
|
||||||
|
}
|
||||||
|
|
||||||
|
#region IStreamFilter Members
|
||||||
|
public bool filter(IBlueRow dr) {
|
||||||
|
bool rv = true;
|
||||||
|
for (int i = 0; i < myCols.Length; i++) {
|
||||||
|
rv &= myRegExps[i].IsMatch(dr[myCols[i]] is DBNull ? "" : dr[myCols[i]].ToString());
|
||||||
|
if (!rv)
|
||||||
|
return rv;
|
||||||
|
}
|
||||||
|
return rv;
|
||||||
|
}
|
||||||
|
#endregion
|
||||||
|
}
|
||||||
|
private BlueTable myLastFiredRows;
|
||||||
|
private IBlueRowCollection myLastReceivedRows;
|
||||||
|
private IStreamFilter myFilter;
|
||||||
|
private ViewStream myParentStream;
|
||||||
|
private string myFilterString;
|
||||||
|
private bool myUseNewFilter = false;// Configuration.get<DataStreamConfig>().UseNewFilter;
|
||||||
|
|
||||||
|
#region constructors
|
||||||
|
public delegate bool OnFilter(IBlueRow r);
|
||||||
|
private class OnFilterWrapper : IStreamFilter {
|
||||||
|
public OnFilterWrapper(OnFilter f) { this.f = f; }
|
||||||
|
|
||||||
|
public bool filter(IBlueRow dr) { return f(dr); }
|
||||||
|
|
||||||
|
private OnFilter f;
|
||||||
|
}
|
||||||
|
public FilterStream(ViewStream vs, OnFilter f)
|
||||||
|
: this(vs, new OnFilterWrapper(f)) { }
|
||||||
|
|
||||||
|
|
||||||
|
public FilterStream(ViewStream vs, IStreamFilter filter) {
|
||||||
|
{
|
||||||
|
myParentStream = vs;
|
||||||
|
myFilter = filter;
|
||||||
|
myFilterString = filter.ToString();
|
||||||
|
if (filter is IDynamicStreamFilter)
|
||||||
|
(filter as IDynamicStreamFilter).onFilterChange += new FilterChangeDelegate(myHandleFilterChange);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public FilterStream(ViewStream vs, string filterExpression)
|
||||||
|
: this(vs, new BooleanExpressionFilter(filterExpression)) {
|
||||||
|
myFilterString = filterExpression;
|
||||||
|
}
|
||||||
|
|
||||||
|
public FilterStream(ViewStream vs, string col, string regExp)
|
||||||
|
: this(vs, new RegExpFilter(col, regExp)) {
|
||||||
|
myFilterString = col + " , " + regExp;
|
||||||
|
}
|
||||||
|
|
||||||
|
public FilterStream(ViewStream vs)
|
||||||
|
: this(vs, new BinaryFilter(true)) {
|
||||||
|
myFilterString = true.ToString();
|
||||||
|
}
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
#region overridden methods
|
||||||
|
protected override void myOnFirstSubscriber() =>
|
||||||
|
myParentStream.onChange += myHandleCallbacks;
|
||||||
|
|
||||||
|
protected override void myOnLastSubscriber() {
|
||||||
|
myLastFiredRows = null;
|
||||||
|
myParentStream.onChange -= myHandleCallbacks;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override void myFireEvent(object o) {
|
||||||
|
DataPacket dp = o as DataPacket;
|
||||||
|
if (myLastValue == null || dp.addedRows.Count + dp.deletedRows.Count > 0)
|
||||||
|
base.myFireEvent(o);
|
||||||
|
}
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
private void myHandleCallbacks(object newValue) {
|
||||||
|
DataPacket retVal;
|
||||||
|
DataPacket arrivedPacket = newValue as DataPacket;
|
||||||
|
myLastReceivedRows = arrivedPacket.newRows;
|
||||||
|
if (myLastFiredRows != null) {
|
||||||
|
retVal = new DataPacket(myLastFiredRows, new BlueTable(myLastFiredRows.schema),
|
||||||
|
new BlueTable(myLastFiredRows.schema));
|
||||||
|
foreach (IBlueRow r in arrivedPacket.deletedRows)
|
||||||
|
if (myLastFiredRows.containsID((int)r["id"])) {
|
||||||
|
myLastFiredRows.deleteRow(r);
|
||||||
|
(retVal.deletedRows as BlueTable).addRow(r);
|
||||||
|
}
|
||||||
|
foreach (IBlueRow r in arrivedPacket.addedRows)
|
||||||
|
if (myFilter.filter(r)) {
|
||||||
|
myLastFiredRows.addRow(r);
|
||||||
|
(retVal.addedRows as BlueTable).addRow(r);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
myLastFiredRows = new BlueTable(arrivedPacket.schema);
|
||||||
|
retVal = new DataPacket(myLastFiredRows, myLastFiredRows, new BlueTable(myLastFiredRows.schema));
|
||||||
|
foreach (IBlueRow r in arrivedPacket.newRows)
|
||||||
|
if (myFilter.filter(r))
|
||||||
|
myLastFiredRows.addRow(r);
|
||||||
|
}
|
||||||
|
myFireEvent(retVal);
|
||||||
|
}
|
||||||
|
|
||||||
|
public IStreamFilter filter {
|
||||||
|
set {
|
||||||
|
{
|
||||||
|
myFilter = value;
|
||||||
|
if (numberOfSubscribers > 0) {
|
||||||
|
if (myLastReceivedRows != null) {
|
||||||
|
BlueTable nRows = new BlueTable(myLastReceivedRows.schema);
|
||||||
|
foreach (IBlueRow r in myLastReceivedRows)
|
||||||
|
if (myFilter.filter(r))
|
||||||
|
nRows.addRow(r);
|
||||||
|
IBlueRowCollection dRows = new BlueTable(nRows.schema),
|
||||||
|
aRows = new BlueTable(nRows.schema);
|
||||||
|
BlueDataUtility.computeDifferences(nRows, myLastFiredRows, out dRows, out aRows);
|
||||||
|
myLastFiredRows = nRows;
|
||||||
|
myFireEvent(new DataPacket(nRows, aRows, dRows));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
get {
|
||||||
|
return myFilter;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//public string filterString { set { filter = new BooleanExpressionFilter(value); } }
|
||||||
|
|
||||||
|
public override string ToString() {
|
||||||
|
return GetType().ToString() + " " + myFilterString;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void myHandleFilterChange() {
|
||||||
|
filter = myFilter;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,121 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Diagnostics;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text.Json;
|
||||||
|
|
||||||
|
using bts;
|
||||||
|
//using bts.SilverPine;
|
||||||
|
using BCG;
|
||||||
|
|
||||||
|
namespace bts.BlueOrb {
|
||||||
|
[DataStreamUserRespresentation("GroupByStream")]
|
||||||
|
public class GroupByStream : ViewStream {
|
||||||
|
|
||||||
|
public interface INonIncGroupByEvaluator {
|
||||||
|
// grouped_rows
|
||||||
|
IBlueRowCollection evaluate(IDictionary<int, List<IBlueRow>> grouped_rows);
|
||||||
|
string[] get_group_by_cols();
|
||||||
|
}
|
||||||
|
|
||||||
|
private class DelNonIncGroupByEvaluator : INonIncGroupByEvaluator {
|
||||||
|
Func<string[]> _groupby_cols_func;
|
||||||
|
Func<List<IBlueRow>, List<IBlueRow>> _evaluate_func;
|
||||||
|
public DelNonIncGroupByEvaluator(Func<string[]> groupby_cols_func,
|
||||||
|
Func<List<IBlueRow>, List<IBlueRow>> evaluate_func) {
|
||||||
|
_groupby_cols_func = groupby_cols_func;
|
||||||
|
_evaluate_func = evaluate_func;
|
||||||
|
}
|
||||||
|
public IBlueRowCollection evaluate(IDictionary<int, List<IBlueRow>> grouped_rows) {
|
||||||
|
BlueTable rv = null;
|
||||||
|
foreach (var kv in grouped_rows) {
|
||||||
|
List<IBlueRow> g_rows = kv.Value;
|
||||||
|
List<IBlueRow> out_rows = _evaluate_func.Invoke(g_rows);
|
||||||
|
if (out_rows != null && out_rows.Count > 0) {
|
||||||
|
rv = rv ?? new BlueTable(out_rows.ElementAt(0).schema);
|
||||||
|
}
|
||||||
|
rv.addRows(out_rows);
|
||||||
|
}
|
||||||
|
return rv;
|
||||||
|
}
|
||||||
|
public string[] get_group_by_cols() {
|
||||||
|
return _groupby_cols_func();
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
private ViewStream _main_stream;
|
||||||
|
private INonIncGroupByEvaluator _groupby_func;
|
||||||
|
private BlueRowHasher _row_hasher;
|
||||||
|
private string[] _groupby_cols;
|
||||||
|
private Stopwatch _timer = new();
|
||||||
|
private int _n_total_fires = 0, _n_expensive_fires = 0;
|
||||||
|
|
||||||
|
public GroupByStream(ViewStream main_stream, INonIncGroupByEvaluator groupby_func) {
|
||||||
|
_main_stream = main_stream;
|
||||||
|
_groupby_func = groupby_func;
|
||||||
|
_groupby_cols = _groupby_func.get_group_by_cols();
|
||||||
|
_row_hasher = new BlueRowHasher(_groupby_cols == null ? 0 : _groupby_cols.Length);
|
||||||
|
}
|
||||||
|
|
||||||
|
public GroupByStream(ViewStream main_stream, Func<string[]> groupby_cols_func,
|
||||||
|
Func<List<IBlueRow>, List<IBlueRow>> evaluate_func)
|
||||||
|
: this(main_stream, new DelNonIncGroupByEvaluator(groupby_cols_func, evaluate_func)) { }
|
||||||
|
|
||||||
|
public GroupByStream(ViewStream parent_str, string groupby_col, string standard_group_by_text)
|
||||||
|
: this(parent_str, groupby_col, standard_group_by_text, String.Empty) { }
|
||||||
|
|
||||||
|
// this is the main constructor that does everything
|
||||||
|
public GroupByStream(ViewStream parent_str, string groupby_col, string standard_group_by_ops, string optional_sort_col) {
|
||||||
|
MultiRowOpHelper std_group_by = MultiRowOpHelper.parse_ops(standard_group_by_ops);
|
||||||
|
Func<string[]> groupby_cols_func = () => {
|
||||||
|
return String.IsNullOrEmpty(groupby_col) ? null : new string[] { groupby_col };
|
||||||
|
};
|
||||||
|
Func<List<IBlueRow>, List<IBlueRow>> evaluate_func = (group_rows) => {
|
||||||
|
if (!String.IsNullOrEmpty(optional_sort_col))
|
||||||
|
group_rows.Sort((r1, r2) => BlueDataUtility.compare_rows(r2, r1, optional_sort_col));
|
||||||
|
// this si where the group by aggregation happens
|
||||||
|
IBlueRow rv = MultiRowOpHelper.group_by_compute(group_rows, std_group_by);
|
||||||
|
return new IBlueRow[] { rv }.ToList();
|
||||||
|
};
|
||||||
|
ViewStream rs = new GroupByStream(parent_str, groupby_cols_func, evaluate_func);
|
||||||
|
mySetRealSource(rs);
|
||||||
|
}
|
||||||
|
public GroupByStream(ViewStream parent_str, string standard_group_by_text) :
|
||||||
|
this(parent_str, String.Empty, standard_group_by_text) {
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
protected override void myOnFirstSubscriber() { _main_stream.onChange += _main_stream_onchange; }
|
||||||
|
|
||||||
|
protected override void myOnLastSubscriber() { _main_stream.onChange -= _main_stream_onchange; }
|
||||||
|
|
||||||
|
private void _main_stream_onchange(object nv) {
|
||||||
|
DataPacket dp = nv as DataPacket;
|
||||||
|
///grouping together
|
||||||
|
_timer.Restart();
|
||||||
|
IDictionary<int, List<IBlueRow>> grouped_rows = (_groupby_cols == null || _groupby_cols.Length == 0) ?
|
||||||
|
new Dictionary<int, List<IBlueRow>>() { { 0, dp.newRows.to_list() } } :
|
||||||
|
BlueDataUtility.group_together(dp.newRows, _groupby_cols, ref _row_hasher);
|
||||||
|
_timer.Stop();
|
||||||
|
var groupElapsedMs = _timer.ElapsedMilliseconds;
|
||||||
|
if (groupElapsedMs >= 50) {
|
||||||
|
Log.DataFlow.info($"Time to group {dp.newRows.Count} rows into {grouped_rows.Count} groups: {_timer.ElapsedMilliseconds}ms");
|
||||||
|
}
|
||||||
|
// Log.log(bts.Log.Level.Info, bts.log.Subsystem.gen, String.Format("Time to group {0} rows into {1} groups = {2}", dp.newRows.Count, grouped_rows.Count, _timer.lastIntervalTime));
|
||||||
|
/// reducing
|
||||||
|
_timer.Restart();
|
||||||
|
IBlueRowCollection total_state = _groupby_func.evaluate(grouped_rows);
|
||||||
|
_timer.Stop();
|
||||||
|
var applyElapsedMs = _timer.ElapsedMilliseconds;
|
||||||
|
_n_total_fires++;
|
||||||
|
if (applyElapsedMs >= 50) {
|
||||||
|
_n_expensive_fires++;
|
||||||
|
Log.DataFlow.info(
|
||||||
|
$"Time to evaluate {grouped_rows.Count} groups {_timer.ElapsedMilliseconds}ms, ratio {_n_expensive_fires}/{_n_total_fires}");
|
||||||
|
}
|
||||||
|
// TODO,
|
||||||
|
if (total_state != null)
|
||||||
|
myFireEvent(new DataPacket(total_state, total_state, myLastValue == null ? new BlueTable(total_state.schema) : (myLastValue as DataPacket).newRows));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,187 @@
|
|||||||
|
namespace bts.BlueOrb {
|
||||||
|
using BCG;
|
||||||
|
using RowHash = System.Int32;
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using System.Collections;
|
||||||
|
using System.Data.Entity.Core.Mapping;
|
||||||
|
|
||||||
|
[DataStreamUserRespresentation("JoinStream")]
|
||||||
|
public class SimpleJoinStream : ViewStream {
|
||||||
|
public class JoinBookkeepingData {
|
||||||
|
// initialized in cons
|
||||||
|
private readonly List<string> _join_col_names;
|
||||||
|
private readonly bool _is_left;
|
||||||
|
private readonly BlueRowHasher _hasher;
|
||||||
|
// initialized on first udpate
|
||||||
|
private IBlueTableSchema _schema;
|
||||||
|
private int[] _join_cols;
|
||||||
|
private IDictionary<RowHash, List<IBlueRow>> _hash_row_map = new Dictionary<RowHash, List<IBlueRow>>();
|
||||||
|
|
||||||
|
public JoinBookkeepingData(ViewStream vs, List<string> join_cols, bool is_left, BlueRowHasher row_hasher) {
|
||||||
|
_join_col_names = join_cols.Where (c => !String.IsNullOrEmpty(c)).ToList ();
|
||||||
|
_is_left = is_left;
|
||||||
|
_hasher = row_hasher;
|
||||||
|
}
|
||||||
|
|
||||||
|
public IBlueTableSchema schema => _schema;
|
||||||
|
|
||||||
|
public IDictionary<RowHash, List<IBlueRow>> rows => _hash_row_map;
|
||||||
|
|
||||||
|
public List<IBlueRow> get_matching_rows (int hash) {
|
||||||
|
List<IBlueRow> rv = null;
|
||||||
|
_hash_row_map.TryGetValue(hash, out rv);
|
||||||
|
return rv;
|
||||||
|
}
|
||||||
|
|
||||||
|
private RowHash _get_hash(IBlueRow r) {
|
||||||
|
if (_join_cols == null || _join_cols.Length == 0) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
return _hasher.get_hash(r, _join_cols);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void update_data(DataPacket dp) {
|
||||||
|
if (!ready) {
|
||||||
|
_schema = dp.newRows.schema;
|
||||||
|
_join_cols = _join_col_names.Count == 0 ? new int[] { }: _join_col_names.Select(n => dp.schema[n].colNo).ToArray();
|
||||||
|
}
|
||||||
|
_hash_row_map.Clear();
|
||||||
|
foreach (IBlueRow r in dp.newRows) {
|
||||||
|
int hash = _get_hash(r);
|
||||||
|
List<IBlueRow> hash_rows = null;
|
||||||
|
if (!_hash_row_map.TryGetValue(hash, out hash_rows)) {
|
||||||
|
hash_rows = new List<IBlueRow>();
|
||||||
|
_hash_row_map.Add(hash, hash_rows);
|
||||||
|
}
|
||||||
|
hash_rows.Add(r);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public bool ready {
|
||||||
|
get {
|
||||||
|
return _schema != null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private ViewStream _ls, _rs;
|
||||||
|
private JoinBookkeepingData _ldata, _rdata;
|
||||||
|
private ViewStreamDatabase _vsd;
|
||||||
|
private IBlueTableSchema _schema = null;
|
||||||
|
|
||||||
|
public SimpleJoinStream(ViewStream ls, string ljc, ViewStream rs, string rjc) :
|
||||||
|
this(ViewStreamDatabase.instance, ls, ljc, rs, rjc) { }
|
||||||
|
|
||||||
|
public SimpleJoinStream(ViewStreamDatabase vsd, ViewStream ls, string ljc, ViewStream rs, string rjc) {
|
||||||
|
_ls = ls;
|
||||||
|
_rs = rs;
|
||||||
|
List<string> lj_col_list = ljc.Split(',').Where(x => !String.IsNullOrEmpty(x)).ToList();
|
||||||
|
List<string> rj_col_list = rjc.Split(',').Where(x => !String.IsNullOrEmpty(x)).ToList();
|
||||||
|
Log.assert(lj_col_list.Count == rj_col_list.Count);
|
||||||
|
int n_cols = lj_col_list.Count;
|
||||||
|
BlueRowHasher hasher = new BlueRowHasher(n_cols);
|
||||||
|
_ldata = new JoinBookkeepingData(ls, lj_col_list, true, hasher);
|
||||||
|
_rdata = new JoinBookkeepingData(rs, rj_col_list, false, hasher);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override void myOnFirstSubscriber() {
|
||||||
|
_ls.onChange += _ls_onchange;
|
||||||
|
_rs.onChange += _rs_onchange;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void _ls_onchange(object dp_obj) {
|
||||||
|
DataPacket dp = dp_obj as DataPacket;
|
||||||
|
_ldata.update_data(dp);
|
||||||
|
_form_and_fire();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void _rs_onchange(object dp_obj) {
|
||||||
|
DataPacket dp = dp_obj as DataPacket ;
|
||||||
|
_rdata.update_data(dp);
|
||||||
|
_form_and_fire();
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override void myOnLastSubscriber() {
|
||||||
|
_ls.onChange -= _ls_onchange;
|
||||||
|
_rs.onChange -= _rs_onchange;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void _build_schema() {
|
||||||
|
if (_schema != null)
|
||||||
|
return;
|
||||||
|
List<ColumnInfo> cis = new List<ColumnInfo>();
|
||||||
|
cis.Add(new ColumnInfo("id", 0, TypeCode.Int32));
|
||||||
|
foreach (ColumnInfo ci in _ldata.schema.columnInfo) {
|
||||||
|
string col_name = _rdata.schema.contains_column(ci.colName) ? $"left_{ci.colName}" : ci.colName;
|
||||||
|
cis.Add(new ColumnInfo(col_name, cis.Count, ci.colType));
|
||||||
|
}
|
||||||
|
foreach (ColumnInfo ci in _rdata.schema.columnInfo) {
|
||||||
|
string col_name = _ldata.schema.contains_column(ci.colName) ? $"right_{ci.colName}" : ci.colName;
|
||||||
|
cis.Add(new ColumnInfo(col_name, cis.Count, ci.colType));
|
||||||
|
}
|
||||||
|
_schema = new BlueTableSchema($"{_ldata.schema.tableName}_join_{_rdata.schema.tableName}", cis.ToArray());
|
||||||
|
}
|
||||||
|
|
||||||
|
private void _form_and_fire() {
|
||||||
|
if (!_ldata.ready||!_rdata.ready)
|
||||||
|
return;
|
||||||
|
_build_schema();
|
||||||
|
List<object[]> res_rows = new List<object[]>();
|
||||||
|
|
||||||
|
Action<object[], IBlueRow, bool> copy_row = (rval, r, is_left) => {
|
||||||
|
int offset = 1;
|
||||||
|
JoinBookkeepingData sdata = _ldata;
|
||||||
|
if (is_left) {
|
||||||
|
offset = 1;
|
||||||
|
sdata = _ldata;
|
||||||
|
} else {
|
||||||
|
sdata = _rdata;
|
||||||
|
offset = 1 + _ldata.schema.columnInfo.Length;
|
||||||
|
}
|
||||||
|
for (int i = 0; i < sdata.schema.columnInfo.Length; i++) {
|
||||||
|
rval[offset + i] = r[i];
|
||||||
|
}
|
||||||
|
};
|
||||||
|
Func<int, IBlueRow, object[]> build_row_array = (id, l_row) => {
|
||||||
|
object[] rv = new object[_schema.columnNames.Length];
|
||||||
|
for (int i = 0; i < _schema.columnNames.Length; i++) {
|
||||||
|
rv[i] = DBNull.Value;
|
||||||
|
}
|
||||||
|
rv[0] = id;
|
||||||
|
copy_row(rv, l_row, true);
|
||||||
|
return rv;
|
||||||
|
};
|
||||||
|
// this is where the join happens
|
||||||
|
foreach (var kv in _ldata.rows) {
|
||||||
|
RowHash hash = kv.Key;
|
||||||
|
List<IBlueRow> l_rows = kv.Value;
|
||||||
|
List<IBlueRow> r_rows = _rdata.get_matching_rows(hash);
|
||||||
|
|
||||||
|
foreach (IBlueRow lr in l_rows) {
|
||||||
|
if (r_rows != null) {
|
||||||
|
foreach (IBlueRow r in r_rows) {
|
||||||
|
object[] rowvals = build_row_array(res_rows.Count, lr);
|
||||||
|
copy_row(rowvals, r, false);
|
||||||
|
res_rows.Add(rowvals);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
object[] rowvals = build_row_array(res_rows.Count, lr);
|
||||||
|
res_rows.Add(rowvals);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
BlueTable rv = new BlueTable(_schema);
|
||||||
|
foreach (object[] rval in res_rows) {
|
||||||
|
rv.addRow(new BlueRow(_schema, rval));
|
||||||
|
}
|
||||||
|
var dp = BlueDataUtility.build_dp(rv, myLastValue as DataPacket);
|
||||||
|
myFireEvent(dp);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,28 @@
|
|||||||
|
//namespace bts.Blueorb {
|
||||||
|
// using BCG;
|
||||||
|
|
||||||
|
// public class JsonSaverStream : ViewStream {
|
||||||
|
// private ViewStream _stream;
|
||||||
|
// private string _file_name;
|
||||||
|
// public JsonSaverStream(ViewStream vs, string file_name) {
|
||||||
|
// _stream = vs;
|
||||||
|
// _file_name = file_name;
|
||||||
|
// }
|
||||||
|
|
||||||
|
// protected override void myOnFirstSubscriber() {
|
||||||
|
// _stream.onChange += _on_data;
|
||||||
|
// }
|
||||||
|
|
||||||
|
// private void _on_data(object dp_obj) {
|
||||||
|
// if (dp_obj == null) {
|
||||||
|
// return;
|
||||||
|
// }
|
||||||
|
// DataPacket dp = dp_obj as DataPacket;
|
||||||
|
// dp.newRows.write_to_json_file(dp.newRows, _file_name);
|
||||||
|
// }
|
||||||
|
|
||||||
|
// protected override void myOnLastSubscriber() {
|
||||||
|
// _stream.onChange -= _on_data;
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
//}
|
||||||
@@ -0,0 +1,91 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
|
||||||
|
using Amazon.Runtime.Internal.Util;
|
||||||
|
|
||||||
|
using BCG;
|
||||||
|
using BCG.Utilities;
|
||||||
|
|
||||||
|
using bts;
|
||||||
|
|
||||||
|
namespace bts.BlueOrb{
|
||||||
|
public class LiteralStream : ViewStream {
|
||||||
|
|
||||||
|
public static List<Tuple<ColumnInfo, object>> parse_columns(string key_value_pairs) {
|
||||||
|
List<Tuple<ColumnInfo, object>> rv = new List<Tuple<ColumnInfo, object>>();
|
||||||
|
string[] pairs = key_value_pairs.Split(' ');
|
||||||
|
foreach (string p in pairs) {
|
||||||
|
string[] kvp = p.Split(':');
|
||||||
|
string col_name = kvp[0];
|
||||||
|
string val = kvp[1];
|
||||||
|
var tup = BlueDataUtility.guess_type(val);
|
||||||
|
var ci = new ColumnInfo(col_name, rv.Count, tup.Item1);
|
||||||
|
rv.Add(Tuple.Create(ci, tup.Item2));
|
||||||
|
}
|
||||||
|
return rv;
|
||||||
|
}
|
||||||
|
|
||||||
|
//literal("table1", "x:123, y:1.001, z:abc;x:123, y:1.001, z:abc")
|
||||||
|
// col_name: col_value ... ; col_name: col_value
|
||||||
|
public LiteralStream(string table_name, string rows) {
|
||||||
|
Func<string, int, IBlueRow> get_row = (json_row, id) => {
|
||||||
|
Dictionary<string, object> map = new Dictionary<string, object>();
|
||||||
|
string[] toks = json_row.Split(',', StringSplitOptions.TrimEntries);
|
||||||
|
//Logger.assert(col_vals.Length == 2);
|
||||||
|
foreach (string t in toks) {
|
||||||
|
var col_vals = t.Split(':', StringSplitOptions.TrimEntries);
|
||||||
|
string col = col_vals[0];
|
||||||
|
string val = col_vals[1];
|
||||||
|
map.Add(col, val);
|
||||||
|
}
|
||||||
|
map["id"] = id;
|
||||||
|
return new BlueRow(map);
|
||||||
|
};
|
||||||
|
string[] row_arr = rows.Split(';', StringSplitOptions.TrimEntries);
|
||||||
|
BlueTable table = null;
|
||||||
|
foreach (string json_string in row_arr) {
|
||||||
|
IBlueRow r = //BlueDataUtility.convert_json_to_row(json_string, table == null ? 0 : table.Count);
|
||||||
|
get_row(json_string, table == null ? 0 : table.Count);
|
||||||
|
table = table ?? new BlueTable(r.schema);
|
||||||
|
table.addRow(r);
|
||||||
|
}
|
||||||
|
ViewStream str = new BlueTableStream(table);
|
||||||
|
str = new SchemaGuesserStream(str);
|
||||||
|
mySetRealSource(str);
|
||||||
|
}
|
||||||
|
|
||||||
|
public LiteralStream(string tableName, string schema, string value) {
|
||||||
|
string[] columns = schema.Split(' ');
|
||||||
|
|
||||||
|
|
||||||
|
ColumnInfo[] ci = new ColumnInfo[columns.Length + 1];
|
||||||
|
ci[0] = new ColumnInfo("id", 0, typeof(int));
|
||||||
|
int n = 1;
|
||||||
|
foreach (string c in columns) {
|
||||||
|
string[] columnAndType = c.Split('/');
|
||||||
|
if (columnAndType.Length == 1)
|
||||||
|
ci[n] = new ColumnInfo(c, n, typeof(double));
|
||||||
|
else
|
||||||
|
ci[n] = new ColumnInfo(columnAndType[0], n, Type.GetType("System." + columnAndType[1], true));
|
||||||
|
n++;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
BlueTable t = new BlueTable(new BlueTableSchema(tableName, ci));
|
||||||
|
string[] rows = value.Split(';');
|
||||||
|
n = 0;
|
||||||
|
foreach (string r in rows)
|
||||||
|
try {
|
||||||
|
if (r == string.Empty)
|
||||||
|
continue;
|
||||||
|
t.addRow(
|
||||||
|
BlueDataUtility.createRowFromCSVFileRow(r, t.schema, ++n));
|
||||||
|
} catch (Exception e) {
|
||||||
|
throw (new Exception("Error occured at line: " + n.ToString() + " " + e.Message));
|
||||||
|
}
|
||||||
|
|
||||||
|
mySetRealSource(new BlueRowCollectionStaticStream(t));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,89 @@
|
|||||||
|
using System;
|
||||||
|
|
||||||
|
using BCG.Utilities.General;
|
||||||
|
using BCG;
|
||||||
|
using bts;
|
||||||
|
|
||||||
|
namespace bts.BlueOrb {
|
||||||
|
[DataStreamUserRespresentation("MillisecondStream")]
|
||||||
|
public class MillisecondStream : ViewStream, IWorker {
|
||||||
|
private DateTime _last_fire_time = DateTime.MinValue;
|
||||||
|
private readonly TimeSpan _period;
|
||||||
|
private readonly int _size;
|
||||||
|
private readonly ViewStreamDatabase _vsd;
|
||||||
|
private IBlueTableSchema _schema;
|
||||||
|
private bts.CircularBufferTable _table;
|
||||||
|
|
||||||
|
public MillisecondStream(int interval_msecs, int size)
|
||||||
|
: this(ViewStreamDatabase.instance, interval_msecs, size) {
|
||||||
|
}
|
||||||
|
|
||||||
|
public MillisecondStream(ViewStreamDatabase vsd, int interval_msecs, int size) {
|
||||||
|
_vsd = vsd;
|
||||||
|
_period = TimeSpan.FromMilliseconds(interval_msecs);
|
||||||
|
_size = size;
|
||||||
|
_schema = BlueDataUtility.form_schema("Milliseconds",
|
||||||
|
Tuple.Create("id", TypeCode.Int32),
|
||||||
|
Tuple.Create("time", TypeCode.DateTime),
|
||||||
|
Tuple.Create("display_time", TypeCode.String));
|
||||||
|
_table = new CircularBufferTable(_schema, _size);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override void myOnFirstSubscriber() {
|
||||||
|
_vsd.addWorker(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override void myOnLastSubscriber() {
|
||||||
|
_vsd.removeWorker(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
private int _id = 0;
|
||||||
|
public void doWork() {
|
||||||
|
if (DateTime.Now - _last_fire_time >= _period) {
|
||||||
|
_last_fire_time = DateTime.Now;
|
||||||
|
IBlueRow nr = new BlueRow(_schema, _id++, _last_fire_time,
|
||||||
|
_last_fire_time.ToString("yyyy-MM-dd HH:mm:ss.fff"));
|
||||||
|
_table.add_row(nr);
|
||||||
|
var dp = BlueDataUtility.build_dp_inc(_table, myLastValue as DataPacket);
|
||||||
|
myFireEvent(dp);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
internal class MSecondStream : TimeUnitStream {
|
||||||
|
public MSecondStream(int intervalInms, int size)
|
||||||
|
: base(DateTime.Now, new TimeSpan(0, 0, 0, 0, intervalInms), size, ViewStreamDatabase.instance) { }
|
||||||
|
|
||||||
|
protected override DateTime myRoundTime(DateTime dt) { return dt; }
|
||||||
|
}
|
||||||
|
|
||||||
|
internal class DisplayableMillisecondStream : ViewStream, IStreamMapper {
|
||||||
|
private IBlueTableSchema mySchema = new BlueTableSchema("ms",
|
||||||
|
new ColumnInfo("id", 0, typeof(int)),
|
||||||
|
new ColumnInfo("time", 1, typeof(string)));
|
||||||
|
public DisplayableMillisecondStream(int intervalInMs, int sz) {
|
||||||
|
mySetRealSource(new MapStream(new MSecondStream(intervalInMs, sz), this));
|
||||||
|
}
|
||||||
|
#region IStreamMapper Members
|
||||||
|
|
||||||
|
public IBlueTableSchema getOutputSchema(IBlueTableSchema inputSchema) {
|
||||||
|
return mySchema;
|
||||||
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
#region IDynamicStreamMapper Members
|
||||||
|
|
||||||
|
public IBlueRow map(IBlueRow row) {
|
||||||
|
DateTime time = row.get_datetime("time");
|
||||||
|
var time_txt = time.ToString("yyyy-MM-dd HH:mm:ss.fff");
|
||||||
|
return new BlueRow(mySchema, row["id"], time_txt);
|
||||||
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
private string myToString(DateTime dt) {
|
||||||
|
string sep = ":";
|
||||||
|
return dt.Hour + sep + dt.Minute + sep + dt.Second + sep + dt.Millisecond;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,161 @@
|
|||||||
|
namespace bts.BlueOrb {
|
||||||
|
using BCG;
|
||||||
|
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
//using MathNet.Numerics.Statistics;
|
||||||
|
|
||||||
|
|
||||||
|
public enum MultiRowOp {
|
||||||
|
Mean,
|
||||||
|
Median,
|
||||||
|
Mode,
|
||||||
|
Range,
|
||||||
|
StdDev,
|
||||||
|
Max,
|
||||||
|
Min,
|
||||||
|
First,
|
||||||
|
Last,
|
||||||
|
Sum,
|
||||||
|
EdgeDiff,
|
||||||
|
EdgeDiffPercentage,
|
||||||
|
}
|
||||||
|
public class MultiRowOpHelper {
|
||||||
|
// input + op
|
||||||
|
public readonly List<Tuple<string, MultiRowOp>> operations;
|
||||||
|
|
||||||
|
public static MultiRowOpHelper parse_ops(string text) {
|
||||||
|
// text is inp_col: op, inp_col: op, inp_col:op
|
||||||
|
// ex: "open:First, close:Last, high:Max, low:Min, volume:Sum")
|
||||||
|
List<Tuple<string, MultiRowOp>> rv = new List<Tuple<string, MultiRowOp>>();
|
||||||
|
string[] calcs = text.Split(',');
|
||||||
|
foreach (string c in calcs) {
|
||||||
|
string[] toks = c.Split(':');
|
||||||
|
string inp_col = toks[0].Trim();
|
||||||
|
string op_txt = toks[1].Trim();
|
||||||
|
MultiRowOp op = Enum.Parse<MultiRowOp>(op_txt, true);
|
||||||
|
rv.Add(Tuple.Create(inp_col, op));
|
||||||
|
}
|
||||||
|
return new MultiRowOpHelper(rv);
|
||||||
|
}
|
||||||
|
|
||||||
|
public MultiRowOpHelper(List<Tuple<string, MultiRowOp>> operations_) {
|
||||||
|
operations = operations_;
|
||||||
|
}
|
||||||
|
|
||||||
|
// aggregates multiple rows into one - ie does group_by compute
|
||||||
|
public static IBlueRow group_by_compute(List<IBlueRow> rows, MultiRowOpHelper parameters) {
|
||||||
|
if (rows.Count() == 0) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
IBlueRow ir = rows.ElementAt(0);
|
||||||
|
IBlueTableSchema in_schema = ir.schema;
|
||||||
|
IBlueTableSchema out_schema = in_schema;
|
||||||
|
IDictionary<string, Tuple<string, MultiRowOp>> out_col_map =
|
||||||
|
new Dictionary<string, Tuple<string, MultiRowOp>>();
|
||||||
|
foreach (var t in parameters.operations) {
|
||||||
|
string out_col_name = $"{t.Item1}_{t.Item2}".ToLower();
|
||||||
|
out_schema = out_schema.add_column(TypeCode.Double, out_col_name);
|
||||||
|
out_col_map[out_col_name] = t;
|
||||||
|
}
|
||||||
|
MutableBlueRow or = new MutableBlueRow(out_schema, ir);
|
||||||
|
foreach (var kv in out_col_map) {
|
||||||
|
string out_col_name = kv.Key;
|
||||||
|
string in_col_name = kv.Value.Item1;
|
||||||
|
MultiRowOp op = kv.Value.Item2;
|
||||||
|
IEnumerable<double> col_vals = BlueDataUtility.get_colvalues<double>(rows, in_col_name);
|
||||||
|
double comp_res = compute_op(col_vals, op);
|
||||||
|
or.setValue(out_col_name, comp_res);
|
||||||
|
}
|
||||||
|
return or;
|
||||||
|
}
|
||||||
|
|
||||||
|
// aggregates multiple rows into one, used by MultiRowRollingMathStream
|
||||||
|
public static IBlueRow group_by_compute(List<IBlueRow> rows, int start_idx, int n_rows, MultiRowOpHelper parameters) {
|
||||||
|
if (rows.Count() == 0) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
IBlueRow ir = rows.ElementAt(start_idx);
|
||||||
|
IBlueTableSchema in_schema = ir.schema;
|
||||||
|
IBlueTableSchema out_schema = in_schema;
|
||||||
|
// out_col vs inp_cal + type
|
||||||
|
IDictionary<string, Tuple<string, MultiRowOp>> out_col_map =
|
||||||
|
new Dictionary<string, Tuple<string, MultiRowOp>>();
|
||||||
|
foreach (var t in parameters.operations) {
|
||||||
|
string out_col_name = $"{t.Item1}_{t.Item2}".ToLower();
|
||||||
|
out_schema = out_schema.add_column(TypeCode.Double, out_col_name);
|
||||||
|
out_col_map[out_col_name] = t;
|
||||||
|
}
|
||||||
|
MutableBlueRow or = new MutableBlueRow(out_schema, ir);
|
||||||
|
foreach (var kv in out_col_map) {
|
||||||
|
string out_col_name = kv.Key;
|
||||||
|
string in_col_name = kv.Value.Item1;
|
||||||
|
MultiRowOp op = kv.Value.Item2;
|
||||||
|
IEnumerable<double> col_vals = BlueDataUtility.get_colvalues<double>(rows, start_idx, n_rows, in_col_name);
|
||||||
|
double comp_res = compute_op(col_vals, op);
|
||||||
|
or.setValue(out_col_name, comp_res);
|
||||||
|
or.setValue("id", ir["id"]);
|
||||||
|
}
|
||||||
|
return or;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 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.
|
||||||
|
|
||||||
|
public IBlueRow rolling_calc(List<IBlueRow> rolling_rows) {
|
||||||
|
if (rolling_rows.Count() == 0) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
IBlueRow ir = rolling_rows.ElementAt(0);
|
||||||
|
IBlueTableSchema in_schema = ir.schema;
|
||||||
|
IBlueTableSchema out_schema = in_schema;
|
||||||
|
IDictionary<string, Tuple<string, MultiRowOp>> out_col_map =
|
||||||
|
new Dictionary<string, Tuple<string, MultiRowOp>>();
|
||||||
|
foreach (var t in operations) {
|
||||||
|
string out_col_name = $"{t.Item1}_{t.Item2}".ToLower();
|
||||||
|
out_schema = out_schema.add_column(TypeCode.Double, out_col_name);
|
||||||
|
out_col_map[out_col_name] = t;
|
||||||
|
}
|
||||||
|
MutableBlueRow or = new MutableBlueRow(out_schema, ir);
|
||||||
|
foreach (var kv in out_col_map) {
|
||||||
|
string out_col_name = kv.Key;
|
||||||
|
string in_col_name = kv.Value.Item1;
|
||||||
|
MultiRowOp op = kv.Value.Item2;
|
||||||
|
IEnumerable<double> col_vals = BlueDataUtility.get_colvalues<double>(rolling_rows, in_col_name);
|
||||||
|
double comp_res = compute_op(col_vals, op);
|
||||||
|
or.setValue(out_col_name, comp_res);
|
||||||
|
}
|
||||||
|
return or;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static double compute_op(IEnumerable<double> col_vals, MultiRowOp op) {
|
||||||
|
switch (op) {
|
||||||
|
case MultiRowOp.Max:
|
||||||
|
return col_vals.Max<double>();
|
||||||
|
case MultiRowOp.Min:
|
||||||
|
return col_vals.Min<double>();
|
||||||
|
case MultiRowOp.Mean:
|
||||||
|
return MathNet.Numerics.Statistics.Statistics.Mean(col_vals);
|
||||||
|
case MultiRowOp.Sum:
|
||||||
|
return col_vals.Sum();
|
||||||
|
case MultiRowOp.Median:
|
||||||
|
return MathNet.Numerics.Statistics.Statistics.Median(col_vals);
|
||||||
|
//case MultiRowOp.Mode:
|
||||||
|
// return MathNet.Numerics.Statistics.Statistics.(col_vals);
|
||||||
|
case MultiRowOp.First:
|
||||||
|
return col_vals.First();
|
||||||
|
case MultiRowOp.Last:
|
||||||
|
return col_vals.Last();
|
||||||
|
case MultiRowOp.StdDev:
|
||||||
|
return MathNet.Numerics.Statistics.Statistics.StandardDeviation(col_vals);
|
||||||
|
default:
|
||||||
|
// TODO
|
||||||
|
Log.assert(false);
|
||||||
|
return Double.NaN;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,40 @@
|
|||||||
|
namespace bts.BlueOrb {
|
||||||
|
using BCG;
|
||||||
|
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Net;
|
||||||
|
|
||||||
|
[DataStreamUserRespresentation("MultiRowRollingMathStream")]
|
||||||
|
public class MultiRowRollingMathStream : ViewStream {
|
||||||
|
private ViewStream _sorted_parent_str;
|
||||||
|
private MultiRowOpHelper _op;
|
||||||
|
private int _rolling_window_sz;
|
||||||
|
public MultiRowRollingMathStream(ViewStream parent_str, string op_txt, string sort_exp, int rolling_window_sz) {
|
||||||
|
_sorted_parent_str = new SortStream(parent_str, sort_exp);
|
||||||
|
_op = MultiRowOpHelper.parse_ops(op_txt);
|
||||||
|
_rolling_window_sz = rolling_window_sz;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override void myOnFirstSubscriber() {
|
||||||
|
_sorted_parent_str.onChange += _parent_str_onchange;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override void myOnLastSubscriber() {
|
||||||
|
_sorted_parent_str.onChange -= _parent_str_onchange;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void _parent_str_onchange(object dp_obj) {
|
||||||
|
DataPacket dp = dp_obj as DataPacket;
|
||||||
|
var rows = dp.newRows.to_list();
|
||||||
|
BlueTable out_table = null;
|
||||||
|
for (int i = 0; i < rows.Count; i++) {
|
||||||
|
var out_r = MultiRowOpHelper.group_by_compute(rows, i, _rolling_window_sz, _op);
|
||||||
|
if (out_table == null)
|
||||||
|
out_table = new BlueTable(out_r.schema);
|
||||||
|
out_table.addRow(out_r);
|
||||||
|
}
|
||||||
|
var dp_out = BlueDataUtility.build_dp_inc(out_table, myLastValue as DataPacket, true);
|
||||||
|
myFireEvent(dp_out);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,188 @@
|
|||||||
|
namespace bts.BlueOrb {
|
||||||
|
using BCG;
|
||||||
|
using System;
|
||||||
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
|
||||||
|
#region mappings
|
||||||
|
internal class ProjectData {
|
||||||
|
// schema from the base stream
|
||||||
|
public readonly IBlueTableSchema in_schema;
|
||||||
|
// this is the projected schema
|
||||||
|
public readonly IBlueTableSchema out_schema;
|
||||||
|
// projected cols to the input cols, for cols who's names are changed
|
||||||
|
public readonly IDictionary<string, string> mapped_to_orig_col_map = new Dictionary<string, string>();
|
||||||
|
public ProjectData(IBlueTableSchema in_schema_, IBlueTableSchema out_schema_,
|
||||||
|
IDictionary<string, string> mapped_to_orig_col_map_) {
|
||||||
|
in_schema = in_schema_;
|
||||||
|
out_schema = out_schema_;
|
||||||
|
mapped_to_orig_col_map = mapped_to_orig_col_map_;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
|
||||||
|
#region Row with mappings build in
|
||||||
|
internal class NewProjectRow : IBlueRow {
|
||||||
|
#region IBlueRow members
|
||||||
|
private ProjectData _project_data;
|
||||||
|
private IBlueRow _row;
|
||||||
|
public NewProjectRow(ProjectData project_data, IBlueRow row) {
|
||||||
|
_project_data = project_data;
|
||||||
|
_row = row;
|
||||||
|
}
|
||||||
|
public IBlueTableSchema schema { get { return _project_data.out_schema; } }
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
#region ICollection members
|
||||||
|
public int Count { get { return schema.columnNames.Length; } }
|
||||||
|
|
||||||
|
public bool IsSynchronized { get { return false; } }
|
||||||
|
|
||||||
|
public object SyncRoot { get { return this; } }
|
||||||
|
|
||||||
|
public void CopyTo(Array array, int index) {
|
||||||
|
int i = index;
|
||||||
|
foreach (object o in this as IEnumerable)
|
||||||
|
array.SetValue(o, i++);
|
||||||
|
}
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
#region IDictionary members
|
||||||
|
public bool IsFixedSize { get { return true; } }
|
||||||
|
|
||||||
|
public bool IsReadOnly { get { return true; } }
|
||||||
|
|
||||||
|
public object this[object key] {
|
||||||
|
get {
|
||||||
|
if (key is string)
|
||||||
|
return this[(string)key];
|
||||||
|
return this[(int)key];
|
||||||
|
}
|
||||||
|
set { throw new NotSupportedException("The IBlueRow is readonly"); }
|
||||||
|
}
|
||||||
|
|
||||||
|
public object this[int index] {
|
||||||
|
get {
|
||||||
|
return this[schema.columnInfo[index].colName];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public object this[string col_name] {
|
||||||
|
get {
|
||||||
|
string mapped_to_col = null;
|
||||||
|
if (_project_data.mapped_to_orig_col_map.TryGetValue(col_name, out mapped_to_col)) {
|
||||||
|
return _row[mapped_to_col];
|
||||||
|
}
|
||||||
|
return _row[col_name];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public ICollection Keys { get { return schema.columnNames; } }
|
||||||
|
|
||||||
|
public ICollection Values {
|
||||||
|
get {
|
||||||
|
object[] retVal = new object[schema.columnNames.Length];
|
||||||
|
CopyTo(retVal, 0);
|
||||||
|
return retVal;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Add(object key, object value) { throw new NotSupportedException("The IBlueRow is readonly"); }
|
||||||
|
|
||||||
|
public void Clear() { throw new NotSupportedException("The IBlueRow is readonly"); }
|
||||||
|
|
||||||
|
public bool Contains(object key) { return schema[(string)key] != null; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Note, the default enumerator is the IDictionary's enumerator, so if user needs to
|
||||||
|
/// iterate through the values, typecast this into an IEnumerable
|
||||||
|
/// </summary>
|
||||||
|
/// <returns></returns>
|
||||||
|
public IDictionaryEnumerator GetEnumerator() { return new BlueRowDictionaryEnumerator(this); }
|
||||||
|
|
||||||
|
IEnumerator IEnumerable.GetEnumerator() { return new BlueRowEnumerator(this); }
|
||||||
|
|
||||||
|
public void Remove(object key) { throw new NotSupportedException("The IBlueRow is readonly"); }
|
||||||
|
#endregion
|
||||||
|
}
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
[DataStreamUserRespresentation("ProjectStream")]
|
||||||
|
public class NewProjectStream : ViewStream, IStreamMapper {
|
||||||
|
|
||||||
|
private ViewStream _stream;
|
||||||
|
private string _project_expression;
|
||||||
|
private ProjectData _project_data = null;
|
||||||
|
//public ProjectData
|
||||||
|
public NewProjectStream(ViewStream vs, string project_expression) {
|
||||||
|
_stream = vs;
|
||||||
|
_project_expression = project_expression;
|
||||||
|
_stream = new MapStream(vs, this);
|
||||||
|
mySetRealSource(_stream);
|
||||||
|
}
|
||||||
|
|
||||||
|
public IBlueTableSchema getOutputSchema(IBlueTableSchema input_schema) {
|
||||||
|
_project_data = _create_project_data(input_schema, _project_expression);
|
||||||
|
return _project_data.out_schema;
|
||||||
|
}
|
||||||
|
|
||||||
|
public IBlueRow map(IBlueRow row) {
|
||||||
|
return new NewProjectRow(_project_data, row);
|
||||||
|
}
|
||||||
|
|
||||||
|
// this is where most of the logic is, in terms of translating cols
|
||||||
|
private static ProjectData _create_project_data(IBlueTableSchema input_schema,
|
||||||
|
string project_expression) {
|
||||||
|
project_expression = project_expression.Trim();
|
||||||
|
string[] project_toks = project_expression.Split(' ', ',');
|
||||||
|
HashSet<string> removed_cols = new HashSet<string>();
|
||||||
|
Dictionary<string, string> orig_to_mapped = new Dictionary<string, string>();
|
||||||
|
// by default every col will show up, so if we have the projection as (a:a1)
|
||||||
|
// it will convert a to a1,
|
||||||
|
// modifications (6/30/2025):
|
||||||
|
// only the columns represented here, either mapped
|
||||||
|
// or not, will show
|
||||||
|
// examples: if a schema has cols a b c
|
||||||
|
// project(parent_str, "a:aa b") -> aa b
|
||||||
|
foreach (string o_p_tok in project_toks) {
|
||||||
|
string p_tok = o_p_tok.Trim();
|
||||||
|
if (p_tok.Contains(":")) {
|
||||||
|
// explicit mapping
|
||||||
|
string[] map_toks = p_tok.Split(":");
|
||||||
|
string orig_col = map_toks[0];
|
||||||
|
string mapped_col = map_toks[1];
|
||||||
|
orig_to_mapped.Add(orig_col, mapped_col);
|
||||||
|
} else {
|
||||||
|
// this is a col_name explicitely stated
|
||||||
|
if (input_schema.columnNames.Contains(p_tok)) {
|
||||||
|
string orig_col = p_tok;
|
||||||
|
string mapped_col = orig_col;
|
||||||
|
orig_to_mapped.Add(orig_col, mapped_col);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// make the new schema
|
||||||
|
List<ColumnInfo> new_cols = new List<ColumnInfo>();
|
||||||
|
foreach (ColumnInfo ci in input_schema.columnInfo) {
|
||||||
|
if (ci.colName == "id") {
|
||||||
|
ColumnInfo nc = new ColumnInfo(ci.colName, new_cols.Count, ci.colType);
|
||||||
|
new_cols.Add(nc);
|
||||||
|
continue;
|
||||||
|
} else if (orig_to_mapped.ContainsKey(ci.colName)) {
|
||||||
|
string mapped_name = orig_to_mapped[ci.colName];
|
||||||
|
ColumnInfo nc = new ColumnInfo(mapped_name, new_cols.Count, ci.colType);
|
||||||
|
new_cols.Add(nc);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
IBlueTableSchema new_schema = new BlueTableSchema(input_schema.tableName, new_cols.ToArray());
|
||||||
|
var mapped_to_orig_map = orig_to_mapped.ToDictionary(kv => kv.Value, kv => kv.Key);
|
||||||
|
return new ProjectData(input_schema, new_schema, mapped_to_orig_map);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,127 @@
|
|||||||
|
namespace bts.BlueOrb {
|
||||||
|
using BCG;
|
||||||
|
using System.IO;
|
||||||
|
using System.Diagnostics;
|
||||||
|
using System;
|
||||||
|
|
||||||
|
[DataStreamUserRespresentation("PythonDataframeStream")]
|
||||||
|
public class PythonDataframeStream : ViewStream {
|
||||||
|
private ViewStream _parent_str;
|
||||||
|
private readonly string _in_csv_file_name;
|
||||||
|
private readonly string _out_csv_filename;
|
||||||
|
private readonly string _transform_function;
|
||||||
|
public PythonDataframeStream(ViewStream parent_str, string transform_function) {
|
||||||
|
var guid = System.Guid.NewGuid();
|
||||||
|
_in_csv_file_name = $"pdfs_in_{guid}.csv";
|
||||||
|
_out_csv_filename = $"pdfs_out_{guid}.csv";
|
||||||
|
_parent_str = new CSVSaverStream(parent_str, _in_csv_file_name);
|
||||||
|
_transform_function = transform_function;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override void myOnFirstSubscriber() {
|
||||||
|
_parent_str.onChange += _parent_str_onchange;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override void myOnLastSubscriber() {
|
||||||
|
_parent_str.onChange -= _parent_str_onchange;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void _parent_str_onchange(object dp_obj) {
|
||||||
|
Log.assert(dp_obj != null);
|
||||||
|
// the file _in_csv_file_name is now populated.
|
||||||
|
// call py_func_wrapper_main and pass this file name as well
|
||||||
|
// as the output file name
|
||||||
|
// py_func_wrapper_main reads _in_csv_file_name into the df and calls
|
||||||
|
// transform function, which returns the tranformed df. py_func_wrapper_main then
|
||||||
|
// writes it into the _out_csv_filename file.
|
||||||
|
// now this function should read _out_csv_filename into a dp
|
||||||
|
// and fire it
|
||||||
|
_compute_and_write();
|
||||||
|
ViewStream rs = new SchemaGuesserStream(new CSVReaderStream(_out_csv_filename));
|
||||||
|
IBlueRowCollection nrows = null;
|
||||||
|
rs.onChange += (dp_obj) => {
|
||||||
|
nrows = (dp_obj as DataPacket).newRows;
|
||||||
|
};
|
||||||
|
var dp = BlueDataUtility.build_dp(nrows, myLastValue as DataPacket);
|
||||||
|
myFireEvent(dp);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void _compute_and_write() {
|
||||||
|
File.WriteAllText("user_code.py", _transform_function);
|
||||||
|
// wrapper function
|
||||||
|
string py_func_wrapper_main = @"
|
||||||
|
import sys
|
||||||
|
from user_code import transform
|
||||||
|
import pandas as pd
|
||||||
|
|
||||||
|
if __name__ == '__main__':
|
||||||
|
input_file_name = sys.argv[1]
|
||||||
|
output_file_name = sys.argv[2]
|
||||||
|
# 1. load input_file_name into df
|
||||||
|
# 2. do some test calc
|
||||||
|
# 3. write the output of 2 into output_file_name
|
||||||
|
df = pd.read_csv(input_file_name)
|
||||||
|
df_out = transform(df)
|
||||||
|
df_out.to_csv(output_file_name, index=False)";
|
||||||
|
|
||||||
|
|
||||||
|
File.WriteAllText("runner.py", py_func_wrapper_main);
|
||||||
|
|
||||||
|
ProcessStartInfo psi = new ProcessStartInfo {
|
||||||
|
FileName = "python",
|
||||||
|
Arguments = $"runner.py {_in_csv_file_name} {_out_csv_filename}",
|
||||||
|
RedirectStandardOutput = false,
|
||||||
|
UseShellExecute = false
|
||||||
|
};
|
||||||
|
var proc = Process.Start(psi);
|
||||||
|
proc.WaitForExit();
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
#region Unused test code
|
||||||
|
private void _simple_test() {
|
||||||
|
|
||||||
|
// actual function that needs to be called ////////////////////////
|
||||||
|
string py_real_function = @"
|
||||||
|
def test(x, out_path):
|
||||||
|
rv = x * 10
|
||||||
|
with open(out_path, 'w') as f:
|
||||||
|
f.write(str(rv))
|
||||||
|
return rv";
|
||||||
|
// the function is in a string object.
|
||||||
|
File.WriteAllText("user_code.py", py_real_function);
|
||||||
|
|
||||||
|
|
||||||
|
// runner app (top level main function) //////////////////////////////
|
||||||
|
string py_func_wrapper_main = @"
|
||||||
|
import sys
|
||||||
|
from user_code import test
|
||||||
|
|
||||||
|
if __name__ == '__main__':
|
||||||
|
arg = int(sys.argv[1])
|
||||||
|
out_path = sys.argv[2]
|
||||||
|
rv = test(arg, out_path)
|
||||||
|
rv = rv + 12
|
||||||
|
with open(out_path, 'w') as f:to \
|
||||||
|
f.write(str(rv))";
|
||||||
|
|
||||||
|
File.WriteAllText("runner.py", py_func_wrapper_main);
|
||||||
|
|
||||||
|
string outputPath = "py_out.txt";
|
||||||
|
ProcessStartInfo psi = new ProcessStartInfo {
|
||||||
|
FileName = "python",
|
||||||
|
Arguments = $"runner.py 4 {outputPath}",
|
||||||
|
RedirectStandardOutput = false,
|
||||||
|
UseShellExecute = false
|
||||||
|
};
|
||||||
|
var proc = Process.Start(psi);
|
||||||
|
proc.WaitForExit();
|
||||||
|
|
||||||
|
// Now read the output written by the function
|
||||||
|
string result = File.ReadAllText(outputPath);
|
||||||
|
Console.WriteLine(result); // Should print "6"
|
||||||
|
|
||||||
|
}
|
||||||
|
#endregion
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,30 @@
|
|||||||
|
using BCG;
|
||||||
|
|
||||||
|
namespace bts.BlueOrb {
|
||||||
|
public class SchemaGuesserStream : ViewStream {
|
||||||
|
|
||||||
|
private IBlueRowCollection _rows = null;
|
||||||
|
private ViewStream _vs;
|
||||||
|
public SchemaGuesserStream(ViewStream vs) {
|
||||||
|
_vs = vs;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override void myOnFirstSubscriber() {
|
||||||
|
_vs.onChange += _on_data;
|
||||||
|
}
|
||||||
|
protected override void myOnLastSubscriber() {
|
||||||
|
_vs.onChange -= _on_data;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void _on_data(object obj) {
|
||||||
|
DataPacket dp = obj as DataPacket;
|
||||||
|
if (_rows == null) {
|
||||||
|
_rows = BlueDataUtility.get_typed_table(dp.newRows);
|
||||||
|
}
|
||||||
|
var dp_out = BlueDataUtility.build_dp_inc(_rows, myLastValue as DataPacket);
|
||||||
|
myFireEvent(dp_out);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,67 @@
|
|||||||
|
using Bts.ArithmeticExpressions;
|
||||||
|
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
|
using BCG;
|
||||||
|
|
||||||
|
namespace bts.BlueOrb {
|
||||||
|
|
||||||
|
[DataStreamUserRespresentation("SingleRowMathStream")]
|
||||||
|
public class MathStream : ViewStream, IStreamMapper {
|
||||||
|
private IArithmeticProgram myExp;
|
||||||
|
private BooleanExpressionFilter _bool;
|
||||||
|
List<string> myExtraColumns = new List<string>();
|
||||||
|
BlueTableSchema mySchema;
|
||||||
|
|
||||||
|
|
||||||
|
public MathStream(ViewStream vs, string mathExpression)
|
||||||
|
: this(vs, mathExpression, string.Empty) {
|
||||||
|
}
|
||||||
|
|
||||||
|
public MathStream(ViewStream vs, string mathExpression, string boolean_expression) {
|
||||||
|
myExp = ArithmeticProgramParser.Parse(mathExpression) ??
|
||||||
|
throw new Exception($"Failed to parse ArithmeticExpression '{mathExpression}'");
|
||||||
|
myExtraColumns = myExp.OutputIdentifiers.ToList();
|
||||||
|
if (!string.IsNullOrEmpty(boolean_expression))
|
||||||
|
_bool = new BooleanExpressionFilter(boolean_expression);
|
||||||
|
mySetRealSource(new MapStream(vs, this));
|
||||||
|
}
|
||||||
|
|
||||||
|
#region IStreamMapper Members
|
||||||
|
|
||||||
|
public IBlueTableSchema getOutputSchema(IBlueTableSchema inputSchema) {
|
||||||
|
if (mySchema == null) {
|
||||||
|
Dictionary<string, ColumnInfo> colIdx = new Dictionary<string, ColumnInfo>();
|
||||||
|
foreach (ColumnInfo ci in inputSchema.columnInfo)
|
||||||
|
colIdx[ci.colName] = ci;
|
||||||
|
|
||||||
|
foreach (string ncn in myExtraColumns) {
|
||||||
|
ColumnInfo newC;
|
||||||
|
if (colIdx.ContainsKey(ncn))
|
||||||
|
newC = new ColumnInfo(colIdx[ncn].colName, colIdx[ncn].colNo, typeof(double));
|
||||||
|
else
|
||||||
|
newC = new ColumnInfo(ncn, colIdx.Count, typeof(double));
|
||||||
|
colIdx[ncn] = newC;
|
||||||
|
}
|
||||||
|
mySchema = new BlueTableSchema(colIdx.Values.ToArray(), "math(" + inputSchema.tableName + ")");
|
||||||
|
}
|
||||||
|
return mySchema;
|
||||||
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
#region IDynamicStreamMapper Members
|
||||||
|
|
||||||
|
public IBlueRow map(IBlueRow row) {
|
||||||
|
MutableBlueRow result = new MutableBlueRow(mySchema, row);
|
||||||
|
if (_bool == null || _bool.filter(row)) {
|
||||||
|
myExp.Evaluate(result.AsDictionary());
|
||||||
|
}
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
namespace bts.BlueOrb {
|
||||||
|
using BCG;
|
||||||
|
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
|
[DataStreamUserRespresentation("SortStream")]
|
||||||
|
public class SortStream: ViewStream {
|
||||||
|
public SortStream (ViewStream parent_stream, string sort_expr) {
|
||||||
|
ViewStream rs = new BCG.SortStream(parent_stream, sort_expr);
|
||||||
|
mySetRealSource(rs);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
namespace bts.BlueOrb {
|
||||||
|
using BCG;
|
||||||
|
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
[DataStreamUserRespresentation("TimeBasedRollingFilterStream")]
|
||||||
|
public class TimeBasedRollingFilterStream : ViewStream {
|
||||||
|
public TimeBasedRollingFilterStream(ViewStream parent_str, string time_col, double n_seconds) {
|
||||||
|
ViewStream rs = new BCG.TimeBasedFilterStream(ViewStreamDatabase.instance, parent_str, time_col, TimeSpan.FromSeconds(n_seconds));
|
||||||
|
mySetRealSource(rs);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
+1
-1
@@ -2,7 +2,7 @@ using System;
|
|||||||
|
|
||||||
using BCG;
|
using BCG;
|
||||||
|
|
||||||
namespace bts.SilverPine {
|
namespace bts.BlueOrb {
|
||||||
// Keeps adding changing rows to the stream, hence preserving the history
|
// Keeps adding changing rows to the stream, hence preserving the history
|
||||||
// and creating a time series, for example this can be used to make bbo updates
|
// and creating a time series, for example this can be used to make bbo updates
|
||||||
// into a time series of prices/qty
|
// into a time series of prices/qty
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
namespace bts.BlueOrb {
|
||||||
|
using BCG;
|
||||||
|
[DataStreamUserRespresentation("TopStream")]
|
||||||
|
public class TopStream : ViewStream {
|
||||||
|
public TopStream(ViewStream vs, int n_rows, string sort_col) {
|
||||||
|
ViewStream rs = new BCG.TopStream (vs, n_rows, sort_col);
|
||||||
|
mySetRealSource(rs);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
namespace bts.BlueOrb {
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
|
||||||
|
using mbts;
|
||||||
|
using BCG;
|
||||||
|
|
||||||
|
[DataStreamUserRespresentation("UnionStream")]
|
||||||
|
public class UnionStream : ViewStream {
|
||||||
|
public UnionStream(ViewStream left_stream, ViewStream right_stream) {
|
||||||
|
ViewStream rs = new BCG.MutableAppendStream(left_stream, right_stream);
|
||||||
|
mySetRealSource(rs);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>net7.0</TargetFramework>
|
<TargetFramework>net8.0</TargetFramework>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
@@ -18,11 +18,13 @@
|
|||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="HtmlAgilityPack" Version="1.11.57" />
|
<PackageReference Include="HtmlAgilityPack" Version="1.11.57" />
|
||||||
|
<PackageReference Include="IronPython" Version="3.4.2" />
|
||||||
<PackageReference Include="Microsoft.Data.Analysis" Version="0.21.1" />
|
<PackageReference Include="Microsoft.Data.Analysis" Version="0.21.1" />
|
||||||
<PackageReference Include="MongoDB.Bson" Version="2.23.1" />
|
<PackageReference Include="MongoDB.Bson" Version="2.23.1" />
|
||||||
<PackageReference Include="MongoDB.Driver" Version="2.23.1" />
|
<PackageReference Include="MongoDB.Driver" Version="2.23.1" />
|
||||||
<PackageReference Include="Parquet.Net" Version="5.0.1" />
|
<PackageReference Include="Parquet.Net" Version="5.0.1" />
|
||||||
<PackageReference Include="System.Data.SQLite" Version="1.0.118" />
|
<PackageReference Include="System.Data.SQLite" Version="1.0.118" />
|
||||||
|
<PackageReference Include="MathNet.Numerics" Version="5.0.0" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
@@ -12,12 +12,11 @@ using Spark.Core.Disposables;
|
|||||||
|
|
||||||
using System;
|
using System;
|
||||||
using System.Collections;
|
using System.Collections;
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Reactive.Linq;
|
using System.Reactive.Linq;
|
||||||
|
|
||||||
public static class DataStreamExtensions {
|
public static class DataStreamExtensions {
|
||||||
public static ViewStream AsViewStream(this IObservable<DataPacket> source) =>
|
public static ViewStream AsViewStream(this IObservable<IDataPacket> source) =>
|
||||||
source as ViewStream ?? new ObservableViewStream(source);
|
source as ViewStream ?? new ObservableViewStream(source);
|
||||||
|
|
||||||
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 =>
|
||||||
@@ -89,6 +88,25 @@ public static class DataStreamExtensions {
|
|||||||
.Where(t => t.Dp.addedRows.Any() || t.Dp.deletedRows.Any())
|
.Where(t => t.Dp.addedRows.Any() || t.Dp.deletedRows.Any())
|
||||||
.Select(t => t.Dp);
|
.Select(t => t.Dp);
|
||||||
|
|
||||||
|
public static IObservable<IDataPacket<BlueRowAdapter<T>>> AsDataPackets<T, TKey>(this IObservable<TableUpdate<T, TKey>> source, BlueTableSchemaAdapter<T> schema) where TKey : IEquatable<TKey> {
|
||||||
|
return Observable.Create<IDataPacket<BlueRowAdapter<T>>>(Subscribe);
|
||||||
|
|
||||||
|
IDisposable Subscribe(IObserver<IDataPacket<BlueRowAdapter<T>>> o) {
|
||||||
|
var adapter = new BlueTableImmutableAdapter<T>(schema);
|
||||||
|
IDataPacket<BlueRowAdapter<T>> initDataPacket = DataPacket<BlueRowAdapter<T>>.Empty(schema);
|
||||||
|
return source.Scan((Adapter: adapter, DataPacket: initDataPacket), OnUpdate).Select(res => res.DataPacket).Subscribe(o);
|
||||||
|
|
||||||
|
(BlueTableImmutableAdapter<T> Adapter, IDataPacket<BlueRowAdapter<T>> DataPacket) OnUpdate(
|
||||||
|
(BlueTableImmutableAdapter<T> Adapter, IDataPacket<BlueRowAdapter<T>> DataPacket) state, TableUpdate<T, TKey> tableUpdate) {
|
||||||
|
var bd = state.Adapter.ToDataPacketBuilder();
|
||||||
|
bd.Update(tableUpdate);
|
||||||
|
var dp = bd.ToDataPacket();
|
||||||
|
var tableAdapter = bd.ToImmutable();
|
||||||
|
return (bd.ToImmutable(), dp);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public static ViewStream AsViewStream<T>(this IObservable<TableUpdate<T, int>> source, IBlueTableSchema schema) where T : IBlueRow =>
|
public static ViewStream AsViewStream<T>(this IObservable<TableUpdate<T, int>> source, IBlueTableSchema schema) where T : IBlueRow =>
|
||||||
source.AsDataPackets(schema).AsViewStream();
|
source.AsDataPackets(schema).AsViewStream();
|
||||||
|
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ namespace bts.SilverPine {
|
|||||||
using BCG;
|
using BCG;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using Bts.DataStreamExpressions;
|
using Bts.DataStreamExpressions;
|
||||||
using Bts.DataStream;
|
using Bts.DataStreamCore;
|
||||||
|
|
||||||
// All this does is take in a dsl expression, parse it and fire the data that come out of running it.
|
// All this does is take in a dsl expression, parse it and fire the data that come out of running it.
|
||||||
// So for example, if an expresison is passed
|
// So for example, if an expresison is passed
|
||||||
@@ -13,8 +13,7 @@ namespace bts.SilverPine {
|
|||||||
public DSLStream(string dsl, IDataStreamFactory streamFactory) {
|
public DSLStream(string dsl, IDataStreamFactory streamFactory) {
|
||||||
Log.Gen.info($"DSLStream.cons dsl: {dsl}");
|
Log.Gen.info($"DSLStream.cons dsl: {dsl}");
|
||||||
_dsl = dsl;
|
_dsl = dsl;
|
||||||
var rs = build_stream(streamFactory, dsl);
|
var rs = build_stream(streamFactory, dsl) ?? new LiteralStream("error", $"msg:invalid dsl");
|
||||||
rs = rs ?? new LiteralStream("error", $"msg:invalid dsl");
|
|
||||||
mySetRealSource(rs);
|
mySetRealSource(rs);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -8,13 +8,13 @@ using Microsoft.Extensions.Logging;
|
|||||||
|
|
||||||
using System;
|
using System;
|
||||||
|
|
||||||
public class ObservableViewStream : ViewStream, IObservable<DataPacket>, IDisposable {
|
public class ObservableViewStream : ViewStream, IObservable<IDataPacket>, IDisposable {
|
||||||
readonly IObservable<DataPacket> source;
|
readonly IObservable<IDataPacket> source;
|
||||||
readonly string? name;
|
readonly string? name;
|
||||||
readonly ILogger? logger;
|
readonly ILogger? logger;
|
||||||
IDisposable? subscription;
|
IDisposable? subscription;
|
||||||
|
|
||||||
public ObservableViewStream(IObservable<DataPacket> source, string? name = null, ILogger? logger = null) {
|
public ObservableViewStream(IObservable<IDataPacket> source, string? name = null, ILogger? logger = null) {
|
||||||
this.source = source;
|
this.source = source;
|
||||||
this.name = name;
|
this.name = name;
|
||||||
this.logger = logger;
|
this.logger = logger;
|
||||||
@@ -45,6 +45,6 @@ public class ObservableViewStream : ViewStream, IObservable<DataPacket>, IDispos
|
|||||||
subscription = null;
|
subscription = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
IDisposable IObservable<DataPacket>.Subscribe(IObserver<DataPacket> observer) =>
|
IDisposable IObservable<IDataPacket>.Subscribe(IObserver<IDataPacket> observer) =>
|
||||||
source.Subscribe(observer);
|
source.Subscribe(observer);
|
||||||
}
|
}
|
||||||
@@ -11,6 +11,7 @@ using Spark.Core.Disposables;
|
|||||||
|
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
using System.Reactive.Linq;
|
using System.Reactive.Linq;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
@@ -58,10 +59,13 @@ namespace BCG {
|
|||||||
bool isDisposed;
|
bool isDisposed;
|
||||||
|
|
||||||
|
|
||||||
public RemoteQueryManager(IManagedSubscriber managedSubscriber, IPubTableBroker pubTableBroker, IDataStreamFactory streamFactory) {
|
public RemoteQueryManager(IManagedSubscriber managedSubscriber, IPubTableBroker pubTableBroker, IEnumerable<IDataStreamFactory> streamFactories) {
|
||||||
_sub = managedSubscriber;
|
_sub = managedSubscriber;
|
||||||
_broker = pubTableBroker;
|
_broker = pubTableBroker;
|
||||||
this.streamFactory = streamFactory;
|
var streamFactoryList = streamFactories.ToList();
|
||||||
|
streamFactory = streamFactoryList.Count == 1
|
||||||
|
? streamFactoryList[0]
|
||||||
|
: new CompositeDataStreamFactory(streamFactoryList);
|
||||||
}
|
}
|
||||||
|
|
||||||
public Task StartAsync(CancellationToken cancellationToken) {
|
public Task StartAsync(CancellationToken cancellationToken) {
|
||||||
@@ -69,7 +73,9 @@ namespace BCG {
|
|||||||
Log.assert(!isDisposed);
|
Log.assert(!isDisposed);
|
||||||
Log.isnull(cloudStreamsSub);
|
Log.isnull(cloudStreamsSub);
|
||||||
Log.isnull(remoteRequestsSub);
|
Log.isnull(remoteRequestsSub);
|
||||||
cloudStreamsSub = new TableStream("cloud_streams").AsObservable().Subscribe(_on_str);
|
var cloudStream = streamFactory.Create("table", new (string?, int?, object?)[] { ("name", 0, "cloud_streams") })
|
||||||
|
?? throw new Exception("Failed to create TableStream 'cloud_stream'");
|
||||||
|
cloudStreamsSub = cloudStream.AsObservable().Subscribe(_on_str);
|
||||||
remoteRequestsSub = _sub.Observe("RemoteRequest").Subscribe(data => {
|
remoteRequestsSub = _sub.Observe("RemoteRequest").Subscribe(data => {
|
||||||
RemoteRequest req = RemoteRequest.construct_from_bytes(data);
|
RemoteRequest req = RemoteRequest.construct_from_bytes(data);
|
||||||
_spawn_remote_stream(req.published_table_name, req.stream_expression, false);
|
_spawn_remote_stream(req.published_table_name, req.stream_expression, false);
|
||||||
|
|||||||
@@ -2,17 +2,29 @@ using BCG;
|
|||||||
|
|
||||||
using bts;
|
using bts;
|
||||||
|
|
||||||
|
using Bts.DataStreamCore.StreamFactories;
|
||||||
|
|
||||||
|
using Spark.Core.Disposables;
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
|
|
||||||
namespace BCG {
|
namespace BCG {
|
||||||
// this is a stream so we can run it from the DSQA (since dsqa can only load streams)
|
/// <summary>
|
||||||
[DataStreamUserRespresentation("remoteQuery")]
|
/// This is a stream so we can run it from the DSQA (since dsqa can only load streams).
|
||||||
|
/// <para>
|
||||||
|
/// Note: It's hidden because this stream is now created by an IDataStreamFactory
|
||||||
|
/// (see RemoteQueryStreamFactory.cs for details)
|
||||||
|
/// </para>
|
||||||
|
/// </summary>
|
||||||
|
[DataStreamUserRespresentation(false)]
|
||||||
public class RemoteQueryStream : ViewStream {
|
public class RemoteQueryStream : ViewStream {
|
||||||
private readonly string _name, _stream_exp;
|
private readonly string _name, _stream_exp;
|
||||||
|
readonly TableStreamFactory tableStreamFactory;
|
||||||
private PublisherCore _publisher_core = new PublisherCore();
|
private PublisherCore _publisher_core = new PublisherCore();
|
||||||
private ViewStream _source_str;
|
IDisposable? subscription;
|
||||||
|
|
||||||
public RemoteQueryStream(params string[] lines) {
|
public RemoteQueryStream(TableStreamFactory tableStreamFactory, params string[] lines) {
|
||||||
|
this.tableStreamFactory = tableStreamFactory;
|
||||||
_stream_exp = get_expression(lines);
|
_stream_exp = get_expression(lines);
|
||||||
_name = Guid.NewGuid().ToString();
|
_name = Guid.NewGuid().ToString();
|
||||||
_name = $"remotereq_{DateTimeOffset.UtcNow.ToUnixTimeMilliseconds().ToString()}";
|
_name = $"remotereq_{DateTimeOffset.UtcNow.ToUnixTimeMilliseconds().ToString()}";
|
||||||
@@ -21,17 +33,17 @@ namespace BCG {
|
|||||||
}
|
}
|
||||||
|
|
||||||
protected override void myOnFirstSubscriber() {
|
protected override void myOnFirstSubscriber() {
|
||||||
|
Log.isnull(subscription);
|
||||||
RemoteRequest rem_req = new RemoteRequest(_stream_exp, _name);
|
RemoteRequest rem_req = new RemoteRequest(_stream_exp, _name);
|
||||||
byte[] rem_req_bytes = rem_req.serialize();
|
byte[] rem_req_bytes = rem_req.serialize();
|
||||||
_publisher_core.publish("System", "RemoteRequest", rem_req_bytes);
|
_publisher_core.publish("System", "RemoteRequest", rem_req_bytes);
|
||||||
_source_str = new TableStream(_name);
|
var sourceStream = tableStreamFactory.Create(_name);
|
||||||
_source_str.onChange += _handle_data;
|
sourceStream.onChange += _handle_data;
|
||||||
|
subscription = Disposable.Create(() => sourceStream.onChange -= _handle_data);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void myOnLastSubscriber() {
|
protected override void myOnLastSubscriber() =>
|
||||||
//maybe there should be a way to turn remote requests off ?
|
Disposable.dispose(ref subscription);
|
||||||
_source_str.onChange -= _handle_data;
|
|
||||||
}
|
|
||||||
|
|
||||||
static string get_expression(params string[] lines) {
|
static string get_expression(params string[] lines) {
|
||||||
for (int i = 0; i < lines.Length; i++) {
|
for (int i = 0; i < lines.Length; i++) {
|
||||||
|
|||||||
@@ -1,33 +1,51 @@
|
|||||||
using System;
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
|
||||||
namespace BCG {
|
namespace BCG {
|
||||||
public class AddColumnsStream : ViewStream {
|
public class AddColumnsStream : ViewStream {
|
||||||
public static Tuple<string, Type, object> parse_exp(string exp) {
|
public static Tuple<string, Type, object> parse_single_tok(string exp) {
|
||||||
string[] toks = exp.Split(':');
|
string[] toks = exp.Split(':');
|
||||||
string col_name = toks[0];
|
string col_name = toks[0].Trim();
|
||||||
string col_value = toks[1];
|
string col_value = toks[1].Trim();
|
||||||
Tuple<Type, object> tup = BlueDataUtility.guess_type(col_value);
|
Tuple<Type, object> tup = BlueDataUtility.guess_type(col_value);
|
||||||
return Tuple.Create(col_name, tup.Item1, tup.Item2);
|
return Tuple.Create(col_name, tup.Item1, tup.Item2);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static List<Tuple<string, Type, object>> parse_exp(string exp) {
|
||||||
|
string[] toks = exp.Split(",");
|
||||||
|
List<Tuple<string, Type, object>> rv = new List<Tuple<string, Type, object>>();
|
||||||
|
foreach (string s in toks) {
|
||||||
|
var tup = parse_single_tok(s.Trim());
|
||||||
|
rv.Add(tup);
|
||||||
|
}
|
||||||
|
return rv;
|
||||||
|
}
|
||||||
|
|
||||||
private Tuple<string, Type, object> _new_col;
|
private Tuple<string, Type, object> _new_col;
|
||||||
|
private List<Tuple<string, Type, object>> _new_col_map;
|
||||||
private IBlueTableSchema _out_schema;
|
private IBlueTableSchema _out_schema;
|
||||||
|
|
||||||
public AddColumnsStream(ViewStream vs, string col_def) {
|
public AddColumnsStream(ViewStream vs, string col_def) {
|
||||||
_new_col = parse_exp(col_def);
|
_new_col_map = parse_exp(col_def);
|
||||||
ViewStream rs = new MapStream(vs, (IBlueTableSchema s) => _get_schema(s), (IBlueRow r) => _map(r));
|
ViewStream rs = new MapStream(vs, (IBlueTableSchema s) => _get_schema(s), (IBlueRow r) => _map(r));
|
||||||
mySetRealSource(rs);
|
mySetRealSource(rs);
|
||||||
}
|
}
|
||||||
|
|
||||||
private IBlueTableSchema _get_schema(IBlueTableSchema input_schema) {
|
private IBlueTableSchema _get_schema(IBlueTableSchema input_schema) {
|
||||||
if (_out_schema == null)
|
if (_out_schema == null) {
|
||||||
_out_schema = BlueDataUtility.add_column(input_schema, _new_col.Item1, _new_col.Item2);
|
_out_schema = input_schema;
|
||||||
|
foreach (var m in _new_col_map) {
|
||||||
|
_out_schema = BlueDataUtility.add_column(_out_schema, m.Item1, m.Item2);
|
||||||
|
}
|
||||||
|
}
|
||||||
return _out_schema;
|
return _out_schema;
|
||||||
}
|
}
|
||||||
|
|
||||||
private IBlueRow _map(IBlueRow r) {
|
private IBlueRow _map(IBlueRow r) {
|
||||||
MutableBlueRow rv = new MutableBlueRow(_get_schema(r.schema), r);
|
MutableBlueRow rv = new MutableBlueRow(_get_schema(r.schema), r);
|
||||||
rv.setValue(_new_col.Item1, _new_col.Item3);
|
foreach (var m in _new_col_map) {
|
||||||
|
rv.setValue(m.Item1, m.Item3);
|
||||||
|
}
|
||||||
return rv;
|
return rv;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,50 +1,42 @@
|
|||||||
using System;
|
using System;
|
||||||
|
|
||||||
namespace BCG
|
namespace bts.BlueOrb {
|
||||||
{
|
using BCG;
|
||||||
[DataStreamUserRespresentation ("count")]
|
[DataStreamUserRespresentation("oldCount")]
|
||||||
public class CountStream : ViewStream
|
public class CountStream : ViewStream {
|
||||||
{
|
|
||||||
private DataPacket myLastFiredDataPacket;
|
private DataPacket myLastFiredDataPacket;
|
||||||
private IBlueTableSchema mySchema = new BlueTableSchema ("count",
|
private IBlueTableSchema mySchema = new BlueTableSchema("count",
|
||||||
new ColumnInfo ("id", 0, typeof(int)),
|
new ColumnInfo("id", 0, typeof(int)),
|
||||||
new ColumnInfo ("count", 1, typeof(int)));
|
new ColumnInfo("count", 1, typeof(int)));
|
||||||
private int myId = 0;
|
private int myId = 0;
|
||||||
private ViewStream myVS;
|
private ViewStream myVS;
|
||||||
|
|
||||||
public CountStream (ViewStream vs)
|
public CountStream(ViewStream vs) {
|
||||||
{
|
|
||||||
myVS = vs;
|
myVS = vs;
|
||||||
}
|
}
|
||||||
|
|
||||||
public CountStream (string tableName)
|
|
||||||
: this (new TableStream (tableName))
|
|
||||||
{}
|
|
||||||
|
|
||||||
protected override void myOnFirstSubscriber () =>
|
protected override void myOnFirstSubscriber () =>
|
||||||
myVS.onChange += myHandleChanges;
|
myVS.onChange += myHandleChanges;
|
||||||
|
|
||||||
protected override void myOnLastSubscriber () =>
|
protected override void myOnLastSubscriber () =>
|
||||||
myVS.onChange -= myHandleChanges;
|
myVS.onChange -= myHandleChanges;
|
||||||
|
|
||||||
private void myHandleChanges(object newValue)
|
private void myHandleChanges(object newValue) {
|
||||||
{
|
myFireEvent(
|
||||||
myFireEvent (
|
|
||||||
myLastFiredDataPacket =
|
myLastFiredDataPacket =
|
||||||
myLastFiredDataPacket == null ?
|
myLastFiredDataPacket == null ?
|
||||||
new DataPacket (myGetRows (newValue, ++myId), myGetRows (newValue, myId),
|
new DataPacket(myGetRows(newValue, ++myId), myGetRows(newValue, myId),
|
||||||
new BlueTable (mySchema))
|
new BlueTable(mySchema))
|
||||||
:
|
:
|
||||||
new DataPacket (myGetRows (newValue, ++myId), myGetRows (newValue, myId),
|
new DataPacket(myGetRows(newValue, ++myId), myGetRows(newValue, myId),
|
||||||
myLastFiredDataPacket.newRows)
|
myLastFiredDataPacket.newRows)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
private IBlueRowCollection myGetRows (object dp, int id)
|
private IBlueRowCollection myGetRows(object dp, int id) {
|
||||||
{
|
BlueTable retVal = new BlueTable(mySchema);
|
||||||
BlueTable retVal = new BlueTable (mySchema);
|
|
||||||
retVal.addRow
|
retVal.addRow
|
||||||
(new BlueRow (mySchema, id, (dp as DataPacket).newRows.Count));
|
(new BlueRow(mySchema, id, (dp as DataPacket).newRows.Count));
|
||||||
return retVal;
|
return retVal;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ namespace BCG
|
|||||||
for (int i = 0; i < myToCrush.Length; ++i)
|
for (int i = 0; i < myToCrush.Length; ++i)
|
||||||
{
|
{
|
||||||
int tempI = i;
|
int tempI = i;
|
||||||
myDelegates[tempI] = new((o) => { myHandleChange(tempI, ((DataPacket)o).newRows); });
|
myDelegates[tempI] = o => myHandleChange(tempI, ((DataPacket)o).newRows);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections;
|
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using mbts;
|
using mbts;
|
||||||
|
|
||||||
@@ -12,30 +11,21 @@ namespace BCG
|
|||||||
{
|
{
|
||||||
ViewStream myLStream, myRStream;
|
ViewStream myLStream, myRStream;
|
||||||
|
|
||||||
DataPacket myLastR = null, myLastL = null;
|
DataPacket? myLastR = null, myLastL = null;
|
||||||
|
|
||||||
BlueTable myLastFired = null;
|
BlueTable? myLastFired = null;
|
||||||
|
|
||||||
double myThreshold = .00005;
|
double myThreshold = .00005;
|
||||||
|
|
||||||
string[] myColumnsToMatch;
|
string[] myColumnsToMatch;
|
||||||
public DiffStream(ViewStream v1, ViewStream v2) : this(null, v1, v2, "id") { }
|
public DiffStream(ViewStream v1, ViewStream v2) : this(v1, v2, "id") { }
|
||||||
public DiffStream(ViewStream v1, ViewStream v2, params string[] ColumnsToMatch) : this(null, v1, v2, ColumnsToMatch) { }
|
public DiffStream(ViewStream v1, ViewStream v2, params string[] columnsToMatch) : this(v1, v2, .00005, columnsToMatch) { }
|
||||||
public DiffStream(ViewStream v1, ViewStream v2, double thresh, params string[] ColumnsToMatch) :
|
public DiffStream(ViewStream v1, ViewStream v2, double thresh, params string[] columnsToMatch) {
|
||||||
this(null, v1, v2, thresh, ColumnsToMatch) { }
|
|
||||||
|
|
||||||
public DiffStream(ViewStreamDatabase db, ViewStream v1, ViewStream v2, double thresh, params string[] columnsToMatch)
|
|
||||||
{
|
|
||||||
myThreshold = thresh;
|
myThreshold = thresh;
|
||||||
myLStream = v1;
|
myLStream = v1;
|
||||||
myRStream = v2;
|
myRStream = v2;
|
||||||
myColumnsToMatch = columnsToMatch;
|
myColumnsToMatch = columnsToMatch;
|
||||||
}
|
}
|
||||||
public DiffStream(ViewStreamDatabase db, ViewStream v1, ViewStream v2, params string[] columnsToMatch)
|
|
||||||
: this(db,v1,v2,.00005,columnsToMatch)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
protected override void myOnFirstSubscriber()
|
protected override void myOnFirstSubscriber()
|
||||||
{
|
{
|
||||||
@@ -52,8 +42,14 @@ namespace BCG
|
|||||||
|
|
||||||
struct ListComparer : IEqualityComparer<List<object>>
|
struct ListComparer : IEqualityComparer<List<object>>
|
||||||
{
|
{
|
||||||
public bool Equals(List<object> x, List<object> y)
|
public bool Equals(List<object>? x, List<object>? y)
|
||||||
{
|
{
|
||||||
|
if (x is null) {
|
||||||
|
return y is null;
|
||||||
|
}
|
||||||
|
if (y is null) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
if (x.Count != y.Count)
|
if (x.Count != y.Count)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
@@ -74,21 +70,20 @@ namespace BCG
|
|||||||
|
|
||||||
void myHandleCallbacks()
|
void myHandleCallbacks()
|
||||||
{
|
{
|
||||||
DataPacket packet = null;
|
DataPacket? packet;
|
||||||
|
|
||||||
if (myLastL == null || myLastR == null)
|
if (myLastL == null || myLastR == null)
|
||||||
{
|
{
|
||||||
packet = myLastL == null ? myLastR : myLastL;
|
packet = myLastL == null ? myLastR : myLastL;
|
||||||
if (packet != null)
|
if (packet != null) {
|
||||||
myFireEvent(packet);
|
myFireEvent(packet);
|
||||||
|
myLastFired = new BlueTable(packet.newRows);
|
||||||
myLastFired = new BlueTable(packet.newRows);
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
BlueTable table = new BlueTable(myLastL.newRows.schema);
|
BlueTable table = new BlueTable(myLastL.newRows.schema);
|
||||||
|
|
||||||
Dictionary<List<object>, Pair<BlueRow, BlueRow>> rowPairs = new Dictionary<List<object>, Pair<BlueRow, BlueRow>>(new ListComparer());
|
Dictionary<List<object>, Pair<BlueRow?, BlueRow?>> rowPairs = new(new ListComparer());
|
||||||
|
|
||||||
foreach(BlueRow row in myLastL.newRows)
|
foreach(BlueRow row in myLastL.newRows)
|
||||||
{
|
{
|
||||||
@@ -104,7 +99,7 @@ namespace BCG
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
rowPairs[hash] = new Pair<BlueRow, BlueRow>(row, null);
|
rowPairs[hash] = new(row, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach (BlueRow row in myLastR.newRows)
|
foreach (BlueRow row in myLastR.newRows)
|
||||||
@@ -119,12 +114,11 @@ namespace BCG
|
|||||||
catch (Exception) { }
|
catch (Exception) { }
|
||||||
}
|
}
|
||||||
|
|
||||||
Pair<BlueRow, BlueRow> pair;
|
rowPairs.TryGetValue(hash, out var pair);
|
||||||
rowPairs.TryGetValue(hash, out pair);
|
|
||||||
|
|
||||||
|
|
||||||
if (pair == null)
|
if (pair == null)
|
||||||
pair = new Pair<BlueRow, BlueRow>(null, row);
|
pair = new(null, row);
|
||||||
else
|
else
|
||||||
pair.second = row;
|
pair.second = row;
|
||||||
|
|
||||||
@@ -132,13 +126,11 @@ namespace BCG
|
|||||||
}
|
}
|
||||||
|
|
||||||
int id = 0;
|
int id = 0;
|
||||||
foreach (KeyValuePair<List<object>, Pair<BlueRow, BlueRow>> hashpair in rowPairs)
|
foreach (var (hashVals, pair) in rowPairs)
|
||||||
{
|
{
|
||||||
Pair<BlueRow, BlueRow> pair = hashpair.Value;
|
|
||||||
|
|
||||||
if (pair.first == null || pair.second == null)
|
if (pair.first == null || pair.second == null)
|
||||||
{
|
{
|
||||||
BlueRow row = pair.first == null ? pair.second : pair.first;
|
var row = pair.first ?? pair.second ?? throw new InvalidOperationException("Both rows in pair are null");
|
||||||
|
|
||||||
Dictionary<string, object> newRow = new Dictionary<string, object>();
|
Dictionary<string, object> newRow = new Dictionary<string, object>();
|
||||||
foreach (ColumnInfo info in row.schema.columnInfo)
|
foreach (ColumnInfo info in row.schema.columnInfo)
|
||||||
@@ -211,4 +203,4 @@ namespace BCG
|
|||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -8,25 +8,20 @@ using mbts.config;
|
|||||||
using System;
|
using System;
|
||||||
using System.Text.RegularExpressions;
|
using System.Text.RegularExpressions;
|
||||||
|
|
||||||
namespace BCG.StreamWorld.Addition
|
namespace BCG.StreamWorld.Addition {
|
||||||
{
|
[DataStreamUserRespresentation(false)]
|
||||||
[DataStreamUserRespresentation (false)]
|
public class FilterStream : ViewStream {
|
||||||
public class FilterStream : ViewStream
|
|
||||||
{
|
|
||||||
private ViewStream myBaseStream;
|
private ViewStream myBaseStream;
|
||||||
private BlueTable myBaseTable, myStateTable;
|
private BlueTable myBaseTable, myStateTable;
|
||||||
private IStreamFilter myFilter;
|
private IStreamFilter myFilter;
|
||||||
|
|
||||||
public FilterStream(ViewStream vs)
|
public FilterStream(ViewStream vs)
|
||||||
: this(vs, "1=1")
|
: this(vs, "1=1") { }
|
||||||
{ }
|
|
||||||
|
|
||||||
public FilterStream(ViewStream vs, string filterExp)
|
public FilterStream(ViewStream vs, string filterExp)
|
||||||
: this(vs, new BooleanExpressionFilter(filterExp))
|
: this(vs, new BooleanExpressionFilter(filterExp)) { }
|
||||||
{ }
|
|
||||||
|
|
||||||
public FilterStream(ViewStream vs, IStreamFilter filter)
|
public FilterStream(ViewStream vs, IStreamFilter filter) {
|
||||||
{
|
|
||||||
myBaseStream = vs;
|
myBaseStream = vs;
|
||||||
myFilter = filter;
|
myFilter = filter;
|
||||||
vs.ErrorChanged += OnError;
|
vs.ErrorChanged += OnError;
|
||||||
@@ -35,10 +30,8 @@ namespace BCG.StreamWorld.Addition
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
protected override void myOnFirstSubscriber()
|
protected override void myOnFirstSubscriber() =>
|
||||||
{
|
|
||||||
myBaseStream.onChange += myHandleChanges;
|
myBaseStream.onChange += myHandleChanges;
|
||||||
}
|
|
||||||
|
|
||||||
protected override void myOnLastSubscriber()
|
protected override void myOnLastSubscriber()
|
||||||
{
|
{
|
||||||
@@ -57,23 +50,19 @@ namespace BCG.StreamWorld.Addition
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void myHandleChanges(object newValue)
|
private void myHandleChanges(object newValue) {
|
||||||
{
|
|
||||||
try {
|
try {
|
||||||
DataPacket dp = newValue as DataPacket;
|
DataPacket dp = newValue as DataPacket;
|
||||||
if (myStateTable == null)
|
if (myStateTable == null) {
|
||||||
{
|
|
||||||
bts.Log.assert(myBaseTable == null);
|
bts.Log.assert(myBaseTable == null);
|
||||||
myStateTable = new BlueTable(dp.schema);
|
myStateTable = new BlueTable(dp.schema);
|
||||||
myBaseTable = new BlueTable(dp.schema);
|
myBaseTable = new BlueTable(dp.schema);
|
||||||
}
|
}
|
||||||
BlueTable dels = new BlueTable(dp.schema),
|
BlueTable dels = new BlueTable(dp.schema),
|
||||||
adds = new BlueTable(dp.schema);
|
adds = new BlueTable(dp.schema);
|
||||||
foreach (IBlueRow r in dp.deletedRows)
|
foreach (IBlueRow r in dp.deletedRows) {
|
||||||
{
|
|
||||||
myBaseTable.deleteRow(r);
|
myBaseTable.deleteRow(r);
|
||||||
if (myStateTable.containsID((int)r["id"]))
|
if (myStateTable.containsID((int)r["id"])) {
|
||||||
{
|
|
||||||
dels.addRow(r);
|
dels.addRow(r);
|
||||||
myStateTable.deleteRow(r);
|
myStateTable.deleteRow(r);
|
||||||
}
|
}
|
||||||
@@ -85,21 +74,17 @@ namespace BCG.StreamWorld.Addition
|
|||||||
myStateTable.addRow(r);
|
myStateTable.addRow(r);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if ((dels.Count > 0 || adds.Count > 0) || (myLastValue == null)) {
|
if ((dels.Count > 0 || adds.Count > 0) || (myLastValue == null))
|
||||||
myFireEvent(new DataPacket(myStateTable, adds, dels));
|
myFireEvent(new DataPacket(myStateTable, adds, dels));
|
||||||
}
|
|
||||||
} catch (Exception ex) {
|
} catch (Exception ex) {
|
||||||
OnError(ex);
|
OnError(ex);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public IStreamFilter filter
|
public IStreamFilter filter {
|
||||||
{
|
set {
|
||||||
set
|
|
||||||
{
|
|
||||||
myFilter = value;
|
myFilter = value;
|
||||||
if (myBaseTable != null)
|
if (myBaseTable != null) {
|
||||||
{
|
|
||||||
IBlueRowCollection oldState = new BlueTable(myStateTable);
|
IBlueRowCollection oldState = new BlueTable(myStateTable);
|
||||||
myStateTable.clear();
|
myStateTable.clear();
|
||||||
// If the filter throws an exception, we can rethrow it as a StreamFilterException
|
// If the filter throws an exception, we can rethrow it as a StreamFilterException
|
||||||
@@ -245,27 +230,31 @@ namespace BCG
|
|||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
private void myHandleCallbacks(object newValue) {
|
private void myHandleCallbacks(object newValue)
|
||||||
|
{
|
||||||
DataPacket retVal;
|
DataPacket retVal;
|
||||||
DataPacket arrivedPacket = newValue as DataPacket;
|
DataPacket arrivedPacket = newValue as DataPacket;
|
||||||
myLastReceivedRows = arrivedPacket.newRows;
|
myLastReceivedRows = arrivedPacket.newRows;
|
||||||
try {
|
try {
|
||||||
if (myLastFiredRows != null) {
|
if (myLastFiredRows != null)
|
||||||
|
{
|
||||||
retVal = new DataPacket(myLastFiredRows, new BlueTable(myLastFiredRows.schema),
|
retVal = new DataPacket(myLastFiredRows, new BlueTable(myLastFiredRows.schema),
|
||||||
new BlueTable(myLastFiredRows.schema));
|
new BlueTable(myLastFiredRows.schema));
|
||||||
foreach (IBlueRow r in arrivedPacket.deletedRows) {
|
foreach (IBlueRow r in arrivedPacket.deletedRows)
|
||||||
if (myLastFiredRows.containsID((int)r["id"])) {
|
if (myLastFiredRows.containsID((int)r["id"]))
|
||||||
|
{
|
||||||
myLastFiredRows.deleteRow(r);
|
myLastFiredRows.deleteRow(r);
|
||||||
(retVal.deletedRows as BlueTable).addRow(r);
|
(retVal.deletedRows as BlueTable).addRow(r);
|
||||||
}
|
}
|
||||||
}
|
foreach (IBlueRow r in arrivedPacket.addedRows)
|
||||||
foreach (IBlueRow r in arrivedPacket.addedRows) {
|
if (filterRow(r))
|
||||||
if (filterRow(r)) {
|
{
|
||||||
myLastFiredRows.addRow(r);
|
myLastFiredRows.addRow(r);
|
||||||
(retVal.addedRows as BlueTable).addRow(r);
|
(retVal.addedRows as BlueTable).addRow(r);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
else
|
||||||
|
{
|
||||||
myLastFiredRows = new BlueTable(arrivedPacket.schema);
|
myLastFiredRows = new BlueTable(arrivedPacket.schema);
|
||||||
retVal = new DataPacket(myLastFiredRows, myLastFiredRows, new BlueTable(myLastFiredRows.schema));
|
retVal = new DataPacket(myLastFiredRows, myLastFiredRows, new BlueTable(myLastFiredRows.schema));
|
||||||
foreach (IBlueRow r in arrivedPacket.newRows)
|
foreach (IBlueRow r in arrivedPacket.newRows)
|
||||||
@@ -291,19 +280,18 @@ namespace BCG
|
|||||||
myFilter = value;
|
myFilter = value;
|
||||||
if (numberOfSubscribers > 0)
|
if (numberOfSubscribers > 0)
|
||||||
{
|
{
|
||||||
if (myLastReceivedRows != null) {
|
if (myLastReceivedRows != null)
|
||||||
|
{
|
||||||
try {
|
try {
|
||||||
BlueTable nRows = new BlueTable(myLastReceivedRows.schema);
|
BlueTable nRows = new BlueTable(myLastReceivedRows.schema);
|
||||||
foreach (IBlueRow r in myLastReceivedRows) {
|
foreach (IBlueRow r in myLastReceivedRows)
|
||||||
if (filterRow(r)) {
|
if (filterRow(r))
|
||||||
nRows.addRow(r);
|
nRows.addRow(r);
|
||||||
}
|
IBlueRowCollection dRows = new BlueTable(nRows.schema),
|
||||||
}
|
aRows = new BlueTable(nRows.schema);
|
||||||
IBlueRowCollection dRows = new BlueTable(nRows.schema),
|
BlueDataUtility.computeDifferences(nRows, myLastFiredRows, out dRows, out aRows);
|
||||||
aRows = new BlueTable(nRows.schema);
|
myLastFiredRows = nRows;
|
||||||
BlueDataUtility.computeDifferences(nRows, myLastFiredRows, out dRows, out aRows);
|
myFireEvent(new DataPacket(nRows, aRows, dRows));
|
||||||
myLastFiredRows = nRows;
|
|
||||||
myFireEvent(new DataPacket(nRows, aRows, dRows));
|
|
||||||
} catch (Exception ex) {
|
} catch (Exception ex) {
|
||||||
OnError(ex);
|
OnError(ex);
|
||||||
}
|
}
|
||||||
@@ -336,8 +324,10 @@ namespace BCG
|
|||||||
try {
|
try {
|
||||||
return myFilter.filter(r);
|
return myFilter.filter(r);
|
||||||
} catch (Exception ex) {
|
} catch (Exception ex) {
|
||||||
throw new StreamFilterException(StreamId, StreamName, null, ex, r);
|
Log.Gen.error($"FilterStream delegate threw exception: {ex}");
|
||||||
|
OnError(new StreamFilterException(StreamId, StreamName, null, ex, r));
|
||||||
}
|
}
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -52,14 +52,14 @@ namespace BCG {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public TimeBasedFilter(ViewStreamDatabase vsd, string rowTimeColumnName, TimeSpan rowTimeToLive)
|
public TimeBasedFilter(ViewStreamDatabase vsd, string rowTimeColumnName, TimeSpan rowTimeToLive)
|
||||||
: this(vsd, rowTimeColumnName, rowTimeToLive, new TimeSpan(0, 1, 0) /* 1 minute */) {
|
: this(vsd, rowTimeColumnName, rowTimeToLive, rowTimeToLive) {
|
||||||
}
|
}
|
||||||
|
|
||||||
public TimeBasedFilter(ViewStreamDatabase vsd, string rowTimeColumnName, TimeSpan rowTimeToLive, TimeSpan filterFrequency) {
|
public TimeBasedFilter(ViewStreamDatabase vsd, string rowTimeColumnName, TimeSpan rowTimeToLive, TimeSpan filter_period) {
|
||||||
myVsd = vsd;
|
myVsd = vsd;
|
||||||
_time_col = rowTimeColumnName;
|
_time_col = rowTimeColumnName;
|
||||||
_ttl = rowTimeToLive;
|
_ttl = rowTimeToLive;
|
||||||
myFilterFrequency = filterFrequency;
|
_filter_period = filter_period;
|
||||||
myNextFilter = DateTime.MinValue;
|
myNextFilter = DateTime.MinValue;
|
||||||
|
|
||||||
// add worker
|
// add worker
|
||||||
@@ -92,7 +92,7 @@ namespace BCG {
|
|||||||
// fire event
|
// fire event
|
||||||
onFilterChange?.Invoke();
|
onFilterChange?.Invoke();
|
||||||
|
|
||||||
myNextFilter = now.Add(myFilterFrequency);
|
myNextFilter = now.Add(_filter_period);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
@@ -108,7 +108,7 @@ namespace BCG {
|
|||||||
private ViewStreamDatabase myVsd;
|
private ViewStreamDatabase myVsd;
|
||||||
private string _time_col;
|
private string _time_col;
|
||||||
private TimeSpan _ttl;
|
private TimeSpan _ttl;
|
||||||
private TimeSpan myFilterFrequency;
|
private TimeSpan _filter_period;
|
||||||
private DateTime myNextFilter;
|
private DateTime myNextFilter;
|
||||||
#endregion
|
#endregion
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,8 @@
|
|||||||
using System;
|
using bts;
|
||||||
|
|
||||||
|
using Bts.DataStreamCore;
|
||||||
|
|
||||||
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
@@ -40,12 +44,12 @@ namespace BCG
|
|||||||
private IComparer<IBlueRow> myRightCompare;
|
private IComparer<IBlueRow> myRightCompare;
|
||||||
protected FuzzyRowComparer myFuzzyCompare;
|
protected FuzzyRowComparer myFuzzyCompare;
|
||||||
protected TimeSpan myTimeWindow;
|
protected TimeSpan myTimeWindow;
|
||||||
protected IBlueTableSchema myLeftSchema;
|
protected IBlueTableSchema? myLeftSchema;
|
||||||
protected IBlueTableSchema myRightSchema;
|
protected IBlueTableSchema? myRightSchema;
|
||||||
protected IBlueTableSchema myOutputSchema;
|
protected IBlueTableSchema? myOutputSchema;
|
||||||
private int myID = 0;
|
private int myID = 0;
|
||||||
|
|
||||||
protected TimeWindowTable myStateRows;
|
protected TimeWindowTable? myStateRows;
|
||||||
|
|
||||||
private DateTime myNextCull;
|
private DateTime myNextCull;
|
||||||
const long MinCullIntervalMS = 1000;
|
const long MinCullIntervalMS = 1000;
|
||||||
@@ -65,7 +69,7 @@ namespace BCG
|
|||||||
this.myFuzzyCompare = fuzzyCompare;
|
this.myFuzzyCompare = fuzzyCompare;
|
||||||
}
|
}
|
||||||
|
|
||||||
public virtual IBlueTableSchema OutputSchema
|
public virtual IBlueTableSchema? OutputSchema
|
||||||
{
|
{
|
||||||
get
|
get
|
||||||
{
|
{
|
||||||
@@ -150,7 +154,7 @@ namespace BCG
|
|||||||
int count;
|
int count;
|
||||||
for (count = 0; count < list.Count; count++)
|
for (count = 0; count < list.Count; count++)
|
||||||
{
|
{
|
||||||
if ((DateTime)list[count][timeColumn] > expiry)
|
if (list[count].GetValue<DateTime>(timeColumn) > expiry)
|
||||||
{
|
{
|
||||||
// Stop when we find the first row that we can keep. Since this is sorted all others are also kept.
|
// Stop when we find the first row that we can keep. Since this is sorted all others are also kept.
|
||||||
break;
|
break;
|
||||||
@@ -172,14 +176,17 @@ namespace BCG
|
|||||||
this.myFitness = fitness;
|
this.myFitness = fitness;
|
||||||
}
|
}
|
||||||
public IBlueRow myRightRow { get; private set; }
|
public IBlueRow myRightRow { get; private set; }
|
||||||
public IBlueRow myLeftRow { get; set; }
|
public IBlueRow? myLeftRow { get; set; }
|
||||||
public double myFitness { get; private set; }
|
public double myFitness { get; private set; }
|
||||||
public IBlueRow myMergedRow { get; set; }
|
public IBlueRow? myMergedRow { get; set; }
|
||||||
|
|
||||||
#region IComparable<RowMatch> Members
|
#region IComparable<RowMatch> Members
|
||||||
|
|
||||||
public int CompareTo(RowMatch other)
|
public int CompareTo(RowMatch? other)
|
||||||
{
|
{
|
||||||
|
if (other is null) {
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
return myFitness.CompareTo(other.myFitness);
|
return myFitness.CompareTo(other.myFitness);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -262,6 +269,10 @@ namespace BCG
|
|||||||
|
|
||||||
private void HandleCorrection(List<RowMatch> corrections, BlueTable adds, BlueTable dels)
|
private void HandleCorrection(List<RowMatch> corrections, BlueTable adds, BlueTable dels)
|
||||||
{
|
{
|
||||||
|
if (corrections.Count == 0) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
Log.notnull(myStateRows);
|
||||||
// We already emitted correction.MergedRow so we need to redact that and
|
// We already emitted correction.MergedRow so we need to redact that and
|
||||||
// then emit correction.left as an add since it is no longer matched
|
// then emit correction.left as an add since it is no longer matched
|
||||||
foreach (RowMatch correction in corrections.Distinct())
|
foreach (RowMatch correction in corrections.Distinct())
|
||||||
@@ -285,7 +296,7 @@ namespace BCG
|
|||||||
int r = 0;
|
int r = 0;
|
||||||
for (l = 0, r = 0; l < leftExpired.Length && r < rightExpired.Length; )
|
for (l = 0, r = 0; l < leftExpired.Length && r < rightExpired.Length; )
|
||||||
{
|
{
|
||||||
if ((DateTime)leftExpired[l][this.myLeftTimeColumn] <= (DateTime)rightExpired[r][this.myRightTimeColumn])
|
if (leftExpired[l].GetValue<DateTime>(myLeftTimeColumn) <= rightExpired[r].GetValue<DateTime>(myRightTimeColumn))
|
||||||
{
|
{
|
||||||
// Advance Left
|
// Advance Left
|
||||||
IEnumerable<RowMatch> rm = rightMatches[l];
|
IEnumerable<RowMatch> rm = rightMatches[l];
|
||||||
@@ -332,7 +343,7 @@ namespace BCG
|
|||||||
|
|
||||||
private IBlueRow MergeLeftWithBestRight(IBlueRow leftRow, IEnumerable<RowMatch> rightMatches)
|
private IBlueRow MergeLeftWithBestRight(IBlueRow leftRow, IEnumerable<RowMatch> rightMatches)
|
||||||
{
|
{
|
||||||
IBlueRow merged = null;
|
IBlueRow? merged = null;
|
||||||
if (rightMatches != null)
|
if (rightMatches != null)
|
||||||
{
|
{
|
||||||
foreach (RowMatch match in rightMatches)
|
foreach (RowMatch match in rightMatches)
|
||||||
@@ -366,9 +377,9 @@ namespace BCG
|
|||||||
/// Override this function to provide a custom row merge.
|
/// Override this function to provide a custom row merge.
|
||||||
/// The overrided function must add a new column called FuzzyJoinOverTimeStream.NEW_TIME_COLUMN which will contain a timestamp for sorting.
|
/// The overrided function must add a new column called FuzzyJoinOverTimeStream.NEW_TIME_COLUMN which will contain a timestamp for sorting.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
protected virtual IBlueRow MergeRows(IBlueRow left, IBlueRow right)
|
protected virtual IBlueRow MergeRows(IBlueRow? left, IBlueRow? right)
|
||||||
{
|
{
|
||||||
Dictionary<string, object> newRow = new Dictionary<string, object>();
|
Dictionary<string, object?> newRow = new();
|
||||||
|
|
||||||
if (left == null && right == null) throw new ArgumentException("oh come on.");
|
if (left == null && right == null) throw new ArgumentException("oh come on.");
|
||||||
|
|
||||||
@@ -393,14 +404,14 @@ namespace BCG
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
newRow["id"] = this.myID++;
|
newRow["id"] = this.myID++;
|
||||||
newRow[NEW_TIME_COLUMN] = (left != null) ? left[this.myLeftTimeColumn] : right[this.myRightTimeColumn];
|
newRow[NEW_TIME_COLUMN] = (left != null) ? left[myLeftTimeColumn] : right![myRightTimeColumn];
|
||||||
|
|
||||||
return new BlueRow(this.OutputSchema, newRow);
|
return new BlueRow(this.OutputSchema, newRow);
|
||||||
}
|
}
|
||||||
|
|
||||||
private IEnumerable<RowMatch> FindMatches(IBlueRow row, List<IBlueRow> list, List<RowMatch> corrections)
|
private IEnumerable<RowMatch>? FindMatches(IBlueRow row, List<IBlueRow> list, List<RowMatch> corrections)
|
||||||
{
|
{
|
||||||
List<RowMatch> matches = null;
|
List<RowMatch>? matches = null;
|
||||||
|
|
||||||
// Search through all rows in list and compare with the fuzzy comparer
|
// Search through all rows in list and compare with the fuzzy comparer
|
||||||
for (int x = 0; x < list.Count; x++)
|
for (int x = 0; x < list.Count; x++)
|
||||||
@@ -421,21 +432,15 @@ namespace BCG
|
|||||||
matches.Insert(insertIndex >= 0 ? insertIndex : ~insertIndex, currentMatch);
|
matches.Insert(insertIndex >= 0 ? insertIndex : ~insertIndex, currentMatch);
|
||||||
|
|
||||||
// Mark the best match for this particular right hand match
|
// Mark the best match for this particular right hand match
|
||||||
RowMatch oldMatch;
|
if (myBestMatch.TryGetValue(match, out var oldMatch)) {
|
||||||
if (this.myBestMatch.TryGetValue(match, out oldMatch))
|
if (currentMatch.myFitness < oldMatch.myFitness) {
|
||||||
{
|
|
||||||
if (currentMatch.myFitness < oldMatch.myFitness)
|
|
||||||
{
|
|
||||||
this.myBestMatch[match] = currentMatch;
|
this.myBestMatch[match] = currentMatch;
|
||||||
if (oldMatch.myMergedRow != null)
|
if (oldMatch.myMergedRow != null) {
|
||||||
{
|
|
||||||
// We already emitted oldMatch.MergedRow so we need to fix it
|
// We already emitted oldMatch.MergedRow so we need to fix it
|
||||||
corrections.Add(oldMatch);
|
corrections.Add(oldMatch);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
this.myBestMatch[match] = currentMatch;
|
this.myBestMatch[match] = currentMatch;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,42 +4,46 @@ namespace bts.SilverPine {
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
//using MathNet.Numerics.Statistics;
|
||||||
|
|
||||||
using ZstdSharp.Unsafe;
|
|
||||||
|
|
||||||
public enum GroupByBundleOp {
|
public enum MultiRowOp {
|
||||||
Mean,
|
Mean,
|
||||||
Median,
|
Median,
|
||||||
Mode,
|
Mode,
|
||||||
|
Range,
|
||||||
StdDev,
|
StdDev,
|
||||||
Max,
|
Max,
|
||||||
Min,
|
Min,
|
||||||
First,
|
First,
|
||||||
Last,
|
Last,
|
||||||
Sum
|
Sum,
|
||||||
|
EdgeDiff,
|
||||||
|
EdgeDiffPercentage,
|
||||||
|
//IsEdgeDiff,
|
||||||
}
|
}
|
||||||
public class GroupByBundle {
|
public class MultiRowOpHelper {
|
||||||
public readonly List<Tuple<string, GroupByBundleOp>> operations;
|
public readonly List<Tuple<string, MultiRowOp>> operations;
|
||||||
|
|
||||||
public static GroupByBundle parse(string text) {
|
public static MultiRowOpHelper parse(string text) {
|
||||||
// text is inp_col: op, inp_col: op, inp_col:op
|
// text is inp_col: op, inp_col: op, inp_col:op
|
||||||
List<Tuple<string, GroupByBundleOp>> rv = new List<Tuple<string, GroupByBundleOp>>();
|
List<Tuple<string, MultiRowOp>> rv = new List<Tuple<string, MultiRowOp>>();
|
||||||
string[] calcs = text.Split(',');
|
string[] calcs = text.Split(',');
|
||||||
foreach (string c in calcs) {
|
foreach (string c in calcs) {
|
||||||
string[] toks = c.Split(':');
|
string[] toks = c.Split(':');
|
||||||
string inp_col = toks[0].Trim();
|
string inp_col = toks[0].Trim();
|
||||||
string op_txt = toks[1].Trim();
|
string op_txt = toks[1].Trim();
|
||||||
GroupByBundleOp op = Enum.Parse<GroupByBundleOp>(op_txt, true);
|
MultiRowOp op = Enum.Parse<MultiRowOp>(op_txt, true);
|
||||||
rv.Add(Tuple.Create(inp_col, op));
|
rv.Add(Tuple.Create(inp_col, op));
|
||||||
}
|
}
|
||||||
return new GroupByBundle(rv);
|
return new MultiRowOpHelper(rv);
|
||||||
}
|
}
|
||||||
|
|
||||||
public GroupByBundle(List<Tuple<string, GroupByBundleOp>> operations_) {
|
public MultiRowOpHelper(List<Tuple<string, MultiRowOp>> operations_) {
|
||||||
operations = operations_;
|
operations = operations_;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static IBlueRow group_by(List<IBlueRow> rows, GroupByBundle parameters) {
|
public static IBlueRow group_by(List<IBlueRow> rows, MultiRowOpHelper parameters) {
|
||||||
if (rows.Count() == 0) {
|
if (rows.Count() == 0) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
@@ -47,8 +51,8 @@ namespace bts.SilverPine {
|
|||||||
IBlueRow ir = rows.ElementAt(0);
|
IBlueRow ir = rows.ElementAt(0);
|
||||||
IBlueTableSchema in_schema = ir.schema;
|
IBlueTableSchema in_schema = ir.schema;
|
||||||
IBlueTableSchema out_schema = in_schema;
|
IBlueTableSchema out_schema = in_schema;
|
||||||
IDictionary<string, Tuple<string, GroupByBundleOp>> out_col_map =
|
IDictionary<string, Tuple<string, MultiRowOp>> out_col_map =
|
||||||
new Dictionary<string, Tuple<string, GroupByBundleOp>>();
|
new Dictionary<string, Tuple<string, MultiRowOp>>();
|
||||||
foreach (var t in parameters.operations) {
|
foreach (var t in parameters.operations) {
|
||||||
string out_col_name = $"{t.Item1}_{t.Item2}".ToLower();
|
string out_col_name = $"{t.Item1}_{t.Item2}".ToLower();
|
||||||
out_schema = out_schema.add_column(TypeCode.Double, out_col_name);
|
out_schema = out_schema.add_column(TypeCode.Double, out_col_name);
|
||||||
@@ -58,7 +62,7 @@ namespace bts.SilverPine {
|
|||||||
foreach (var kv in out_col_map) {
|
foreach (var kv in out_col_map) {
|
||||||
string out_col_name = kv.Key;
|
string out_col_name = kv.Key;
|
||||||
string in_col_name = kv.Value.Item1;
|
string in_col_name = kv.Value.Item1;
|
||||||
GroupByBundleOp op = kv.Value.Item2;
|
MultiRowOp op = kv.Value.Item2;
|
||||||
IEnumerable<double> col_vals = BlueDataUtility.get_colvalues<double>(rows, in_col_name);
|
IEnumerable<double> col_vals = BlueDataUtility.get_colvalues<double>(rows, in_col_name);
|
||||||
double comp_res = compute_op(col_vals, op);
|
double comp_res = compute_op(col_vals, op);
|
||||||
or.setValue(out_col_name, comp_res);
|
or.setValue(out_col_name, comp_res);
|
||||||
@@ -66,20 +70,51 @@ namespace bts.SilverPine {
|
|||||||
return or;
|
return or;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static double compute_op(IEnumerable<double> col_vals, GroupByBundleOp op) {
|
// 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.
|
||||||
|
|
||||||
|
public IBlueRow rolling_calc(List<IBlueRow> rolling_rows) {
|
||||||
|
if (rolling_rows.Count() == 0) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
IBlueRow ir = rolling_rows.ElementAt(0);
|
||||||
|
IBlueTableSchema in_schema = ir.schema;
|
||||||
|
IBlueTableSchema out_schema = in_schema;
|
||||||
|
IDictionary<string, Tuple<string, MultiRowOp>> out_col_map =
|
||||||
|
new Dictionary<string, Tuple<string, MultiRowOp>>();
|
||||||
|
foreach (var t in operations) {
|
||||||
|
string out_col_name = $"{t.Item1}_{t.Item2}".ToLower();
|
||||||
|
out_schema = out_schema.add_column(TypeCode.Double, out_col_name);
|
||||||
|
out_col_map[out_col_name] = t;
|
||||||
|
}
|
||||||
|
MutableBlueRow or = new MutableBlueRow(out_schema, ir);
|
||||||
|
foreach (var kv in out_col_map) {
|
||||||
|
string out_col_name = kv.Key;
|
||||||
|
string in_col_name = kv.Value.Item1;
|
||||||
|
MultiRowOp op = kv.Value.Item2;
|
||||||
|
IEnumerable<double> col_vals = BlueDataUtility.get_colvalues<double>(rolling_rows, in_col_name);
|
||||||
|
double comp_res = compute_op(col_vals, op);
|
||||||
|
or.setValue(out_col_name, comp_res);
|
||||||
|
}
|
||||||
|
return or;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static double compute_op(IEnumerable<double> col_vals, MultiRowOp op) {
|
||||||
switch (op) {
|
switch (op) {
|
||||||
case GroupByBundleOp.Max:
|
case MultiRowOp.Max:
|
||||||
return col_vals.Max<double>();
|
return col_vals.Max<double>();
|
||||||
case GroupByBundleOp.Min:
|
case MultiRowOp.Min:
|
||||||
return col_vals.Min<double>();
|
return col_vals.Min<double>();
|
||||||
case GroupByBundleOp.Mean:
|
case MultiRowOp.Mean:
|
||||||
return col_vals.Sum() / col_vals.Count();
|
return col_vals.Sum() / col_vals.Count();
|
||||||
case GroupByBundleOp.Sum:
|
case MultiRowOp.Sum:
|
||||||
return col_vals.Sum();
|
return col_vals.Sum();
|
||||||
case GroupByBundleOp.First:
|
case MultiRowOp.First:
|
||||||
return col_vals.First();
|
return col_vals.First();
|
||||||
case GroupByBundleOp.Last:
|
case MultiRowOp.Last:
|
||||||
return col_vals.Last();
|
return col_vals.Last();
|
||||||
|
case MultiRowOp.StdDev:
|
||||||
|
return MathNet.Numerics.Statistics.Statistics.StandardDeviation(col_vals);
|
||||||
default:
|
default:
|
||||||
// TODO
|
// TODO
|
||||||
Log.assert(false);
|
Log.assert(false);
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ using System.Collections.Generic;
|
|||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
|
||||||
namespace BCG {
|
namespace BCG {
|
||||||
public 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;
|
private Func<DataPacket, IBlueRow> _groupby_func;
|
||||||
|
|||||||
@@ -0,0 +1,20 @@
|
|||||||
|
namespace bts.SilverPine {
|
||||||
|
using BCG;
|
||||||
|
|
||||||
|
using System;
|
||||||
|
|
||||||
|
[DataStreamUserRespresentation("AggregationStream")]
|
||||||
|
public class AgregationStream : ViewStream {
|
||||||
|
|
||||||
|
public AgregationStream(ViewStream parent_str, string operation_txt) {
|
||||||
|
ViewStream rs = new NonIncGroupByStream(parent_str, String.Empty, operation_txt);
|
||||||
|
mySetRealSource(rs);
|
||||||
|
}
|
||||||
|
|
||||||
|
public AgregationStream(ViewStream parent_str, string groupby_col, string operation_txt) {
|
||||||
|
ViewStream rs = new NonIncGroupByStream(parent_str, groupby_col, operation_txt);
|
||||||
|
mySetRealSource(rs);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
+16
-6
@@ -7,8 +7,10 @@ using System.Text.Json;
|
|||||||
using bts;
|
using bts;
|
||||||
using bts.SilverPine;
|
using bts.SilverPine;
|
||||||
|
|
||||||
|
using mbts.utils;
|
||||||
|
|
||||||
namespace BCG {
|
namespace BCG {
|
||||||
[DataStreamUserRespresentation("aggregate")]
|
//[DataStreamUserRespresentation("AggregateStream")]
|
||||||
public class NonIncGroupByStream : ViewStream {
|
public class NonIncGroupByStream : ViewStream {
|
||||||
private class DelNonIncGroupByEvaluator : INonIncGroupByEvaluator {
|
private class DelNonIncGroupByEvaluator : INonIncGroupByEvaluator {
|
||||||
Func<string[]> _groupby_cols_func;
|
Func<string[]> _groupby_cols_func;
|
||||||
@@ -53,15 +55,18 @@ namespace BCG {
|
|||||||
Func<List<IBlueRow>, List<IBlueRow>> evaluate_func)
|
Func<List<IBlueRow>, List<IBlueRow>> evaluate_func)
|
||||||
: this(main_stream, new DelNonIncGroupByEvaluator(groupby_cols_func, evaluate_func)) { }
|
: this(main_stream, new DelNonIncGroupByEvaluator(groupby_cols_func, evaluate_func)) { }
|
||||||
|
|
||||||
public NonIncGroupByStream(ViewStream parent_str, string groupby_col, string standard_group_by_text, string optional_sort_col = null) {
|
public NonIncGroupByStream(ViewStream parent_str, string groupby_col, string standard_group_by_text)
|
||||||
GroupByBundle std_group_by = GroupByBundle.parse(standard_group_by_text);
|
: this(parent_str, groupby_col, standard_group_by_text, String.Empty) { }
|
||||||
|
|
||||||
|
public NonIncGroupByStream(ViewStream parent_str, string groupby_col, string standard_group_by_text, string optional_sort_col) {
|
||||||
|
MultiRowOpHelper std_group_by = MultiRowOpHelper.parse(standard_group_by_text);
|
||||||
Func<string[]> groupby_cols_func = () => {
|
Func<string[]> groupby_cols_func = () => {
|
||||||
return String.IsNullOrEmpty(groupby_col) ? null : new string[] { groupby_col };
|
return String.IsNullOrEmpty(groupby_col) ? null : new string[] { groupby_col };
|
||||||
};
|
};
|
||||||
Func<List<IBlueRow>, List<IBlueRow>> evaluate_func = (group_rows) => {
|
Func<List<IBlueRow>, List<IBlueRow>> evaluate_func = (group_rows) => {
|
||||||
if (!String.IsNullOrEmpty(optional_sort_col))
|
if (!String.IsNullOrEmpty(optional_sort_col))
|
||||||
group_rows.Sort((r1, r2) => BlueDataUtility.compare_rows(r2, r1, optional_sort_col));
|
group_rows.Sort((r1, r2) => BlueDataUtility.compare_rows(r2, r1, optional_sort_col));
|
||||||
IBlueRow rv = GroupByBundle.group_by(group_rows, std_group_by);
|
IBlueRow rv = MultiRowOpHelper.group_by(group_rows, std_group_by);
|
||||||
return new IBlueRow[] { rv }.ToList();
|
return new IBlueRow[] { rv }.ToList();
|
||||||
};
|
};
|
||||||
ViewStream rs = new NonIncGroupByStream(parent_str, groupby_cols_func, evaluate_func);
|
ViewStream rs = new NonIncGroupByStream(parent_str, groupby_cols_func, evaluate_func);
|
||||||
@@ -77,7 +82,7 @@ namespace BCG {
|
|||||||
protected override void myOnLastSubscriber() { _main_stream.onChange -= _main_stream_onchange; }
|
protected override void myOnLastSubscriber() { _main_stream.onChange -= _main_stream_onchange; }
|
||||||
|
|
||||||
private void _main_stream_onchange(object nv) {
|
private void _main_stream_onchange(object nv) {
|
||||||
DataPacket dp = nv as DataPacket;
|
var dp = ExceptionAssert.Argument.Is<DataPacket>(nv);
|
||||||
///grouping together
|
///grouping together
|
||||||
_timer.Restart();
|
_timer.Restart();
|
||||||
IDictionary<int, List<IBlueRow>> grouped_rows = (_groupby_cols == null || _groupby_cols.Length == 0) ?
|
IDictionary<int, List<IBlueRow>> grouped_rows = (_groupby_cols == null || _groupby_cols.Length == 0) ?
|
||||||
@@ -106,7 +111,12 @@ namespace BCG {
|
|||||||
}
|
}
|
||||||
// TODO,
|
// TODO,
|
||||||
if (total_state != null)
|
if (total_state != null)
|
||||||
myFireEvent(new DataPacket(total_state, total_state, myLastValue == null ? new BlueTable(total_state.schema) : (myLastValue as DataPacket).newRows));
|
myFireEvent(new DataPacket(
|
||||||
|
total_state,
|
||||||
|
total_state,
|
||||||
|
myLastValue == null
|
||||||
|
? new BlueTable(total_state.schema)
|
||||||
|
: ExceptionAssert.of_type<DataPacket>(myLastValue).newRows));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,31 +1,31 @@
|
|||||||
using System;
|
//using System;
|
||||||
using System.Collections.Generic;
|
//using System.Collections.Generic;
|
||||||
using System.Linq;
|
//using System.Linq;
|
||||||
using System.Text;
|
//using System.Text;
|
||||||
|
|
||||||
namespace BCG
|
//namespace BCG
|
||||||
{
|
//{
|
||||||
public class FullJoinStream : ViewStream
|
// public class FullJoinStream : ViewStream
|
||||||
{
|
// {
|
||||||
private ViewStream myMainStream;
|
// private ViewStream myMainStream;
|
||||||
public FullJoinStream(ViewStream v1, string joinCol1, string cmExp1,
|
// public FullJoinStream(ViewStream v1, string joinCol1, string cmExp1,
|
||||||
ViewStream v2, string joinCol2, string cmExp2, string empty_col)
|
// ViewStream v2, string joinCol2, string cmExp2, string empty_col)
|
||||||
{
|
// {
|
||||||
myMainStream = new LeftJoinStream(v1, joinCol1, cmExp1, v2, joinCol2, cmExp2);
|
// myMainStream = new LeftJoinStream(v1, joinCol1, cmExp1, v2, joinCol2, cmExp2);
|
||||||
ViewStream filtered = new LeftJoinStream(v2, joinCol2, cmExp2, v1, joinCol1, cmExp1);
|
// ViewStream filtered = new LeftJoinStream(v2, joinCol2, cmExp2, v1, joinCol1, cmExp1);
|
||||||
filtered = new FilterStream(filtered, String.Format("{0}=null", empty_col));
|
// filtered = new FilterStream(filtered, String.Format("{0}=null", empty_col));
|
||||||
myMainStream = new AppendStream(myMainStream, filtered);
|
// myMainStream = new AppendStream(myMainStream, filtered);
|
||||||
}
|
// }
|
||||||
|
|
||||||
protected override void myOnFirstSubscriber()
|
// protected override void myOnFirstSubscriber()
|
||||||
{
|
// {
|
||||||
myMainStream.onChange += myHandleMainStreamChange;
|
// myMainStream.onChange += myHandleMainStreamChange;
|
||||||
}
|
// }
|
||||||
|
|
||||||
private void myHandleMainStreamChange(object newData)
|
// private void myHandleMainStreamChange(object newData)
|
||||||
{
|
// {
|
||||||
IBlueRowCollection result = (newData as DataPacket).newRows;
|
// IBlueRowCollection result = (newData as DataPacket).newRows;
|
||||||
myFireEvent(new DataPacket(result, result, myLastValue == null ? new BlueTable(result.schema) : (myLastValue as DataPacket).newRows));
|
// myFireEvent(new DataPacket(result, result, myLastValue == null ? new BlueTable(result.schema) : (myLastValue as DataPacket).newRows));
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
}
|
//}
|
||||||
@@ -1,6 +1,5 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections;
|
using System.Collections.Generic;
|
||||||
using BCG.Utilities;
|
|
||||||
|
|
||||||
namespace BCG
|
namespace BCG
|
||||||
{
|
{
|
||||||
@@ -11,7 +10,8 @@ namespace BCG
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
internal class JoinOperandRowIndex
|
internal class JoinOperandRowIndex
|
||||||
{
|
{
|
||||||
private IDictionary myJoinColDict = new Hashtable (), myIdDict = new Hashtable ();
|
readonly Dictionary<object, object> myJoinColDict = new();
|
||||||
|
readonly Dictionary<object, object> myIdDict = new();
|
||||||
private int myJoinColOrdinal, myIdColOrdinal;
|
private int myJoinColOrdinal, myIdColOrdinal;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -35,18 +35,18 @@ namespace BCG
|
|||||||
public void add (IBlueRow row)
|
public void add (IBlueRow row)
|
||||||
{
|
{
|
||||||
RowList list;
|
RowList list;
|
||||||
if (myJoinColDict[row[myJoinColOrdinal]] == null)
|
if (myJoinColDict[row[myJoinColOrdinal] ?? DBNull.Value] == null)
|
||||||
myJoinColDict[row[myJoinColOrdinal]] = list = new RowList ();
|
myJoinColDict[row[myJoinColOrdinal] ?? DBNull.Value] = list = new RowList ();
|
||||||
else
|
else
|
||||||
list = (RowList)myJoinColDict[row[myJoinColOrdinal]];
|
list = (RowList)myJoinColDict[row[myJoinColOrdinal] ?? DBNull.Value];
|
||||||
myIdDict[row[myIdColOrdinal]] = list.add (row);
|
myIdDict[row[myIdColOrdinal] ?? DBNull.Value] = list.add (row);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void remove (IBlueRow row)
|
public void remove (IBlueRow row)
|
||||||
{
|
{
|
||||||
RowNode node = (RowNode)myIdDict[row[myIdColOrdinal]];
|
RowNode node = (RowNode)myIdDict[row[myIdColOrdinal] ?? DBNull.Value];
|
||||||
((RowList)myJoinColDict[row[myJoinColOrdinal]]).remove (node);
|
((RowList)myJoinColDict[row[myJoinColOrdinal] ?? DBNull.Value]).remove (node);
|
||||||
myIdDict.Remove (row[myIdColOrdinal]);
|
myIdDict.Remove (row[myIdColOrdinal] ?? DBNull.Value);
|
||||||
}
|
}
|
||||||
|
|
||||||
public RowList getMatchingRows (object key)
|
public RowList getMatchingRows (object key)
|
||||||
|
|||||||
@@ -1,18 +1,20 @@
|
|||||||
using System;
|
using System;
|
||||||
using BCG.Utilities;
|
|
||||||
using System.Collections;
|
using System.Collections;
|
||||||
using bts;
|
using bts;
|
||||||
|
using Bts.DataStreamCore;
|
||||||
|
|
||||||
namespace BCG
|
namespace BCG
|
||||||
{
|
{
|
||||||
internal class JoinRow : IBlueRow
|
internal class JoinRow : IBlueRow
|
||||||
{
|
{
|
||||||
private RowNode myLeftNode, myRightNode;
|
RowNode? myLeftNode;
|
||||||
protected IBlueRow myLeftRow, myRightRow;
|
RowNode? myRightNode;
|
||||||
|
protected IBlueRow myLeftRow;
|
||||||
|
protected IBlueRow? myRightRow;
|
||||||
protected int myId;
|
protected int myId;
|
||||||
protected JoinTableSchema mySchema;
|
protected JoinTableSchema mySchema;
|
||||||
private object[] myValues;
|
private object?[] myValues;
|
||||||
|
|
||||||
#region Constructor(s)
|
#region Constructor(s)
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -21,8 +23,8 @@ namespace BCG
|
|||||||
/// <param name="leftRow">left row of the join</param>
|
/// <param name="leftRow">left row of the join</param>
|
||||||
/// <param name="rightRow">right row of the join</param>
|
/// <param name="rightRow">right row of the join</param>
|
||||||
/// <param name="schema">schema of the joined row</param>
|
/// <param name="schema">schema of the joined row</param>
|
||||||
public JoinRow (IBlueRow leftRow, IBlueRow rightRow, JoinTableSchema schema)
|
public JoinRow(IBlueRow leftRow, IBlueRow rightRow, JoinTableSchema schema)
|
||||||
: this ((int)leftRow["id"], leftRow, rightRow, schema) {}
|
: this(leftRow.Id(), leftRow, rightRow, schema) { }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Constructs a row assigning it the ID provioded as the first argument
|
/// Constructs a row assigning it the ID provioded as the first argument
|
||||||
@@ -31,7 +33,7 @@ namespace BCG
|
|||||||
/// <param name="leftRow">left row of the join</param>
|
/// <param name="leftRow">left row of the join</param>
|
||||||
/// <param name="rightRow">right row of the join</param>
|
/// <param name="rightRow">right row of the join</param>
|
||||||
/// <param name="schema">schema of the joined row</param>
|
/// <param name="schema">schema of the joined row</param>
|
||||||
public JoinRow (int id, IBlueRow leftRow, IBlueRow rightRow, JoinTableSchema schema)
|
public JoinRow (int id, IBlueRow leftRow, IBlueRow? rightRow, JoinTableSchema schema)
|
||||||
{
|
{
|
||||||
myId = id;
|
myId = id;
|
||||||
myLeftRow = leftRow;
|
myLeftRow = leftRow;
|
||||||
@@ -48,13 +50,13 @@ namespace BCG
|
|||||||
|
|
||||||
public bool isPartialJoin{get{return myRightRow == null;}}
|
public bool isPartialJoin{get{return myRightRow == null;}}
|
||||||
|
|
||||||
public RowNode leftNode
|
public RowNode? leftNode
|
||||||
{
|
{
|
||||||
get{return myLeftNode;}
|
get{return myLeftNode;}
|
||||||
set{myLeftNode = value;}
|
set{myLeftNode = value;}
|
||||||
}
|
}
|
||||||
|
|
||||||
public RowNode rightNode
|
public RowNode? rightNode
|
||||||
{
|
{
|
||||||
get{return myRightNode;}
|
get{return myRightNode;}
|
||||||
set{myRightNode = value;}
|
set{myRightNode = value;}
|
||||||
@@ -85,7 +87,7 @@ namespace BCG
|
|||||||
/// The key can either be the string corrsponding to the column name or
|
/// The key can either be the string corrsponding to the column name or
|
||||||
/// the order of the column
|
/// the order of the column
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public virtual object this [object key]
|
public virtual object? this [object key]
|
||||||
{
|
{
|
||||||
get
|
get
|
||||||
{
|
{
|
||||||
@@ -96,7 +98,7 @@ namespace BCG
|
|||||||
set {throw new NotSupportedException ("The IBlueRow is read only");}
|
set {throw new NotSupportedException ("The IBlueRow is read only");}
|
||||||
}
|
}
|
||||||
|
|
||||||
public object this [int index]
|
public object? this [int index]
|
||||||
{
|
{
|
||||||
get
|
get
|
||||||
{
|
{
|
||||||
@@ -119,7 +121,7 @@ namespace BCG
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public object this [string colName] {get{return this[mySchema[colName].colNo];}}
|
public object? this [string colName] {get{return this[mySchema[colName].colNo];}}
|
||||||
|
|
||||||
public ICollection Keys{get{return mySchema.columnNames;}}
|
public ICollection Keys{get{return mySchema.columnNames;}}
|
||||||
|
|
||||||
@@ -133,9 +135,11 @@ namespace BCG
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Add (object key, object value) {throw new NotSupportedException ("The IBlueRow is readonly");}
|
public void Add(object key, object? value) =>
|
||||||
|
throw new NotSupportedException("The IBlueRow is readonly");
|
||||||
|
|
||||||
public void Clear () {throw new NotSupportedException ("The IBlueRow is readonly");}
|
public void Clear() =>
|
||||||
|
throw new NotSupportedException ("The IBlueRow is readonly");
|
||||||
|
|
||||||
public bool Contains (object key){return mySchema[(string)key] != null;}
|
public bool Contains (object key){return mySchema[(string)key] != null;}
|
||||||
|
|
||||||
|
|||||||
@@ -1,11 +1,10 @@
|
|||||||
using System;
|
|
||||||
using System.Data;
|
|
||||||
using System.Collections;
|
|
||||||
using System.Text.RegularExpressions;
|
|
||||||
using BCG.Utilities;
|
|
||||||
using BCG.Utilities.General;
|
|
||||||
using bts;
|
using bts;
|
||||||
|
|
||||||
|
using mbts.utils;
|
||||||
|
|
||||||
|
using System;
|
||||||
|
using System.Collections;
|
||||||
|
|
||||||
namespace BCG
|
namespace BCG
|
||||||
{
|
{
|
||||||
public class JoinStream : ViewStream
|
public class JoinStream : ViewStream
|
||||||
@@ -111,8 +110,15 @@ namespace BCG
|
|||||||
{
|
{
|
||||||
if (myPs == null)
|
if (myPs == null)
|
||||||
{
|
{
|
||||||
JoinNameResolver resolver = new JoinNameResolver ((JoinTableSchema)myIjs.schema, myIjs.getSchema (true), myLeftCm.columnExpression,
|
ArgumentNullException.ThrowIfNull(myIjs);
|
||||||
myIjs.getSchema (false), myRightCm.columnExpression);
|
ArgumentNullException.ThrowIfNull(myLeftCm);
|
||||||
|
ArgumentNullException.ThrowIfNull(myRightCm);
|
||||||
|
var resolver = new JoinNameResolver(
|
||||||
|
ExceptionAssert.of_type<JoinTableSchema>(myIjs.schema),
|
||||||
|
myIjs.getSchema(true),
|
||||||
|
myLeftCm.columnExpression,
|
||||||
|
myIjs.getSchema(false),
|
||||||
|
myRightCm.columnExpression);
|
||||||
IDictionary map = resolver.getMap ();
|
IDictionary map = resolver.getMap ();
|
||||||
map["id"] = "id";
|
map["id"] = "id";
|
||||||
myPs = new ProjectStream (myIjs, map);
|
myPs = new ProjectStream (myIjs, map);
|
||||||
@@ -123,26 +129,27 @@ namespace BCG
|
|||||||
Log.assert(false, "This call back should not have been called");
|
Log.assert(false, "This call back should not have been called");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
myFireEvent ((o as ICloneable).Clone());
|
myFireEvent(ExceptionAssert.of_type<ICloneable>(o).Clone());
|
||||||
}
|
}
|
||||||
|
|
||||||
private void myProjectChangeHandler (object o)
|
private void myProjectChangeHandler (object o)
|
||||||
{
|
{
|
||||||
|
ArgumentNullException.ThrowIfNull(myIjs);
|
||||||
if (myIjs.myOnChangeDelegate.GetInvocationList().Length > 1)
|
if (myIjs.myOnChangeDelegate.GetInvocationList().Length > 1)
|
||||||
myIjs.onChange -= myInternalJoinChangeHandler;
|
myIjs.onChange -= myInternalJoinChangeHandler;
|
||||||
myFireEvent ((o as ICloneable).Clone());
|
myFireEvent(ExceptionAssert.of_type<ICloneable>(o).Clone());
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void myOnFirstSubscriber ()
|
protected override void myOnFirstSubscriber ()
|
||||||
{
|
{
|
||||||
myIjs.onChange += myInternalJoinChangeHandler;
|
ExceptionAssert.not_null(myIjs).onChange += myInternalJoinChangeHandler;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void myOnLastSubscriber ()
|
protected override void myOnLastSubscriber ()
|
||||||
{
|
{
|
||||||
// how does this relate to the -= in myProjectChangeHandler?
|
// how does this relate to the -= in myProjectChangeHandler?
|
||||||
myIjs.onChange -= myInternalJoinChangeHandler;
|
ExceptionAssert.not_null(myIjs).onChange -= myInternalJoinChangeHandler;
|
||||||
|
|
||||||
// if there is a project after the ijs we need to
|
// if there is a project after the ijs we need to
|
||||||
// unsubscribe to it otherwise references will be kept and
|
// unsubscribe to it otherwise references will be kept and
|
||||||
@@ -159,7 +166,9 @@ namespace BCG
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="leftPacket"></param>
|
/// <param name="leftPacket"></param>
|
||||||
/// <param name="rightPacket"></param>
|
/// <param name="rightPacket"></param>
|
||||||
public void test (DataPacket dp, bool isLeft) {myIjs.test (dp, isLeft);}
|
public void test (DataPacket dp, bool isLeft) =>
|
||||||
|
ExceptionAssert.not_null(myIjs).test(dp, isLeft);
|
||||||
|
|
||||||
/***********************************************************************************************/
|
/***********************************************************************************************/
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
|
using Bts.DataStreamCore;
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
using System.Collections;
|
using System.Collections;
|
||||||
using System.IO;
|
|
||||||
using BCG.Utilities.General;
|
|
||||||
|
|
||||||
namespace BCG
|
namespace BCG
|
||||||
{
|
{
|
||||||
@@ -19,20 +19,13 @@ namespace BCG
|
|||||||
myRightIndex = new JoinDeletionIndex (mySchema.getRenamedName ("id", false), false);
|
myRightIndex = new JoinDeletionIndex (mySchema.getRenamedName ("id", false), false);
|
||||||
}
|
}
|
||||||
|
|
||||||
public IBlueRow this [int id]
|
public IBlueRow this [int id] =>
|
||||||
{
|
myIdIndex[id] as IBlueRow ?? throw new BlueDataException ("ID " + id.ToString() + " does not exist in table " + mySchema.tableName);
|
||||||
get
|
|
||||||
{
|
|
||||||
if (myIdIndex[id] == null)
|
|
||||||
throw new BlueDataException ("ID " + id.ToString() + " does not exist in table " + mySchema.tableName);
|
|
||||||
return (IBlueRow)myIdIndex[id];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#region JoinTable members
|
#region JoinTable members
|
||||||
public virtual void addRow (IBlueRow leftRow, IBlueRow rightRow, DataPacket dp)
|
public virtual void addRow (IBlueRow leftRow, IBlueRow? rightRow, DataPacket dp)
|
||||||
{
|
{
|
||||||
JoinRow newRow = new JoinRow (myNewRowId, leftRow, rightRow, mySchema);
|
var newRow = new JoinRow(myNewRowId, leftRow, rightRow, mySchema);
|
||||||
myIdIndex[myNewRowId ++] = newRow;
|
myIdIndex[myNewRowId ++] = newRow;
|
||||||
((BlueTable)(dp.addedRows)).addRow (newRow);
|
((BlueTable)(dp.addedRows)).addRow (newRow);
|
||||||
myLeftIndex.add (newRow);
|
myLeftIndex.add (newRow);
|
||||||
@@ -48,17 +41,17 @@ namespace BCG
|
|||||||
thisIndex = myLeftIndex;
|
thisIndex = myLeftIndex;
|
||||||
otherIndex = myRightIndex;
|
otherIndex = myRightIndex;
|
||||||
}
|
}
|
||||||
RowList matchingNodes = thisIndex.getMatchingRows (deletedRow["id"]);
|
RowList matchingNodes = thisIndex.getMatchingRows (deletedRow.Id());
|
||||||
foreach (RowNode node in matchingNodes)
|
foreach (RowNode node in matchingNodes)
|
||||||
{
|
{
|
||||||
JoinRow row = (JoinRow)node.row;
|
JoinRow row = (JoinRow)node.row;
|
||||||
RowNode correspondingNode = isLeft ? row.rightNode : row.leftNode;
|
var correspondingNode = isLeft ? row.rightNode : row.leftNode;
|
||||||
if (correspondingNode != null)
|
if (correspondingNode != null)
|
||||||
otherIndex.remove (correspondingNode); //in case of partial left joinss
|
otherIndex.remove (correspondingNode); //in case of partial left joinss
|
||||||
myIdIndex.Remove (row["id"]);
|
myIdIndex.Remove (row.Id());
|
||||||
((BlueTable)dp.deletedRows).addRow (row);
|
((BlueTable)dp.deletedRows).addRow (row);
|
||||||
}
|
}
|
||||||
thisIndex.removeAll (deletedRow["id"]);
|
thisIndex.removeAll(deletedRow.Id());
|
||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
#region ICollection members
|
#region ICollection members
|
||||||
|
|||||||
@@ -1,9 +1,10 @@
|
|||||||
using System;
|
using System.Collections.Generic;
|
||||||
using System.Collections;
|
using System.Linq;
|
||||||
using BCG.Utilities;
|
|
||||||
|
|
||||||
using bts;
|
using bts;
|
||||||
|
|
||||||
|
using mbts.utils;
|
||||||
|
|
||||||
namespace BCG
|
namespace BCG
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -13,10 +14,11 @@ namespace BCG
|
|||||||
public class JoinTableSchema : BlueTableSchema
|
public class JoinTableSchema : BlueTableSchema
|
||||||
{
|
{
|
||||||
private string myLeftJc = "", myRightJc = "", myLeftId = "", myRightId = "";
|
private string myLeftJc = "", myRightJc = "", myLeftId = "", myRightId = "";
|
||||||
private IDictionary myLeftNameToAlias = new Hashtable ();
|
readonly Dictionary<string, string> myLeftNameToAlias = new();
|
||||||
private IDictionary myRightNameToAlias = new Hashtable ();
|
readonly Dictionary<string, string> myRightNameToAlias = new();
|
||||||
private IDictionary myAliasToLeftName = new Hashtable(),
|
readonly Dictionary<string, string> myAliasToLeftName = new();
|
||||||
myAliasToRightName = new Hashtable();
|
readonly Dictionary<string, string> myAliasToRightName = new();
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Constructs the schema of the Jointable with the schema of the left and right tables. Incase of
|
/// Constructs the schema of the Jointable with the schema of the left and right tables. Incase of
|
||||||
/// a name being there in both the shemas it prefixes the name with "L." or "R." accordingly. Column "id"
|
/// a name being there in both the shemas it prefixes the name with "L." or "R." accordingly. Column "id"
|
||||||
@@ -85,9 +87,9 @@ namespace BCG
|
|||||||
renamed = false;
|
renamed = false;
|
||||||
}
|
}
|
||||||
myIndexByColName["id"] = new ColumnInfo("id", myIndexByColName.Count, typeof(int));
|
myIndexByColName["id"] = new ColumnInfo("id", myIndexByColName.Count, typeof(int));
|
||||||
myIndexByColOrder[myIndexByColOrder.Length - 1] = (ColumnInfo)myIndexByColName["id"];
|
myIndexByColOrder[myIndexByColOrder.Length - 1] = ExceptionAssert.of_type<ColumnInfo>(myIndexByColName["id"]);
|
||||||
myAliasToLeftName = ProjectHelper.invertDic(myLeftNameToAlias);
|
myAliasToLeftName = myLeftNameToAlias.ToDictionary(kv => kv.Value, kv => kv.Key);
|
||||||
myAliasToRightName = ProjectHelper.invertDic(myRightNameToAlias);
|
myAliasToRightName = myRightNameToAlias.ToDictionary(kv => kv.Key, kv => kv.Value);
|
||||||
}
|
}
|
||||||
|
|
||||||
public string leftJoinCol {get{return myLeftJc;}}
|
public string leftJoinCol {get{return myLeftJc;}}
|
||||||
@@ -97,8 +99,8 @@ namespace BCG
|
|||||||
public string getRenamedName (string origName, bool isLeft)
|
public string getRenamedName (string origName, bool isLeft)
|
||||||
{
|
{
|
||||||
if (isLeft)
|
if (isLeft)
|
||||||
return (string)myLeftNameToAlias[origName];
|
return myLeftNameToAlias[origName] as string ?? string.Empty;
|
||||||
return (string)myRightNameToAlias[origName];
|
return myRightNameToAlias[origName] as string ?? string.Empty;
|
||||||
}
|
}
|
||||||
|
|
||||||
public string getOriginalName(string rename, bool isLeft)
|
public string getOriginalName(string rename, bool isLeft)
|
||||||
|
|||||||
+33
-21
@@ -2,16 +2,15 @@
|
|||||||
using bts.collections;
|
using bts.collections;
|
||||||
|
|
||||||
using mbts;
|
using mbts;
|
||||||
|
using mbts.utils;
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Diagnostics;
|
using System.Diagnostics;
|
||||||
using System.Linq;
|
|
||||||
using System.Security.Cryptography;
|
|
||||||
|
|
||||||
namespace BCG {
|
namespace BCG {
|
||||||
public class NonIncJoinBookkeeper : IDisposable {
|
public class NonIncJoinBookkeeper : IDisposable {
|
||||||
public Action on_new_data;
|
public Action? on_new_data;
|
||||||
private readonly NonIncJoinSpec _join_spec;
|
private readonly NonIncJoinSpec _join_spec;
|
||||||
private readonly int _join_position;
|
private readonly int _join_position;
|
||||||
private readonly int _start_index_in_output;
|
private readonly int _start_index_in_output;
|
||||||
@@ -20,16 +19,19 @@ namespace BCG {
|
|||||||
private readonly bool _is_tag_along;
|
private readonly bool _is_tag_along;
|
||||||
private int _n_total_fires = 0, _n_expensive_fires = 0;
|
private int _n_total_fires = 0, _n_expensive_fires = 0;
|
||||||
|
|
||||||
private IBlueTableSchema _schema = null;
|
private IBlueTableSchema? _schema;
|
||||||
private IDictionary<int, IBlueRow> _row_map = new Dictionary<int, IBlueRow>();
|
private IDictionary<int, IBlueRow> _row_map = new Dictionary<int, IBlueRow>();
|
||||||
private List<Pair<int, IBlueRow>> _row_list = new List<Pair<int, IBlueRow>>();
|
private List<Pair<int, IBlueRow>> _row_list = new List<Pair<int, IBlueRow>>();
|
||||||
private IBlueRow _solitary_row = null;
|
private IBlueRow? _solitary_row;
|
||||||
|
|
||||||
private int[] _join_col_indices = null,
|
int[]? _join_col_indices;
|
||||||
_data_col_indices = null;
|
int[]? _data_col_indices;
|
||||||
|
|
||||||
public NonIncJoinBookkeeper(NonIncJoinSpec the_join_spec, int join_position, int start_index_in_output, BlueRowHasher row_hasher) {
|
public NonIncJoinBookkeeper(NonIncJoinSpec join_spec, int join_position, int start_index_in_output, BlueRowHasher row_hasher) {
|
||||||
_join_spec = the_join_spec;
|
if (join_spec.join_col_names is null) {
|
||||||
|
throw new ArgumentException("join_col_names is null", nameof(join_spec));
|
||||||
|
}
|
||||||
|
_join_spec = join_spec;
|
||||||
_join_position = join_position;
|
_join_position = join_position;
|
||||||
_start_index_in_output = start_index_in_output;
|
_start_index_in_output = start_index_in_output;
|
||||||
_row_hasher = row_hasher;
|
_row_hasher = row_hasher;
|
||||||
@@ -41,7 +43,7 @@ namespace BCG {
|
|||||||
private void _fill_missing_data(DataPacket dp) {
|
private void _fill_missing_data(DataPacket dp) {
|
||||||
if (_filled_missing_data)
|
if (_filled_missing_data)
|
||||||
return;
|
return;
|
||||||
Func<string[], bool> null_or_empty = (str_arr) => {
|
bool null_or_empty(string[]? str_arr) {
|
||||||
if (str_arr == null || str_arr.Length == 0)
|
if (str_arr == null || str_arr.Length == 0)
|
||||||
return true;
|
return true;
|
||||||
foreach (string s in str_arr) {
|
foreach (string s in str_arr) {
|
||||||
@@ -50,13 +52,16 @@ namespace BCG {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
};
|
}
|
||||||
Func<string[], string[]> remove_bad_cols = (col_names) => {
|
string[] remove_bad_cols(string[]? col_names) {
|
||||||
|
if (col_names is null) {
|
||||||
|
return Array.Empty<string>();
|
||||||
|
}
|
||||||
HashSet<string> schema_col_map = new HashSet<string>(dp.schema.columnNames);
|
HashSet<string> schema_col_map = new HashSet<string>(dp.schema.columnNames);
|
||||||
List<string> cols_list = new List<string>(col_names);
|
List<string> cols_list = new List<string>(col_names);
|
||||||
cols_list.RemoveWhere(c => !schema_col_map.Contains(c));
|
cols_list.RemoveWhere(c => !schema_col_map.Contains(c));
|
||||||
return cols_list.ToArray();
|
return cols_list.ToArray();
|
||||||
};
|
}
|
||||||
if (null_or_empty(_join_spec.data_col_names)) {
|
if (null_or_empty(_join_spec.data_col_names)) {
|
||||||
_join_spec.data_col_names = dp.schema.columnNames;
|
_join_spec.data_col_names = dp.schema.columnNames;
|
||||||
}
|
}
|
||||||
@@ -70,11 +75,11 @@ namespace BCG {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void init() {
|
public void init() {
|
||||||
_join_spec.stream.onChange += _on_stream_cb;
|
ExceptionAssert.not_null(_join_spec.stream).onChange += _on_stream_cb;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void _on_stream_cb(object dp_obj) {
|
public void _on_stream_cb(object dp_obj) {
|
||||||
Log.Gen.info($"NonIncJoinBookkeeper._on_stream_cb dp_obj: {dp_obj}");
|
//Log.Gen.info($"NonIncJoinBookkeeper._on_stream_cb dp_obj: {dp_obj}");
|
||||||
var timer = Stopwatch.StartNew();
|
var timer = Stopwatch.StartNew();
|
||||||
DataPacket dp = (DataPacket)dp_obj;
|
DataPacket dp = (DataPacket)dp_obj;
|
||||||
_fill_missing_data(dp);
|
_fill_missing_data(dp);
|
||||||
@@ -111,14 +116,19 @@ namespace BCG {
|
|||||||
public bool is_ready { get { return _schema != null; } }
|
public bool is_ready { get { return _schema != null; } }
|
||||||
|
|
||||||
public void constribute_cols_to_schema(List<ColumnInfo> cis) {
|
public void constribute_cols_to_schema(List<ColumnInfo> cis) {
|
||||||
for (int i = 0; i < _join_spec.data_col_names.Length; i++)
|
ArgumentNullException.ThrowIfNull(_join_spec.data_col_names);
|
||||||
cis.Add(new ColumnInfo(_join_spec.projected_col_names[i], cis.Count, _schema[_join_spec.data_col_names[i]].colType));
|
if (_join_spec.data_col_names.Length > 0) {
|
||||||
|
ArgumentNullException.ThrowIfNull(_join_spec.projected_col_names);
|
||||||
|
ArgumentNullException.ThrowIfNull(_schema);
|
||||||
|
for (int i = 0; i < _join_spec.data_col_names.Length; i++)
|
||||||
|
cis.Add(new ColumnInfo(_join_spec.projected_col_names[i], cis.Count, _schema[_join_spec.data_col_names[i]].colType));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<Pair<int, IBlueRow>> get_list() { return _row_list; }
|
public List<Pair<int, IBlueRow>> get_list() { return _row_list; }
|
||||||
|
|
||||||
public void copy_master_row_to_output_row(int row_index, object[] output_row) {
|
public void copy_master_row_to_output_row(int row_index, object[] output_row) {
|
||||||
IBlueRow this_row = _row_list[row_index].second;
|
IBlueRow? this_row = _row_list[row_index].second;
|
||||||
BlueDataUtility.copy_to_row(this_row, _data_col_indices, output_row, _start_index_in_output);
|
BlueDataUtility.copy_to_row(this_row, _data_col_indices, output_row, _start_index_in_output);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -129,8 +139,7 @@ namespace BCG {
|
|||||||
else
|
else
|
||||||
copy_dbnull_to_output_row(output_row);
|
copy_dbnull_to_output_row(output_row);
|
||||||
} else {
|
} else {
|
||||||
IBlueRow this_row = null;
|
if (_row_map.TryGetValue(row_hash, out var this_row))
|
||||||
if (_row_map.TryGetValue(row_hash, out this_row))
|
|
||||||
BlueDataUtility.copy_to_row(this_row, _data_col_indices, output_row, _start_index_in_output);
|
BlueDataUtility.copy_to_row(this_row, _data_col_indices, output_row, _start_index_in_output);
|
||||||
else
|
else
|
||||||
copy_dbnull_to_output_row(output_row);
|
copy_dbnull_to_output_row(output_row);
|
||||||
@@ -138,13 +147,16 @@ namespace BCG {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void copy_dbnull_to_output_row(object[] output_row) {
|
private void copy_dbnull_to_output_row(object[] output_row) {
|
||||||
|
ArgumentNullException.ThrowIfNull(_data_col_indices);
|
||||||
for (int i = 0; i < _data_col_indices.Length; i++)
|
for (int i = 0; i < _data_col_indices.Length; i++)
|
||||||
output_row[i + _start_index_in_output] = DBNull.Value;
|
output_row[i + _start_index_in_output] = DBNull.Value;
|
||||||
}
|
}
|
||||||
|
|
||||||
#region IDisposable
|
#region IDisposable
|
||||||
|
|
||||||
public void Dispose() { _join_spec.stream.onChange -= _on_stream_cb; }
|
public void Dispose() {
|
||||||
|
ExceptionAssert.not_null(_join_spec.stream).onChange -= _on_stream_cb;
|
||||||
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,20 +1,18 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
|
|
||||||
using mbts;
|
using mbts;
|
||||||
|
using mbts.utils;
|
||||||
|
|
||||||
namespace BCG {
|
namespace BCG {
|
||||||
// this a collection of data, theres no joining logic in here
|
// this a collection of data, theres no joining logic in here
|
||||||
public class NonIncJoinSpec {
|
public class NonIncJoinSpec {
|
||||||
public ViewStream stream;
|
public ViewStream? stream;
|
||||||
// join col names are the names on which the streams are joined (for equality),
|
// join col names are the names on which the streams are joined (for equality),
|
||||||
// data col names are the names in the original stream
|
// data col names are the names in the original stream
|
||||||
// projected col names are their new names, ie if its x:l_x, then x is in the
|
// projected col names are their new names, ie if its x:l_x, then x is in the
|
||||||
// data_col_names and l_x in projected cols
|
// data_col_names and l_x in projected cols
|
||||||
public string[] join_col_names, data_col_names, projected_col_names;
|
public string[]? join_col_names, data_col_names, projected_col_names;
|
||||||
|
|
||||||
public NonIncJoinSpec() { }
|
public NonIncJoinSpec() { }
|
||||||
|
|
||||||
@@ -31,8 +29,8 @@ namespace BCG {
|
|||||||
public static NonIncJoinSpec[] from_triplet(params Triplet<ViewStream, string, string>[] join_specs) {
|
public static NonIncJoinSpec[] from_triplet(params Triplet<ViewStream, string, string>[] join_specs) {
|
||||||
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 = (r.second ?? string.Empty).Split(' ');
|
||||||
string[] visible_cols = r.third.Split(' ');
|
string[] visible_cols = ExceptionAssert.not_null(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(':');
|
||||||
@@ -44,22 +42,15 @@ 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 NonIncJoinSpec(ExceptionAssert.not_null(r.first), keys, data_col_names.ToArray(), mapped_col_names.ToArray()));
|
||||||
}
|
}
|
||||||
return rv.ToArray();
|
return rv.ToArray();
|
||||||
}
|
}
|
||||||
|
|
||||||
public override string ToString() {
|
public override string ToString() =>
|
||||||
Func<string[], string> arr_txt = (a) => {
|
$"stream: {stream} "
|
||||||
string rv = "";
|
+ $"join_col_names: { string.Join(" ", join_col_names ?? Array.Empty<string>())} "
|
||||||
foreach (string s in a) {
|
+ $"data_col_names: { string.Join(" ", data_col_names ?? Array.Empty<string>())} "
|
||||||
rv += "{s} ";
|
+ $"projected_col_names: { string.Join(" ", projected_col_names ?? Array.Empty<string>())}";
|
||||||
}
|
|
||||||
rv = rv.Trim();
|
|
||||||
return rv;
|
|
||||||
};
|
|
||||||
string rv = $"stream: {stream} join_col_names: {arr_txt(join_col_names)} data_col_names: {arr_txt(data_col_names)} projected_col_names: {arr_txt(projected_col_names)}";
|
|
||||||
return rv;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Loaded 100 of 2164 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user