HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/SciQLOPCore Commit - r44:79fb0ced05d7

Bypassed cache and merge mechanism, this seems to be broken...

jeandet -

r44:79fb0ced05d7

parent child

Context file:

r44:79fb0ced05d7

include/Variable/Variable.h +4 0

                                 const DateTimeRange& newRange, const DateTimeRange& newCacheRange,
                                 bool notify=true);
+                void setData(const std::vector<IDataSeries*>& dataSeries,
+                                const DateTimeRange& newRange, const DateTimeRange& newCacheRange,
+                                bool notify=true);
                 static QByteArray mimeData(const std::vector<std::shared_ptr<Variable> > &variables)
                 {
                     auto encodedData = QByteArray{};

include/Variable/private/VCTransaction.h +8 -3

                 std::vector<DateTimeRange> _ranges;
                 DateTimeRange _range;
                 DateTimeRange _cacheRange;
+                bool _overwrite;
             public:
                 TransactionExe(const std::shared_ptr<Variable>& variable, const std::shared_ptr<IDataProvider>& provider,
-                               const std::vector<DateTimeRange>& ranges, DateTimeRange range, DateTimeRange cacheRange)
+                               const std::vector<DateTimeRange>& ranges, DateTimeRange range, DateTimeRange cacheRange,
-                    :_variable{variable}, _provider{provider},_ranges{ranges},_range{range},_cacheRange{cacheRange}
+                               bool overwrite=true)
+                    :_variable{variable}, _provider{provider},_ranges{ranges},_range{range},_cacheRange{cacheRange}, _overwrite{overwrite}
                 {
                     setAutoDelete(true);
                 }
                         if(ds)
                             data.push_back(ds);
                     }
-                    _variable->updateData(data, _range, _cacheRange, true);
+                    if(_overwrite)
+                        _variable->setData(data,_range, _cacheRange, true);
+                    else
+                        _variable->updateData(data, _range, _cacheRange, true);
                     emit transactionComplete();
                 }
             signals:

src/Variable/Variable.cpp +15 -2

                     updateRealRange();
                     updateNbPoints();
                 }
-                void mergeDataSeries(const std::vector<IDataSeries*>& dataseries)
+                void mergeDataSeries(const std::vector<IDataSeries*>& dataseries, bool overwrite=false)
                 {
                     QWriteLocker lock{&m_Lock};
                     for(auto ds:dataseries)
                     {
-                        if(m_DataSeries)
+                        if(!overwrite & bool(m_DataSeries))
                             m_DataSeries->merge(ds);
                         else
                             m_DataSeries = ds->clone();
                     emit updated(this->ID());
             }
+            void Variable::setData(const std::vector<IDataSeries *> &dataSeries, const DateTimeRange &newRange, const DateTimeRange &newCacheRange, bool notify)
+            {
+                {
+                    QWriteLocker lock{&m_lock};
+                    impl->mergeDataSeries(dataSeries, true);
+                    impl->setRange(newRange);
+                    impl->setCacheRange(newCacheRange);
+                    impl->purgeDataSeries();
+                }
+                if(notify)
+                    emit updated(this->ID());
+            }
             std::shared_ptr<IDataSeries> Variable::dataSeries() const noexcept
             {
                 return impl->dataSeries();

src/Variable/VariableController2.cpp +27 -14

@@ -16,7 +16,6
16	#include <QCoreApplication>	16	#include <QCoreApplication>
17		17
18		18
19
20	class VariableController2::VariableController2Private	19	class VariableController2::VariableController2Private
21	{	20	{
22	struct threadSafeVaraiblesMaps	21	struct threadSafeVaraiblesMaps
@@ -130,7 +129,7 class VariableController2::VariableController2Private
130	this->_processTransactions();	129	this->_processTransactions();
131	}	130	}
132		131
133	void _processTransactions()	132	void _processTransactions(bool fragmented=false)
134	{	133	{
135	auto nextTransactions = _transactions.nextTransactions();	134	auto nextTransactions = _transactions.nextTransactions();
136	auto pendingTransactions = _transactions.pendingTransactions();	135	auto pendingTransactions = _transactions.pendingTransactions();
@@ -145,18 +144,32 class VariableController2::VariableController2Private
145	{	144	{
146	auto provider = _maps.provider(ID);	145	auto provider = _maps.provider(ID);
147	auto variable = _maps.variable(ID);	146	auto variable = _maps.variable(ID);
148	auto [missingRanges, newCacheRange] = _computeMissingRanges(variable,range);	147	if(fragmented)
149		148	{
150	auto exe = new TransactionExe(variable, provider, missingRanges, range, newCacheRange);	149	auto [missingRanges, newCacheRange] = _computeMissingRanges(variable,range);
151	QObject::connect(exe,	150
152	&TransactionExe::transactionComplete,	151	auto exe = new TransactionExe(variable, provider, missingRanges, range, newCacheRange);
153	[groupID=groupID,transaction=newTransaction.value(),this]()	152	QObject::connect(exe,
154	{	153	&TransactionExe::transactionComplete,
155	~~this~~->~~_transactionComplete~~(groupID, transaction);	154	[groupID=groupID,transaction=newTransaction.value(),this]()
156	}	155	{
157	);	156	this->_transactionComplete(groupID, transaction);
158	_ThreadPool->start(exe);	157	}
159		158	);
		159	_ThreadPool->start(exe);
		160	}
		161	else
		162	{
		163	auto exe = new TransactionExe(variable, provider, {range}, range, range);
		164	QObject::connect(exe,
		165	&TransactionExe::transactionComplete,
		166	[groupID=groupID,transaction=newTransaction.value(),this]()
		167	{
		168	this->_transactionComplete(groupID, transaction);
		169	}
		170	);
		171	_ThreadPool->start(exe);
		172	}
160	}	173	}
161	}	174	}
162	}	175	}

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages