bill
/
AQuery
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed table/column name problem

Browse Source
dev
Bill 2 years ago
parent a464029d14
commit bea97a909a
4 changed files with 42 additions and 24 deletions
Show Stats Download Patch File Download Diff File

9
Makefile
Unescape View File

@ -18,6 +18,15 @@ else
UNAME_S = $(shell uname -s) UNAME_S = $(shell uname -s)
UNAME_M = $(shell uname -m) UNAME_M = $(shell uname -m)
NULL_DEVICE = /dev/null NULL_DEVICE = /dev/null
MonetDB_LIB =
ifeq ($(UNAME_S),Darwin)
MonetDB_LIB += -L`brew --prefix monetdb`/lib
ifneq ($(UNAME_M),arm64)
OPTFLAGS += -march=native
endif
else
OPTFLAGS += -march=native
endif
MonetDB_LIB += -I/usr/local/include/monetdb -I/usr/include/monetdb -lmonetdbe MonetDB_LIB += -I/usr/local/include/monetdb -I/usr/include/monetdb -lmonetdbe
endif endif

40
reconstruct/ast.py
Unescape View File

@ -91,12 +91,15 @@ class projection(ast_node):
def consume(self, node): def consume(self, node):
# deal with projections # deal with projections
if 'into' not in node: out_table_varname = 'out_'+base62uuid(6)
out_table_name = 'out_'+base62uuid(6) if 'into' in node:
else:
out_table_name = node['into'] out_table_name = node['into']
else:
out_table_name = out_table_varname
self.out_table : TableInfo = TableInfo(out_table_name, [], self.context) self.out_table : TableInfo = TableInfo(out_table_name, [], self.context)
self.out_table.contextname_cpp = out_table_varname
cols = [] cols = []
self.col_ext : Set[ColRef]= set() self.col_ext : Set[ColRef]= set()
col_exprs : List[Tuple[str, Types]] = [] col_exprs : List[Tuple[str, Types]] = []
@ -117,24 +120,27 @@ class projection(ast_node):
name = proj_expr.sql name = proj_expr.sql
compound = True # compound column compound = True # compound column
proj_expr.cols_mentioned = self.datasource.rec proj_expr.cols_mentioned = self.datasource.rec
alias = ''
if 'name' in proj: # renaming column by AS keyword
alias = proj['name']
if not proj_expr.is_special: if not proj_expr.is_special:
y = lambda x:x y = lambda x:x
name = eval('f\'' + name + '\'') name = eval('f\'' + name + '\'')
if name not in self.var_table: if name not in self.var_table:
self.var_table[name] = len(col_exprs) self.var_table[name] = len(col_exprs)
proj_map[i] = [this_type, len(col_exprs), proj_expr] proj_map[i] = [this_type, len(col_exprs), proj_expr]
col_exprs.append((name, proj_expr.type)) col_expr = name + ' AS ' + alias if alias else name
if alias:
self.var_table[alias] = len(col_exprs)
col_exprs.append((col_expr, proj_expr.type))
else: else:
self.context.headers.add('"./server/aggregations.h"') self.context.headers.add('"./server/aggregations.h"')
if self.datasource.rec is not None: if self.datasource.rec is not None:
self.col_ext = self.col_ext.union(self.datasource.rec) self.col_ext = self.col_ext.union(self.datasource.rec)
proj_map[i] = [this_type, proj_expr.sql, proj_expr] proj_map[i] = [this_type, proj_expr.sql, proj_expr]
if 'name' in proj: # renaming column by AS keyword
name += ' AS ' + proj['name']
if not proj_expr.is_special:
self.var_table[proj['name']] = len(col_exprs)
disp_name = get_legal_name(name) disp_name = get_legal_name(alias if alias else name)
elif type(proj) is str: elif type(proj) is str:
col = self.datasource.get_col(proj) col = self.datasource.get_col(proj)
@ -207,7 +213,6 @@ class projection(ast_node):
self.context.emitc(f'auto {vname} = ColRef<{typenames[idx].cname}>({length_name}, server->getCol({idx}));') self.context.emitc(f'auto {vname} = ColRef<{typenames[idx].cname}>({length_name}, server->getCol({idx}));')
vid2cname[idx] = vname vid2cname[idx] = vname
# Create table into context # Create table into context
self.outtable_name = self.out_table.table_name
out_typenames = [None] * len(proj_map) out_typenames = [None] * len(proj_map)
for key, val in proj_map.items(): for key, val in proj_map.items():
@ -233,8 +238,11 @@ class projection(ast_node):
): ):
out_typenames[key] = f'ColRef<{out_typenames[key]}>' out_typenames[key] = f'ColRef<{out_typenames[key]}>'
outtable_col_nameslist = ', '.join([f'"{c.name}"' for c in self.out_table.columns])
self.outtable_col_names = 'names_' + base62uuid(4)
self.context.emitc(f'const char* {self.outtable_col_names}[] = {{{outtable_col_nameslist}}};')
# out_typenames = [v[0].cname for v in proj_map.values()] # out_typenames = [v[0].cname for v in proj_map.values()]
self.context.emitc(f'auto {self.outtable_name} = new TableInfo<{",".join(out_typenames)}>("{self.outtable_name}");') self.context.emitc(f'auto {self.out_table.contextname_cpp} = new TableInfo<{",".join(out_typenames)}>("{self.out_table.table_name}", {self.outtable_col_names});')
# TODO: Inject custom group by code here and flag them in proj_map # TODO: Inject custom group by code here and flag them in proj_map
# Type of UDFs? Complex UDFs, ones with static vars? # Type of UDFs? Complex UDFs, ones with static vars?
if self.group_node is not None and self.group_node.use_sp_gb: if self.group_node is not None and self.group_node.use_sp_gb:
@ -243,20 +251,20 @@ class projection(ast_node):
for key, val in proj_map.items(): for key, val in proj_map.items():
col_name = 'col_' + base62uuid(6) col_name = 'col_' + base62uuid(6)
self.context.emitc(f'decltype(auto) {col_name} = {self.outtable_name}->get_col<{key}>();') self.context.emitc(f'decltype(auto) {col_name} = {self.out_table.contextname_cpp}->get_col<{key}>();')
gb_cexprs.append((col_name, val[2])) gb_cexprs.append((col_name, val[2]))
self.group_node.finalize(gb_cexprs, gb_vartable) self.group_node.finalize(gb_cexprs, gb_vartable)
else: else:
for i, (key, val) in enumerate(proj_map.items()): for i, (key, val) in enumerate(proj_map.items()):
if type(val[1]) is int: if type(val[1]) is int:
self.context.emitc( self.context.emitc(
f'{self.outtable_name}->get_col<{key}>().initfrom({vid2cname[val[1]]}, "{cols[i].name}");' f'{self.out_table.contextname_cpp}->get_col<{key}>().initfrom({vid2cname[val[1]]}, "{cols[i].name}");'
) )
else: else:
# for funcs evaluate f_i(x, ...) # for funcs evaluate f_i(x, ...)
self.context.emitc(f'{self.outtable_name}->get_col<{key}>() = {val[1]};') self.context.emitc(f'{self.out_table.contextname_cpp}->get_col<{key}>() = {val[1]};')
# print out col_is # print out col_is
self.context.emitc(f'print(*{self.outtable_name});') self.context.emitc(f'print(*{self.out_table.contextname_cpp});')
if self.outfile: if self.outfile:
self.outfile.finalize() self.outfile.finalize()
@ -756,7 +764,7 @@ class outfile(ast_node):
sep = ',' if 'term' not in self.node else self.node['term']['literal'] sep = ',' if 'term' not in self.node else self.node['term']['literal']
file_pointer = 'fp_' + base62uuid(6) file_pointer = 'fp_' + base62uuid(6)
self.addc(f'FILE* {file_pointer} = fopen("{filename}", "w");') self.addc(f'FILE* {file_pointer} = fopen("{filename}", "w");')
self.addc(f'{self.parent.outtable_name}->printall("{sep}", "\\n", nullptr, {file_pointer});') self.addc(f'{self.parent.out_table.contextname_cpp}->printall("{sep}", "\\n", nullptr, {file_pointer});')
self.addc(f'fclose({file_pointer});') self.addc(f'fclose({file_pointer});')
self.context.ccode += self.ccode self.context.ccode += self.ccode

1
reconstruct/storage.py
Unescape View File

@ -33,6 +33,7 @@ class TableInfo:
def __init__(self, table_name, cols, cxt:'Context'): def __init__(self, table_name, cols, cxt:'Context'):
# statics # statics
self.table_name : str = table_name self.table_name : str = table_name
self.contextname_cpp : str = ''
self.alias : Set[str] = set([table_name]) self.alias : Set[str] = set([table_name])
self.columns_byname : Dict[str, ColRef] = dict() # column_name, type self.columns_byname : Dict[str, ColRef] = dict() # column_name, type
self.columns : List[ColRef] = [] self.columns : List[ColRef] = []

10
server/table.h
Unescape View File

@ -260,7 +260,7 @@ struct TableInfo {
template <size_t ...Idxs> template <size_t ...Idxs>
using getRecordType = typename GetTypes<Idxs...>::type; using getRecordType = typename GetTypes<Idxs...>::type;
TableInfo(const char* name, uint32_t n_cols); TableInfo(const char* name, uint32_t n_cols);
TableInfo(const char* name = ""); TableInfo(const char* name = "", const char **col_names = nullptr);
template <int prog = 0> template <int prog = 0>
inline void materialize(const vector_type<uint32_t>& idxs, TableInfo<Types...>* tbl = nullptr) { // inplace materialize inline void materialize(const vector_type<uint32_t>& idxs, TableInfo<Types...>* tbl = nullptr) { // inplace materialize
if constexpr(prog == 0) tbl = (tbl == 0 ? this : tbl); if constexpr(prog == 0) tbl = (tbl == 0 ? this : tbl);
@ -319,8 +319,8 @@ struct TableInfo {
std::string get_header_string(const char* __restrict sep, const char* __restrict end) const{ std::string get_header_string(const char* __restrict sep, const char* __restrict end) const{
std::string header_string = std::string(); std::string header_string = std::string();
for (int i = 0; i < sizeof...(Types); ++i) for (int i = 0; i < sizeof...(Types); ++i)
header_string += std::string(this->colrefs[i].name) + sep; header_string += std::string(this->colrefs[i].name) + sep + '|' + sep;
const size_t l_sep = strlen(sep); const size_t l_sep = strlen(sep) + 1;
if (header_string.size() - l_sep >= 0) if (header_string.size() - l_sep >= 0)
header_string.resize(header_string.size() - l_sep); header_string.resize(header_string.size() - l_sep);
header_string += end + std::string(header_string.size(), '=') + end; header_string += end + std::string(header_string.size(), '=') + end;
@ -420,10 +420,10 @@ TableInfo<Types...>::TableInfo(const char* name, uint32_t n_cols) : name(name),
} }
} }
template<class ...Types> template<class ...Types>
TableInfo<Types...>::TableInfo(const char* name) : name(name), n_cols(sizeof...(Types)) { TableInfo<Types...>::TableInfo(const char* name, const char** col_names) : name(name), n_cols(sizeof...(Types)) {
this->colrefs = (ColRef<void>*)malloc(sizeof(ColRef<void>) * this->n_cols); this->colrefs = (ColRef<void>*)malloc(sizeof(ColRef<void>) * this->n_cols);
for (uint32_t i = 0; i < n_cols; ++i) { for (uint32_t i = 0; i < n_cols; ++i) {
this->colrefs[i].init(); this->colrefs[i].init(col_names? col_names[i] : "");
} }
} }
template <class ...Types> template <class ...Types>

Write Preview
Loading…
Cancel
Save