--- parser3/src/classes/table.C 2002/04/15 10:35:21 1.149 +++ parser3/src/classes/table.C 2003/04/25 12:32:31 1.181 @@ -1,12 +1,12 @@ /** @file Parser: @b table parser class. - Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) - - $Id: table.C,v 1.149 2002/04/15 10:35:21 paf Exp $ */ +static const char* IDENT_TABLE_C="$Date: 2003/04/25 12:32:31 $"; + #include "classes.h" #include "pa_common.h" #include "pa_request.h" @@ -15,10 +15,6 @@ #include "pa_sql_connection.h" #include "pa_vbool.h" -// defines - -#define TABLE_CLASS_NAME "table" - // class class MTable : public Methoded { @@ -34,14 +30,74 @@ public: // Methoded // methods +static Table::Action_options get_action_options(Request& r, + const String& method_name, MethodParams *params, + const Table& source) { + Table::Action_options result; + + if(!params->size()) + return result; + + Hash* options=params->get(params->size()-1).get_hash(&method_name); + if(!options) + return result; + + result.defined=true; + bool defined_offset=false; + + int valid_options=0; + if(Value *voffset=(Value *)options->get(*sql_offset_name)) { + valid_options++; + defined_offset=true; + if(voffset->is_string()) { + const String& soffset=*voffset->get_string(); + if(soffset == "cur") + result.offset=source.current(); + else + throw Exception("parser.runtime", + &soffset, + "must be 'cur' string or expression"); + } else + result.offset=r.process_to_value(*voffset).as_int(); + } + if(Value *vlimit=(Value *)options->get(*sql_limit_name)) { + valid_options++; + result.limit=r.process_to_value(*vlimit).as_int(); + } + if(Value *vreverse=(Value *)options->get(*table_reverse_name)) { + valid_options++; + result.reverse=r.process_to_value(*vreverse).as_bool(); + if(result.reverse && !defined_offset) + result.offset=source.size()-1; + } + if(valid_options!=options->size()) + throw Exception("parser.runtime", + &method_name, + "called with invalid option"); + + return result; +} +static void check_option_param(bool options_defined, + const String& method_name, MethodParams *params, + int next_param_index, + const char *msg) { + if(next_param_index+(options_defined?1:0) != params->size()) + throw Exception("parser.runtime", + &method_name, + "%s", msg); +} + static void _create(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - // clone? - if(params->size()==1) - if(const Table *source=params->get(0).get_table()) { - static_cast(r.self)->set_table(*new(pool) Table(*source)); - return; - } + // clone/copy part? + if(const Table *source=params->get(0).get_table()) { + Table::Action_options o=get_action_options(r, method_name, params, *source); + check_option_param(o.defined, method_name, params, 1, + "too many parameters"); + static_cast(r.get_self())-> + set_table(*new(pool) Table(pool, *source, o)); + return; + } // data is last parameter Temp_lang temp_lang(r, String::UL_PASS_APPENDED); @@ -79,17 +135,24 @@ static void _create(Request& r, const St } // replace any previous table value - static_cast(r.self)->set_table(table); + static_cast(r.get_self())->set_table(table); } static void _load(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - // filename is last parameter - Value& vfile_name=params->as_no_junction(params->size()-1, - "file name must not be code"); - + const String& first_param=params->as_string(0, "file name must be string"); + int filename_param_index=0; + 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.absolute(vfile_name.as_string())); + char *data=file_read_text(pool, + r.absolute(params->as_string(filename_param_index, "file name must be string")), + true, + options_param_indexsize()?params->as_no_junction(options_param_index, "additional params must be hash").get_hash(&method_name):0 + ); // parse columns Array *columns; @@ -98,7 +161,7 @@ static void _load(Request& r, const Stri const char *file=origin.file; uint line=origin.line; #endif - if(params->size()==2) { + if(nameless) { columns=0; // nameless } else { columns=new(pool) Array(pool); @@ -137,7 +200,7 @@ static void _load(Request& r, const Stri }; // replace any previous table value - static_cast(r.self)->set_table(table); + static_cast(r.get_self())->set_table(table); } /// @todo "x\nx" "xxx""xx" @@ -146,7 +209,7 @@ static void _save(Request& r, const Stri Value& vfile_name=params->as_no_junction(params->size()-1, "file name must not be code"); - Table& table=static_cast(r.self)->table(); + Table& table=static_cast(r.get_self())->table(&method_name); bool do_append=false; String sdata(pool); @@ -188,8 +251,9 @@ static void _save(Request& r, const Stri while(i.has_next()) { Array_iter c(*static_cast(i.next())); while(c.has_next()) { - sdata.append(*c.next_string(), //*static_cast(row->quick_get(column)), - String::UL_TABLE); + if(const String *s=c.next_string()) + sdata.append(*s, + String::UL_TABLE); if(c.has_next()) sdata.APPEND_CONST("\t"); } @@ -203,21 +267,19 @@ static void _save(Request& r, const Stri static void _count(Request& r, const String& method_name, MethodParams *) { Pool& pool=r.pool(); - Value& value=*new(pool) VInt(pool, static_cast(r.self)->table().size()); - value.set_name(method_name); - r.write_no_lang(value); + int result=static_cast(r.get_self())->table(&method_name).size(); + r.write_no_lang(*new(pool) VInt(pool, result)); } static void _line(Request& r, const String& method_name, MethodParams *) { Pool& pool=r.pool(); - Value& value=*new(pool) VInt(pool, 1+static_cast(r.self)->table().current()); - value.set_name(method_name); - r.write_no_lang(value); + int result=1+static_cast(r.get_self())->table(&method_name).current(); + r.write_no_lang(*new(pool) VInt(pool, result)); } static void _offset(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - Table& table=static_cast(r.self)->table(); + Table& table=static_cast(r.get_self())->table(&method_name); if(params->size()) { bool absolute=false; if(params->size()>1) { @@ -230,15 +292,12 @@ static void _offset(Request& r, const St throw Exception("parser.runtime", &whence, "is invalid whence, valid are 'cur' or 'set'"); - } + } Value& offset_expr=params->as_junction(params->size()-1, "offset must be expression"); table.offset(absolute, r.process_to_value(offset_expr).as_int()); - } else { - Value& value=*new(pool) VInt(pool, table.current()); - value.set_name(method_name); - r.write_no_lang(value); - } + } else + r.write_no_lang(*new(pool) VInt(pool, table.current())); } static void _menu(Request& r, const String& method_name, MethodParams *params) { @@ -246,31 +305,36 @@ static void _menu(Request& r, const Stri Value *delim_maybe_code=params->size()>1?¶ms->get(1):0; - Table& table=static_cast(r.self)->table(); + Table& table=static_cast(r.get_self())->table(&method_name); bool need_delim=false; int saved_current=table.current(); int size=table.size(); for(int row=0; rowsize()) // need delim & iteration produced string? - r.write_pass_lang(r.process_to_string(*delim_maybe_code)); + StringOrValue sv_processed=r.process(body_code); + const String *s_processed=sv_processed.get_string(); + if(delim_maybe_code && s_processed && s_processed->size()) { // delimiter set and we have body + if(need_delim) // need delim & iteration produced string? + r.write_pass_lang(r.process(*delim_maybe_code)); need_delim=true; } - r.write_pass_lang(processed_body); + r.write_pass_lang(sv_processed); } table.set_current(saved_current); } #ifndef DOXYGEN +enum Table2hash_distint { D_ILLEGAL, D_FIRST, D_TABLES }; struct Row_info { + Request *r; Table *table; + Value *key_code; int key_field; Array *value_fields; Hash *hash; + Table2hash_distint distinct; + int row; }; #endif static void table_row_to_hash(Array::Item *value, void *info) { @@ -278,33 +342,104 @@ static void table_row_to_hash(Array::Ite Row_info& ri=*static_cast(info); Pool& pool=ri.table->pool(); - if(ri.key_fieldsize(); i++) { - int value_field=ri.value_fields->get_int(i); - if(value_fieldcolumns()->get_string(value_field), - new(pool) VString(*row.get_string(value_field))); - } + const String *key; + if(ri.key_code) { + ri.table->set_current(ri.row++); // change context row + StringOrValue sv_processed=ri.r->process(*ri.key_code); + key=&sv_processed.as_string(); + } else + key=ri.key_fieldput(*row.get_string(ri.key_field), &result); + switch(ri.distinct) { + case D_ILLEGAL: case D_FIRST: + { + VHash& result=*new(pool) VHash(pool); + Hash& hash=*result.get_hash(0); + for(int i=0; isize(); i++) { + int value_field=ri.value_fields->get_int(i); + if(value_fieldcolumns()->get_string(value_field), + new(pool) VString(*row.get_string(value_field))); + } + + if(ri.hash->put_dont_replace(*key, &result)) // put. existed? + if(ri.distinct==D_ILLEGAL) + throw Exception("parser.runtime", + key, + "duplicate key"); + } + break; + case D_TABLES: + { + VTable* vtable=(VTable*)ri.hash->get(*key); // put. table existed? + Table* table; + if(vtable) + table=vtable->get_table(); + else { + // no? creating table of same structure as source + Table::Action_options table_options(0, 0); + table=new(pool) Table(pool, *ri.table, table_options/*no rows, just structure*/); + ri.hash->put(*key, new(pool) VTable(pool, table)); + } + *table+=&row; + } + break; + default: + throw Exception(0, + 0, + "invalid distinct code (#%d)", ri.distinct); } + } static void _hash(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - Table& self_table=static_cast(r.self)->table(); + Table& self_table=static_cast(r.get_self())->table(&method_name); Value& result=*new(pool) VHash(pool); - if(const Array *columns=self_table.columns()) - if(columns->size()>1) { - const String& key_field_name=params->as_no_junction(0, - "key field name must not be code").as_string(); - int key_field=self_table.column_name2index(key_field_name, true); + if(const Array *columns=self_table.columns()) + if(columns->size()>0) { + Table2hash_distint distinct=D_ILLEGAL; + int param_index=params->size()-1; + if(param_index>0) { + if(Hash *options= + params->as_no_junction(param_index, "param must not be code").get_hash(0)) { + --param_index; + int valid_options=0; + if(Value *vdistinct_code=(Value *)options->get(*sql_distinct_name)) { + valid_options++; + Value& vdistinct_value=r.process_to_value(*vdistinct_code); + if(vdistinct_value.is_string()) { + const String& sdistinct=*vdistinct_value.get_string(); + if(sdistinct=="tables") + distinct=D_TABLES; + else + throw Exception("parser.runtime", + &sdistinct, + "must be 'tables' or true/false"); + } else + distinct=vdistinct_value.as_bool()?D_FIRST:D_ILLEGAL; + } + if(valid_options!=options->size()) + throw Exception("parser.runtime", + &method_name, + "called with invalid option"); + } + } + if(param_index==2) // bad options param type + throw Exception("parser.runtime", + &method_name, + "options must be hash"); Array value_fields(pool); - if(params->size()>1) { - Value& value_fields_param=params->as_no_junction(1, "value field(s) must not be code"); + if(param_index>0) { + if(distinct!=D_ILLEGAL && distinct!=D_FIRST) + throw Exception("parser.runtime", + 0, + "in distinct[tables] mode you may not specify value field(s)"); + 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(), true); } else if(Table *value_fields_table=value_fields_param.get_table()) { @@ -319,15 +454,24 @@ static void _hash(Request& r, const Stri "value field(s) must be string or self_table" ); } else { // by all columns, including key - for(int i=0; isize(); i++) - value_fields+=i; + if(!(distinct!=D_ILLEGAL && distinct!=D_FIRST)) + for(int i=0; isize(); i++) + value_fields+=i; } - // integers: key_field & value_fields - Row_info row_info={&self_table, key_field, &value_fields, result.get_hash(0)}; + Value& key_param=params->get(0); + Value *key_code=key_param.get_junction()?&key_param:0; + int key_field=key_code?-1 + :self_table.column_name2index(key_param.as_string(), true); + + Row_info row_info={&r, &self_table, + key_code, key_field, &value_fields, + result.get_hash(0), distinct}; + + int saved_current=self_table.current(); self_table.for_each(table_row_to_hash, &row_info); + self_table.set_current(saved_current); } - result.set_name(method_name); r.write_no_lang(result); } @@ -364,7 +508,10 @@ static void _sort(Request& r, const Stri reverse=params->as_no_junction(1, "order must not be code").as_string()=="desc": false; // default=asc - Table& old_table=static_cast(r.self)->table(); + Table& old_table=static_cast(r.get_self())->table(&method_name); + if(old_table.size()==0) + return; + Table& new_table=*new(pool) Table(pool, &method_name, old_table.columns()); Table_seq_item *seq=(Table_seq_item *)pool.malloc(sizeof(Table_seq_item)*old_table.size()); @@ -372,8 +519,6 @@ static void _sort(Request& r, const Stri // calculate key values bool key_values_are_strings=true; - // save 'current' - int saved_current=old_table.current(); for(i=0; i(r.self)->set_table(new_table); + static_cast(r.get_self())->set_table(new_table); } -static bool _locate_expression(Request& r, const String& method_name, MethodParams *params) { - if(params->size()>1) - throw Exception("parser.runtime", - &method_name, - "locate by expression has only one parameter - expression"); - +#ifndef DOXYGEN +struct Locate_expression_func_info { + Request* r; + Value* expression_code; +}; +#endif +bool locate_expression_func(Table& self, void* ainfo) { + Locate_expression_func_info& info=*static_cast(ainfo); + return info.r->process_to_value(*info.expression_code).as_bool(); +} +static bool _locate_expression(Table& table, Table::Action_options o, + Request& r, const String& method_name, MethodParams *params) { + check_option_param(o.defined, method_name, params, 1, + "locate by expression only has parameters: expression and, maybe, options"); Value& expression_code=params->as_junction(0, "must be expression"); - Table& table=static_cast(r.self)->table(); - int saved_current=table.current(); - int size=table.size(); - for(int row=0; rowsize()>2) - throw Exception("parser.runtime", - &method_name, - "locate by name and value has only two parameters - name and value"); +static bool _locate_name_value(Table& table, Table::Action_options o, + Request& r, const String& method_name, MethodParams *params) { + check_option_param(o.defined, method_name, params, 2, + "locate by locate by name has parameters: name, value and, maybe, options"); + const String& name=params->as_string(0, "column name must be string"); + const String& value=params->as_string(1, "value must be string"); - Table& table=static_cast(r.self)->table(); - return table.locate( - params->as_string(0, "column name must be string"), - params->as_string(1, "value must be string") - ); + return table.locate(name, value, o); } static void _locate(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - Value& result=*new(pool) VBool(pool, - params->get(0).get_junction()? - _locate_expression(r, method_name, params) : - _locate_name_value(r, method_name, params)); - result.set_name(method_name); - r.write_no_lang(result); + Table& table=static_cast(r.get_self())->table(&method_name); + + Table::Action_options o=get_action_options(r, method_name, params, table); + + bool result=params->get(0).get_junction()? + _locate_expression(table, o, r, method_name, params) : + _locate_name_value(table, o, r, method_name, params); + r.write_no_lang(*new(pool) VBool(pool, result)); } static void _flip(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - Table& old_table=static_cast(r.self)->table(); + Table& old_table=static_cast(r.get_self())->table(&method_name); Table& new_table=*new(pool) Table(pool, &method_name, 0/*nameless*/); if(old_table.size()) if(int old_cols=old_table.at(0).size()) @@ -472,28 +613,40 @@ static void _append(Request& r, const St Array& row=*new(pool) Array(pool); string.split(row, 0, "\t", 1, String::UL_AS_IS); - static_cast(r.self)->table()+=&row; + static_cast(r.get_self())->table(&method_name)+=&row; } static void _join(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - Table *maybe_src=params->as_no_junction(0, "table ref must not be code").get_table(); + 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, "source is not a table"); - Table& src=*maybe_src; - Table& dest=static_cast(r.self)->table(); + + Table::Action_options o=get_action_options(r, method_name, params, src); + check_option_param(o.defined, method_name, params, 1, + "invalid extra parameter"); + + Table& dest=static_cast(r.get_self())->table(&method_name); if(&src == &dest) throw Exception("parser.runtime", &method_name, "source and destination are same table"); + if(o.reverse) + throw Exception(0, + &method_name, + "not implemented in this version, please upgrade"); if(const Array *dest_columns=dest.columns()) { // dest is named int saved_src_current=src.current(); - for(int src_row=0; src_rowm) + o.limit=m; + int end=o.offset+o.limit; + for(int src_row=o.offset; src_rowsize(); dest_column++) { @@ -510,7 +663,7 @@ static void _join(Request& r, const Stri } #ifndef DOXYGEN -class Table_sql_event_handlers : public SQL_Driver_query_event_handlers { +class Table_sql_event_handlers: public SQL_Driver_query_event_handlers { public: Table_sql_event_handlers(Pool& apool, const String& amethod_name, const String& astatement_string, const char *astatement_cstr) : @@ -524,26 +677,50 @@ public: { } - void add_column(void *ptr, size_t size) { - String *column=new(pool) String(pool); - column->APPEND_TAINTED( - (const char *)ptr, size, - statement_cstr, 0); - columns+=column; - } - void before_rows() { - table=new(pool) Table(pool, &method_name, &columns); - } - void add_row() { - (*table)+=(row=new(pool) Array(pool)); - } - void add_row_cell(void *ptr, size_t size) { - String *cell=new(pool) String(pool); - if(size) - cell->APPEND_TAINTED( + bool add_column(SQL_Error& error, void *ptr, size_t size) { + try { + String *column=new(pool) String(pool); + column->APPEND_TAINTED( (const char *)ptr, size, - statement_cstr, table->size()-1); - (*row)+=cell; + statement_cstr, 0); + columns+=column; + return false; + } catch(...) { + error=SQL_Error("exception occured in Table_sql_event_handlers::add_column"); + return true; + } + } + bool before_rows(SQL_Error& error) { + try { + table=new(pool) Table(pool, &method_name, &columns); + return false; + } catch(...) { + error=SQL_Error("exception occured in Table_sql_event_handlers::before_rows"); + return true; + } + } + bool add_row(SQL_Error& error) { + try { + (*table)+=(row=new(pool) Array(pool)); + return false; + } catch(...) { + error=SQL_Error("exception occured in Table_sql_event_handlers::add_row"); + return true; + } + } + bool add_row_cell(SQL_Error& error, void *ptr, size_t size) { + try { + String *cell=new(pool) String(pool); + if(size) + cell->APPEND_TAINTED( + (const char *)ptr, size, + statement_cstr, table->size()-1); + (*row)+=cell; + return false; + } catch(...) { + error=SQL_Error("exception occured in Table_sql_event_handlers::add_row_cell"); + return true; + } } private: @@ -565,12 +742,21 @@ static void _sql(Request& r, const Strin ulong offset=0; if(params->size()>1) { Value& voptions=params->as_no_junction(1, "options must be hash, not code"); - if(voptions.is_defined()) + if(!voptions.is_string()) if(Hash *options=voptions.get_hash(&method_name)) { - if(Value *vlimit=(Value *)options->get(*sql_limit_name)) + int valid_options=0; + if(Value *vlimit=(Value *)options->get(*sql_limit_name)) { + valid_options++; limit=(ulong)r.process_to_value(*vlimit).as_double(); - if(Value *voffset=(Value *)options->get(*sql_offset_name)) + } + if(Value *voffset=(Value *)options->get(*sql_offset_name)) { + valid_options++; offset=(ulong)r.process_to_value(*voffset).as_double(); + } + if(valid_options!=options->size()) + throw Exception("parser.runtime", + &method_name, + "called with invalid option"); } else throw Exception("parser.runtime", &method_name, @@ -583,15 +769,15 @@ static void _sql(Request& r, const Strin statement_string.cstr(String::UL_UNSPECIFIED, r.connection(&method_name)); Table_sql_event_handlers handlers(pool, method_name, statement_string, statement_cstr); - try { #ifdef RESOURCES_DEBUG struct timeval mt[2]; //measure:before gettimeofday(&mt[0],NULL); #endif - r.connection(&method_name)->query( - statement_cstr, offset, limit, - handlers); + r.connection(&method_name)->query( + statement_cstr, offset, limit, + handlers, + statement_string); #ifdef RESOURCES_DEBUG //measure:after connect @@ -603,19 +789,13 @@ static void _sql(Request& r, const Strin r.sql_request_time+=t[1]-t[0]; #endif - } catch(const Exception& e) { // query problem - // more specific source [were url] - throw Exception("sql.execute", - &statement_string, - "%s", e.comment()); - } Table *result= handlers.table?handlers.table: // query resulted in table? return it new(pool) Table(pool, &method_name, 0); // query returned no table, fake it // replace any previous table value - static_cast(r.self)->set_table(*result); + static_cast(r.get_self())->set_table(*result); } static void _columns(Request& r, const String& method_name, MethodParams *) { @@ -625,7 +805,7 @@ static void _columns(Request& r, const S result_columns+=new(pool) String(pool, "column"); Table& result_table=*new(pool) Table(pool, &method_name, &result_columns); - Table& source_table=static_cast(r.self)->table(); + Table& source_table=static_cast(r.get_self())->table(&method_name); if(const Array *source_columns=source_table.columns()) { Array_iter i(*source_columns); while(i.has_next()) { @@ -635,9 +815,7 @@ static void _columns(Request& r, const S } } - VTable& result=*new(pool) VTable(pool, &result_table); - result.set_name(method_name); - r.write_no_lang(result); + r.write_no_lang(*new(pool) VTable(pool, &result_table)); } static void _select(Request& r, const String& method_name, MethodParams *params) { @@ -645,7 +823,7 @@ static void _select(Request& r, const St Value& vcondition=params->as_junction(0, "condition must be expression"); - Table& source_table=static_cast(r.self)->table(); + Table& source_table=static_cast(r.get_self())->table(&method_name); Table& result_table=*new(pool) Table(pool, source_table.origin_string(), source_table.columns() @@ -656,9 +834,7 @@ static void _select(Request& r, const St for(int row=0; row