Skip to content

Commit f23cb93

Browse files
committed
[ADD] Added files of release 4.2.0
1 parent a85048d commit f23cb93

40 files changed

+359
-390
lines changed

.gitmodules

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[submodule "WindFlow_Dashboard"]
2-
path = WindFlow_Dashboard
3-
url = https://github.com/ParaGroup/WindFlow_Dashboard
2+
path = WindFlow_Dashboard
3+
url = https://github.com/ParaGroup/WindFlow_Dashboard

API

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ The corresponding builder needs two parameters (for the lift and combine logics)
159159
__host__ __device__ void(const result_t &, const result_t &, result_t &);
160160

161161
Interval_Join
162-
----------------
162+
-------------
163163
std::optional<result_t> (const tuple_t &, const tuple_t &)
164164
std::optional<result_t> (const tuple_t &, const tuple_t &, RuntimeContext &)
165165

AUTHORS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,4 @@ Fausto Frasca, contributor (Web Dashboard)
1818
Alberto Ottimo, contributor
1919
Matteo Della Bartola, contributor
2020
Simone Frassinelli, contributor
21+
Yuriy Rymarchuk, contributor

tests/join_tests/CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,11 @@ set(CMAKE_CXX_FLAGS_RELEASE "-O3 -g -finline-functions")
66

77
# Macros to be provided to the compiler
88
add_definitions(-DFF_BOUNDED_BUFFER)
9-
# -DWF_JOIN_MEASUREMENT to enable the measurement of how uniformerly the tuples are distributed among the joiners
10-
# -DWF_TRACING_ENABLED to enable the tracing with Dashboard
119

1210
# Header files of WindFlow and FastFlow
1311
include_directories(${PROJECT_SOURCE_DIR}/wf ${ff_root_dir})
1412

1513
# Linking to pthread
16-
# cdt gvc cgraph to enable the tracing with Dashboard
1714
link_libraries(pthread)
1815

1916
# Set output directory

tests/join_tests/join_common.hpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**************************************************************************************
2-
* Copyright (c) 2023- Gabriele Mencagli and Yuriy Rymarchuk
2+
* Copyright (c) 2024- Gabriele Mencagli and Yuriy Rymarchuk
33
*
44
* This file is part of WindFlow.
55
*
@@ -42,7 +42,6 @@ struct tuple_t
4242
int64_t value;
4343
};
4444

45-
#if 1
4645
template<>
4746
struct std::hash<tuple_t>
4847
{
@@ -53,7 +52,6 @@ struct std::hash<tuple_t>
5352
return h1 ^ h2;
5453
}
5554
};
56-
#endif
5755

5856
struct res_t
5957
{
@@ -97,7 +95,7 @@ class Source_Positive_Functor
9795
shipper.setNextWatermark(next_ts);
9896
}
9997
auto offset = (distribution(generator)+1);
100-
next_ts += offset*1000; // in ms
98+
next_ts += offset * 1000; // in ms
10199
}
102100
}
103101
}
@@ -141,7 +139,7 @@ class Source_Negative_Functor
141139
shipper.setNextWatermark(next_ts);
142140
}
143141
auto offset = (distribution(generator)+1);
144-
next_ts += offset*1000; // in ms
142+
next_ts += offset * 1000; // in ms
145143
}
146144
}
147145
}

tests/join_tests/test_join_1.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
*/
2323

2424
/*
25-
* Test 1 of general graphs of operators.
25+
* Test 1 of the Interval Join operator.
2626
*
2727
* +---------------------+ +-----------+
2828
* | +-----+ +-----+ | | +-----+ |
@@ -264,7 +264,7 @@ int main(int argc, char *argv[])
264264
}
265265
check_degree += (sink1_degree + sink2_degree);
266266
// prepare the test
267-
PipeGraph graph("test_graph_1 (DETERMINISTIC)", Execution_Mode_t::DETERMINISTIC, Time_Policy_t::EVENT_TIME);
267+
PipeGraph graph("test_join_1 (DETERMINISTIC)", Execution_Mode_t::DETERMINISTIC, Time_Policy_t::EVENT_TIME);
268268
// prepare the first MultiPipe
269269
Source_Positive_Functor source_functor_positive(stream_len, n_keys, false);
270270
Source source1 = Source_Builder(source_functor_positive)

tests/join_tests/test_join_2.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
*/
2323

2424
/*
25-
* Test 2 of general graphs of operators.
25+
* Test 2 of the Interval Join operator.
2626
*
2727
* +---------------------+
2828
* | +-----+ +-----+ |

tests/join_tests/test_join_3.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
*/
2323

2424
/*
25-
* Test 3 of merge between MultiPipes.
25+
* Test 3 of the Interval Join operator.
2626
*
2727
* +-----------+
2828
* | +-----+ |

tests/join_tests/test_join_4.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
*/
2323

2424
/*
25-
* Test 11 of general graphs of operators.
25+
* Test 4 of the Interval Join operator.
2626
* +---------------------+
2727
* | +-----+ +-----+ |
2828
* | | S | | F | |

tests/join_tests/test_join_5.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
*/
2323

2424
/*
25-
* Test 7 of general graphs of operators.
25+
* Test 5 of the Interval Join operator.
2626
*
2727
* +---------------------+
2828
* | +-----+ +-----+ |

0 commit comments

Comments
 (0)