Skip to content
This repository was archived by the owner on Dec 23, 2023. It is now read-only.

Commit 0890ab4

Browse files
songy23songy23
authored
Rename Window and WindowData (#574)
1 parent 5e51002 commit 0890ab4

File tree

10 files changed

+87
-83
lines changed

10 files changed

+87
-83
lines changed

‎core/src/main/java/io/opencensus/stats/RpcViewConstants.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@
4646
import io.opencensus.stats.Aggregation.Count;
4747
import io.opencensus.stats.Aggregation.Histogram;
4848
import io.opencensus.stats.Aggregation.Sum;
49-
import io.opencensus.stats.View.Window;
50-
import io.opencensus.stats.View.Window.Cumulative;
51-
import io.opencensus.stats.View.Window.Interval;
49+
import io.opencensus.stats.View.AggregationWindow;
50+
import io.opencensus.stats.View.AggregationWindow.Cumulative;
51+
import io.opencensus.stats.View.AggregationWindow.Interval;
5252
import java.util.Arrays;
5353
import java.util.Collections;
5454
import java.util.List;
@@ -91,9 +91,9 @@ public final class RpcViewConstants {
9191

9292
static final Duration MINUTE = Duration.create(60, 0);
9393
static final Duration HOUR = Duration.create(60 * 60, 0);
94-
static final Window CUMULATIVE = Cumulative.create();
95-
static final Window INTERVAL_MINUTE = Interval.create(MINUTE);
96-
static final Window INTERVAL_HOUR = Interval.create(HOUR);
94+
static final AggregationWindow CUMULATIVE = Cumulative.create();
95+
static final AggregationWindow INTERVAL_MINUTE = Interval.create(MINUTE);
96+
static final AggregationWindow INTERVAL_HOUR = Interval.create(HOUR);
9797

9898
// Rpc client cumulative {@link View}s.
9999
public static final View RPC_CLIENT_ERROR_COUNT_VIEW =

‎core/src/main/java/io/opencensus/stats/View.java‎

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,11 @@ public abstract class View {
7373
public abstract List<TagKey> getColumns();
7474

7575
/**
76-
* Returns the time {@link Window} for this {@code View}.
76+
* Returns the time {@link AggregationWindow} for this {@code View}.
7777
*
78-
* @return the time {@link Window}.
78+
* @return the time {@link AggregationWindow}.
7979
*/
80-
public abstract Window getWindow();
80+
public abstract AggregationWindow getWindow();
8181

8282
/**
8383
* Constructs a new {@link View}.
@@ -89,7 +89,7 @@ public abstract class View {
8989
* list should not contain duplicates.
9090
* @param columns the {@link TagKey}s that this view will aggregate on. Columns should not contain
9191
* duplicates.
92-
* @param window the {@link Window} of view.
92+
* @param window the {@link AggregationWindow} of view.
9393
* @return a new {@link View}.
9494
*/
9595
public static View create(
@@ -98,7 +98,7 @@ public static View create(
9898
Measure measure,
9999
List<Aggregation> aggregations,
100100
List<? extends TagKey> columns,
101-
Window window) {
101+
AggregationWindow window) {
102102
checkArgument(new HashSet<Aggregation>(aggregations).size() == aggregations.size(),
103103
"Aggregations have duplicate.");
104104
checkArgument(new HashSet<TagKey>(columns).size() == columns.size(),
@@ -148,32 +148,34 @@ public static Name create(String name) {
148148

149149
/** The time window for a {@code View}. */
150150
@Immutable
151-
public abstract static class Window {
151+
public abstract static class AggregationWindow {
152152

153-
private Window() {}
153+
private AggregationWindow() {}
154154

155155
/**
156156
* Applies the given match function to the underlying data type.
157157
*/
158158
public abstract <T> T match(
159159
Function<? super Cumulative, T> p0,
160160
Function<? super Interval, T> p1,
161-
Function<? super Window, T> defaultFunction);
161+
Function<? super AggregationWindow, T> defaultFunction);
162162

163-
/** Cumulative (infinite interval) time {@code Window}. */
163+
/** Cumulative (infinite interval) time {@code AggregationWindow}. */
164164
@Immutable
165165
@AutoValue
166-
public abstract static class Cumulative extends Window {
166+
public abstract static class Cumulative extends AggregationWindow {
167167

168-
private static final Cumulative CUMULATIVE = new AutoValue_View_Window_Cumulative();
168+
private static final Cumulative CUMULATIVE =
169+
new AutoValue_View_AggregationWindow_Cumulative();
169170

170171
Cumulative() {}
171172

172173
/**
173-
* Constructs a cumulative {@code Window} that does not have an explicit {@code Duration}.
174-
* Instead, cumulative {@code Window} always has an interval of infinite {@code Duration}.
174+
* Constructs a cumulative {@code AggregationWindow} that does not have an explicit {@code
175+
* Duration}. Instead, cumulative {@code AggregationWindow} always has an interval of infinite
176+
* {@code Duration}.
175177
*
176-
* @return a cumulative {@code Window}.
178+
* @return a cumulative {@code AggregationWindow}.
177179
*/
178180
public static Cumulative create() {
179181
return CUMULATIVE;
@@ -183,15 +185,15 @@ public static Cumulative create() {
183185
public final <T> T match(
184186
Function<? super Cumulative, T> p0,
185187
Function<? super Interval, T> p1,
186-
Function<? super Window, T> defaultFunction) {
188+
Function<? super AggregationWindow, T> defaultFunction) {
187189
return p0.apply(this);
188190
}
189191
}
190192

191-
/** Interval (finite interval) time {@code Window.} */
193+
/** Interval (finite interval) time {@code AggregationWindow.} */
192194
@Immutable
193195
@AutoValue
194-
public abstract static class Interval extends Window {
196+
public abstract static class Interval extends AggregationWindow {
195197

196198
Interval() {}
197199

@@ -204,22 +206,23 @@ public abstract static class Interval extends Window {
204206

205207

206208
/**
207-
* Constructs an interval {@code Window} that has a finite explicit {@code Duration}.
209+
* Constructs an interval {@code AggregationWindow} that has a finite explicit {@code
210+
* Duration}.
208211
*
209212
* <p>The {@code Duration} should be able to round to milliseconds. Currently interval window
210213
* cannot have smaller {@code Duration} such as microseconds or nanoseconds.
211214
*
212-
* @return an interval {@code Window}.
215+
* @return an interval {@code AggregationWindow}.
213216
*/
214217
public static Interval create(Duration duration) {
215-
return new AutoValue_View_Window_Interval(duration);
218+
return new AutoValue_View_AggregationWindow_Interval(duration);
216219
}
217220

218221
@Override
219222
public final <T> T match(
220223
Function<? super Cumulative, T> p0,
221224
Function<? super Interval, T> p1,
222-
Function<? super Window, T> defaultFunction) {
225+
Function<? super AggregationWindow, T> defaultFunction) {
223226
return p1.apply(this);
224227
}
225228
}

‎core/src/main/java/io/opencensus/stats/ViewData.java‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -48,42 +48,42 @@ public abstract class ViewData {
4848
public abstract Map<List<TagValue>, List<AggregationData>> getAggregationMap();
4949

5050
/**
51-
* Returns the {@link WindowData} associated with this {@link ViewData}.
51+
* Returns the {@link AggregationWindowData} associated with this {@link ViewData}.
5252
*
53-
* @return the {@code WindowData}.
53+
* @return the {@code AggregationWindowData}.
5454
*/
55-
public abstract WindowData getWindowData();
55+
public abstract AggregationWindowData getWindowData();
5656

5757
/** Constructs a new {@link ViewData}. */
5858
public static ViewData create(
5959
View view,
6060
Map<? extends List<? extends TagValue>, List<AggregationData>> map,
61-
final WindowData windowData) {
61+
final AggregationWindowData windowData) {
6262
view.getWindow()
6363
.match(
64-
new Function<View.Window.Cumulative, Void>() {
64+
new Function<View.AggregationWindow.Cumulative, Void>() {
6565
@Override
66-
public Void apply(View.Window.Cumulative arg) {
67-
if (!(windowData instanceof WindowData.CumulativeData)) {
66+
public Void apply(View.AggregationWindow.Cumulative arg) {
67+
if (!(windowData instanceof AggregationWindowData.CumulativeData)) {
6868
throw new IllegalArgumentException(
69-
"Window and WindowData types mismatch. "
70-
+ "Window: "
69+
"AggregationWindow and AggregationWindowData types mismatch. "
70+
+ "AggregationWindow: "
7171
+ arg
72-
+ " WindowData: "
72+
+ " AggregationWindowData: "
7373
+ windowData);
7474
}
7575
return null;
7676
}
7777
},
78-
new Function<View.Window.Interval, Void>() {
78+
new Function<View.AggregationWindow.Interval, Void>() {
7979
@Override
80-
public Void apply(View.Window.Interval arg) {
81-
if (!(windowData instanceof WindowData.IntervalData)) {
80+
public Void apply(View.AggregationWindow.Interval arg) {
81+
if (!(windowData instanceof AggregationWindowData.IntervalData)) {
8282
throw new IllegalArgumentException(
83-
"Window and WindowData types mismatch. "
84-
+ "Window: "
83+
"AggregationWindow and AggregationWindowData types mismatch. "
84+
+ "AggregationWindow: "
8585
+ arg
86-
+ " WindowData: "
86+
+ " AggregationWindowData: "
8787
+ windowData);
8888
}
8989
return null;
@@ -102,22 +102,22 @@ public Void apply(View.Window.Interval arg) {
102102
return new AutoValue_ViewData(view, Collections.unmodifiableMap(deepCopy), windowData);
103103
}
104104

105-
/** The {@code WindowData} for a {@link ViewData}. */
105+
/** The {@code AggregationWindowData} for a {@link ViewData}. */
106106
@Immutable
107-
public abstract static class WindowData {
107+
public abstract static class AggregationWindowData {
108108

109-
private WindowData() {}
109+
private AggregationWindowData() {}
110110

111111
/** Applies the given match function to the underlying data type. */
112112
public abstract <T> T match(
113113
Function<? super CumulativeData, T> p0,
114114
Function<? super IntervalData, T> p1,
115-
Function<? super WindowData, T> defaultFunction);
115+
Function<? super AggregationWindowData, T> defaultFunction);
116116

117-
/** Cumulative {@code WindowData.} */
117+
/** Cumulative {@code AggregationWindowData.} */
118118
@Immutable
119119
@AutoValue
120-
public abstract static class CumulativeData extends WindowData {
120+
public abstract static class CumulativeData extends AggregationWindowData {
121121

122122
CumulativeData() {}
123123

@@ -139,7 +139,7 @@ public abstract static class CumulativeData extends WindowData {
139139
public final <T> T match(
140140
Function<? super CumulativeData, T> p0,
141141
Function<? super IntervalData, T> p1,
142-
Function<? super WindowData, T> defaultFunction) {
142+
Function<? super AggregationWindowData, T> defaultFunction) {
143143
return p0.apply(this);
144144
}
145145

@@ -148,14 +148,14 @@ public static CumulativeData create(Timestamp start, Timestamp end) {
148148
if (start.compareTo(end) > 0) {
149149
throw new IllegalArgumentException("Start time is later than end time.");
150150
}
151-
return new AutoValue_ViewData_WindowData_CumulativeData(start, end);
151+
return new AutoValue_ViewData_AggregationWindowData_CumulativeData(start, end);
152152
}
153153
}
154154

155-
/** Interval {@code WindowData.} */
155+
/** Interval {@code AggregationWindowData.} */
156156
@Immutable
157157
@AutoValue
158-
public abstract static class IntervalData extends WindowData {
158+
public abstract static class IntervalData extends AggregationWindowData {
159159

160160
IntervalData() {}
161161

@@ -170,13 +170,13 @@ public abstract static class IntervalData extends WindowData {
170170
public final <T> T match(
171171
Function<? super CumulativeData, T> p0,
172172
Function<? super IntervalData, T> p1,
173-
Function<? super WindowData, T> defaultFunction) {
173+
Function<? super AggregationWindowData, T> defaultFunction) {
174174
return p1.apply(this);
175175
}
176176

177177
/** Constructs a new {@link IntervalData}. */
178178
public static IntervalData create(Timestamp end) {
179-
return new AutoValue_ViewData_WindowData_IntervalData(end);
179+
return new AutoValue_ViewData_AggregationWindowData_IntervalData(end);
180180
}
181181
}
182182
}

‎core/src/test/java/io/opencensus/stats/RpcViewConstantsTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
import io.opencensus.stats.Aggregation.Count;
2323
import io.opencensus.stats.Aggregation.Histogram;
2424
import io.opencensus.stats.Aggregation.Sum;
25-
import io.opencensus.stats.View.Window.Cumulative;
26-
import io.opencensus.stats.View.Window.Interval;
25+
import io.opencensus.stats.View.AggregationWindow.Cumulative;
26+
import io.opencensus.stats.View.AggregationWindow.Interval;
2727
import org.junit.Test;
2828
import org.junit.runner.RunWith;
2929
import org.junit.runners.JUnit4;

‎core/src/test/java/io/opencensus/stats/ViewDataTest.java‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@
3737
import io.opencensus.stats.AggregationData.RangeData;
3838
import io.opencensus.stats.AggregationData.StdDevData;
3939
import io.opencensus.stats.AggregationData.SumData;
40-
import io.opencensus.stats.View.Window;
41-
import io.opencensus.stats.View.Window.Cumulative;
42-
import io.opencensus.stats.View.Window.Interval;
43-
import io.opencensus.stats.ViewData.WindowData;
44-
import io.opencensus.stats.ViewData.WindowData.CumulativeData;
45-
import io.opencensus.stats.ViewData.WindowData.IntervalData;
40+
import io.opencensus.stats.View.AggregationWindow;
41+
import io.opencensus.stats.View.AggregationWindow.Cumulative;
42+
import io.opencensus.stats.View.AggregationWindow.Interval;
43+
import io.opencensus.stats.ViewData.AggregationWindowData;
44+
import io.opencensus.stats.ViewData.AggregationWindowData.CumulativeData;
45+
import io.opencensus.stats.ViewData.AggregationWindowData.IntervalData;
4646
import io.opencensus.tags.TagKey.TagKeyString;
4747
import io.opencensus.tags.TagValue;
4848
import io.opencensus.tags.TagValue.TagValueString;
@@ -68,7 +68,7 @@ public void testDistributionViewData() {
6868
View.create(name, description, measure, AGGREGATIONS, tagKeys, CUMULATIVE);
6969
Timestamp start = Timestamp.fromMillis(1000);
7070
Timestamp end = Timestamp.fromMillis(2000);
71-
WindowData windowData = CumulativeData.create(start, end);
71+
AggregationWindowData windowData = CumulativeData.create(start, end);
7272
ViewData viewData = ViewData.create(view, ENTRIES, windowData);
7373
assertThat(viewData.getView()).isEqualTo(view);
7474
assertThat(viewData.getAggregationMap()).isEqualTo(ENTRIES);
@@ -80,7 +80,7 @@ public void testIntervalViewData() {
8080
View view = View.create(
8181
name, description, measure, AGGREGATIONS, tagKeys, INTERVAL_HOUR);
8282
Timestamp end = Timestamp.fromMillis(2000);
83-
WindowData windowData = IntervalData.create(end);
83+
AggregationWindowData windowData = IntervalData.create(end);
8484
ViewData viewData = ViewData.create(view, ENTRIES, windowData);
8585
assertThat(viewData.getView()).isEqualTo(view);
8686
assertThat(viewData.getAggregationMap()).isEqualTo(ENTRIES);
@@ -126,11 +126,11 @@ public void testViewDataEquals() {
126126
}
127127

128128
@Test
129-
public void testWindowDataMatch() {
129+
public void testAggregationWindowDataMatch() {
130130
final Timestamp start = Timestamp.fromMillis(1000);
131131
final Timestamp end = Timestamp.fromMillis(2000);
132-
final WindowData windowData1 = CumulativeData.create(start, end);
133-
final WindowData windowData2 = IntervalData.create(end);
132+
final AggregationWindowData windowData1 = CumulativeData.create(start, end);
133+
final AggregationWindowData windowData2 = IntervalData.create(end);
134134
windowData1.match(
135135
new Function<CumulativeData, Void>() {
136136
@Override
@@ -167,7 +167,7 @@ public Void apply(IntervalData windowData) {
167167
}
168168

169169
@Test
170-
public void preventWindowAndWindowDataMismatch() {
170+
public void preventWindowAndAggregationWindowDataMismatch() {
171171
thrown.expect(IllegalArgumentException.class);
172172
ViewData.create(
173173
View.create(name, description, measure, AGGREGATIONS, tagKeys, INTERVAL_HOUR),
@@ -177,7 +177,7 @@ public void preventWindowAndWindowDataMismatch() {
177177
}
178178

179179
@Test
180-
public void preventWindowAndWindowDataMismatch2() {
180+
public void preventWindowAndAggregationWindowDataMismatch2() {
181181
thrown.expect(IllegalArgumentException.class);
182182
ViewData.create(
183183
View.create(name, description, measure, AGGREGATIONS, tagKeys, CUMULATIVE),
@@ -202,8 +202,8 @@ public void preventStartTimeLaterThanEndTime() {
202202
private static final TagValueString V10 = TagValueString.create("v10");
203203
private static final TagValueString V20 = TagValueString.create("v20");
204204

205-
private static final Window CUMULATIVE = Cumulative.create();
206-
private static final Window INTERVAL_HOUR = Interval.create(Duration.create(3600, 0));
205+
private static final AggregationWindow CUMULATIVE = Cumulative.create();
206+
private static final AggregationWindow INTERVAL_HOUR = Interval.create(Duration.create(3600, 0));
207207

208208
private static final BucketBoundaries BUCKET_BOUNDARIES = BucketBoundaries.create(
209209
Arrays.asList(10.0, 20.0, 30.0, 40.0));

‎core/src/test/java/io/opencensus/stats/ViewTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
import io.opencensus.common.Duration;
2323
import io.opencensus.stats.Aggregation.Count;
2424
import io.opencensus.stats.Aggregation.Sum;
25-
import io.opencensus.stats.View.Window.Cumulative;
26-
import io.opencensus.stats.View.Window.Interval;
25+
import io.opencensus.stats.View.AggregationWindow.Cumulative;
26+
import io.opencensus.stats.View.AggregationWindow.Interval;
2727
import io.opencensus.tags.TagKey.TagKeyString;
2828
import java.util.Arrays;
2929
import java.util.List;

‎core_impl/src/main/java/io/opencensus/implcore/stats/MutableViewData.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@
4646
import io.opencensus.stats.AggregationData.StdDevData;
4747
import io.opencensus.stats.AggregationData.SumData;
4848
import io.opencensus.stats.View;
49-
import io.opencensus.stats.View.Window.Cumulative;
50-
import io.opencensus.stats.View.Window.Interval;
49+
import io.opencensus.stats.View.AggregationWindow.Cumulative;
50+
import io.opencensus.stats.View.AggregationWindow.Interval;
5151
import io.opencensus.stats.ViewData;
52-
import io.opencensus.stats.ViewData.WindowData.CumulativeData;
52+
import io.opencensus.stats.ViewData.AggregationWindowData.CumulativeData;
5353
import io.opencensus.tags.Tag;
5454
import io.opencensus.tags.Tag.TagBoolean;
5555
import io.opencensus.tags.Tag.TagLong;

0 commit comments

Comments
 (0)