Skip to content

Commit 58078e7

Browse files
Code0x58kramasamy
authored andcommitted
Correct case of acronyms (apache#2920)
* Correct dag to DAG * Correct hdfs to HDFS * Correct s3 to S3 * Correct ram to RAM * Add vagrant/.vagrant/ to .gitignore * Correct jvm to JVM * Correct apiserver to API server * Correct 'api server' to 'API server' * Correct api to API * Correct cpu to CPU * Fix error made while correcting documentation * Correct acronyms * ram, Ram → RAM * Cpu → CPU
1 parent 13f6626 commit 58078e7

File tree

110 files changed

+287
-285
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

110 files changed

+287
-285
lines changed

.gitignore

+4-1
Original file line numberDiff line numberDiff line change
@@ -134,4 +134,7 @@ website/public/
134134
.vscode
135135

136136
# integration_test
137-
results/
137+
results/
138+
139+
# Vagrant
140+
vagrant/.vagrant/

WORKSPACE

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ slf4j_version = "1.7.7"
1111
distributedlog_version = "0.5.0"
1212
http_client_version = "4.5.2"
1313

14-
# heron api server
14+
# heron API server
1515
jetty_version = "9.4.6.v20170531"
1616
jersey_verion = "2.25.1"
1717
hk2_api = "2.5.0-b32"
@@ -566,7 +566,7 @@ maven_jar(
566566

567567
# end Kubernetes java client
568568

569-
# heron api server
569+
# heron API server
570570
# jetty
571571
maven_jar(
572572
name = "org_eclipse_jetty_server",
@@ -723,7 +723,7 @@ maven_jar(
723723
)
724724
# end bookkeeper & distributedlog dependencies
725725

726-
# end heron api server
726+
# end heron API server
727727

728728
# Nomad dependencies
729729
maven_jar(

deploy/kubernetes/general/README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -40,21 +40,21 @@ $ kubectl create -f https://raw.githubusercontent.com/apache/incubator-heron/mas
4040
$ kubectl create -f https://raw.githubusercontent.com/apache/incubator-heron/master/deploy/kubernetes/general/tools.yaml
4141
```
4242

43-
4. Start heron apiserver:
43+
4. Start heron API server:
4444
```shell
4545
$ kubectl create -f https://raw.githubusercontent.com/apache/incubator-heron/master/deploy/kubernetes/general/apiserver.yaml
4646
```
4747

48-
### Deploy via heron apiserver
49-
We will start a proxy to the cluster and then construct a [proxy url](https://kubernetes.io/docs/tasks/administer-cluster/access-cluster-services/#manually-constructing-apiserver-proxy-urls) to access the apiserver.
48+
### Deploy via heron API server
49+
We will start a proxy to the cluster and then construct a [proxy url](https://kubernetes.io/docs/tasks/administer-cluster/access-cluster-services/#manually-constructing-apiserver-proxy-urls) to access the API server.
5050

5151

5252
1. Start kubectl proxy:
5353
```shell
5454
$ kubectl proxy -p 8001
5555
```
5656

57-
2. Verify we can access the apiserver:
57+
2. Verify we can access the API server:
5858

5959
```shell
6060
$ curl http://localhost:8001/api/v1/proxy/namespaces/default/services/heron-apiserver:9000/api/v1/version

deploy/kubernetes/gke/gcs-apiserver.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ spec:
116116
---
117117

118118
##
119-
## Service to expose the heron api server
119+
## Service to expose the heron API server
120120
##
121121
apiVersion: v1
122122
kind: Service

deploy/kubernetes/gke/medium.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ platform: gke
3030
# Number of replicas for the job binary in bookkeeper
3131
jobReplicas: 2
3232

33-
# amount of memory to provide for api server
33+
# amount of memory to provide for API server
3434
apiServerMemory: 512M
3535

3636
# Number of replicas for storage bookies, memory and storage requirements

deploy/kubernetes/gke/small.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ platform: gke
3030
# Number of replicas for the job binary in bookkeeper
3131
jobReplicas: 2
3232

33-
# amount of memory to provide for api server
33+
# amount of memory to provide for API server
3434
apiServerMemory: 512M
3535

3636
# Number of replicas for storage bookies, memory and storage requirements

deploy/kubernetes/helm/templates/NOTES.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ You can check the status of Heron by doing the following:
33
1. Start kubectl proxy
44
kubectl proxy -p 8001
55

6-
2. Verify you can access the api server
6+
2. Verify you can access the API server
77
curl http://localhost:8001/api/v1/proxy/namespaces/{{ .Release.Namespace }}/services/{{ .Release.Name }}-apiserver:9000/api/v1/version
88

99
3. Verify you can access the heron ui

deploy/kubernetes/helm/values.yaml.template

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ imagePullPolicy: IfNotPresent
1919
# Number of replicas for the job binary in bookkeeper
2020
jobReplicas: 1
2121

22-
# amount of memory to provide for api server
22+
# amount of memory to provide for API server
2323
apiServerMemory: 512M
2424

2525
# Number of replicas for storage bookies, memory and storage requirements

deploy/kubernetes/minikube/README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -39,21 +39,21 @@ $ kubectl create -f https://raw.githubusercontent.com/apache/incubator-heron/mas
3939
$ kubectl create -f https://raw.githubusercontent.com/apache/incubator-heron/master/deploy/kubernetes/minikube/tools.yaml
4040
```
4141

42-
4. Start heron apiserver:
42+
4. Start heron API server:
4343
```shell
4444
$ kubectl create -f https://raw.githubusercontent.com/apache/incubator-heron/master/deploy/kubernetes/minikube/apiserver.yaml
4545
```
4646

47-
### Deploy via heron apiserver
48-
We will start a proxy to the cluster and then construct a [proxy url](https://kubernetes.io/docs/tasks/administer-cluster/access-cluster-services/#manually-constructing-apiserver-proxy-urls) to access the apiserver.
47+
### Deploy via heron API server
48+
We will start a proxy to the cluster and then construct a [proxy url](https://kubernetes.io/docs/tasks/administer-cluster/access-cluster-services/#manually-constructing-apiserver-proxy-urls) to access the API server.
4949

5050

5151
1. Start kubectl proxy:
5252
```shell
5353
$ kubectl proxy -p 8001
5454
```
5555

56-
2. Verify we can access the apiserver:
56+
2. Verify we can access the API server:
5757

5858
```shell
5959
$ curl http://localhost:8001/api/v1/proxy/namespaces/default/services/heron-apiserver:9000/api/v1/version

eco-heron-examples/src/java/org/apache/heron/examples/eco/heron_wordcount.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ config:
3030
topology.component.resourcemap:
3131

3232
- id: "spout-1"
33-
ram: 256MB # The minimum value for a component's specified ram is 256MB
33+
ram: 256MB # The minimum value for a component's specified RAM is 256MB
3434
cpu: 0.5
3535
disk: 4GB
3636

3737
- id: "bolt-1"
38-
ram: 256MB # The minimum value for a component's specified ram is 256MB
38+
ram: 256MB # The minimum value for a component's specified RAM is 256MB
3939
cpu: 0.5
4040
disk: 2GB
4141

eco-storm-examples/src/java/org/apache/heron/examples/eco/simple_wordcount.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ config:
2929
topology.component.resourcemap:
3030

3131
- id: "spout-1"
32-
ram: 256MB # The minimum value for a component's specified ram is 256MB
32+
ram: 256MB # The minimum value for a component's specified RAM is 256MB
3333
cpu: 0.5
3434
disk: 4GB
3535

3636
- id: "bolt-1"
37-
ram: 256MB # The minimum value for a component's specified ram is 256MB
37+
ram: 256MB # The minimum value for a component's specified RAM is 256MB
3838
cpu: 0.5
3939
disk: 2GB
4040

eco/src/java/org/apache/heron/eco/builder/ConfigBuilder.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ private void setComponentLevelResource(Config config, Map.Entry<String, Object>
145145
long megaBytes = extractRawValue(ramWithUom, mbIndex);
146146
if (megaBytes < MINIMUM_MB) {
147147
throw new IllegalArgumentException(
148-
"The minimum Ram resource allocation for a component must be at least 256MB");
148+
"The minimum RAM resource allocation for a component must be at least 256MB");
149149
}
150150
byteAmount = ByteAmount.fromMegabytes(megaBytes);
151151

@@ -161,15 +161,15 @@ private void setComponentLevelResource(Config config, Map.Entry<String, Object>
161161
long bytes = extractRawValue(ramWithUom, bIndex);
162162
if (bytes < MINIMUM_BYTES) {
163163
throw new IllegalArgumentException(
164-
"The minimum Ram resource allocation for a component must be at least 256000000B");
164+
"The minimum RAM resource allocation for a component must be at least 256000000B");
165165
}
166166
byteAmount = ByteAmount.fromBytes(bytes);
167167

168168
} else {
169169
// There is no format throw an exception
170170
throw new
171171
IllegalArgumentException(
172-
" Please specify 'B', 'MB', 'GB' when declaring Ram Resources");
172+
" Please specify 'B', 'MB', 'GB' when declaring RAM Resources");
173173
}
174174
config.setComponentRam(id, byteAmount);
175175
}

examples/src/java/org/apache/heron/examples/api/ComponentJVMOptionsTopology.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public static void main(String[] args) throws Exception {
7878
conf.setContainerRamRequested(ByteAmount.fromGigabytes(2));
7979
conf.setContainerCpuRequested(2);
8080

81-
// Specify the size of ram padding to per container.
81+
// Specify the size of RAM padding to per container.
8282
// Notice, this config will be considered as a hint,
8383
// and it's up to the packing algorithm to determine whether to apply this hint
8484
conf.setContainerRamPadding(ByteAmount.fromGigabytes(2));

examples/src/java/org/apache/heron/examples/api/spout/TestWordSpout.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public void nextTuple() {
6565
final String word = words[rand.nextInt(words.length)];
6666
collector.emit(new Values(word));
6767
if (!throttleDuration.isZero()) {
68-
SysUtils.sleep(throttleDuration); // sleep to throttle back cpu usage
68+
SysUtils.sleep(throttleDuration); // sleep to throttle back CPU usage
6969
}
7070
}
7171

heron/api/src/cpp/config/config.h

+9-9
Original file line numberDiff line numberDiff line change
@@ -131,12 +131,12 @@ class Config {
131131
static const std::string TOPOLOGY_RELIABILITY_MODE;
132132

133133
/**
134-
* Number of cpu cores per container to be reserved for this topology
134+
* Number of CPU cores per container to be reserved for this topology
135135
*/
136136
static const std::string TOPOLOGY_CONTAINER_CPU_REQUESTED;
137137

138138
/**
139-
* Amount of ram per container to be reserved for this topology.
139+
* Amount of RAM per container to be reserved for this topology.
140140
* In bytes.
141141
*/
142142
static const std::string TOPOLOGY_CONTAINER_RAM_REQUESTED;
@@ -148,12 +148,12 @@ class Config {
148148
static const std::string TOPOLOGY_CONTAINER_DISK_REQUESTED;
149149

150150
/**
151-
* Hint for max number of cpu cores per container to be reserved for this topology
151+
* Hint for max number of CPU cores per container to be reserved for this topology
152152
*/
153153
static const std::string TOPOLOGY_CONTAINER_MAX_CPU_HINT;
154154

155155
/**
156-
* Hint for max amount of ram per container to be reserved for this topology.
156+
* Hint for max amount of RAM per container to be reserved for this topology.
157157
* In bytes.
158158
*/
159159
static const std::string TOPOLOGY_CONTAINER_MAX_RAM_HINT;
@@ -171,19 +171,19 @@ class Config {
171171
static const std::string TOPOLOGY_CONTAINER_PADDING_PERCENTAGE;
172172

173173
/**
174-
* Amount of ram to pad each container for this topology.
174+
* Amount of RAM to pad each container for this topology.
175175
* In bytes.
176176
*/
177177
static const std::string TOPOLOGY_CONTAINER_RAM_PADDING;
178178

179179
/**
180-
* Per component cpu requirement. The format of this flag is something like
180+
* Per component CPU requirement. The format of this flag is something like
181181
* spout0:0.2,spout1:0.2,bolt1:0.5.
182182
*/
183183
static const std::string TOPOLOGY_COMPONENT_CPUMAP;
184184

185185
/**
186-
* Per component ram requirement. The format of this flag is something like
186+
* Per component RAM requirement. The format of this flag is something like
187187
* spout0:12434,spout1:345353,bolt1:545356.
188188
*/
189189
static const std::string TOPOLOGY_COMPONENT_RAMMAP;
@@ -305,14 +305,14 @@ class Config {
305305

306306
void setComponentCpu(const std::string& componentName, double cpu) {
307307
if (cpu < 0) {
308-
throw std::runtime_error("Invalid Cpu specified for component");
308+
throw std::runtime_error("Invalid CPU specified for component");
309309
}
310310
appendComponentConfig<double>(Config::TOPOLOGY_COMPONENT_CPUMAP, componentName, cpu);
311311
}
312312

313313
void setComponentRam(const std::string& componentName, int64_t bytes) {
314314
if (bytes < 0) {
315-
throw std::runtime_error("Invalid Ram specified for component");
315+
throw std::runtime_error("Invalid RAM specified for component");
316316
}
317317
appendComponentConfig<int64_t>(Config::TOPOLOGY_COMPONENT_RAMMAP, componentName, bytes);
318318
}

heron/api/src/java/org/apache/heron/api/Config.java

+9-9
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public class Config extends HashMap<String, Object> {
4848
*/
4949
public static final String TOPOLOGY_WORKER_CHILDOPTS = "topology.worker.childopts";
5050
/**
51-
* Per component jvm options. The format of this flag is something like
51+
* Per component JVM options. The format of this flag is something like
5252
* spout0:jvmopt_for_spout0,spout1:jvmopt_for_spout1. Mostly should be used
5353
* in conjunction with setComponentJvmOptions(). This is used in addition
5454
* to TOPOLOGY_WORKER_CHILDOPTS. While TOPOLOGY_WORKER_CHILDOPTS applies for
@@ -153,11 +153,11 @@ public enum TopologyReliabilityMode {
153153
public static final String TOPOLOGY_RELIABILITY_MODE = "topology.reliability.mode";
154154

155155
/**
156-
* Number of cpu cores per container to be reserved for this topology
156+
* Number of CPU cores per container to be reserved for this topology
157157
*/
158158
public static final String TOPOLOGY_CONTAINER_CPU_REQUESTED = "topology.container.cpu";
159159
/**
160-
* Amount of ram per container to be reserved for this topology.
160+
* Amount of RAM per container to be reserved for this topology.
161161
* In bytes.
162162
*/
163163
public static final String TOPOLOGY_CONTAINER_RAM_REQUESTED = "topology.container.ram";
@@ -167,11 +167,11 @@ public enum TopologyReliabilityMode {
167167
*/
168168
public static final String TOPOLOGY_CONTAINER_DISK_REQUESTED = "topology.container.disk";
169169
/**
170-
* Hint for max number of cpu cores per container to be reserved for this topology
170+
* Hint for max number of CPU cores per container to be reserved for this topology
171171
*/
172172
public static final String TOPOLOGY_CONTAINER_MAX_CPU_HINT = "topology.container.max.cpu.hint";
173173
/**
174-
* Hint for max amount of ram per container to be reserved for this topology.
174+
* Hint for max amount of RAM per container to be reserved for this topology.
175175
* In bytes.
176176
*/
177177
public static final String TOPOLOGY_CONTAINER_MAX_RAM_HINT = "topology.container.max.ram.hint";
@@ -187,22 +187,22 @@ public enum TopologyReliabilityMode {
187187
public static final String TOPOLOGY_CONTAINER_PADDING_PERCENTAGE
188188
= "topology.container.padding.percentage";
189189
/**
190-
* Amount of ram to pad each container.
190+
* Amount of RAM to pad each container.
191191
* In bytes.
192192
*/
193193
public static final String TOPOLOGY_CONTAINER_RAM_PADDING = "topology.container.ram.padding";
194194
/**
195-
* Per component ram requirement. The format of this flag is something like
195+
* Per component RAM requirement. The format of this flag is something like
196196
* spout0:0.2,spout1:0.2,bolt1:0.5.
197197
*/
198198
public static final String TOPOLOGY_COMPONENT_CPUMAP = "topology.component.cpumap";
199199
/**
200-
* Per component ram requirement. The format of this flag is something like
200+
* Per component RAM requirement. The format of this flag is something like
201201
* spout0:12434,spout1:345353,bolt1:545356.
202202
*/
203203
public static final String TOPOLOGY_COMPONENT_RAMMAP = "topology.component.rammap";
204204
/**
205-
* Per component ram requirement. The format of this flag is something like
205+
* Per component RAM requirement. The format of this flag is something like
206206
* spout0:12434,spout1:345353,bolt1:545356.
207207
*/
208208
public static final String TOPOLOGY_COMPONENT_DISKMAP = "topology.component.diskmap";

heron/api/src/java/org/apache/heron/api/utils/TopologyUtils.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ public static boolean verifyTopology(TopologyAPI.Topology topology) {
181181
return false;
182182
}
183183

184-
// Only verify ram map string well-formed.
184+
// Only verify RAM map string well-formed.
185185
getComponentRamMapConfig(topology);
186186
// Verify all bolts input streams exist. First get all output streams.
187187
Set<String> outputStreams = new HashSet<>();
@@ -244,7 +244,7 @@ public static Map<String, Double> getComponentCpuMapConfig(TopologyAPI.Topology
244244
* Returns a empty map if the Config is not set
245245
*
246246
* @param topology the topology def
247-
* @return a map (componentName -&gt; ram required)
247+
* @return a map (componentName -&gt; RAM required)
248248
*/
249249
public static Map<String, ByteAmount> getComponentRamMapConfig(TopologyAPI.Topology topology)
250250
throws RuntimeException {

heron/api/src/java/org/apache/heron/streamlet/Builder.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
/**
2626
* Builder is used to register all sources. Builder thus keeps track
27-
* of all the starting points of the computation dag and uses this
27+
* of all the starting points of the computation DAG and uses this
2828
* information to build the topology
2929
*/
3030
public interface Builder {

heron/api/src/java/org/apache/heron/streamlet/impl/BuilderImpl.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
/**
3434
* BuilderImpl implements the Builder interface.
3535
* The builder keeps track of the all the sources of the
36-
* computation dag and builds the Topology by traversing all
36+
* computation DAG and builds the Topology by traversing all
3737
* the computation nodes.
3838
*/
3939
public final class BuilderImpl implements Builder {

heron/api/src/scala/org/apache/heron/streamlet/scala/Builder.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import org.apache.heron.streamlet.scala.impl.BuilderImpl
2222

2323
/**
2424
* Builder is used to register all sources. Builder thus keeps track
25-
* of all the starting points of the computation dag and uses this
25+
* of all the starting points of the computation DAG and uses this
2626
* information to build the topology
2727
*/
2828
object Builder {
@@ -32,7 +32,7 @@ object Builder {
3232

3333
/**
3434
* Builder is used to register all sources. Builder thus keeps track
35-
* of all the starting points of the computation dag and uses this
35+
* of all the starting points of the computation DAG and uses this
3636
* information to build the topology
3737
*/
3838
trait Builder {

0 commit comments

Comments
 (0)