Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# MiniOB 介绍

> **声明:本项目仅供学习用途,不承诺代码安全及稳定可靠。请勿将其直接用于生产环境。**

<div align="left">

[![Chinese Doc](https://img.shields.io/badge/文档-简体中文-blue)](https://oceanbase.github.io/miniob/)
Expand Down
14 changes: 7 additions & 7 deletions src/observer/sql/executor/load_data_executor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,11 @@ using namespace common;

RC LoadDataExecutor::execute(SQLStageEvent *sql_event)
{
RC rc = RC::SUCCESS;
SqlResult *sql_result = sql_event->session_event()->sql_result();
LoadDataStmt *stmt = static_cast<LoadDataStmt *>(sql_event->stmt());
Table *table = stmt->table();
const char *file_name = stmt->filename();
load_data(table, file_name, stmt->terminated(), stmt->enclosed(), sql_result);
return rc;
return load_data(table, file_name, stmt->terminated(), stmt->enclosed(), sql_result);
}

/**
Expand Down Expand Up @@ -83,7 +81,7 @@ RC insert_record_from_file(


// TODO: pax format and row format
void LoadDataExecutor::load_data(Table *table, const char *file_name, char terminated, char enclosed, SqlResult *sql_result)
RC LoadDataExecutor::load_data(Table *table, const char *file_name, char terminated, char enclosed, SqlResult *sql_result)
{
// your code here
stringstream result_string;
Expand All @@ -94,7 +92,7 @@ void LoadDataExecutor::load_data(Table *table, const char *file_name, char termi
result_string << "Failed to open file: " << file_name << ". system error=" << strerror(errno) << endl;
sql_result->set_return_code(RC::FILE_NOT_EXIST);
sql_result->set_state_string(result_string.str());
return;
return RC::FILE_NOT_EXIST;
}

struct timespec begin_time;
Expand Down Expand Up @@ -144,6 +142,8 @@ void LoadDataExecutor::load_data(Table *table, const char *file_name, char termi
if (RC::SUCCESS == rc) {
result_string << strrc(rc);
}
LOG_INFO("load data done. row num: %s, result: %s", insertion_count, strrc(rc));
sql_result->set_return_code(RC::SUCCESS);
LOG_INFO("load data done. row num: %d, result: %s", insertion_count, strrc(rc));
sql_result->set_return_code(rc);
sql_result->set_state_string(result_string.str());
return rc;
}
2 changes: 1 addition & 1 deletion src/observer/sql/executor/load_data_executor.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,5 @@ class LoadDataExecutor
RC execute(SQLStageEvent *sql_event);

private:
void load_data(Table *table, const char *file_name, char terminated, char enclosed, SqlResult *sql_result);
RC load_data(Table *table, const char *file_name, char terminated, char enclosed, SqlResult *sql_result);
};
Loading