Skip to content

Commit 2ee066e

Browse files
authored
fix: fix typo (#4055)
1 parent d4f9e16 commit 2ee066e

Some content is hidden

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

57 files changed

+218
-218
lines changed

src/apiserver/api_server_impl.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ void APIServerImpl::RegisterPut() {
436436

437437
for (int i = 0; i < cnt; ++i) {
438438
if (!AppendJsonValue(arr[i], schema->GetColumnType(i), schema->IsColumnNotNull(i), row)) {
439-
writer << resp.Set(absl::StrCat("convertion failed on col ", schema->GetColumnName(i), "[",
439+
writer << resp.Set(absl::StrCat("conversion failed on col ", schema->GetColumnName(i), "[",
440440
schema->GetColumnType(i), "] with value ", arr[i].GetString()));
441441
return;
442442
}

src/apiserver/api_server_test.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -612,7 +612,7 @@ TEST_F(APIServerTest, validPut) {
612612
JsonReader reader(cntl.response_attachment().to_string().c_str());
613613
reader >> resp;
614614
ASSERT_EQ(-1, resp.code) << resp.msg;
615-
ASSERT_STREQ("convertion failed on col field4[7] with value 2021-0 4-27", resp.msg.c_str());
615+
ASSERT_STREQ("conversion failed on col field4[7] with value 2021-0 4-27", resp.msg.c_str());
616616
}
617617

618618
// valid data
@@ -1164,7 +1164,7 @@ TEST_F(APIServerTest, getDBs) {
11641164
{
11651165
hybridse::sdk::Status status;
11661166
for (auto& db : test_dbs) {
1167-
// empty db can be droped
1167+
// empty db can be dropped
11681168
env->cluster_remote->DropDB(db, &status);
11691169
ASSERT_TRUE(env->cluster_remote->CreateDB(db, &status));
11701170
}

src/base/endianconv.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
#endif /* BYTE_ORDER */
8383

8484
/* Sometimes after including an OS-specific header that defines the
85-
* endianess we end with __BYTE_ORDER but not with BYTE_ORDER that is what
85+
* endianness we end with __BYTE_ORDER but not with BYTE_ORDER that is what
8686
* the Redis code uses. In this case let's define everything without the
8787
* underscores. */
8888
#ifndef BYTE_ORDER
@@ -121,7 +121,7 @@ uint16_t intrev16(uint16_t v);
121121
uint32_t intrev32(uint32_t v);
122122
uint64_t intrev64(uint64_t v);
123123

124-
/* variants of the function doing the actual convertion only if the target
124+
/* variants of the function doing the actual conversion only if the target
125125
* host is big endian */
126126
#if (BYTE_ORDER == LITTLE_ENDIAN)
127127
#define memrev16ifbe(p)

src/base/linenoise.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
*
9292
* DSR (Device Status Report)
9393
* Sequence: ESC [ 6 n
94-
* Effect: reports the current cusor position as ESC [ n ; m R
94+
* Effect: reports the current cursor position as ESC [ n ; m R
9595
* where n is the row and m is the column
9696
*
9797
* When multi line mode is enabled, we also use an additional escape
@@ -562,7 +562,7 @@ static void refreshMultiLine(struct linenoiseState *l) {
562562
int rows = (plen + l->len + l->cols - 1) / l->cols; /* rows used by current buf. */
563563
int rpos = (plen + l->oldpos + l->cols) / l->cols; /* cursor relative row. */
564564
int rpos2; /* rpos after refresh. */
565-
int col; /* colum position, zero-based. */
565+
int col; /* column position, zero-based. */
566566
int old_rows = l->maxrows;
567567
int fd = l->ofd, j;
568568
struct abuf ab;
@@ -756,7 +756,7 @@ void linenoiseEditBackspace(struct linenoiseState *l) {
756756
}
757757
}
758758

759-
/* Delete the previosu word, maintaining the cursor at the start of the
759+
/* Delete the previous word, maintaining the cursor at the start of the
760760
* current word. */
761761
void linenoiseEditDeletePrevWord(struct linenoiseState *l) {
762762
size_t old_pos = l->pos;

src/base/status.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ enum ReturnCode {
8282
kSnapshotRecycled = 147,
8383
kQueryFailed = 148,
8484
kPutBadFormat = 149,
85-
kUnkownTableType = 150,
85+
kUnknownTableType = 150,
8686
kColNameNotFound = 151,
8787
kEncodeError = 152,
8888
kAddTypeToColumnDescFailed = 153,
@@ -144,7 +144,7 @@ enum ReturnCode {
144144
kTermLeCurTerm = 406,
145145
kZoneNameNotEqual = 407,
146146
kAlreadyJoinZone = 408,
147-
kUnkownServerMode = 409,
147+
kUnknownServerMode = 409,
148148
kZoneNotEmpty = 410,
149149
kCreateZkFailed = 450,
150150
kGetZkFailed = 451,

src/catalog/client_manager.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ bool AsyncTablesHandler::SyncAllTableHandlers() {
183183
return false;
184184
}
185185
if (!iter) {
186-
status_.msg = "fail to sync table hander: iter is null";
186+
status_.msg = "fail to sync table handler: iter is null";
187187
status_.code = hybridse::common::kResponseError;
188188
LOG(WARNING) << status_;
189189
return false;
@@ -348,7 +348,7 @@ std::shared_ptr<hybridse::vm::RowHandler> TabletsAccessor::SubQuery(uint32_t tas
348348
const hybridse::codec::Row& row,
349349
const bool is_procedure, const bool is_debug) {
350350
return std::make_shared<::hybridse::vm::ErrorRowHandler>(::hybridse::common::kRpcError,
351-
"TabletsAccessor Unsupport SubQuery with request");
351+
"TabletsAccessor Unsupported SubQuery with request");
352352
}
353353

354354
std::shared_ptr<hybridse::vm::TableHandler> TabletsAccessor::SubQuery(uint32_t task_id, const std::string& db,

src/catalog/distribute_iterator.cc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -182,9 +182,9 @@ const ::hybridse::codec::Row& FullTableIterator::GetValue() {
182182
slice_row = kv_it_->GetValue();
183183
}
184184
size_t sz = slice_row.size();
185-
int8_t* copyed_row_data = reinterpret_cast<int8_t*>(malloc(sz));
186-
memcpy(copyed_row_data, slice_row.data(), sz);
187-
auto shared_slice = ::hybridse::base::RefCountedSlice::CreateManaged(copyed_row_data, sz);
185+
int8_t* copied_row_data = reinterpret_cast<int8_t*>(malloc(sz));
186+
memcpy(copied_row_data, slice_row.data(), sz);
187+
auto shared_slice = ::hybridse::base::RefCountedSlice::CreateManaged(copied_row_data, sz);
188188
buffered_slices_.push_back(shared_slice);
189189
value_.Reset(shared_slice);
190190
return value_;
@@ -419,9 +419,9 @@ const ::hybridse::codec::Row& RemoteWindowIterator::GetValue() {
419419
size_t sz = slice_row.size();
420420
// for distributed environment, slice_row's data probably become invalid when the DistributeWindowIterator
421421
// iterator goes out of scope. so copy action occurred here
422-
int8_t* copyed_row_data = reinterpret_cast<int8_t*>(malloc(sz));
423-
memcpy(copyed_row_data, slice_row.data(), sz);
424-
auto shared_slice = ::hybridse::base::RefCountedSlice::CreateManaged(copyed_row_data, sz);
422+
int8_t* copied_row_data = reinterpret_cast<int8_t*>(malloc(sz));
423+
memcpy(copied_row_data, slice_row.data(), sz);
424+
auto shared_slice = ::hybridse::base::RefCountedSlice::CreateManaged(copied_row_data, sz);
425425
row_.Reset(shared_slice);
426426
DLOG(INFO) << "get value pk " << pk_ << " ts_key " << kv_it_->GetKey() << " ts " << ts_;
427427
valid_value_ = true;

src/catalog/distribute_iterator.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class FullTableIterator : public ::hybridse::codec::ConstIterator<uint64_t, ::hy
3838
FullTableIterator(uint32_t tid, std::shared_ptr<Tables> tables,
3939
const std::map<uint32_t, std::shared_ptr<::openmldb::client::TabletClient>>& tablet_clients);
4040
void Seek(const uint64_t& ts) override {
41-
LOG(ERROR) << "Unsupport Seek in FullTableIterator";
41+
LOG(ERROR) << "Unsupported Seek in FullTableIterator";
4242
}
4343

4444
void SeekToFirst() override;

src/catalog/tablet_catalog.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ class TabletSegmentHandler : public ::hybridse::vm::TableHandler {
8787
class TabletPartitionHandler : public ::hybridse::vm::PartitionHandler,
8888
public std::enable_shared_from_this<hybridse::vm::PartitionHandler> {
8989
public:
90-
TabletPartitionHandler(std::shared_ptr<::hybridse::vm::TableHandler> table_hander, const std::string &index_name)
91-
: PartitionHandler(), table_handler_(table_hander), index_name_(index_name) {}
90+
TabletPartitionHandler(std::shared_ptr<::hybridse::vm::TableHandler> table_handler, const std::string &index_name)
91+
: PartitionHandler(), table_handler_(table_handler), index_name_(index_name) {}
9292

9393
~TabletPartitionHandler() {}
9494

src/client/taskmanager_client.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ ::openmldb::base::Status TaskManagerClient::ShowJobs(bool only_unfinished, int j
3030

3131
auto st = client_.SendRequestSt(&::openmldb::taskmanager::TaskManagerServer_Stub::ShowJobs, &request, &response,
3232
job_timeout, 1);
33-
// if ok, cntl won't failed, only check repsonse
33+
// if ok, cntl won't failed, only check response
3434
if (st.OK()) {
3535
if (response.code() == 0) {
3636
for (int32_t i = 0; i < response.jobs_size(); i++) {

0 commit comments

Comments
 (0)