--- parser3/src/classes/table.C 2003/02/14 16:52:20 1.172.2.7 +++ parser3/src/classes/table.C 2003/03/24 14:53:56 1.172.2.14.2.16 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_TABLE_C="$Date: 2003/02/14 16:52:20 $"; +static const char* IDENT_TABLE_C="$Date: 2003/03/24 14:53:56 $"; #include "classes.h" #include "pa_vmethod_frame.h" @@ -19,9 +19,9 @@ static const char* IDENT_TABLE_C="$Date: // class -class MTable : public Methoded { +class MTable: public Methoded { public: // VStateless_class - ValuePtr create_new_value() { return ValuePtr(new VTable()); } + Value* create_new_value() { return new VTable(); } public: MTable(); @@ -32,7 +32,7 @@ public: // Methoded // global variable -MethodedPtr table_class(new MTable); +DECLARE_CLASS_VAR(table, new MTable, 0); // defines for globals @@ -43,132 +43,128 @@ MethodedPtr table_class(new MTable); // globals -StringPtr sql_limit_name(new String(SQL_LIMIT_NAME)); -StringPtr sql_offset_name(new String(SQL_OFFSET_NAME)); -StringPtr sql_default_name(new String(SQL_DEFAULT_NAME)); -StringPtr sql_distinct_name(new String(SQL_DISTINCT_NAME)); +String sql_limit_name(SQL_LIMIT_NAME); +String sql_offset_name(SQL_OFFSET_NAME); +String sql_default_name(SQL_DEFAULT_NAME); +String sql_distinct_name(SQL_DISTINCT_NAME); // methods -static void get_copy_options(Request& r, StringPtr method_name, MethodParams& params, int param_index, +static void get_copy_options(Request& r, MethodParams* params, int param_index, const Table& source, int& offset, int& limit) { - Pool& pool=r.pool(); offset=0; limit=0; - if(params.count()<=param_index) + if(params->count()<=param_index) return; - ValuePtr voptions=params.as_no_junction(param_index, "options must be hash, not code"); - if(!voptions->is_string()) { - if(HashStringValue* options=voptions->get_hash(method_name)) { + Value& voptions=params->as_no_junction(param_index, "options must be hash, not code"); + if(!voptions.is_string()) { + if(HashStringValue* options=voptions.get_hash()) { int valid_options=0; - if(ValuePtr voffset=options->get(sql_offset_name)) { + if(Value* voffset=options->get(sql_offset_name)) { valid_options++; if(voffset->is_string()) { - StringPtr soffset=voffset->get_string(&pool); - if(*soffset == "cur") + const String& soffset=*voffset->get_string(); + if(soffset == "cur") offset=source.current(); else throw Exception("parser.runtime", - soffset, + &soffset, "must be 'cur' string or expression"); } else - offset=r.process_to_value(voffset)->as_int(); + offset=r.process_to_value(*voffset).as_int(); } - if(ValuePtr vlimit=options->get(sql_limit_name)) { + if(Value* vlimit=options->get(sql_limit_name)) { valid_options++; - limit=r.process_to_value(vlimit)->as_int(); + limit=r.process_to_value(*vlimit).as_int(); + if(!limit) // zero limit = should be 'nothing to copy', for methods zero means 'all' + limit=-1; // thus fixing } if(valid_options!=options->count()) throw Exception("parser.runtime", - method_name, + 0, "called with invalid option"); } else throw Exception("parser.runtime", - method_name, + 0, "options must be hash"); } - if(!limit) // zero limit = sould be 'nothing to copy', for methods zero means 'all' - limit=-1; // thus fixing } -static void _create(Request& r, StringPtr method_name, MethodParams& params) { - Pool& pool=r.pool(); +static void _create(Request& r, MethodParams* params) { // clone/copy part? - if(const Table *source=params[0]->get_table()) { + if(Table *source=(*params)[0]->get_table()) { int offset, limit; - get_copy_options(r, method_name, params, 1, *source, + get_copy_options(r, params, 1, *source, offset, limit); - GET_SELF(r, VTable).set_table(TablePtr(new Table(*source, offset, limit))); + GET_SELF(r, VTable).set_table(*new Table(*source, offset, limit)); return; } // data is last parameter - Temp_lang temp_lang(r, String::UL_PASS_APPENDED); - StringPtr data= - r.process_to_string(params.as_junction(params.count()-1, "body must be code")); + Temp_lang temp_lang(r, String::L_PASS_APPENDED); + const String& data= + r.process_to_string(params->as_junction(params->count()-1, "body must be code")); - size_t pos_after=0; // parse columns Table::columns_type columns; - if(params.count()==2) { + if(params->count()==2) { columns=Table::columns_type(0); // nameless } else { columns=Table::columns_type(new ArrayString); ArrayString head; - data->split(head, &pos_after, "\n", 1, String::UL_AS_IS, 1); - if(head.count()) - head[0]->split(*columns, 0, "\t", 1, String::UL_AS_IS); + size_t pos_after=0; + data.split(head, pos_after, "\n", String::L_AS_IS, 1); + if(head.count()) { + size_t pos_after=0; + head[0]->split(*columns, pos_after, "\t", String::L_AS_IS); + } } - TablePtr table(new Table(method_name, columns)); + Table& table=*new Table(columns); // parse cells ArrayString rows; - data->split(rows, &pos_after, "\n", 1, String::UL_AS_IS); - Array_iterator i(rows); + size_t pos_after=0; + data.split(rows, pos_after, "\n", String::L_AS_IS); + Array_iterator i(rows); while(i.has_next()) { Table::element_type row(new ArrayString); - StringPtr string=i.next(); + const String& string=*i.next(); // remove comment lines - if(!string->size()) + if(!string.length()) continue; - string->split(*row, 0, "\t", 1, String::UL_AS_IS); - *table+=row; + size_t pos_after=0; + string.split(*row, pos_after, "\t", String::L_AS_IS); + table+=row; } // replace any previous table value GET_SELF(r, VTable).set_table(table); } -static void _load(Request& r, StringPtr method_name, MethodParams& params) { - Pool& pool=r.pool(); - StringPtr first_param=params.as_string(0, "file name must be string"); +static void _load(Request& r, MethodParams* params) { + const String& first_param=params->as_string(0, "file name must be string"); int filename_param_index=0; - bool nameless=*first_param=="nameless"; + bool nameless=first_param=="nameless"; if(nameless) filename_param_index++; int options_param_index=filename_param_index+1; // loading text - char *data=file_read_text(pool, r.charsets.source(), - r.absolute(params.as_string(filename_param_index, "file name must be string")), + char *data=file_read_text(r.charsets.source(), + r.absolute(params->as_string(filename_param_index, "file name must be string")), true, - options_param_indexget_hash(method_name):0 + options_param_indexcount()?params->as_no_junction(options_param_index, "additional params must be hash").get_hash():0 ); // parse columns Table::columns_type columns; -#ifndef NO_STRING_ORIGIN - const String_fragment::Origin& origin=method_name->origin(); - const char* file=origin.file; - uint line=origin.line; -#endif if(nameless) { columns=Table::columns_type(0); // nameless } else { @@ -179,9 +175,7 @@ static void _load(Request& r, StringPtr if(!*row_chars || *row_chars == '#') continue; do { - StringPtr name(new String); - name->APPEND_TAINTED(lsplit(&row_chars, '\t'), 0, file, line++); - *columns+=name; + *columns+=new String(lsplit(&row_chars, '\t'), 0, true); } while(row_chars); break; @@ -189,7 +183,7 @@ static void _load(Request& r, StringPtr } // parse cells - TablePtr table(new Table(method_name, columns)); + Table& table=*new Table(columns); char *row_chars; while(row_chars=getrow(&data)) { // remove empty&comment lines @@ -197,14 +191,9 @@ static void _load(Request& r, StringPtr continue; Table::element_type row(new ArrayString); while(char *cell_chars=lsplit(&row_chars, '\t')) { - StringPtr cell(new String); - cell->APPEND_TAINTED(cell_chars, 0, file, line); - *row+=cell; + *row+=new String(cell_chars, 0, true); } -#ifndef NO_STRING_ORIGIN - line++; -#endif - *table+=row; + table+=row; }; // replace any previous table value @@ -212,104 +201,102 @@ static void _load(Request& r, StringPtr } /// @todo "x\nx" "xxx""xx" -static void _save(Request& r, StringPtr method_name, MethodParams& params) { - Pool& pool=r.pool(); - ValuePtr vfile_name=params.as_no_junction(params.count()-1, - "file name must not be code"); +static void _save(Request& r, MethodParams* params) { + Value& vfile_name=params->as_no_junction(params->count()-1, "file name must not be code"); - Table& table=GET_SELF(r, VTable).table(method_name); + Table& table=GET_SELF(r, VTable).table(); bool do_append=false; String sdata; - if(params.count()==1) { // named output + if(params->count()==1) { // named output // write out names line if(table.columns()) { // named table - Array_iterator i(*table.columns()); + Array_iterator i(*table.columns()); while(i.has_next()) { - sdata.append(*i.next(), String::UL_TABLE); + sdata.append(*i.next(), String::L_TABLE); if(i.has_next()) - sdata.APPEND_CONST("\t"); + sdata.append("\t", 1, String::L_CLEAN); } } else { // nameless table if(int lsize=table.count()?table[0]->count():0) for(int column=0; columnas_string(0, "mode must be string"); + if(mode=="append") do_append=true; - else if(*mode=="nameless") + else if(mode=="nameless") /*ok, already skipped names output*/; else throw Exception("parser.runtime", - mode, + &mode, "unknown mode, must be 'append'"); } // data lines - Array_iterator i(table); + Array_iterator i(table); while(i.has_next()) { - Array_iterator c(*i.next()); + Array_iterator c(*i.next()); while(c.has_next()) { - if(StringPtr s=c.next()) - sdata.append(*s, String::UL_TABLE); + if(const String* s=c.next()) + sdata.append(*s, String::L_TABLE); if(c.has_next()) - sdata.APPEND_CONST("\t"); + sdata.append("\t", 1, String::L_CLEAN); } - sdata.APPEND_CONST("\n"); + sdata.append("\n", 1, String::L_CLEAN); } // write - file_write(r.absolute(vfile_name->as_string(&pool)), - sdata.cstr(), sdata.size(), true, do_append); + file_write(r.absolute(vfile_name.as_string()), + sdata.cstr(), sdata.length(), true, do_append); } -static void _count(Request& r, StringPtr method_name, MethodParams& ) { - int result=GET_SELF(r, VTable).table(method_name).count(); - r.write_no_lang(ValuePtr(new VInt(result))); +static void _count(Request& r, MethodParams* ) { + int result=GET_SELF(r, VTable).table().count(); + r.write_no_lang(*new VInt(result)); } -static void _line(Request& r, StringPtr method_name, MethodParams& ) { - int result=1+GET_SELF(r, VTable).table(method_name).current(); - r.write_no_lang(ValuePtr(new VInt(result))); +static void _line(Request& r, MethodParams* ) { + int result=1+GET_SELF(r, VTable).table().current(); + r.write_no_lang(*new VInt(result)); } -static void _offset(Request& r, StringPtr method_name, MethodParams& params) { - Pool& pool=r.pool(); - Table& table=GET_SELF(r, VTable).table(method_name); - if(params.count()) { +static void _offset(Request& r, MethodParams* params) { + Table& table=GET_SELF(r, VTable).table(); + if(params->count()) { bool absolute=false; - if(params.count()>1) { - StringPtr whence=params.as_string(0, "whence must be string"); - if(*whence=="cur") + if(params->count()>1) { + const String& whence=params->as_string(0, "whence must be string"); + if(whence=="cur") absolute=false; - else if(*whence=="set") + else if(whence=="set") absolute=true; else throw Exception("parser.runtime", - whence, + &whence, "is invalid whence, valid are 'cur' or 'set'"); } - ValuePtr offset_expr=params.as_junction(params.count()-1, "offset must be expression"); - table.offset(absolute, r.process_to_value(offset_expr)->as_int()); + Value& offset_expr=params->as_junction(params->count()-1, "offset must be expression"); + table.offset(absolute, r.process_to_value(offset_expr).as_int()); } else - r.write_no_lang(ValuePtr(new VInt(table.current()))); + r.write_no_lang(*new VInt(table.current())); } -static void _menu(Request& r, StringPtr method_name, MethodParams& params) { - ValuePtr body_code=params.as_junction(0, "body must be code"); +static void _menu(Request& r, MethodParams* params) { + Value& body_code=params->as_junction(0, "body must be code"); - ValuePtr delim_maybe_code=params.count()>1?params[1]:ValuePtr(0); + Value* delim_maybe_code=params->count()>1?(*params)[1]:0; - Table& table=GET_SELF(r, VTable).table(method_name); + Table& table=GET_SELF(r, VTable).table(); bool need_delim=false; int saved_current=table.current(); int size=table.count(); @@ -317,10 +304,10 @@ static void _menu(Request& r, StringPtr table.set_current(row); StringOrValue sv_processed=r.process(body_code); - StringPtr s_processed=sv_processed.get_string(); - if(delim_maybe_code && s_processed && s_processed->size()) { // delimiter set and we have body + const String* s_processed=sv_processed.get_string(); + if(delim_maybe_code && s_processed && s_processed->length()) { // delimiter set and we have body if(need_delim) // need delim & iteration produced string? - r.write_pass_lang(r.process(delim_maybe_code)); + r.write_pass_lang(r.process(*delim_maybe_code)); need_delim=true; } r.write_pass_lang(sv_processed); @@ -332,7 +319,7 @@ static void _menu(Request& r, StringPtr struct Row_info { Request *r; Table *table; - ValuePtr key_code; + Value* key_code; int key_field; Array* value_fields; HashStringValue* hash; @@ -341,78 +328,75 @@ struct Row_info { }; #endif static void table_row_to_hash(Table::element_type row, Row_info *info) { - Pool& pool=info->r->pool(); - - StringPtr key; + const String* key; if(info->key_code) { info->table->set_current(info->row++); // change context row - StringOrValue sv_processed=info->r->process(info->key_code); - key=sv_processed.as_string(&pool); + StringOrValue sv_processed=info->r->process(*info->key_code); + key=&sv_processed.as_string(); } else - key=info->key_fieldcount()?row->get(info->key_field):StringPtr(0); + key=info->key_fieldcount()?row->get(info->key_field):0; if(!key) return; // ignore rows without key [too-short-record_array if-indexed] - VHashPtr vhash(new VHash); + VHash* vhash=new VHash; HashStringValue& hash=vhash->hash(); for(int i=0; ivalue_fields->count(); i++) { int value_field=info->value_fields->get(i); if(value_fieldcount()) hash.put( - info->table->columns()->get(value_field), - ValuePtr(new VString(row->get(value_field)))); + *info->table->columns()->get(value_field), + new VString(*row->get(value_field))); } - if(info->hash->put_dont_replace(key, vhash)) // put. existed? + if(info->hash->put_dont_replace(*key, vhash)) // put. existed? if(!info->distinct) throw Exception("parser.runtime", key, "duplicate key"); } -static void _hash(Request& r, StringPtr method_name, MethodParams& params) { - Pool& pool=r.pool(); - Table& self_table=GET_SELF(r, VTable).table(method_name); - VHashPtr result(new VHash); +static void _hash(Request& r, MethodParams* params) { + Table& self_table=GET_SELF(r, VTable).table(); + VHash& result=*new VHash; if(Table::columns_type columns=self_table.columns()) if(columns->count()>0) { bool distinct=false; - int param_index=params.count()-1; + int param_index=params->count()-1; if(param_index>0) { if(HashStringValue* options= - params.as_no_junction(param_index, "param must not be code")->get_hash(method_name)) { + params->as_no_junction(param_index, "param must not be code").get_hash()) { --param_index; int valid_options=0; - if(ValuePtr vdistinct=options->get(sql_distinct_name)) { + if(Value* vdistinct=options->get(sql_distinct_name)) { valid_options++; - distinct=r.process_to_value(vdistinct)->as_bool(); + distinct=r.process_to_value(*vdistinct).as_bool(); } if(valid_options!=options->count()) throw Exception("parser.runtime", - method_name, + 0, "called with invalid option"); } } if(param_index==2) // bad options param type throw Exception("parser.runtime", - method_name, + 0, "options must be hash"); Array value_fields; if(param_index>0) { - ValuePtr value_fields_param=params.as_no_junction(param_index, "value field(s) must not be code"); - if(value_fields_param->is_string()) { + Value& value_fields_param=params->as_no_junction(param_index, "value field(s) must not be code"); + if(value_fields_param.is_string()) { value_fields+=self_table.column_name2index( - value_fields_param->as_string(&pool), true); - } else if(Table* value_fields_table=value_fields_param->get_table()) { + *value_fields_param.get_string(), true); + } else if(Table* value_fields_table=value_fields_param.get_table()) { for(int i=0; icount(); i++) { - StringPtr value_field_name= - value_fields_table->get(i)->get(0); + const String& value_field_name= + *value_fields_table->get(i)->get(0); value_fields+=self_table.column_name2index(value_field_name, true); } } else throw Exception("parser.runtime", - method_name, + 0, "value field(s) must be string or self_table" ); } else { // by all columns, including key @@ -425,13 +409,14 @@ static void _hash(Request& r, StringPtr Row_info info; info.r=&r; info.table=&self_table; - ValuePtr key_param=params[0]; - info.key_code=key_param->get_junction()?key_param:ValuePtr(0); + Value* key_param=(*params)[0]; + info.key_code=key_param->get_junction()?key_param:0; info.key_field=info.key_code?-1 - :self_table.column_name2index(key_param->as_string(&pool), true); + :self_table.column_name2index(key_param->as_string(), true); info.value_fields=&value_fields; - info.hash=&result->hash(); + info.hash=&result.hash(); info.distinct=distinct; + info.row=0; int saved_current=self_table.current(); self_table.for_each(table_row_to_hash, &info); @@ -443,9 +428,9 @@ static void _hash(Request& r, StringPtr #ifndef DOXYGEN struct Table_seq_item { - Table::element_type row; + ArrayString* row; union { - char *c_str; + const char *c_str; double d; } value; }; @@ -466,18 +451,17 @@ static int sort_cmp_double(const void *a else return 0; } -static void _sort(Request& r, StringPtr method_name, MethodParams& params) { - Pool local_pool; - ValuePtr key_maker=params.as_junction(0, "key-maker must be code"); +static void _sort(Request& r, MethodParams* params) { + Value& key_maker=params->as_junction(0, "key-maker must be code"); - bool reverse=params.count()>1/*..[desc|asc|]*/? - reverse=*params.as_no_junction(1, "order must not be code")->as_string(&local_pool)=="desc": + bool reverse=params->count()>1/*..[desc|asc|]*/? + reverse=params->as_no_junction(1, "order must not be code").as_string()=="desc": false; // default=asc - Table& old_table=GET_SELF(r, VTable).table(method_name); - TablePtr new_table(new Table(method_name, old_table.columns())); + Table& old_table=GET_SELF(r, VTable).table(); + Table& new_table=*new Table(old_table.columns()); - smart_ptr seq(new Table_seq_item[old_table.count()]); + Table_seq_item* seq=new(PointerFreeGC) Table_seq_item[old_table.count()]; int i; // calculate key values @@ -486,12 +470,12 @@ static void _sort(Request& r, StringPtr old_table.set_current(i); // calculate key value seq[i].row=old_table[i]; - ValuePtr value=r.process_to_value(key_maker)->as_expr_result(true/*return string as-is*/); + Value* value=r.process_to_value(key_maker).as_expr_result(true/*return string as-is*/); if(i==0) // determining key values type by first one key_values_are_strings=value->is_string(); if(key_values_are_strings) - seq[i].value.c_str=value->as_string(&local_pool)->cstr(local_pool); + seq[i].value.c_str=value->as_string().cstr(); else seq[i].value.d=value->as_double(); } @@ -501,101 +485,99 @@ static void _sort(Request& r, StringPtr // reorder table as they require in 'seq' for(i=0; i1) +static bool _locate_expression(Request& r, MethodParams* params) { + if(params->count()>1) throw Exception("parser.runtime", - method_name, + 0, "locate by expression has only one parameter - expression"); - ValuePtr expression_code=params.as_junction(0, "must be expression"); + Value& expression_code=params->as_junction(0, "must be expression"); - Table& table=GET_SELF(r, VTable).table(method_name); + Table& table=GET_SELF(r, VTable).table(); int saved_current=table.current(); int size=table.count(); for(int row=0; rowas_bool()) + if(r.process_to_value(expression_code).as_bool()) return true; } table.set_current(saved_current); return false; } -static bool _locate_name_value(Request& r, StringPtr method_name, MethodParams& params) { - if(params.count()>2) +static bool _locate_name_value(Request& r, MethodParams* params) { + if(params->count()>2) throw Exception("parser.runtime", - method_name, + 0, "locate by name and value has only two parameters - name and value"); - Table& table=GET_SELF(r, VTable).table(method_name); + Table& table=GET_SELF(r, VTable).table(); return table.locate( - params.as_string(0, "column name must be string"), - params.as_string(1, "value must be string") + params->as_string(0, "column name must be string"), + params->as_string(1, "value must be string") ); } -static void _locate(Request& r, StringPtr method_name, MethodParams& params) { - Pool& pool=r.pool(); - bool result=params[0]->get_junction()? - _locate_expression(r, method_name, params) : - _locate_name_value(r, method_name, params); - r.write_no_lang(ValuePtr(new VBool(result))); +static void _locate(Request& r, MethodParams* params) { + bool result=(*params)[0]->get_junction()? + _locate_expression(r, params) : + _locate_name_value(r, params); + r.write_no_lang(*new VBool(result)); } -static void _flip(Request& r, StringPtr method_name, MethodParams& params) { - Pool& pool=r.pool(); - Table& old_table=GET_SELF(r, VTable).table(method_name); - TablePtr new_table(new Table(method_name, old_table.columns())); +static void _flip(Request& r, MethodParams* params) { + Table& old_table=GET_SELF(r, VTable).table(); + Table& new_table=*new Table(old_table.columns()); if(old_table.count()) if(int old_cols=old_table[0]->count()) for(int column=0; columncount()?old_row->get(column):StringPtr(new String); + *new_row+=columncount()?old_row->get(column):new String; } - *new_table+=new_row; + new_table+=new_row; } - r.write_no_lang(ValuePtr(new VTable(new_table))); + r.write_no_lang(*new VTable(&new_table)); } -static void _append(Request& r, StringPtr method_name, MethodParams& params) { - Pool& pool=r.pool(); +static void _append(Request& r, MethodParams* params) { // data - Temp_lang temp_lang(r, String::UL_PASS_APPENDED); - StringPtr string=r.process_to_string(params.as_junction(0, "body must be code")); + Temp_lang temp_lang(r, String::L_PASS_APPENDED); + const String& string=r.process_to_string(params->as_junction(0, "body must be code")); // parse cells - ArrayStringPtr row(new ArrayString); - string->split(*row, 0, "\t", 1, String::UL_AS_IS); + Table::element_type row=new ArrayString; + size_t pos_after=0; + string.split(*row, pos_after, "\t", String::L_AS_IS); - GET_SELF(r, VTable).table(method_name)+=row; + GET_SELF(r, VTable).table()+=row; } -static void _join(Request& r, StringPtr method_name, MethodParams& params) { - Pool& pool=r.pool(); - - Table* maybe_src=params.as_no_junction(0, "table ref must not be code")->get_table(); +static void _join(Request& r, MethodParams* params) { + Table* maybe_src=params->as_no_junction(0, "table ref must not be code").get_table(); if(!maybe_src) throw Exception("parser.runtime", - method_name, + 0, "source is not a table"); Table& src=*maybe_src; - Table& dest=GET_SELF(r, VTable).table(method_name); + Table& dest=GET_SELF(r, VTable).table(); if(&src == &dest) throw Exception("parser.runtime", - method_name, + 0, "source and destination are same table"); int offset, limit; - get_copy_options(r, method_name, params, 1, src, + get_copy_options(r, params, 1, src, offset, limit); if(Table::columns_type dest_columns=dest.columns()) { // dest is named @@ -608,8 +590,8 @@ static void _join(Request& r, StringPtr src.set_current(src_row); Table::element_type dest_row(new ArrayString(src.count())); for(int dest_column=0; dest_columncount(); dest_column++) { - StringPtr src_item=src.item(dest_columns->get(dest_column)); - *dest_row+=src_item?src_item:StringPtr(new String); + const String* src_item=src.item(*dest_columns->get(dest_column)); + *dest_row+=src_item?src_item:new String; } dest+=dest_row; } @@ -622,30 +604,18 @@ static void _join(Request& r, StringPtr #ifndef DOXYGEN class Table_sql_event_handlers: public SQL_Driver_query_event_handlers { - Pool& pool; - StringPtr method_name; - StringPtr statement_string; const char* statement_cstr; - ArrayStringPtr columns; + ArrayString& columns; ArrayString* row; public: - TablePtr table; + Table* table; public: - Table_sql_event_handlers(Pool& apool, StringPtr amethod_name, - StringPtr astatement_string, const char* astatement_cstr) : - pool(apool), - method_name(amethod_name), - statement_string(astatement_string), - statement_cstr(astatement_cstr), - columns(new ArrayString) - {} + Table_sql_event_handlers() : + columns(*new ArrayString), row(0), table(0) { + } bool add_column(SQL_Error& error, void *ptr, size_t size) { try { - StringPtr column(new String); - column->APPEND_TAINTED( - (const char* )ptr, size, - statement_cstr, 0); - *columns+=column; + columns+=new String((const char* )ptr, size, true); return false; } catch(...) { error=SQL_Error("exception occured in Table_sql_event_handlers::add_column"); @@ -654,7 +624,7 @@ public: } bool before_rows(SQL_Error& error) { try { - table=TablePtr(new Table( method_name, columns)); + table=new Table(&columns); return false; } catch(...) { error=SQL_Error("exception occured in Table_sql_event_handlers::before_rows"); @@ -663,7 +633,7 @@ public: } bool add_row(SQL_Error& error) { try { - *table+=(ArrayStringPtr(row=new ArrayString)); + *table+=row=new ArrayString; return false; } catch(...) { error=SQL_Error("exception occured in Table_sql_event_handlers::add_row"); @@ -672,12 +642,10 @@ public: } bool add_row_cell(SQL_Error& error, void *ptr, size_t size) { try { - StringPtr cell(new String); + String& cell=*new String; if(size) - cell->APPEND_TAINTED( - (const char* )ptr, size, - statement_cstr, table->count()-1); - *row+=cell; + cell.append((const char* )ptr, size, String::L_TAINTED); + *row+=&cell; return false; } catch(...) { error=SQL_Error("exception occured in Table_sql_event_handlers::add_row_cell"); @@ -686,48 +654,45 @@ public: } }; #endif -static void _sql(Request& r, StringPtr method_name, MethodParams& params) { - Pool& pool=r.pool(); - - ValuePtr statement=params.as_junction(0, "statement must be code"); +static void _sql(Request& r, MethodParams* params) { + Value& statement=params->as_junction(0, "statement must be code"); ulong limit=0; ulong offset=0; - if(params.count()>1) { - ValuePtr voptions=params.as_no_junction(1, "options must be hash, not code"); - if(!voptions->is_string()) - if(HashStringValue* options=voptions->get_hash(method_name)) { + if(params->count()>1) { + Value& voptions=params->as_no_junction(1, "options must be hash, not code"); + if(!voptions.is_string()) + if(HashStringValue* options=voptions.get_hash()) { int valid_options=0; - if(ValuePtr vlimit=options->get(sql_limit_name)) { + if(Value* vlimit=options->get(sql_limit_name)) { valid_options++; - limit=(ulong)r.process_to_value(vlimit)->as_double(); + limit=(ulong)r.process_to_value(*vlimit).as_double(); } - if(ValuePtr voffset=options->get(sql_offset_name)) { + if(Value* voffset=options->get(sql_offset_name)) { valid_options++; - offset=(ulong)r.process_to_value(voffset)->as_double(); + offset=(ulong)r.process_to_value(*voffset).as_double(); } if(valid_options!=options->count()) throw Exception("parser.runtime", - method_name, + 0, "called with invalid option"); } else throw Exception("parser.runtime", - method_name, + 0, "options must be hash"); } - Temp_lang temp_lang(r, String::UL_SQL); - StringPtr statement_string=r.process_to_string(statement); + Temp_lang temp_lang(r, String::L_SQL); + const String& statement_string=r.process_to_string(statement); const char* statement_cstr= - statement_string->cstr(pool, String::UL_UNSPECIFIED, r.connection(method_name)); - Table_sql_event_handlers handlers(pool, method_name, - statement_string, statement_cstr); + statement_string.cstr(String::L_UNSPECIFIED, r.connection()); + Table_sql_event_handlers handlers; #ifdef RESOURCES_DEBUG struct timeval mt[2]; //measure:before gettimeofday(&mt[0],NULL); #endif - r.connection(method_name)->query( + r.connection()->query( statement_cstr, offset, limit, handlers, statement_string); @@ -743,44 +708,38 @@ static void _sql(Request& r, StringPtr m r.sql_request_time+=t[1]-t[0]; #endif - TablePtr result= - handlers.table?handlers.table: // query resulted in table? return it - TablePtr(new Table(method_name, Table::columns_type(0))); // query returned no table, fake it + Table& result= + handlers.table?*handlers.table: // query resulted in table? return it + *new Table(Table::columns_type(0)); // query returned no table, fake it // replace any previous table value GET_SELF(r, VTable).set_table(result); } -static void _columns(Request& r, StringPtr method_name, MethodParams& ) { - Pool& pool=r.pool(); +static void _columns(Request& r, MethodParams* ) { Table::columns_type result_columns(new ArrayString); - *result_columns+=StringPtr(new String("column")); - TablePtr result_table(new Table(method_name, result_columns)); + *result_columns+=new String("column"); + Table& result_table=*new Table(result_columns); - Table& source_table=GET_SELF(r, VTable).table(method_name); + Table& source_table=GET_SELF(r, VTable).table(); if(Table::columns_type source_columns=source_table.columns()) { - Array_iterator i(*source_columns); + Array_iterator i(*source_columns); while(i.has_next()) { Table::element_type result_row(new ArrayString); *result_row+=i.next(); - *result_table+=result_row; + result_table+=result_row; } } - r.write_no_lang(ValuePtr(new VTable(result_table))); + r.write_no_lang(*new VTable(&result_table)); } -static void _select(Request& r, StringPtr method_name, MethodParams& params) { - Pool& pool=r.pool(); - - ValuePtr vcondition=params.as_junction(0, "condition must be expression"); +static void _select(Request& r, MethodParams* params) { + Value& vcondition=params->as_junction(0, "condition must be expression"); - Table& source_table=GET_SELF(r, VTable).table(method_name); - TablePtr result_table(new Table( - source_table.origin_string(), - source_table.columns() - )); + Table& source_table=GET_SELF(r, VTable).table(); + Table& result_table=*new Table(source_table.columns()); int saved_current=source_table.current(); int size=source_table.count(); @@ -789,14 +748,14 @@ static void _select(Request& r, StringPt bool condition=r.process_to_value(vcondition, /*0/*no name* /,*/ - false/*don't intercept string*/)->as_bool(); + false/*don't intercept string*/).as_bool(); if(condition) // ...condition is true= - *result_table+=source_table[row]; // =green light to go to result + result_table+=source_table[row]; // =green light to go to result } source_table.set_current(saved_current); - r.write_no_lang(ValuePtr(new VTable(result_table))); + r.write_no_lang(*new VTable(&result_table)); } // constructor