--- parser3/src/classes/table.C 2001/10/23 14:43:44 1.128 +++ parser3/src/classes/table.C 2002/09/17 08:44:45 1.161 @@ -1,14 +1,13 @@ /** @file Parser: @b table parser class. - Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) - Author: Alexander Petrosyan (http://design.ru/paf) - - $Id: table.C,v 1.128 2001/10/23 14:43:44 parser Exp $ + Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) + Author: Alexandr Petrosian (http://paf.design.ru) */ +static const char* IDENT_TABLE_C="$Date: 2002/09/17 08:44:45 $"; + #include "classes.h" -#include "pa_config_includes.h" #include "pa_common.h" #include "pa_request.h" #include "pa_vtable.h" @@ -16,10 +15,6 @@ #include "pa_sql_connection.h" #include "pa_vbool.h" -// defines - -#define TABLE_CLASS_NAME "table" - // class class MTable : public Methoded { @@ -35,13 +30,55 @@ public: // Methoded // methods -static void _set(Request& r, const String& method_name, MethodParams *params) { - Pool& pool=r.pool(); - // data is last parameter - Value& vdata=params->as_junction(params->size()-1, "body must be code"); +static void get_copy_options(Request& r, const String& method_name, MethodParams *params, int param_index, + const Table& source, + int& offset, + int& limit) { + offset=0; + limit=0; + if(params->size()<=param_index) + return; + + Value& voptions=params->as_no_junction(param_index, "options must be hash, not code"); + if(!voptions.is_string()) { + if(Hash *options=voptions.get_hash(&method_name)) { + if(Value *voffset=(Value *)options->get(*sql_offset_name)) + if(voffset->is_string()) { + const String& soffset=*voffset->get_string(); + if(soffset == "cur") + offset=source.current(); + else + throw Exception("parser.runtime", + &soffset, + "must be 'cur' string or expression"); + } else + offset=r.process_to_value(*voffset).as_int(); + if(Value *vlimit=(Value *)options->get(*sql_limit_name)) + limit=r.process_to_value(*vlimit).as_int(); + } else + throw Exception("parser.runtime", + &method_name, + "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, const String& method_name, MethodParams *params) { + Pool& pool=r.pool(); + // clone/copy part? + if(const Table *source=params->get(0).get_table()) { + int offset, limit; + get_copy_options(r, method_name, params, 1, *source, + offset, limit); + static_cast(r.self)->set_table(*new(pool) Table(pool, *source, offset, limit)); + return; + } + // data is last parameter Temp_lang temp_lang(r, String::UL_PASS_APPENDED); - const String& data=r.process(vdata).as_string(); + const String& data= + r.process_to_string(params->as_junction(params->size()-1, "body must be code")); size_t pos_after=0; // parse columns @@ -52,15 +89,15 @@ static void _set(Request& r, const Strin columns=new(pool) Array(pool); Array head(pool); - data.split(head, &pos_after, "\n", 1, String::UL_CLEAN, 1); + data.split(head, &pos_after, "\n", 1, String::UL_AS_IS, 1); if(head.size()) - head.get_string(0)->split(*columns, 0, "\t", 1, String::UL_CLEAN); + head.get_string(0)->split(*columns, 0, "\t", 1, String::UL_AS_IS); } Table& table=*new(pool) Table(pool, &method_name, columns); // parse cells Array rows(pool); - data.split(rows, &pos_after, "\n", 1, String::UL_CLEAN); + data.split(rows, &pos_after, "\n", 1, String::UL_AS_IS); Array_iter i(rows); while(i.has_next()) { Array& row=*new(pool) Array(pool); @@ -69,7 +106,7 @@ static void _set(Request& r, const Strin if(!string.size()) continue; - string.split(row, 0, "\t", 1, String::UL_CLEAN); + string.split(row, 0, "\t", 1, String::UL_AS_IS); table+=&row; } @@ -94,16 +131,22 @@ static void _load(Request& r, const Stri uint line=origin.line; #endif if(params->size()==2) { - columns=0; + columns=0; // nameless } else { columns=new(pool) Array(pool); - if(char *row_chars=getrow(&data)) + while(char *row_chars=getrow(&data)) { + // remove empty&comment lines + if(!*row_chars || *row_chars == '#') + continue; do { String *name=new(pool) String(pool); name->APPEND_TAINTED(lsplit(&row_chars, '\t'), 0, file, line++); *columns+=name; } while(row_chars); + + break; + } } // parse cells @@ -129,15 +172,17 @@ static void _load(Request& r, const Stri static_cast(r.self)->set_table(table); } +/// @todo "x\nx" "xxx""xx" static void _save(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); 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.self)->table(&method_name); + bool do_append=false; String sdata(pool); - if(params->size()==1) { // not nameless=named output + if(params->size()==1) { // named output // write out names line if(table.columns()) { // named table Array_iter i(*table.columns()); @@ -158,14 +203,26 @@ static void _save(Request& r, const Stri sdata.APPEND_CONST("empty nameless table"); } sdata.APPEND_CONST("\n"); + } else { // mode specified + const String& mode=params->as_string(0, "mode must be string"); + if(mode=="append") + do_append=true; + else if(mode=="nameless") + /*ok, already skipped names output*/; + else + throw Exception("parser.runtime", + &mode, + "unknown mode, must be 'append'"); + } // data lines Array_iter i(table); 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"); } @@ -173,35 +230,43 @@ static void _save(Request& r, const Stri } // write - file_write(pool, r.absolute(vfile_name.as_string()), - sdata.cstr(), sdata.size(), true); + file_write(r.absolute(vfile_name.as_string()), + sdata.cstr(), sdata.size(), true, do_append); } 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.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.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.self)->table(&method_name); if(params->size()) { - Value& offset_expr=params->as_junction(0, "offset must be expression"); - table.shift(r.process(offset_expr).as_int()); - } else { - Value& value=*new(pool) VInt(pool, table.current()); - value.set_name(method_name); - r.write_no_lang(value); - } + bool absolute=false; + if(params->size()>1) { + const String& whence=params->as_string(0, "whence must be string"); + if(whence=="cur") + absolute=false; + else if(whence=="set") + absolute=true; + else + 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 + r.write_no_lang(*new(pool) VInt(pool, table.current())); } static void _menu(Request& r, const String& method_name, MethodParams *params) { @@ -209,22 +274,21 @@ static void _menu(Request& r, const Stri Value *delim_maybe_code=params->size()>1?¶ms->get(1):0; - VTable& vtable=*static_cast(r.self); - Table& table=vtable.table(); + Table& table=static_cast(r.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? + 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); } @@ -258,10 +322,10 @@ static void table_row_to_hash(Array::Ite } 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.self)->table(&method_name); Value& result=*new(pool) VHash(pool); - if(const Array *columns=self_table.columns()) - if(columns->size()>1) { + if(const Array *columns=self_table.columns()) + if(columns->size()>0) { 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); @@ -278,7 +342,7 @@ static void _hash(Request& r, const Stri value_fields+=self_table.column_name2index(value_field_name, true); } } else - throw Exception(0, 0, + throw Exception("parser.runtime", &method_name, "value field(s) must be string or self_table" ); @@ -291,7 +355,6 @@ static void _hash(Request& r, const Stri Row_info row_info={&self_table, key_field, &value_fields, result.get_hash(0)}; self_table.for_each(table_row_to_hash, &row_info); } - result.set_name(method_name); r.write_no_lang(result); } @@ -328,7 +391,7 @@ 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.self)->table(&method_name); 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()); @@ -342,7 +405,7 @@ static void _sort(Request& r, const Stri old_table.set_current(i); // calculate key value seq[i].row=(MethodParams *)old_table.get(i); - Value& value=*r.process(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(); @@ -365,24 +428,49 @@ static void _sort(Request& r, const Stri static_cast(r.self)->set_table(new_table); } -static void _locate(Request& r, const String& method_name, MethodParams *params) { - Pool& pool=r.pool(); +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"); + + Value& expression_code=params->as_junction(0, "must be expression"); + + Table& table=static_cast(r.self)->table(&method_name); + 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"); - VTable& vtable=*static_cast(r.self); - Table& table=vtable.table(); - Value& result=*new(pool) VBool(pool, table.locate( + Table& table=static_cast(r.self)->table(&method_name); + return table.locate( params->as_string(0, "column name must be string"), params->as_string(1, "value must be string") - )); - result.set_name(method_name); - r.write_no_lang(result); + ); +} +static void _locate(Request& r, const String& method_name, MethodParams *params) { + Pool& pool=r.pool(); + bool result=params->get(0).get_junction()? + _locate_expression(r, method_name, params) : + _locate_name_value(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(); - VTable& vtable=*static_cast(r.self); - - Table& old_table=*vtable.get_table(); + Table& old_table=static_cast(r.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()) @@ -400,16 +488,16 @@ static void _flip(Request& r, const Stri static void _append(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - // data is last parameter + // data + Temp_lang temp_lang(r, String::UL_PASS_APPENDED); const String& string= - r.process(params->as_junction(0, "body must be code")).as_string(); + r.process_to_string(params->as_junction(0, "body must be code")); // parse cells Array& row=*new(pool) Array(pool); - string.split(row, 0, "\t", 1, String::UL_CLEAN); + string.split(row, 0, "\t", 1, String::UL_AS_IS); - VTable& vtable=*static_cast(r.self); - vtable.table()+=&row; + static_cast(r.self)->table(&method_name)+=&row; } static void _join(Request& r, const String& method_name, MethodParams *params) { @@ -417,24 +505,34 @@ static void _join(Request& r, const Stri Table *maybe_src=params->as_no_junction(0, "table ref must not be code").get_table(); if(!maybe_src) - throw Exception(0, 0, + throw Exception("parser.runtime", &method_name, "source is not a table"); Table& src=*maybe_src; - Table& dest=static_cast(r.self)->table(); + Table& dest=static_cast(r.self)->table(&method_name); if(&src == &dest) - throw Exception(0, 0, + throw Exception("parser.runtime", &method_name, "source and destination are same table"); + int offset, limit; + get_copy_options(r, method_name, params, 1, src, + offset, limit); + if(const Array *dest_columns=dest.columns()) { // dest is named int saved_src_current=src.current(); - for(int src_row=0; src_rowm) + limit=m; + int end=offset+limit; + for(int src_row=offset; src_rowsize(); dest_column++) - dest_row+=src.item(*dest_columns->get_string(dest_column)); + for(int dest_column=0; dest_columnsize(); dest_column++) { + const String *src_item=src.item(*dest_columns->get_string(dest_column)); + dest_row+=src_item?src_item:new(pool) String(pool); + } dest+=&dest_row; } src.set_current(saved_src_current); @@ -454,7 +552,7 @@ public: statement_string(astatement_string), statement_cstr(astatement_cstr), columns(*new(pool) Array(pool)), - row(0), row_index(0), + row(0), table(0) { } @@ -477,7 +575,7 @@ public: if(size) cell->APPEND_TAINTED( (const char *)ptr, size, - statement_cstr, row_index++); + statement_cstr, table->size()-1); (*row)+=cell; } @@ -487,7 +585,6 @@ private: const String& statement_string; const char *statement_cstr; Array& columns; Array *row; - uint row_index; public: Table *table; }; @@ -495,45 +592,50 @@ public: static void _sql(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - if(!r.connection) - throw Exception(0, 0, - &method_name, - "without connect"); - Value& statement=params->as_junction(0, "statement must be code"); ulong limit=0; 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)) - limit=(ulong)r.process(*vlimit).as_double(); + limit=(ulong)r.process_to_value(*vlimit).as_double(); if(Value *voffset=(Value *)options->get(*sql_offset_name)) - offset=(ulong)r.process(*voffset).as_double(); + offset=(ulong)r.process_to_value(*voffset).as_double(); } else - throw Exception(0, 0, + throw Exception("parser.runtime", &method_name, "options must be hash"); } Temp_lang temp_lang(r, String::UL_SQL); - const String& statement_string=r.process(statement).as_string(); + const String& statement_string=r.process_to_string(statement); const char *statement_cstr= - statement_string.cstr(String::UL_UNSPECIFIED, r.connection); + statement_string.cstr(String::UL_UNSPECIFIED, r.connection(&method_name)); Table_sql_event_handlers handlers(pool, method_name, statement_string, statement_cstr); - try { - r.connection->query( - statement_cstr, offset, limit, - handlers); - } catch(const Exception& e) { // query problem - // more specific source [were url] - throw Exception(e.type(), e.code(), - &statement_string, - "%s", e.comment()); - } +#ifdef RESOURCES_DEBUG + struct timeval mt[2]; + //measure:before + gettimeofday(&mt[0],NULL); +#endif + r.connection(&method_name)->query( + statement_cstr, offset, limit, + handlers, + statement_string); + +#ifdef RESOURCES_DEBUG + //measure:after connect + gettimeofday(&mt[1],NULL); + + double t[2]; + for(int i=0;i<2;i++) + t[i]=mt[i].tv_sec+mt[i].tv_usec/1000000.0; + + r.sql_request_time+=t[1]-t[0]; +#endif Table *result= handlers.table?handlers.table: // query resulted in table? return it @@ -550,7 +652,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.self)->table(&method_name); if(const Array *source_columns=source_table.columns()) { Array_iter i(*source_columns); while(i.has_next()) { @@ -560,22 +662,49 @@ 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)); } -// constructor +static void _select(Request& r, const String& method_name, MethodParams *params) { + Pool& pool=r.pool(); + + Value& vcondition=params->as_junction(0, "condition must be expression"); -MTable::MTable(Pool& apool) : Methoded(apool) { - set_name(*NEW String(pool(), TABLE_CLASS_NAME)); + Table& source_table=static_cast(r.self)->table(&method_name); + Table& result_table=*new(pool) Table(pool, + source_table.origin_string(), + source_table.columns() + ); + + int saved_current=source_table.current(); + int size=source_table.size(); + for(int row=0; row