xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

remove obsolete code

This commit is contained in:
freemine 2020-10-18 14:18:15 +08:00
parent a1a43cede0
commit b0ff31e1a2
2 changed files with 3 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/CMakeLists.txt
View File

@ -21,5 +21,5 @@ ADD_SUBDIRECTORY(wal)
ADD_SUBDIRECTORY(cq) ADD_SUBDIRECTORY(cq)
ADD_SUBDIRECTORY(dnode) ADD_SUBDIRECTORY(dnode)
ADD_SUBDIRECTORY(connector/odbc) ADD_SUBDIRECTORY(connector/odbc)
ADD_SUBDIRECTORY(connector/jdbc) #ADD_SUBDIRECTORY(connector/jdbc)

24
src/connector/odbc/src/todbc.c
View File

@ -1771,7 +1771,7 @@ static SQLRETURN do_bind_batch(sql_t *sql, int idx_row, TAOS_BIND *binds)
return SQL_SUCCESS; return SQL_SUCCESS;
} }
static SQLRETURN do_execute(sql_t *sql, TAOS_BIND *x_binds) static SQLRETURN do_execute(sql_t *sql)
{ {
int tr = TSDB_CODE_SUCCESS; int tr = TSDB_CODE_SUCCESS;
if (sql->n_rows==0) sql->n_rows = 1; if (sql->n_rows==0) sql->n_rows = 1;
@ -1836,27 +1836,7 @@ static SQLRETURN doSQLExecute(SQLHSTMT StatementHandle)
sql->row = NULL; sql->row = NULL;
} }
TAOS_BIND *binds = NULL; SQLRETURN r = do_execute(sql);
if (sql->n_params>0) {
binds = (TAOS_BIND*)calloc(sql->n_params, sizeof(*binds));
if (!binds) {
SET_ERROR(sql, "HY001", TSDB_CODE_ODBC_OOM, "");
return SQL_ERROR;
}
}
SQLRETURN r = do_execute(sql, binds);
if (binds) {
for (int i = 0; i<sql->n_params; ++i) {
TAOS_BIND *bind = binds + i;
if (bind->allocated) {
free(bind->u.nchar);
bind->u.nchar = NULL;
}
}
free(binds);
}
return r; return r;
} }