Skip to content

Commit f33cef5

Browse files
kiszkkou
authored andcommitted
ARROW-7485: [C++][Prasma] Fix typos
This PR fixes typos in files under `cpp/src/prasma` directory Closes #6113 from kiszk/ARROW-7485 and squashes the following commits: d304057 <Kazuaki Ishizaki> fix typo Authored-by: Kazuaki Ishizaki <[email protected]> Signed-off-by: Sutou Kouhei <[email protected]>
1 parent 967728f commit f33cef5

File tree

8 files changed

+13
-13
lines changed

8 files changed

+13
-13
lines changed

cpp/src/plasma/fling.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include <sys/un.h>
3030
#include <unistd.h>
3131

32-
// This is neccessary for Mac OS X, see http://www.apuebook.com/faqs2e.html
32+
// This is necessary for Mac OS X, see http://www.apuebook.com/faqs2e.html
3333
// (10).
3434
#if !defined(CMSG_SPACE) && !defined(CMSG_LEN)
3535
#define CMSG_SPACE(len) (__DARWIN_ALIGN32(sizeof(struct cmsghdr)) + __DARWIN_ALIGN32(len))

cpp/src/plasma/io.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ enum class MessageType : int64_t;
4040
} // namespace flatbuf
4141

4242
// TODO(pcm): Replace our own custom message header (message type,
43-
// message length, plasma protocol verion) with one that is serialized
43+
// message length, plasma protocol version) with one that is serialized
4444
// using flatbuffers.
4545
constexpr int64_t kPlasmaProtocolVersion = 0x0000000000000000;
4646

cpp/src/plasma/protocol.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ Status SendDeleteReply(int sock, const std::vector<ObjectID>& object_ids,
174174
Status ReadDeleteReply(uint8_t* data, size_t size, std::vector<ObjectID>* object_ids,
175175
std::vector<PlasmaError>* errors);
176176

177-
/* Plasma Constains message functions. */
177+
/* Plasma Contains message functions. */
178178

179179
Status SendContainsRequest(int sock, ObjectID object_id);
180180

cpp/src/plasma/store.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ PlasmaError PlasmaStore::CreateObject(const ObjectID& object_id, int64_t data_si
221221
auto entry = GetObjectTableEntry(&store_info_, object_id);
222222
if (entry != nullptr) {
223223
// There is already an object with the same ID in the Plasma Store, so
224-
// ignore this requst.
224+
// ignore this request.
225225
return PlasmaError::ObjectExists;
226226
}
227227

@@ -465,7 +465,7 @@ void PlasmaStore::ProcessGetRequest(Client* client,
465465
evicted_ids.push_back(object_id);
466466
evicted_entries.push_back(entry);
467467
} else {
468-
// We are out of memory an cannot allocate memory for this object.
468+
// We are out of memory and cannot allocate memory for this object.
469469
// Change the state of the object back to PLASMA_EVICTED so some
470470
// other request can try again.
471471
entry->state = ObjectState::PLASMA_EVICTED;

cpp/src/plasma/store.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ class PlasmaStore {
102102
/// @return 1 if the abort succeeds, else 0.
103103
int AbortObject(const ObjectID& object_id, Client* client);
104104

105-
/// Delete an specific object by object_id that have been created in the hash table.
105+
/// Delete a specific object by object_id that have been created in the hash table.
106106
///
107107
/// @param object_id Object ID of the object to be deleted.
108108
/// @return One of the following error codes:

cpp/src/plasma/test/client_tests.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,7 @@ TEST_F(TestPlasmaStore, RefreshLRUTest) {
503503
TEST_F(TestPlasmaStore, DeleteTest) {
504504
ObjectID object_id = random_object_id();
505505

506-
// Test for deleting non-existance object.
506+
// Test for deleting non-existence object.
507507
Status result = client_.Delete(object_id);
508508
ARROW_CHECK_OK(result);
509509

@@ -533,7 +533,7 @@ TEST_F(TestPlasmaStore, DeleteObjectsTest) {
533533
ObjectID object_id1 = random_object_id();
534534
ObjectID object_id2 = random_object_id();
535535

536-
// Test for deleting non-existance object.
536+
// Test for deleting non-existence object.
537537
Status result = client_.Delete(std::vector<ObjectID>{object_id1, object_id2});
538538
ARROW_CHECK_OK(result);
539539
// Test for the object being in local Plasma store.
@@ -928,7 +928,7 @@ TEST_F(TestPlasmaStore, DeleteObjectsGPUTest) {
928928
ObjectID object_id1 = random_object_id();
929929
ObjectID object_id2 = random_object_id();
930930

931-
// Test for deleting non-existance object.
931+
// Test for deleting non-existence object.
932932
Status result = client_.Delete(std::vector<ObjectID>{object_id1, object_id2});
933933
ARROW_CHECK_OK(result);
934934
// Test for the object being in local Plasma store.

cpp/src/plasma/thirdparty/ae/ae_evport.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ static void aeApiDelEvent(aeEventLoop *eventLoop, int fd, int mask) {
232232
/*
233233
* ENOMEM is a potentially transient condition, but the kernel won't
234234
* generally return it unless things are really bad. EAGAIN indicates
235-
* we've reached an resource limit, for which it doesn't make sense to
235+
* we've reached a resource limit, for which it doesn't make sense to
236236
* retry (counter-intuitively). All other errors indicate a bug. In any
237237
* of these cases, the best we can do is to abort.
238238
*/

cpp/src/plasma/thirdparty/dlmalloc.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1163,7 +1163,7 @@ DLMALLOC_EXPORT void** dlindependent_calloc(size_t, size_t, void**);
11631163
Each element must be freed when it is no longer needed. This can be
11641164
done all at once using bulk_free.
11651165
1166-
independent_comallac differs from independent_calloc in that each
1166+
independent_comalloc differs from independent_calloc in that each
11671167
element may have a different size, and also that it does not
11681168
automatically clear elements.
11691169
@@ -1689,7 +1689,7 @@ static FORCEINLINE void* win32direct_mmap(size_t size) {
16891689
return (ptr != 0)? ptr: MFAIL;
16901690
}
16911691

1692-
/* This function supports releasing coalesed segments */
1692+
/* This function supports releasing coalesced segments */
16931693
static FORCEINLINE int win32munmap(void* ptr, size_t size) {
16941694
MEMORY_BASIC_INFORMATION minfo;
16951695
char* cptr = (char*)ptr;
@@ -1777,7 +1777,7 @@ static FORCEINLINE int win32munmap(void* ptr, size_t size) {
17771777
#define CALL_MREMAP(addr, osz, nsz, mv) MFAIL
17781778
#endif /* HAVE_MMAP && HAVE_MREMAP */
17791779

1780-
/* mstate bit set if continguous morecore disabled or failed */
1780+
/* mstate bit set if contiguous morecore disabled or failed */
17811781
#define USE_NONCONTIGUOUS_BIT (4U)
17821782

17831783
/* segment bit set in create_mspace_with_base */

0 commit comments

Comments
 (0)