Skip to content

Commit 7779cc2

Browse files
committed
compiled by gcc
1 parent 55b614b commit 7779cc2

File tree

6 files changed

+9
-42
lines changed

6 files changed

+9
-42
lines changed

src/observer/sql/stmt/delete_stmt.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ RC DeleteStmt::create(Db *db, const Deletes &delete_sql, Stmt *&stmt)
4646
return RC::SCHEMA_TABLE_NOT_EXIST;
4747
}
4848

49-
std::unordered_map<std::string_view, Table *> table_map;
49+
std::unordered_map<std::string, Table *> table_map;
5050
table_map.insert(std::pair<std::string_view, Table *>(std::string_view(table_name), table));
5151

5252
FilterStmt *filter_stmt = nullptr;

src/observer/sql/stmt/filter_stmt.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ FilterStmt::~FilterStmt()
2727
filter_units_.clear();
2828
}
2929

30-
RC FilterStmt::create(Db *db, Table *default_table, std::unordered_map<std::string_view, Table *> *tables,
30+
RC FilterStmt::create(Db *db, Table *default_table, std::unordered_map<std::string, Table *> *tables,
3131
const Condition *conditions, int condition_num,
3232
FilterStmt *&stmt)
3333
{
@@ -50,13 +50,13 @@ RC FilterStmt::create(Db *db, Table *default_table, std::unordered_map<std::stri
5050
return rc;
5151
}
5252

53-
RC get_table_and_field(Db *db, Table *default_table, std::unordered_map<std::string_view, Table *> *tables,
53+
RC get_table_and_field(Db *db, Table *default_table, std::unordered_map<std::string, Table *> *tables,
5454
const RelAttr &attr, Table *&table, const FieldMeta *&field)
5555
{
5656
if (common::is_blank(attr.relation_name)) {
5757
table = default_table;
5858
} else if (nullptr != tables) {
59-
auto iter = tables->find(std::string_view(attr.relation_name));
59+
auto iter = tables->find(std::string(attr.relation_name));
6060
if (iter != tables->end()) {
6161
table = iter->second;
6262
}
@@ -78,7 +78,7 @@ RC get_table_and_field(Db *db, Table *default_table, std::unordered_map<std::str
7878
return RC::SUCCESS;
7979
}
8080

81-
RC FilterStmt::create_filter_unit(Db *db, Table *default_table, std::unordered_map<std::string_view, Table *> *tables,
81+
RC FilterStmt::create_filter_unit(Db *db, Table *default_table, std::unordered_map<std::string, Table *> *tables,
8282
const Condition &condition, FilterUnit *&filter_unit)
8383
{
8484
RC rc = RC::SUCCESS;

src/observer/sql/stmt/filter_stmt.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,11 @@ class FilterStmt
8686
}
8787

8888
public:
89-
static RC create(Db *db, Table *default_table, std::unordered_map<std::string_view, Table *> *tables,
89+
static RC create(Db *db, Table *default_table, std::unordered_map<std::string, Table *> *tables,
9090
const Condition *conditions, int condition_num,
9191
FilterStmt *&stmt);
9292

93-
static RC create_filter_unit(Db *db, Table *default_table, std::unordered_map<std::string_view, Table *> *tables,
93+
static RC create_filter_unit(Db *db, Table *default_table, std::unordered_map<std::string, Table *> *tables,
9494
const Condition &condition, FilterUnit *&filter_unit);
9595

9696
private:

src/observer/sql/stmt/select_stmt.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ RC SelectStmt::create(Db *db, const Selects &select_sql, Stmt *&stmt)
4545

4646
// collect tables in `from` statement
4747
std::vector<Table *> tables;
48-
std::unordered_map<std::string_view, Table *> table_map;
48+
std::unordered_map<std::string, Table *> table_map;
4949
for (int i = 0; i < select_sql.relation_num; i++) {
5050
const char *table_name = select_sql.relations[i];
5151
if (nullptr == table_name) {

src/observer/storage/common/record.h

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ See the Mulan PSL v2 for more details. */
1616

1717
#include <stddef.h>
1818
#include <vector>
19+
#include <limits>
1920
#include <sstream>
2021

2122
#include "rc.h"

src/observer/storage/default/default_storage_stage.cpp

-34
Original file line numberDiff line numberDiff line change
@@ -158,40 +158,6 @@ void DefaultStorageStage::handle_event(StageEvent *event)
158158

159159
char response[256];
160160
switch (sql->flag) {
161-
case SCF_INSERT: { // insert into
162-
const Inserts &inserts = sql->sstr.insertion;
163-
const char *table_name = inserts.relation_name;
164-
//rc = handler_->insert_record(current_trx, current_db, table_name, inserts.value_num, inserts.values);
165-
snprintf(response, sizeof(response), "%s\n", rc == RC::SUCCESS ? "SUCCESS" : "FAILURE");
166-
} break;
167-
case SCF_UPDATE: {
168-
const Updates &updates = sql->sstr.update;
169-
const char *table_name = updates.relation_name;
170-
const char *field_name = updates.attribute_name;
171-
int updated_count = 0;
172-
#if 0
173-
rc = handler_->update_record(current_trx,
174-
current_db,
175-
table_name,
176-
field_name,
177-
&updates.value,
178-
updates.condition_num,
179-
updates.conditions,
180-
&updated_count);
181-
#endif
182-
snprintf(response, sizeof(response), "%s\n", rc == RC::SUCCESS ? "SUCCESS" : "FAILURE");
183-
} break;
184-
case SCF_DELETE: {
185-
const Deletes &deletes = sql->sstr.deletion;
186-
const char *table_name = deletes.relation_name;
187-
int deleted_count = 0;
188-
#if 0
189-
rc = handler_->delete_record(
190-
current_trx, current_db, table_name, deletes.condition_num, deletes.conditions, &deleted_count);
191-
#endif
192-
snprintf(response, sizeof(response), "%s\n", rc == RC::SUCCESS ? "SUCCESS" : "FAILURE");
193-
} break;
194-
195161
case SCF_LOAD_DATA: {
196162
/*
197163
从文件导入数据,如果做性能测试,需要保持这些代码可以正常工作

0 commit comments

Comments
 (0)