提交 ee32e470 编写于 作者: A alexey-milovidov 提交者: GitHub

Revert "dbms: Server: Use PODArray instead of std::vector in sequenceMatch/Co…"

上级 0b384d0a
......@@ -8,7 +8,6 @@
#include <boost/range/iterator_range_core.hpp>
#include <DB/Parsers/ExpressionElementParsers.h>
#include <DB/Parsers/ASTLiteral.h>
#include <DB/Common/PODArray.h>
#include <bitset>
#include <stack>
......@@ -45,8 +44,7 @@ struct AggregateFunctionSequenceMatchData final
using Comparator = ComparePairFirst<std::less>;
bool sorted = true;
static constexpr size_t bytes_in_arena = 64;
PODArray<TimestampEvents, bytes_in_arena, AllocatorWithStackMemory<Allocator<false>, bytes_in_arena>> eventsList;
std::vector<TimestampEvents> eventsList;
void add(const Timestamp timestamp, const Events & events)
{
......@@ -62,7 +60,7 @@ struct AggregateFunctionSequenceMatchData final
{
const auto size = eventsList.size();
eventsList.insert(std::begin(other.eventsList), std::end(other.eventsList));
eventsList.insert(std::end(eventsList), std::begin(other.eventsList), std::end(other.eventsList));
/// either sort whole container or do so partially merging ranges afterwards
if (!sorted && !other.sorted)
......@@ -264,14 +262,14 @@ private:
PatternAction(const PatternActionType type, const std::uint32_t extra = 0) : type{type}, extra{extra} {}
};
static constexpr size_t bytes_on_stack = 64;
using PatternActions = PODArray<PatternAction, bytes_on_stack, AllocatorWithStackMemory<Allocator<false>, bytes_on_stack>>;
using PatternActions = std::vector<PatternAction>;
void parsePattern()
{
PatternActions actions;
actions.emplace_back(PatternActionType::KleeneStar);
PatternActions actions{
{ PatternActionType::KleeneStar }
};
ParserString special_open_p("(?");
ParserString special_close_p(")");
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册