Skip to content

convert info parse to ignore labels order #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DvirDukhan merged 10 commits into from
Sep 16, 2020
Merged

convert info parse to ignore labels order #38

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
85cd539
convert info parse to ignore labels order
gkorland Sep 15, 2020
d884a46
fix label cast to string
gkorland Sep 15, 2020
b843767
Merge branch 'master' into fix_info_parse
gkorland Sep 15, 2020
70338fd
fix loop
gkorland Sep 15, 2020
c114b1e
Merge branch 'fix_info_parse' of github.com:RedisTimeSeries/NRedisTim…
gkorland Sep 15, 2020
ccabae9
fix parse lastTimestamp and firstTimestamp
gkorland Sep 15, 2020
dc0c159
add chunkSize parsing
gkorland Sep 15, 2020
98769be
fix backward
gkorland Sep 15, 2020
af21533
remove uneeded maxSamplesPerChunk
gkorland Sep 16, 2020
ee5b8a8
revert white spaces changes
gkorland Sep 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions NRedisTimeSeries/DataTypes/TimeSeriesInformation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@ public class TimeSeriesInformation
/// <summary>
/// Maximum Number of samples per Memory Chunk.
/// </summary>
[ObsoleteAttribute("This method has been deprecated. Use ChunkSize instead.")]
[ObsoleteAttribute("This method has been deprecated. Use ChunkSize instead.")]
Copy link

@DvirDukhan DvirDukhan Sep 16, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

undo changes in this file, it is only formatting

public long MaxSamplesPerChunk { get; private set; }

/// <summary>
/// Memory Chunk size in Bytes.
/// Memory Chunk size in Bytes.
/// </summary>
public long ChunkSize { get; private set; }

Expand All @@ -64,7 +64,6 @@ public class TimeSeriesInformation
/// A readonly list of TimeSeriesRules that represent compaction Rules of the time-series.
/// </summary>
public IReadOnlyList<TimeSeriesRule> Rules { get; private set; }

internal TimeSeriesInformation(long totalSamples, long memoryUsage, TimeStamp firstTimeStamp, TimeStamp lastTimeStamp, long retentionTime, long chunkCount, long chunkSize, IReadOnlyList<TimeSeriesLabel> labels, string sourceKey, IReadOnlyList<TimeSeriesRule> rules)
{
TotalSamples = totalSamples;
Expand Down
62 changes: 46 additions & 16 deletions NRedisTimeSeries/TimeSeriesClientResponseParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,24 +110,54 @@ private static IReadOnlyList<TimeSeriesRule> ParseRuleArray(RedisResult result)

private static TimeSeriesInformation ParseInfo(RedisResult result)
{
long totalSamples = -1, memoryUsage = -1, retentionTime = -1, chunkSize=-1, chunkCount = -1, maxSamplesPerChunk = -1;
TimeStamp firstTimestamp = null, lastTimestamp = null;
IReadOnlyList<TimeSeriesLabel> labels = null;
IReadOnlyList <TimeSeriesRule> rules = null;
string sourceKey = null;
RedisResult[] redisResults = (RedisResult[])result;
long totalSamples = (long)redisResults[1];
long memoryUsage = (long)redisResults[3];
TimeStamp firstTimeStamp = ParseTimeStamp(redisResults[5]);
TimeStamp lastTimeStamp = ParseTimeStamp(redisResults[7]);
long retentionTime = (long)redisResults[9];
long chunkCount = (long)redisResults[11];
string chunkSizeProperty = (string)redisResults[12];
long chunkSize = (long)redisResults[13];
// If the property name is maxSamplesPerChunk then this is an old version of RedisTimeSeries and we used the number of samples before ( now Bytes )
if (string.Equals(chunkSizeProperty, "maxSamplesPerChunk"))
{
chunkSize = chunkSize * 16;
for(int i=0; i<redisResults.Length ; ++i){
string label = (string)redisResults[i++];
switch (label) {
case "totalSamples":
totalSamples = (long)redisResults[i];
break;
case "memoryUsage":
memoryUsage = (long)redisResults[i];
break;
case "retentionTime":
retentionTime = (long)redisResults[i];
break;
case "chunkCount":
chunkCount = (long)redisResults[i];
break;
case "chunkSize":
chunkSize = (long)redisResults[i];
break;
case "maxSamplesPerChunk":
// If the property name is maxSamplesPerChunk then this is an old
// version of RedisTimeSeries and we used the number of samples before ( now Bytes )
chunkSize = chunkSize * 16;
break;
case "firstTimestamp":
firstTimestamp = ParseTimeStamp(redisResults[i]);
break;
case "lastTimestamp":
lastTimestamp = ParseTimeStamp(redisResults[i]);
break;
case "labels":
labels = ParseLabelArray(redisResults[i]);
break;
case "sourceKey":
sourceKey = (string)redisResults[i];
break;
case "rules":
rules = ParseRuleArray(redisResults[i]);
break;
}
}
IReadOnlyList<TimeSeriesLabel> labels = ParseLabelArray(redisResults[15]);
string destKey = (string)redisResults[17];
IReadOnlyList<TimeSeriesRule> rules = ParseRuleArray(redisResults[19]);
return new TimeSeriesInformation(totalSamples, memoryUsage, firstTimeStamp, lastTimeStamp, retentionTime, chunkCount, chunkSize, labels, destKey, rules);
return new TimeSeriesInformation(totalSamples, memoryUsage, firstTimestamp,
lastTimestamp, retentionTime, chunkCount, chunkSize, labels, sourceKey, rules);
}

private static IReadOnlyList<string> ParseStringArray(RedisResult result)
Expand Down