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
167void SubscriberConnection::SetProcessingInterval(int32_t value)167void SubscriberConnection::SetProcessingInterval(int32_t value)
168{168{
169 m_processingInterval = value;169 m_processingInterval = value;
170 m_parent->DispatchTemporalProcessingIntervalChangeRequested(shared_from_this());170 m_parent->DispatchProcessingIntervalChangeRequested(shared_from_this());
171 m_parent->DispatchStatusMessage(m_connectionID + " was assigned a new processing interval of " + ToString(value) + ".");171 m_parent->DispatchStatusMessage(m_connectionID + " was assigned a new processing interval of " + ToString(value) + ".");
172}172}
173 173
@@ -363,7 +363,7 @@ void SubscriberConnection::Stop() · 189 unmodified lines
363 363
364void SubscriberConnection::PublishMeasurements(const vector<MeasurementPtr>& measurements)364void SubscriberConnection::PublishMeasurements(const vector<MeasurementPtr>& measurements)
365{365{
366 if (measurements.empty() || !m_isSubscribed)366 if (measurements.empty() || !m_isSubscribed || m_signalIndexCache == nullptr)
367 return;367 return;
368 368
369 if (!m_startTimeSent)369 if (!m_startTimeSent)
@@ -435,7 +435,13 @@ void SubscriberConnection::HandleSubscribe(uint8_t* data, uint32_t length) · 65 unmodified lines
435 {435 {
436 const bool usePayloadCompression = (GetOperationalModes() & OperationalModes::CompressPayloadData) > 0;436 const bool usePayloadCompression = (GetOperationalModes() & OperationalModes::CompressPayloadData) > 0;
437 const bool useCompactMeasurementFormat = (flags & DataPacketFlags::Compact) > 0;437 const bool useCompactMeasurementFormat = (flags & DataPacketFlags::Compact) > 0;
438
439 m_parent->DispatchStatusMessage("About to decode connection string with " + ToString(byteLength) + " bytes...");
440
438 const string connectionString = DecodeString(data, index, byteLength);441 const string connectionString = DecodeString(data, index, byteLength);
442
443 m_parent->DispatchStatusMessage("Successfully decoded connection string: " + connectionString);
444
439 const StringMap<string> settings = ParseKeyValuePairs(connectionString);445 const StringMap<string> settings = ParseKeyValuePairs(connectionString);
440 string setting;446 string setting;
441 447
@@ -474,7 +480,11 @@ void SubscriberConnection::HandleSubscribe(uint8_t* data, uint32_t length) · 32 unmodified lines
474 // Apply subscriber filter expression and build signal index cache480 // Apply subscriber filter expression and build signal index cache
475 if (TryGetValue(settings, "inputMeasurementKeys", setting))481 if (TryGetValue(settings, "inputMeasurementKeys", setting))
476 {482 {
477 if (!ParseSubscriptionRequest(setting, signalIndexCache))483 bool success;
484
485 signalIndexCache = ParseSubscriptionRequest(setting, success);
486
487 if (!success)
478 return;488 return;
479 }489 }
480 490
@@ -533,7 +543,7 @@ void SubscriberConnection::HandleSubscribe(uint8_t* data, uint32_t length) · 52 unmodified lines
533 signalCount = signalIndexCache->Count();543 signalCount = signalIndexCache->Count();
534 544
535 // Send updated signal index cache to client with validated rights of the selected input measurement keys 545 // 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));
537 }547 }
538 548
539 SetSignalIndexCache(signalIndexCache);549 SetSignalIndexCache(signalIndexCache);
@@ -706,7 +716,7 @@ void SubscriberConnection::HandleUserCommand(uint8_t command, uint8_t* data, uin · 166 unmodified lines
706{716{
707}717}
708 718
709bool SubscriberConnection::ParseSubscriptionRequest(const std::string& filterExpression, SignalIndexCachePtr& signalIndexCache)719SignalIndexCachePtr SubscriberConnection::ParseSubscriptionRequest(const string& filterExpression, bool& success)
710{720{
711 string exceptionMessage, parsingException;721 string exceptionMessage, parsingException;
712 FilterExpressionParserPtr parser = NewSharedPtr<FilterExpressionParser>(filterExpression);722 FilterExpressionParserPtr parser = NewSharedPtr<FilterExpressionParser>(filterExpression);
@@ -749,7 +759,9 @@ bool SubscriberConnection::ParseSubscriptionRequest(const std::string& filterExp · 36 unmodified lines
749 759
750 SendResponse(ServerResponse::Failed, ServerCommand::Subscribe, exceptionMessage);760 SendResponse(ServerResponse::Failed, ServerCommand::Subscribe, exceptionMessage);
751 m_parent->DispatchErrorMessage(exceptionMessage);761 m_parent->DispatchErrorMessage(exceptionMessage);
752 return false;762
763 success = false;
764 return nullptr;
753 }765 }
754 766
755 uint32_t charSizeEstimate;767 uint32_t charSizeEstimate;
@@ -772,7 +784,7 @@ bool SubscriberConnection::ParseSubscriptionRequest(const std::string& filterExp · 16 unmodified lines
772 const int32_t signalIDColumn = DataPublisher::GetColumnIndex(activeMeasurements, "SignalID");784 const int32_t signalIDColumn = DataPublisher::GetColumnIndex(activeMeasurements, "SignalID");
773 785
774 // Create a new signal index cache for filtered measurements786 // Create a new signal index cache for filtered measurements
775 signalIndexCache = NewSharedPtr<SignalIndexCache>();787 SignalIndexCachePtr signalIndexCache = NewSharedPtr<SignalIndexCache>();
776 788
777 for (size_t i = 0; i < rows.size(); i++)789 for (size_t i = 0; i < rows.size(); i++)
778 {790 {
@@ -785,7 +797,8 @@ bool SubscriberConnection::ParseSubscriptionRequest(const std::string& filterExp · 6 unmodified lines
785 signalIndexCache->AddMeasurementKey(uint16_t(i), signalID, source, id, charSizeEstimate);797 signalIndexCache->AddMeasurementKey(uint16_t(i), signalID, source, id, charSizeEstimate);
786 }798 }
787 799
788 return true;800 success = true;
801 return signalIndexCache;
789}802}
790 803
791void SubscriberConnection::PublishDataPacket(const vector<uint8_t>& packet, const int32_t count)804void 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
970 ReadCommandChannel();983 ReadCommandChannel();
971}984}
972 985
973std::vector<uint8_t> SubscriberConnection::SerializeSignalIndexCache(const SignalIndexCachePtr& signalIndexCache)986std::vector<uint8_t> SubscriberConnection::SerializeSignalIndexCache(SignalIndexCache& signalIndexCache) const
974{987{
975 vector<uint8_t> serializationBuffer;988 vector<uint8_t> serializationBuffer;
976 989
@@ -982,8 +995,8 @@ std::vector<uint8_t> SubscriberConnection::SerializeSignalIndexCache(const Signa · 5 unmodified lines
982 if (!useCommonSerializationFormat)995 if (!useCommonSerializationFormat)
983 throw PublisherException("DataPublisher only supports common serialization format");996 throw PublisherException("DataPublisher only supports common serialization format");
984 997
985 serializationBuffer.reserve(uint32_t(signalIndexCache->GetBinaryLength() * 0.02));998 serializationBuffer.reserve(uint32_t(signalIndexCache.GetBinaryLength() * 0.02));
986 signalIndexCache->Serialize(shared_from_this(), serializationBuffer);999 signalIndexCache.Serialize(*this, serializationBuffer);
987 1000
988 if (compressSignalIndexCache && useGZipCompression)1001 if (compressSignalIndexCache && useGZipCompression)
989 {1002 {
@@ -1232,7 +1245,15 @@ string SubscriberConnection::DecodeString(const uint8_t* data, uint32_t offset, · 242 unmodified lines
1232 switch (m_encoding)1245 switch (m_encoding)
1233 {1246 {
1234 case OperationalEncoding::UTF8:1247 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 }
1236 case OperationalEncoding::Unicode:1257 case OperationalEncoding::Unicode:
1237 case OperationalEncoding::ANSI:1258 case OperationalEncoding::ANSI:
1238 swapBytes = !swapBytes;1259 swapBytes = !swapBytes;
@@ -1246,7 +1267,7 @@ string SubscriberConnection::DecodeString(const uint8_t* data, uint32_t offset, · 7 unmodified lines
1246 if (swapBytes)1267 if (swapBytes)
1247 value.append(1, EndianConverter::ToLittleEndian<wchar_t>(data, offset + i));1268 value.append(1, EndianConverter::ToLittleEndian<wchar_t>(data, offset + i));
1248 else1269 else
1249 value.append(1, *reinterpret_cast<const wchar_t*>(data + offset + i));1270 value.append(1, static_cast<wchar_t>(data[offset + i]));
1250 }1271 }
1251 1272
1252 return ToUTF8(value);1273 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