database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-30 19:23:07 +03:00
Code Activity

Fix trivial spelling errors

Browse Source 
- occured -> occurred
- reponse -> response
- seperated -> separated

All new code of the whole pull request, including one or several files
that are either new files or modified ones, are contributed under the
BSD-new license. I am contributing on behalf of my employer Amazon Web
Services, Inc.
This commit is contained in:
Otto Kekäläinen
2023-03-11 11:59:47 -08:00
parent 967cf2e005
commit 70124ecc01
29 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dbcon/ddlpackageproc/altertableprocessor.cpp
View File

@ -356,7 +356,7 @@ AlterTableProcessor::DDLResult AlterTableProcessor::processPackage(
{
logging::Message::Args args;
logging::Message message(9);
args.add("Unknown error occured while getting unique number.");
args.add("Unknown error occurred while getting unique number.");
message.format(args);
result.result = ALTER_ERROR;
result.message = message;

2
dbcon/ddlpackageproc/createtableprocessor.cpp
View File

@ -215,7 +215,7 @@ CreateTableProcessor::DDLResult CreateTableProcessor::processPackage(
{
Message::Args args;
Message message(9);
args.add("Unknown error occured while getting unique number.");
args.add("Unknown error occurred while getting unique number.");
message.format(args);
result.result = CREATE_ERROR;
result.message = message;

2
dbcon/ddlpackageproc/droppartitionprocessor.cpp
View File

@ -100,7 +100,7 @@ DropPartitionProcessor::DDLResult DropPartitionProcessor::processPackage(
{
logging::Message::Args args;
logging::Message message(9);
args.add("Unknown error occured while getting unique number.");
args.add("Unknown error occurred while getting unique number.");
message.format(args);
result.result = ALTER_ERROR;
result.message = message;

4
dbcon/ddlpackageproc/droptableprocessor.cpp
View File

@ -114,7 +114,7 @@ DropTableProcessor::DDLResult DropTableProcessor::processPackage(
{
Message::Args args;
Message message(9);
args.add("Unknown error occured while getting unique number.");
args.add("Unknown error occurred while getting unique number.");
message.format(args);
result.result = DROP_ERROR;
result.message = message;
@ -818,7 +818,7 @@ TruncTableProcessor::DDLResult TruncTableProcessor::processPackage(
{
Message::Args args;
Message message(9);
args.add("Unknown error occured while getting unique number.");
args.add("Unknown error occurred while getting unique number.");
message.format(args);
result.result = DROP_ERROR;
result.message = message;

2
dbcon/dmlpackageproc/deletepackageprocessor.cpp
View File

@ -93,7 +93,7 @@ DMLPackageProcessor::DMLResult DeletePackageProcessor::processPackage(dmlpackage
{
logging::Message::Args args;
logging::Message message(9);
args.add("Unknown error occured while getting unique number.");
args.add("Unknown error occurred while getting unique number.");
message.format(args);
result.result = DELETE_ERROR;
result.message = message;

2
dbcon/dmlpackageproc/dmlpackageprocessor.cpp
View File

@ -363,7 +363,7 @@ int DMLPackageProcessor::rollBackTransaction(uint64_t uniqueId, BRM::TxnID txnID
catch (std::exception& e)
{
rc = NETWORK_ERROR;
errorMsg = "Network error occured when rolling back blocks";
errorMsg = "Network error occurred when rolling back blocks";
errorMsg += e.what();
fWEClient->removeQueue(uniqueId);
cout << "erroring out remove queue id " << uniqueId << endl;

2
dbcon/dmlpackageproc/insertpackageprocessor.cpp
View File

@ -100,7 +100,7 @@ DMLPackageProcessor::DMLResult InsertPackageProcessor::processPackage(dmlpackage
{
logging::Message::Args args;
logging::Message message(9);
args.add("Unknown error occured while getting unique number.");
args.add("Unknown error occurred while getting unique number.");
message.format(args);
result.result = INSERT_ERROR;
result.message = message;

2
dbcon/dmlpackageproc/updatepackageprocessor.cpp
View File

@ -98,7 +98,7 @@ DMLPackageProcessor::DMLResult UpdatePackageProcessor::processPackage(dmlpackage
{
logging::Message::Args args;
logging::Message message(9);
args.add("Unknown error occured while getting unique number.");
args.add("Unknown error occurred while getting unique number.");
message.format(args);
result.result = UPDATE_ERROR;
result.message = message;

10
dbcon/execplan/calpontsystemcatalog.cpp
View File

@ -805,7 +805,7 @@ void CalpontSystemCatalog::getSysData(CalpontSelectExecutionPlan& csep, NJLSysDa
getSysData_FE(csep, sysDataList, sysTableName);
break;
}
catch (IDBExcept&) // error already occured. this is not a broken pipe
catch (IDBExcept&) // error already occurred. this is not a broken pipe
{
throw;
}
@ -827,7 +827,7 @@ void CalpontSystemCatalog::getSysData(CalpontSelectExecutionPlan& csep, NJLSysDa
}
if (tryCnt >= 5)
// throw runtime_error("Error occured when calling system catalog. ExeMgr is not functioning.");
// throw runtime_error("Error occurred when calling system catalog. ExeMgr is not functioning.");
throw IDBExcept(ERR_SYSTEM_CATALOG);
}
@ -856,7 +856,7 @@ void CalpontSystemCatalog::getSysData_EC(CalpontSelectExecutionPlan& csep, NJLSy
while (jl->status() != 0)
{
if (retryNum >= 6)
throw runtime_error("Error occured when calling makeJobList");
throw runtime_error("Error occurred when calling makeJobList");
sleep(1);
jl = JobListFactory::makeJobList(&csep, rm, dummyPrimitiveServerThreadPools, true);
@ -866,13 +866,13 @@ void CalpontSystemCatalog::getSysData_EC(CalpontSelectExecutionPlan& csep, NJLSy
if (jl->status() != 0 || jl->putEngineComm(fEc) != 0)
{
string emsg = jl->errMsg();
throw runtime_error("Error occured when calling system catalog (1). " + emsg);
throw runtime_error("Error occurred when calling system catalog (1). " + emsg);
}
if (jl->doQuery() != 0)
{
throw runtime_error(
"Error occured when calling system catalog (2). Make sure all processes are running.");
"Error occurred when calling system catalog (2). Make sure all processes are running.");
}
TupleJobList* tjlp = dynamic_cast<TupleJobList*>(jl.get());

2
dbcon/execplan/objectidmanager.cpp
View File

@ -32,7 +32,7 @@
* This class must implement a high degree of correctness. However, it
* also requires file IO. Most functions throw an exception if a hard IO error
* occurs more than MaxRetries times in a row. Right now the code makes
* no attempt to back out changes that occured before the error although it
* no attempt to back out changes that occurred before the error although it
* may be possible to do so for certain errors. Probably the best course of
* action would be to halt the system if an exception is thrown here
* to prevent database corruption resulting allocation of OIDs from a

2
dbcon/execplan/returnedcolumn.h
View File

@ -370,7 +370,7 @@ class ReturnedColumn : public TreeNode
}
protected:
std::string fErrMsg; /// error occured in evaluation
std::string fErrMsg; /// error occurred in evaluation
uint32_t fInputIndex; /// index to the input rowgroup
uint32_t fOutputIndex; /// index to the output rowgroup
uint32_t fExpressionId; /// unique id for this expression

2
dbcon/mysql/ha_exists_sub.cpp
View File

@ -122,7 +122,7 @@ execplan::ParseTree* ExistsSub::transform()
if (gwi.fatalParseError && !gwi.parseErrorText.empty())
fGwip.parseErrorText = gwi.parseErrorText;
else
fGwip.parseErrorText = "Error occured in ExistsSub::transform()";
fGwip.parseErrorText = "Error occurred in ExistsSub::transform()";
return NULL;
}

2
dbcon/mysql/ha_from_sub.cpp
View File

@ -438,7 +438,7 @@ SCSEP FromSubQuery::transform()
if (!gwi.parseErrorText.empty())
fGwip.parseErrorText = gwi.parseErrorText;
else
fGwip.parseErrorText = "Error occured in FromSubQuery::transform()";
fGwip.parseErrorText = "Error occurred in FromSubQuery::transform()";
csep.reset();
return csep;

2
dbcon/mysql/ha_in_sub.cpp
View File

@ -188,7 +188,7 @@ execplan::ParseTree* InSub::transform()
if (gwi.fatalParseError && !gwi.parseErrorText.empty())
fGwip.parseErrorText = gwi.parseErrorText;
else
fGwip.parseErrorText = "Error occured in InSub::transform()";
fGwip.parseErrorText = "Error occurred in InSub::transform()";
return NULL;
}

2
dbcon/mysql/ha_mcs_ddl.cpp
View File

@ -2174,7 +2174,7 @@ int ProcessDDLStatement(string& ddlStatement, string& schema, const string& tabl
{
rc = 0;
string errmsg(
"Error occured during file deletion. Restart DDLProc or use command tool ddlcleanup to clean up. ");
"Error occurred during file deletion. Restart DDLProc or use command tool ddlcleanup to clean up. ");
push_warning(thd, Sql_condition::WARN_LEVEL_WARN, 9999, errmsg.c_str());
}

8
dbcon/mysql/ha_mcs_partition.cpp
View File

@ -286,7 +286,7 @@ int processPartition(SqlStatement* stmt)
{
rc = 0;
string errmsg(
"Error occured during partitioning operation. Restart DMLProc or use command tool ddlcleanup to "
"Error occurred during partitioning operation. Restart DMLProc or use command tool ddlcleanup to "
"clean up. ");
push_warnings(thd, errmsg);
}
@ -462,7 +462,7 @@ void partitionByValue_common(UDF_ARGS* args, // inp
}
catch (...)
{
errMsg = string("Error occured when calling ") + functionName;
errMsg = string("Error occurred when calling ") + functionName;
return;
}
@ -655,7 +655,7 @@ extern "C"
catch (...)
{
current_thd->get_stmt_da()->set_overwrite_status(true);
current_thd->raise_error_printf(ER_INTERNAL_ERROR, "Error occured when calling CALSHOWPARTITIONS");
current_thd->raise_error_printf(ER_INTERNAL_ERROR, "Error occurred when calling CALSHOWPARTITIONS");
return result;
}
@ -1287,7 +1287,7 @@ extern "C"
catch (...)
{
current_thd->get_stmt_da()->set_overwrite_status(true);
current_thd->raise_error_printf(ER_INTERNAL_ERROR, "Error occured when calling CALSHOWPARTITIONS");
current_thd->raise_error_printf(ER_INTERNAL_ERROR, "Error occurred when calling CALSHOWPARTITIONS");
return result;
}

8
dbcon/mysql/ha_mcs_pushdown.cpp
View File

@ -846,7 +846,7 @@ select_handler* create_columnstore_select_handler_(THD* thd, SELECT_LEX* sel_lex
{
if (!thd->is_error())
{
my_printf_error(ER_INTERNAL_ERROR, "%s", MYF(0), "Error occured in select_lex::handle_derived()");
my_printf_error(ER_INTERNAL_ERROR, "%s", MYF(0), "Error occurred in select_lex::handle_derived()");
}
return handler;
@ -910,7 +910,7 @@ select_handler* create_columnstore_select_handler_(THD* thd, SELECT_LEX* sel_lex
// error out
if (!thd->is_error())
{
my_printf_error(ER_INTERNAL_ERROR, "%s", MYF(0), "Error occured in handler->prepare()");
my_printf_error(ER_INTERNAL_ERROR, "%s", MYF(0), "Error occurred in handler->prepare()");
}
return handler;
@ -972,7 +972,7 @@ select_handler* create_columnstore_select_handler_(THD* thd, SELECT_LEX* sel_lex
{
if (!thd->is_error())
{
my_printf_error(ER_INTERNAL_ERROR, "%s", MYF(0), "Error occured in get_schema_tables_result()");
my_printf_error(ER_INTERNAL_ERROR, "%s", MYF(0), "Error occurred in get_schema_tables_result()");
}
return handler;
@ -1015,7 +1015,7 @@ select_handler* create_columnstore_select_handler_(THD* thd, SELECT_LEX* sel_lex
if (!thd->is_error())
{
my_printf_error(ER_INTERNAL_ERROR, "%s", MYF(0), "Error occured in ha_mcs_impl_pushdown_init()");
my_printf_error(ER_INTERNAL_ERROR, "%s", MYF(0), "Error occurred in ha_mcs_impl_pushdown_init()");
}
// We had an error in `ha_mcs_impl_pushdown_init`, no need to continue execution of this query.

2
dbcon/mysql/ha_scalar_sub.cpp
View File

@ -262,7 +262,7 @@ execplan::ParseTree* ScalarSub::buildParseTree(PredicateOperator* op)
if (!gwi.fatalParseError)
{
fGwip.fatalParseError = true;
fGwip.parseErrorText = "Error occured in ScalarSub::transform()";
fGwip.parseErrorText = "Error occurred in ScalarSub::transform()";
}
else
{

2
dbcon/mysql/ha_select_sub.cpp
View File

@ -84,7 +84,7 @@ SCSEP SelectSubQuery::transform()
if (!gwi.fatalParseError)
{
fGwip.fatalParseError = true;
fGwip.parseErrorText = "Error occured in SelectSubQuery::transform()";
fGwip.parseErrorText = "Error occurred in SelectSubQuery::transform()";
}
else
{

2
dmlproc/dmlprocessor.cpp
View File

@ -839,7 +839,7 @@ void PackageHandler::run()
}
else
{
// error occured. Receive all outstanding messages before erroring out.
// error occurred. Receive all outstanding messages before erroring out.
batchProcessor->receiveOutstandingMsg();
batchProcessor->sendlastBatch(); // needs to flush files
batchProcessor->receiveAllMsg();

2
storage-manager/src/SessionManager.cpp
View File

@ -367,7 +367,7 @@ int SessionManager::start()
//Doing this to work with cloudio_component_test
len = ::read(fds[socketIncr].fd, out, recvMsgLength);
logger->log(LOG_DEBUG,"Read %d bytes.",len);
//Debug test lets send a reponse back
//Debug test lets send a response back
uint32_t response[4] = { storagemanager::SM_MSG_START, 8, (uint32_t ) -1, EINVAL };
len = ::send(fds[socketIncr].fd, response, 16, 0);
*/

2
utils/loggingcpp/ErrorMessage.txt
View File

@ -92,7 +92,7 @@
# disk-based join runtime errors from supported queries
2048 ERR_DBJ_FILE_IO_ERROR There was an IO error doing a disk-based join.
2049 ERR_DBJ_UNKNOWN_ERROR An unknown error error occured doing a disk-based join. Check the error log & contact support.
2049 ERR_DBJ_UNKNOWN_ERROR An unknown error error occurred doing a disk-based join. Check the error log & contact support.
2050 ERR_DBJ_DISK_USAGE_LIMIT This query exceeded the temp disk usage limit. Raise columnstore_diskjoin_smallsidelimit if possible and try again.
2051 ERR_DBJ_DATA_DISTRIBUTION The data distribution in this query overflowed a disk-based join bucket. If possible, raise columnstore_diskjoin_bucketsize and try again.
2052 INFO_SWITCHING_TO_DJS Out of UM memory, switching to disk-based join.

2
versioning/BRM/oidserver.cpp
View File

@ -32,7 +32,7 @@
* This class must implement a high degree of correctness. However, it
* also requires file IO. Most functions throw an exception if a hard IO error
* occurs more than MaxRetries times in a row. Right now the code makes
* no attempt to back out changes that occured before the error although it
* no attempt to back out changes that occurred before the error although it
* may be possible to do so for certain errors. Probably the best course of
* action would be to halt the system if an exception is thrown here
* to prevent database corruption resulting allocation of OIDs from a

2
versioning/BRM/slavenode.cpp
View File

@ -131,7 +131,7 @@ int ServiceWorkerNode::Child()
catch (exception& e)
{
ostringstream os;
os << "An error occured: " << e.what();
os << "An error occurred: " << e.what();
cerr << os.str() << endl;
log(os.str());
NotifyServiceInitializationFailed();

2
versioning/BRM/vbbm.cpp
View File

@ -664,7 +664,7 @@ void VBBM::getBlocks(int num, OID_t vbOID, vector<VBRange>& freeRanges, VSS& vss
{
ostringstream msg;
msg << "VBBM::getBlocks(): version buffer overflow. Increase VersionBufferFileSize. Overflow "
"occured in aged blocks. Requested NumBlocks:VbOid:vbFBO:lastFBO = "
"occurred in aged blocks. Requested NumBlocks:VbOid:vbFBO:lastFBO = "
<< num << ":" << vbOID << ":" << firstFBO << ":" << lastFBO << " lbid locked is "
<< storage[i].lbid << endl;
log(msg.str(), logging::LOG_TYPE_CRITICAL);

2
writeengine/server/we_dataloader.cpp
View File

@ -958,7 +958,7 @@ void WEDataLoader::onReceiveEod(ByteStream& Ibs)
aLock.unlock();
// if(( 1 == getMode())||( 2 == getMode()))
if (1 == getMode()) // BUG 4370 - seperated mode 1 & 2
if (1 == getMode()) // BUG 4370 - separated mode 1 & 2
{
// if(getChPid()) teardownCpimport(false); // @bug 4267
if (getChPid())

6
writeengine/shared/we_convertor.cpp
View File

@ -830,11 +830,11 @@ int Convertor::getCorrectRowWidth(CalpontSystemCatalog::ColDataType dataType, in
* dmFilePathArgs* INPUT/OUTPUT -- Points to a buffer structure
*
* RETURN:
* return 0 if everything went OK. -1 if an error occured. Two
* return 0 if everything went OK. -1 if an error occurred. Two
* kinds of errors are possible:
*
* - a null pointer was passed in
* - truncation occured.
* - truncation occurred.
*
* If a null buffer pointer is passed in, a return code
* of -1 will be returned FOR THAT BUFFER.
@ -908,7 +908,7 @@ int Convertor::dmOid2FPath(uint32_t oid, uint32_t partition, uint32_t segment, d
* segment OUTPUT -- segment for the given filename.
*
* RETURN:
* return 0 if everything went OK. -1 if an error occured.
* return 0 if everything went OK. -1 if an error occurred.
******************************************************************************/
int32_t Convertor::dmFPath2Oid(const dmFilePathArgs_t& pArgs, uint32_t& oid, uint32_t& partition,
uint32_t& segment)

2
writeengine/shared/we_define.cpp
View File

@ -89,7 +89,7 @@ WErrorCodes::WErrorCodes() : fErrorCodes()
fErrorCodes[ERR_STRUCT_VALUE_NOT_MATCH] =
" the number of structs does not match with the number of value sets";
fErrorCodes[ERR_ROWID_VALUE_NOT_MATCH] = " the number of rowids does not match with the number of values";
fErrorCodes[ERR_TBL_SYSCAT_ERROR] = "Error occured when querying systemcatalog.";
fErrorCodes[ERR_TBL_SYSCAT_ERROR] = "Error occurred when querying systemcatalog.";
// index error
fErrorCodes[ERR_IDX_TREE_MOVE_ENTRY] = " an error in moving part of an index tree to a new subblock";

2
writeengine/splitter/we_filereadthread.cpp
View File

@ -204,7 +204,7 @@ void WEFileReadThread::setup(std::string FileName)
catch (std::exception& ex)
{
// cout << ex.what() << endl;
// throw runtime_error("Exception occured in WEFileReadThread\n");
// throw runtime_error("Exception occurred in WEFileReadThread\n");
throw runtime_error(ex.what());
}