Skip to content

Commit b0b8099

Browse files
co63occo63oc
authored
fix: Fix typos (#4492)
<!-- Thanks for your contribution! please review https://github.com/alibaba/GraphScope/blob/main/CONTRIBUTING.md before opening an issue. --> ## What do these changes do? Fix typos <!-- Please give a short brief about these changes. --> ## Related issue number <!-- Are there any issues opened that will be resolved by merging this change? --> Fixes
1 parent 08ad5bf commit b0b8099

File tree

17 files changed

+67
-67
lines changed

17 files changed

+67
-67
lines changed

‎analytical_engine/core/error.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,10 @@ inline std::string formatEnumValue(const vineyard::ErrorCode& value) {
8585

8686
#ifndef __FRAME_CURRENT_EXCEPTION_TYPENAME
8787
#if defined(__GLIBCXX__) || defined(__GLIBCPP__)
88-
#define __FRAME_CURRENT_EXCEPTION_TYPENAME(var) \
89-
do { \
90-
std::exception_ptr __p = std::current_exception(); \
91-
var = __p ? __p.__cxa_exception_type()->name() : "unknow type"; \
88+
#define __FRAME_CURRENT_EXCEPTION_TYPENAME(var) \
89+
do { \
90+
std::exception_ptr __p = std::current_exception(); \
91+
var = __p ? __p.__cxa_exception_type()->name() : "unknown type"; \
9292
} while (0)
9393
#else
9494
#define __FRAME_CURRENT_EXCEPTION_TYPENAME(var) \

‎analytical_engine/java/grape-giraph/src/main/java/com/alibaba/graphscope/context/GiraphComputationAdaptorContext.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ public void writeBackVertexData() {
176176
for (long lid = 0; lid < innerVerticesNum; ++lid) {
177177
// Write the output of toString().
178178
outputStream.writeBytes(vertexDataManager.getVertexData(lid).toString());
179-
long cur = outputStream.bytesWriten();
179+
long cur = outputStream.bytesWritten();
180180
offsets[(int) lid] = cur - previous;
181181
maxOffset = Math.max(offsets[(int) lid], maxOffset);
182182
previous = cur;

‎analytical_engine/java/grape-giraph/src/main/java/com/alibaba/graphscope/graph/impl/GiraphVertexIdManagerImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ private FFIByteVectorInputStream generateVertexIdStream() {
148148
outputStream.finishSetting();
149149
logger.info(
150150
"Vertex id stream size: "
151-
+ outputStream.bytesWriten()
151+
+ outputStream.bytesWritten()
152152
+ ", vertices: "
153153
+ vertexNum);
154154
} catch (IOException e) {

‎analytical_engine/java/grape-giraph/src/main/java/com/alibaba/graphscope/graph/impl/VertexDataManagerImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ private void readVertexDataFromIFragment(FFIByteVectorOutputStream outputStream)
156156
outputStream.finishSetting();
157157
logger.info(
158158
"Vertex data stream size: "
159-
+ outputStream.bytesWriten()
159+
+ outputStream.bytesWritten()
160160
+ ", vertices: "
161161
+ vertexNum);
162162
} catch (IOException e) {

‎analytical_engine/java/grape-giraph/src/main/java/com/alibaba/graphscope/loader/impl/GraphDataBufferManagerImpl.java‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -170,14 +170,14 @@ private void check() {
170170
@Override
171171
public synchronized void addVertex(int threadId, Writable id, Writable value)
172172
throws IOException {
173-
int bytes = (int) -vidOutputStream[threadId].bytesWriten();
173+
int bytes = (int) -vidOutputStream[threadId].bytesWritten();
174174
id.write(vidOutputStream[threadId]);
175-
bytes += vidOutputStream[threadId].bytesWriten();
175+
bytes += vidOutputStream[threadId].bytesWritten();
176176
idOffsetsArr[threadId].push_back(bytes);
177177

178-
int bytes2 = (int) -vdataOutputStream[threadId].bytesWriten();
178+
int bytes2 = (int) -vdataOutputStream[threadId].bytesWritten();
179179
value.write(vdataOutputStream[threadId]);
180-
bytes2 += vdataOutputStream[threadId].bytesWriten();
180+
bytes2 += vdataOutputStream[threadId].bytesWritten();
181181
vdataOffsetsArr[threadId].push_back(bytes2);
182182
}
183183

@@ -187,19 +187,19 @@ public synchronized void addEdges(int threadId, Writable id, Iterable<Edge> edge
187187
int bytesEdgeSrcOffset = 0, bytesEdgeDstOffset = 0, bytesDataOffsets = 0;
188188

189189
for (Edge edge : edges) {
190-
bytesEdgeSrcOffset = (int) -edgeSrcIdOutputStream[threadId].bytesWriten();
190+
bytesEdgeSrcOffset = (int) -edgeSrcIdOutputStream[threadId].bytesWritten();
191191
id.write(edgeSrcIdOutputStream[threadId]);
192-
bytesEdgeSrcOffset += edgeSrcIdOutputStream[threadId].bytesWriten();
192+
bytesEdgeSrcOffset += edgeSrcIdOutputStream[threadId].bytesWritten();
193193
edgeSrcIdOffsetArr[threadId].push_back(bytesEdgeSrcOffset);
194194

195-
bytesEdgeDstOffset = (int) -edgeDstOutputStream[threadId].bytesWriten();
195+
bytesEdgeDstOffset = (int) -edgeDstOutputStream[threadId].bytesWritten();
196196
edge.getTargetVertexId().write(edgeDstOutputStream[threadId]);
197-
bytesEdgeDstOffset += edgeDstOutputStream[threadId].bytesWriten();
197+
bytesEdgeDstOffset += edgeDstOutputStream[threadId].bytesWritten();
198198
edgeDstIdOffsetArr[threadId].push_back(bytesEdgeDstOffset);
199199

200-
bytesDataOffsets = (int) -edgeDataOutStream[threadId].bytesWriten();
200+
bytesDataOffsets = (int) -edgeDataOutStream[threadId].bytesWritten();
201201
edge.getValue().write(edgeDataOutStream[threadId]);
202-
bytesDataOffsets += edgeDataOutStream[threadId].bytesWriten();
202+
bytesDataOffsets += edgeDataOutStream[threadId].bytesWritten();
203203
edgeDataOffsetsArr[threadId].push_back(bytesDataOffsets);
204204
}
205205
}
@@ -210,19 +210,19 @@ public void addEdge(
210210
throws IOException {
211211
int bytesEdgeSrcOffset = 0, bytesEdgeDstOffset = 0, bytesDataOffsets = 0;
212212

213-
bytesEdgeSrcOffset = (int) -edgeSrcIdOutputStream[threadId].bytesWriten();
213+
bytesEdgeSrcOffset = (int) -edgeSrcIdOutputStream[threadId].bytesWritten();
214214
srcId.write(edgeSrcIdOutputStream[threadId]);
215-
bytesEdgeSrcOffset += edgeSrcIdOutputStream[threadId].bytesWriten();
215+
bytesEdgeSrcOffset += edgeSrcIdOutputStream[threadId].bytesWritten();
216216
edgeSrcIdOffsetArr[threadId].push_back(bytesEdgeSrcOffset);
217217

218-
bytesEdgeDstOffset = (int) -edgeDstOutputStream[threadId].bytesWriten();
218+
bytesEdgeDstOffset = (int) -edgeDstOutputStream[threadId].bytesWritten();
219219
dstId.write(edgeDstOutputStream[threadId]);
220-
bytesEdgeDstOffset += edgeDstOutputStream[threadId].bytesWriten();
220+
bytesEdgeDstOffset += edgeDstOutputStream[threadId].bytesWritten();
221221
edgeDstIdOffsetArr[threadId].push_back(bytesEdgeDstOffset);
222222

223-
bytesDataOffsets = (int) -edgeDataOutStream[threadId].bytesWriten();
223+
bytesDataOffsets = (int) -edgeDataOutStream[threadId].bytesWritten();
224224
value.write(edgeDataOutStream[threadId]);
225-
bytesDataOffsets += edgeDataOutStream[threadId].bytesWriten();
225+
bytesDataOffsets += edgeDataOutStream[threadId].bytesWritten();
226226
edgeDataOffsetsArr[threadId].push_back(bytesDataOffsets);
227227

228228
// logger.debug("worker [{}] adding edge [{}]->[{}], value {}", workerId, srcId,

‎analytical_engine/java/grape-giraph/src/main/java/com/alibaba/graphscope/parallel/mm/impl/GiraphMpiMessageManager.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,9 @@ public void sendMessage(OID_T dstOid, OUT_MSG_T message) {
135135

136136
private void sendMessage(com.alibaba.graphscope.ds.Vertex<GS_VID_T> vertex, OUT_MSG_T msg) {
137137
int dstfragId = fragment.getFragId(vertex);
138-
if (cacheOut[dstfragId].bytesWriten() >= THRESHOLD && dstfragId != fragId) {
138+
if (cacheOut[dstfragId].bytesWritten() >= THRESHOLD && dstfragId != fragId) {
139139
cacheOut[dstfragId].writeLong(
140-
0, cacheOut[dstfragId].bytesWriten() - 8); // minus size_of_long
140+
0, cacheOut[dstfragId].bytesWritten() - 8); // minus size_of_long
141141
cacheOut[dstfragId].finishSetting();
142142
// the vertex will be swapped. so this vector is empty;
143143
grapeMessager.sendToFragment(dstfragId, cacheOut[dstfragId].getVector());
@@ -194,31 +194,31 @@ public void sendMessageToAllEdges(Vertex<OID_T, VDATA_T, EDATA_T> vertex, OUT_MS
194194
@Override
195195
public void finishMessageSending() {
196196
for (int i = 0; i < fragNum; ++i) {
197-
long bytesWriten = cacheOut[i].bytesWriten();
197+
long bytesWritten = cacheOut[i].bytesWritten();
198198
cacheOut[i].finishSetting();
199-
cacheOut[i].writeLong(0, bytesWriten - SIZE_OF_LONG);
199+
cacheOut[i].writeLong(0, bytesWritten - SIZE_OF_LONG);
200200

201-
if (bytesWriten == SIZE_OF_LONG) {
201+
if (bytesWritten == SIZE_OF_LONG) {
202202
logger.debug(
203203
"[Finish msg] sending skip msg from {} -> {}, since msg size: {}",
204204
fragId,
205205
i,
206-
bytesWriten);
206+
bytesWritten);
207207
continue;
208208
}
209209
if (i == fragId) {
210210
nextIncomingMessageStore.digest(cacheOut[i].getVector());
211211
logger.info(
212212
"In final step, Frag [{}] digest msg to self of size: {}",
213213
fragId,
214-
bytesWriten);
214+
bytesWritten);
215215
} else {
216216
grapeMessager.sendToFragment(i, cacheOut[i].getVector());
217217
logger.info(
218218
"In final step, Frag [{}] send msg to [{}] of size: {}",
219219
fragId,
220220
i,
221-
bytesWriten);
221+
bytesWritten);
222222
}
223223
}
224224
// if (maxSuperStep > 0) {

‎analytical_engine/java/grape-giraph/src/main/java/com/alibaba/graphscope/parallel/utils/Utils.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ private static String[] actAsCoordinator(
7878
outputStream.writeUTF(res[i]);
7979
info(workerId, "from worker: " + i + ": " + res[i]);
8080
}
81-
outputStream.writeLong(0, outputStream.bytesWriten() - 8);
81+
outputStream.writeLong(0, outputStream.bytesWritten() - 8);
8282
outputStream.finishSetting();
8383

8484
// Distribute to others;
@@ -111,7 +111,7 @@ private static String[] actAsWorker(
111111
e.printStackTrace();
112112
return null;
113113
}
114-
outputStream.writeLong(0, outputStream.bytesWriten() - 8);
114+
outputStream.writeLong(0, outputStream.bytesWritten() - 8);
115115
outputStream.finishSetting();
116116
info(workerId, "now send to coordinator: " + selfIp);
117117
communicator.sendTo(0, outputStream.getVector());

‎analytical_engine/java/grape-giraph/src/test/java/com/alibaba/graphscope/serialization/FFIByteVectorStreamTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,11 +113,11 @@ public void testOutPutStream() throws IOException {
113113
for (int i = 0; i < 25; ++i) {
114114
outputStream.writeInt(i);
115115
}
116-
Assert.assertTrue(outputStream.bytesWriten() == 100);
116+
Assert.assertTrue(outputStream.bytesWritten() == 100);
117117
FFIByteVector vector = outputStream.getVector();
118118
System.out.println("Buffer size: " + vector.size() + ", size: " + vector.size);
119119
outputStream.finishSetting();
120120
vector = outputStream.getVector();
121-
Assert.assertTrue(vector.size == outputStream.bytesWriten());
121+
Assert.assertTrue(vector.size == outputStream.bytesWritten());
122122
}
123123
}

‎analytical_engine/java/grape-graphx/src/main/java/com/alibaba/graphscope/utils/VertexDataUtils.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,21 +56,21 @@ private static <VD> Tuple2<FFIByteVector, FFIIntVector> fillStringVertexArray(
5656
DoubleDouble dd = (DoubleDouble) array.get(i);
5757
ffiByteVectorOutput.writeDouble(dd.a());
5858
ffiByteVectorOutput.writeDouble(dd.b());
59-
ffiOffset.set(i, (int) (ffiByteVectorOutput.bytesWriten() - prevBytesWritten));
60-
prevBytesWritten = ffiByteVectorOutput.bytesWriten();
59+
ffiOffset.set(i, (int) (ffiByteVectorOutput.bytesWritten() - prevBytesWritten));
60+
prevBytesWritten = ffiByteVectorOutput.bytesWritten();
6161
}
6262
} else {
6363
ObjectOutputStream objectOutputStream = new ObjectOutputStream(ffiByteVectorOutput);
6464
for (int i = 0; i < size; ++i) {
6565
objectOutputStream.writeObject(array.get(i));
66-
ffiOffset.set(i, (int) (ffiByteVectorOutput.bytesWriten() - prevBytesWritten));
67-
prevBytesWritten = ffiByteVectorOutput.bytesWriten();
66+
ffiOffset.set(i, (int) (ffiByteVectorOutput.bytesWritten() - prevBytesWritten));
67+
prevBytesWritten = ffiByteVectorOutput.bytesWritten();
6868
}
6969
objectOutputStream.flush();
7070
}
7171

7272
ffiByteVectorOutput.finishSetting();
73-
long writenBytes = ffiByteVectorOutput.bytesWriten();
73+
long writenBytes = ffiByteVectorOutput.bytesWritten();
7474
logger.info(
7575
"write data array {} of type {}, writen bytes {}",
7676
size,

‎analytical_engine/java/grape-graphx/src/main/scala/com/alibaba/graphscope/graphx/utils/GrapeUtils.scala‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -348,9 +348,9 @@ object GrapeUtils extends Logging {
348348
objectOutputStream.writeObject(array(i))
349349
ffiOffset.set(
350350
i,
351-
ffiByteVectorOutput.bytesWriten().toInt - prevBytesWritten
351+
ffiByteVectorOutput.bytesWritten().toInt - prevBytesWritten
352352
)
353-
prevBytesWritten = ffiByteVectorOutput.bytesWriten().toInt
353+
prevBytesWritten = ffiByteVectorOutput.bytesWritten().toInt
354354
i += 1
355355
}
356356
log.info(
@@ -359,9 +359,9 @@ object GrapeUtils extends Logging {
359359
//require(size == (nullCount + activeVertices.cardinality()))
360360
objectOutputStream.flush()
361361
ffiByteVectorOutput.finishSetting()
362-
val writenBytes = ffiByteVectorOutput.bytesWriten()
362+
val writtenBytes = ffiByteVectorOutput.bytesWritten()
363363
log.info(
364-
s"write data array ${limit} of type ${GrapeUtils.getRuntimeClass[T].getName}, writen bytes ${writenBytes}"
364+
s"write data array ${limit} of type ${GrapeUtils.getRuntimeClass[T].getName}, written bytes ${writtenBytes}"
365365
)
366366
(ffiByteVectorOutput.getVector, ffiOffset)
367367
}
@@ -432,9 +432,9 @@ object GrapeUtils extends Logging {
432432
ffiByteVectorOutput.writeDouble(dd.b)
433433
ffiOffset.set(
434434
i,
435-
ffiByteVectorOutput.bytesWriten().toInt - prevBytesWritten
435+
ffiByteVectorOutput.bytesWritten().toInt - prevBytesWritten
436436
)
437-
prevBytesWritten = ffiByteVectorOutput.bytesWriten().toInt
437+
prevBytesWritten = ffiByteVectorOutput.bytesWritten().toInt
438438
i += 1
439439
}
440440
} else {
@@ -446,18 +446,18 @@ object GrapeUtils extends Logging {
446446
objectOutputStream.writeObject(array(i))
447447
ffiOffset.set(
448448
i,
449-
ffiByteVectorOutput.bytesWriten().toInt - prevBytesWritten
449+
ffiByteVectorOutput.bytesWritten().toInt - prevBytesWritten
450450
)
451-
prevBytesWritten = ffiByteVectorOutput.bytesWriten().toInt
451+
prevBytesWritten = ffiByteVectorOutput.bytesWritten().toInt
452452
i += 1
453453
}
454454
objectOutputStream.flush()
455455
}
456456

457457
ffiByteVectorOutput.finishSetting()
458-
val writenBytes = ffiByteVectorOutput.bytesWriten()
458+
val writtenBytes = ffiByteVectorOutput.bytesWritten()
459459
log.info(
460-
s"write data array ${limit} of type ${GrapeUtils.getRuntimeClass[T].getName}, writen bytes ${writenBytes}"
460+
s"write data array ${limit} of type ${GrapeUtils.getRuntimeClass[T].getName}, written bytes ${writtenBytes}"
461461
)
462462
(ffiByteVectorOutput.getVector, ffiOffset)
463463
}
@@ -486,9 +486,9 @@ object GrapeUtils extends Logging {
486486
ffiByteVectorOutput.writeDouble(dd.b)
487487
ffiOffset.set(
488488
i,
489-
ffiByteVectorOutput.bytesWriten().toInt - prevBytesWritten
489+
ffiByteVectorOutput.bytesWritten().toInt - prevBytesWritten
490490
)
491-
prevBytesWritten = ffiByteVectorOutput.bytesWriten().toInt
491+
prevBytesWritten = ffiByteVectorOutput.bytesWritten().toInt
492492
i += 1
493493
}
494494
} else {
@@ -500,18 +500,18 @@ object GrapeUtils extends Logging {
500500
objectOutputStream.writeObject(array.get(i))
501501
ffiOffset.set(
502502
i,
503-
ffiByteVectorOutput.bytesWriten().toInt - prevBytesWritten
503+
ffiByteVectorOutput.bytesWritten().toInt - prevBytesWritten
504504
)
505-
prevBytesWritten = ffiByteVectorOutput.bytesWriten().toInt
505+
prevBytesWritten = ffiByteVectorOutput.bytesWritten().toInt
506506
i += 1
507507
}
508508
objectOutputStream.flush()
509509
}
510510

511511
ffiByteVectorOutput.finishSetting()
512-
val writenBytes = ffiByteVectorOutput.bytesWriten()
512+
val writtenBytes = ffiByteVectorOutput.bytesWritten()
513513
log.info(
514-
s"write data array ${limit} of type ${GrapeUtils.getRuntimeClass[T].getName}, writen bytes ${writenBytes}"
514+
s"write data array ${limit} of type ${GrapeUtils.getRuntimeClass[T].getName}, written bytes ${writtenBytes}"
515515
)
516516
(ffiByteVectorOutput.getVector, ffiOffset)
517517
}

0 commit comments

Comments
 (0)