Skip to content

Add preference to use the 'optimized with last sample' AA postprocessor #3915

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

Open
rjwills28 wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Add preference to use the 'optimized with last sample' AA postprocessor #3915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
abb7e91
Add preference to use the 'optimized with last sample' AA postprocessor
rjwills28 Aug 24, 2026
fea89bc
Fix pre-commit linting
rjwills28 Aug 24, 2026
fc7cd32
Fix pre-commit linting
rjwills28 Aug 24, 2026
191c120
Make optimLastSample the default option
rjwills28 Sep 10, 2026
2697ece
Update archive test to check for new optimLastsample_ data retrieval …
rjwills28 Sep 10, 2026
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
2 changes: 2 additions & 0 deletions ...r/src/main/java/org/phoebus/archive/reader/appliance/ApplianceArchiveReaderConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ public class ApplianceArchiveReaderConstants {
public static final String OP_MEAN = "mean_";
/** Operator for the optimized post processor */
public static final String OP_OPTIMIZED = "optimized_";
/** Operator for the optimized with last sample post processor */
public static final String OP_OPTIMIZED_WITH_LAST_SAMPLE = "optimLastSample_";

/** The schema delimiter: ca://pvName or pva://pvname */
static final String SCHEMA_DELIMITER = "://";
Expand Down
8 changes: 6 additions & 2 deletions ...r/src/main/java/org/phoebus/archive/reader/appliance/ApplianceOptimizedValueIterator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,11 @@ public ApplianceOptimizedValueIterator(ApplianceArchiveReader reader, String nam
*/
@Override
protected void fetchDataInternal(String pvName) throws ArchiverApplianceException {
String optimized = new StringBuilder().append(ApplianceArchiveReaderConstants.OP_OPTIMIZED)
String optimizedOperator = ApplianceArchiveReaderConstants.OP_OPTIMIZED;
if (AppliancePreferences.ppOptimizedWithLastSample)
Comment thread
rjwills28 marked this conversation as resolved.
optimizedOperator = ApplianceArchiveReaderConstants.OP_OPTIMIZED_WITH_LAST_SAMPLE;

String optimized = new StringBuilder().append(optimizedOperator)
.append(requestedPoints).append('(').append(pvName).append(')').toString();
super.fetchDataInternal(optimized);
}
Expand Down Expand Up @@ -155,4 +159,4 @@ public VType next() {
return super.extractData(message);
}
}
}
}
1 change: 1 addition & 0 deletions ...chive-reader/src/main/java/org/phoebus/archive/reader/appliance/AppliancePreferences.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ public class AppliancePreferences {
@Preference static boolean useStatisticsForOptimizedData;
@Preference static boolean useNewOptimizedOperator;
Comment thread
rjwills28 marked this conversation as resolved.
@Preference static boolean useHttps;
@Preference static boolean ppOptimizedWithLastSample;

static {
AnnotatedPreferences.initialize(AppliancePreferences.class, "/appliance_preferences.properties");
Expand Down
5 changes: 5 additions & 0 deletions app/trends/archive-reader/src/main/resources/appliance_preferences.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,8 @@ useNewOptimizedOperator=true

# Use 'https://..' instead of plain 'http://..'?
useHttps=false

# Query the AA using the 'Optimized With Last Sample' post processor.
# Setting to false means that the 'Optimized' post processor will be
# used.
ppOptimizedWithLastSample=true
8 changes: 4 additions & 4 deletions ...c/test/java/org/phoebus/archive/reader/appliance/ApplianceOptimizedValueIteratorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,13 @@ private static GenMsgIterator probeStream(PayloadType type) {
@Test
void fetchUrlContainsOptimizedNOperator() throws Exception {
FakeDataRetrieval dr = new FakeDataRetrieval(probeStream(PayloadType.SCALAR_DOUBLE));
dr.whenPvContains("optimized_", emptyStream());
dr.whenPvContains("optimLastSample_", emptyStream());

FakeApplianceArchiveReader reader = new FakeApplianceArchiveReader(dr);
new ApplianceOptimizedValueIterator(reader, "TEST:PV", START, END, POINTS, false);

assertTrue(dr.pvsCalled.stream().anyMatch(pv -> pv.startsWith("optimized_") && pv.endsWith("(TEST:PV)")),
"Expected optimized_<N>(TEST:PV) call, got: " + dr.pvsCalled);
assertTrue(dr.pvsCalled.stream().anyMatch(pv -> pv.startsWith("optimLastSample_") && pv.endsWith("(TEST:PV)")),
"Expected optimLastSample__<N>(TEST:PV) call, got: " + dr.pvsCalled);
}

@Test
Expand Down Expand Up @@ -78,7 +78,7 @@ private ApplianceOptimizedValueIterator makeWithWaveformData(boolean useStatisti
when(dataStream.getPayLoadInfo()).thenReturn(waveformInfo);

FakeDataRetrieval dr = new FakeDataRetrieval(probeStream(PayloadType.SCALAR_DOUBLE));
dr.whenPvContains("optimized_", dataStream);
dr.whenPvContains("optimLastSample_", dataStream);

FakeApplianceArchiveReader reader = new FakeApplianceArchiveReader(dr);
return new ApplianceOptimizedValueIterator(reader, "TEST:PV", START, END, POINTS, useStatistics);
Expand Down
Loading