History

TimeSeriesPlatformLibrary: Improved handling of SignalIndexCache instance within DataPublisher

J. Ritchie Carroll committed 7 years ago

Commit a5cbc2b1 parent ad6759018 files · +199 −114Browse files

Showing the changes to Source/Libraries/TimeSeriesPlatformLibrary/Transport/SubscriberConnection.cpp (1 of 18 files). Show all

Unified · Split

Source/Libraries/TimeSeriesPlatformLibrary/Transport/SubscriberConnection.cpp+34−13
@@ -167,7 +167,7 @@ int32_t SubscriberConnection::GetProcessingInterval() const · 166 unmodified lines
167167 void SubscriberConnection::SetProcessingInterval(int32_t value)
168168 {
169169 m_processingInterval = value;
170− m_parent->DispatchTemporalProcessingIntervalChangeRequested(shared_from_this());
170+ m_parent->DispatchProcessingIntervalChangeRequested(shared_from_this());
171171 m_parent->DispatchStatusMessage(m_connectionID + " was assigned a new processing interval of " + ToString(value) + ".");
172172 }
173173
@@ -363,7 +363,7 @@ void SubscriberConnection::Stop() · 189 unmodified lines
363363
364364 void SubscriberConnection::PublishMeasurements(const vector<MeasurementPtr>& measurements)
365365 {
366− if (measurements.empty() || !m_isSubscribed)
366+ if (measurements.empty() || !m_isSubscribed || m_signalIndexCache == nullptr)
367367 return;
368368
369369 if (!m_startTimeSent)
@@ -435,7 +435,13 @@ void SubscriberConnection::HandleSubscribe(uint8_t* data, uint32_t length) · 65 unmodified lines
435435 {
436436 const bool usePayloadCompression = (GetOperationalModes() & OperationalModes::CompressPayloadData) > 0;
437437 const bool useCompactMeasurementFormat = (flags & DataPacketFlags::Compact) > 0;
438+
439+ m_parent->DispatchStatusMessage("About to decode connection string with " + ToString(byteLength) + " bytes...");
440+
438441 const string connectionString = DecodeString(data, index, byteLength);
442+
443+ m_parent->DispatchStatusMessage("Successfully decoded connection string: " + connectionString);
444+
439445 const StringMap<string> settings = ParseKeyValuePairs(connectionString);
440446 string setting;
441447
@@ -474,7 +480,11 @@ void SubscriberConnection::HandleSubscribe(uint8_t* data, uint32_t length) · 32 unmodified lines
474480 // Apply subscriber filter expression and build signal index cache
475481 if (TryGetValue(settings, "inputMeasurementKeys", setting))
476482 {
477− if (!ParseSubscriptionRequest(setting, signalIndexCache))
483+ bool success;
484+
485+ signalIndexCache = ParseSubscriptionRequest(setting, success);
486+
487+ if (!success)
478488 return;
479489 }
480490
@@ -533,7 +543,7 @@ void SubscriberConnection::HandleSubscribe(uint8_t* data, uint32_t length) · 52 unmodified lines
533543 signalCount = signalIndexCache->Count();
534544
535545 // Send updated signal index cache to client with validated rights of the selected input measurement keys
536− SendResponse(ServerResponse::UpdateSignalIndexCache, ServerCommand::Subscribe, SerializeSignalIndexCache(signalIndexCache));
546+ SendResponse(ServerResponse::UpdateSignalIndexCache, ServerCommand::Subscribe, SerializeSignalIndexCache(*signalIndexCache));
537547 }
538548
539549 SetSignalIndexCache(signalIndexCache);
@@ -706,7 +716,7 @@ void SubscriberConnection::HandleUserCommand(uint8_t command, uint8_t* data, uin · 166 unmodified lines
706716 {
707717 }
708718
709−bool SubscriberConnection::ParseSubscriptionRequest(const std::string& filterExpression, SignalIndexCachePtr& signalIndexCache)
719+SignalIndexCachePtr SubscriberConnection::ParseSubscriptionRequest(const string& filterExpression, bool& success)
710720 {
711721 string exceptionMessage, parsingException;
712722 FilterExpressionParserPtr parser = NewSharedPtr<FilterExpressionParser>(filterExpression);
@@ -749,7 +759,9 @@ bool SubscriberConnection::ParseSubscriptionRequest(const std::string& filterExp · 36 unmodified lines
749759
750760 SendResponse(ServerResponse::Failed, ServerCommand::Subscribe, exceptionMessage);
751761 m_parent->DispatchErrorMessage(exceptionMessage);
752− return false;
762+
763+ success = false;
764+ return nullptr;
753765 }
754766
755767 uint32_t charSizeEstimate;
@@ -772,7 +784,7 @@ bool SubscriberConnection::ParseSubscriptionRequest(const std::string& filterExp · 16 unmodified lines
772784 const int32_t signalIDColumn = DataPublisher::GetColumnIndex(activeMeasurements, "SignalID");
773785
774786 // Create a new signal index cache for filtered measurements
775− signalIndexCache = NewSharedPtr<SignalIndexCache>();
787+ SignalIndexCachePtr signalIndexCache = NewSharedPtr<SignalIndexCache>();
776788
777789 for (size_t i = 0; i < rows.size(); i++)
778790 {
@@ -785,7 +797,8 @@ bool SubscriberConnection::ParseSubscriptionRequest(const std::string& filterExp · 6 unmodified lines
785797 signalIndexCache->AddMeasurementKey(uint16_t(i), signalID, source, id, charSizeEstimate);
786798 }
787799
788− return true;
800+ success = true;
801+ return signalIndexCache;
789802 }
790803
791804 void SubscriberConnection::PublishDataPacket(const vector<uint8_t>& packet, const int32_t count)
@@ -970,7 +983,7 @@ void SubscriberConnection::ParseCommand(const ErrorCode& error, uint32_t bytesTr · 178 unmodified lines
970983 ReadCommandChannel();
971984 }
972985
973−std::vector<uint8_t> SubscriberConnection::SerializeSignalIndexCache(const SignalIndexCachePtr& signalIndexCache)
986+std::vector<uint8_t> SubscriberConnection::SerializeSignalIndexCache(SignalIndexCache& signalIndexCache) const
974987 {
975988 vector<uint8_t> serializationBuffer;
976989
@@ -982,8 +995,8 @@ std::vector<uint8_t> SubscriberConnection::SerializeSignalIndexCache(const Signa · 5 unmodified lines
982995 if (!useCommonSerializationFormat)
983996 throw PublisherException("DataPublisher only supports common serialization format");
984997
985− serializationBuffer.reserve(uint32_t(signalIndexCache->GetBinaryLength() * 0.02));
986− signalIndexCache->Serialize(shared_from_this(), serializationBuffer);
998+ serializationBuffer.reserve(uint32_t(signalIndexCache.GetBinaryLength() * 0.02));
999+ signalIndexCache.Serialize(*this, serializationBuffer);
9871000
9881001 if (compressSignalIndexCache && useGZipCompression)
9891002 {
@@ -1232,7 +1245,15 @@ string SubscriberConnection::DecodeString(const uint8_t* data, uint32_t offset, · 242 unmodified lines
12321245 switch (m_encoding)
12331246 {
12341247 case OperationalEncoding::UTF8:
1235− return string(reinterpret_cast<const char*>(data + offset), length / sizeof(char));
1248+ {
1249+ string value {};
1250+ value.reserve(length / sizeof(char));
1251+
1252+ for (size_t i = 0; i < length; i += sizeof(char))
1253+ value.append(1, static_cast<char>(data[offset + i]));
1254+
1255+ return value;
1256+ }
12361257 case OperationalEncoding::Unicode:
12371258 case OperationalEncoding::ANSI:
12381259 swapBytes = !swapBytes;
@@ -1246,7 +1267,7 @@ string SubscriberConnection::DecodeString(const uint8_t* data, uint32_t offset, · 7 unmodified lines
12461267 if (swapBytes)
12471268 value.append(1, EndianConverter::ToLittleEndian<wchar_t>(data, offset + i));
12481269 else
1249− value.append(1, *reinterpret_cast<const wchar_t*>(data + offset + i));
1270+ value.append(1, static_cast<wchar_t>(data[offset + i]));
12501271 }
12511272
12521273 return ToUTF8(value);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t