--- parser3/src/classes/table.C 2003/02/07 14:38:05 1.172.2.6 +++ parser3/src/classes/table.C 2003/03/18 15:14:14 1.172.2.14.2.1 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_TABLE_C="$Date: 2003/02/07 14:38:05 $"; +static const char* IDENT_TABLE_C="$Date: 2003/03/18 15:14:14 $"; #include "classes.h" #include "pa_vmethod_frame.h" @@ -19,7 +19,7 @@ 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()); } @@ -32,29 +32,43 @@ public: // Methoded // global variable -MethodedPtr table_class(new MTable); +DECLARE_CLASS_VAR(table, new MTable, 0); + +// defines for globals + +#define SQL_LIMIT_NAME "limit" +#define SQL_OFFSET_NAME "offset" +#define SQL_DEFAULT_NAME "default" +#define SQL_DISTINCT_NAME "distinct" + +// globals + +const String& sql_limit_name(new String(SQL_LIMIT_NAME)); +const String& sql_offset_name(new String(SQL_OFFSET_NAME)); +const String& sql_default_name(new String(SQL_DEFAULT_NAME)); +const String& sql_distinct_name(new String(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, const String& method_name, MethodParams* params, int param_index, const Table& source, int& offset, int& limit) { - Pool& pool=r.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"); + 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)) { int valid_options=0; if(ValuePtr voffset=options->get(sql_offset_name)) { valid_options++; if(voffset->is_string()) { - StringPtr soffset=voffset->get_string(&pool); + const String& soffset=voffset->get_string(&pool); if(*soffset == "cur") offset=source.current(); else @@ -67,6 +81,8 @@ static void get_copy_options(Request& r, if(ValuePtr vlimit=options->get(sql_limit_name)) { valid_options++; 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", @@ -77,30 +93,28 @@ static void get_copy_options(Request& r, 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, StringPtr method_name, MethodParams& params) { - Pool& pool=r.pool(); +static void _create(Request& r, const String& method_name, MethodParams* params) { + =r.pool(); // clone/copy part? - if(const Table *source=params[0]->get_table()) { + if(const Table *source=(*params)[0]->get_table()) { int offset, limit; get_copy_options(r, method_name, params, 1, *source, offset, limit); - GET_SELF(r, VTable).set_table(TablePtr(new Table(*source, offset, limit))); + GET_SELF(r, VTable).set_table(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")); + 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); @@ -111,15 +125,15 @@ static void _create(Request& r, StringPt head[0]->split(*columns, 0, "\t", 1, String::UL_AS_IS); } - TablePtr table(new Table(method_name, columns)); + Table* table(new Table(method_name, columns)); // parse cells ArrayString rows; data->split(rows, &pos_after, "\n", 1, String::UL_AS_IS); - Array_iterator i(rows); + 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()) continue; @@ -132,9 +146,9 @@ static void _create(Request& r, StringPt 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, const String& method_name, MethodParams* params) { + =r.pool(); + 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) @@ -143,9 +157,9 @@ static void _load(Request& r, StringPtr // loading text char *data=file_read_text(pool, r.charsets.source(), - r.absolute(params.as_string(filename_param_index, "file name must be string")), + 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(method_name):0 ); // parse columns @@ -165,7 +179,7 @@ static void _load(Request& r, StringPtr if(!*row_chars || *row_chars == '#') continue; do { - StringPtr name(new String); + const String& name(new String); name->APPEND_TAINTED(lsplit(&row_chars, '\t'), 0, file, line++); *columns+=name; } while(row_chars); @@ -175,7 +189,7 @@ static void _load(Request& r, StringPtr } // parse cells - TablePtr table(new Table(method_name, columns)); + Table* table(new Table(method_name, columns)); char *row_chars; while(row_chars=getrow(&data)) { // remove empty&comment lines @@ -183,7 +197,7 @@ 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); + const String& cell(new String); cell->APPEND_TAINTED(cell_chars, 0, file, line); *row+=cell; } @@ -198,19 +212,19 @@ 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, +static void _save(Request& r, const String& method_name, MethodParams* params) { + =r.pool(); + ValuePtr vfile_name=params->as_no_junction(params->count()-1, "file name must not be code"); Table& table=GET_SELF(r, VTable).table(method_name); 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); if(i.has_next()) @@ -219,7 +233,7 @@ static void _save(Request& r, StringPtr } 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") @@ -240,11 +254,11 @@ static void _save(Request& r, StringPtr } // 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()) + if(const String& s=c.next()) sdata.append(*s, String::UL_TABLE); if(c.has_next()) sdata.APPEND_CONST("\t"); @@ -257,23 +271,23 @@ static void _save(Request& r, StringPtr sdata.cstr(), sdata.size(), true, do_append); } -static void _count(Request& r, StringPtr method_name, MethodParams& ) { +static void _count(Request& r, const String& method_name, MethodParams* ) { int result=GET_SELF(r, VTable).table(method_name).count(); r.write_no_lang(ValuePtr(new VInt(result))); } -static void _line(Request& r, StringPtr method_name, MethodParams& ) { +static void _line(Request& r, const String& method_name, MethodParams* ) { int result=1+GET_SELF(r, VTable).table(method_name).current(); r.write_no_lang(ValuePtr(new VInt(result))); } -static void _offset(Request& r, StringPtr method_name, MethodParams& params) { - Pool& pool=r.pool(); +static void _offset(Request& r, const String& method_name, MethodParams* params) { + =r.pool(); Table& table=GET_SELF(r, VTable).table(method_name); - if(params.count()) { + if(params->count()) { bool absolute=false; - if(params.count()>1) { - StringPtr whence=params.as_string(0, "whence must be string"); + if(params->count()>1) { + const String& whence=params->as_string(0, "whence must be string"); if(*whence=="cur") absolute=false; else if(*whence=="set") @@ -284,16 +298,16 @@ static void _offset(Request& r, StringPt "is invalid whence, valid are 'cur' or 'set'"); } - ValuePtr offset_expr=params.as_junction(params.count()-1, "offset must be expression"); + ValuePtr 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()))); } -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, const String& method_name, MethodParams* params) { + ValuePtr body_code=params->as_junction(0, "body must be code"); - ValuePtr delim_maybe_code=params.count()>1?params[1]:ValuePtr(0); + ValuePtr delim_maybe_code=params->count()>1?(*params)[1]:ValuePtr(0); Table& table=GET_SELF(r, VTable).table(method_name); bool need_delim=false; @@ -303,7 +317,7 @@ static void _menu(Request& r, StringPtr table.set_current(row); StringOrValue sv_processed=r.process(body_code); - StringPtr s_processed=sv_processed.get_string(); + 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)); @@ -327,15 +341,15 @@ struct Row_info { }; #endif static void table_row_to_hash(Table::element_type row, Row_info *info) { - Pool& pool=info->r->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); } 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] @@ -356,17 +370,17 @@ static void table_row_to_hash(Table::ele key, "duplicate key"); } -static void _hash(Request& r, StringPtr method_name, MethodParams& params) { - Pool& pool=r.pool(); +static void _hash(Request& r, const String& method_name, MethodParams* params) { + =r.pool(); Table& self_table=GET_SELF(r, VTable).table(method_name); VHashPtr 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(method_name)) { --param_index; int valid_options=0; if(ValuePtr vdistinct=options->get(sql_distinct_name)) { @@ -386,13 +400,13 @@ static void _hash(Request& r, StringPtr Array value_fields; if(param_index>0) { - ValuePtr value_fields_param=params.as_no_junction(param_index, "value field(s) must not be code"); + ValuePtr 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()) { for(int i=0; icount(); i++) { - StringPtr value_field_name= + const String& value_field_name= value_fields_table->get(i)->get(0); value_fields+=self_table.column_name2index(value_field_name, true); } @@ -411,13 +425,14 @@ static void _hash(Request& r, StringPtr Row_info info; info.r=&r; info.table=&self_table; - ValuePtr key_param=params[0]; + ValuePtr key_param=(*params)[0]; info.key_code=key_param->get_junction()?key_param:ValuePtr(0); info.key_field=info.key_code?-1 :self_table.column_name2index(key_param->as_string(&pool), true); info.value_fields=&value_fields; 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); @@ -429,7 +444,7 @@ static void _hash(Request& r, StringPtr #ifndef DOXYGEN struct Table_seq_item { - Table::element_type row; + ArrayString* row; union { char *c_str; double d; @@ -452,16 +467,16 @@ static int sort_cmp_double(const void *a else return 0; } -static void _sort(Request& r, StringPtr method_name, MethodParams& params) { +static void _sort(Request& r, const String& method_name, MethodParams* params) { Pool local_pool; - ValuePtr key_maker=params.as_junction(0, "key-maker must be code"); + ValuePtr 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(&local_pool)=="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* new_table(new Table(method_name, old_table.columns())); smart_ptr seq(new Table_seq_item[old_table.count()]); int i; @@ -471,7 +486,7 @@ static void _sort(Request& r, StringPtr for(i=0; ias_expr_result(true/*return string as-is*/); if(i==0) // determining key values type by first one key_values_are_strings=value->is_string(); @@ -487,19 +502,19 @@ static void _sort(Request& r, StringPtr // reorder table as they require in 'seq' for(i=0; i1) +static bool _locate_expression(Request& r, const String& method_name, MethodParams* params) { + if(params->count()>1) throw Exception("parser.runtime", method_name, "locate by expression has only one parameter - expression"); - ValuePtr expression_code=params.as_junction(0, "must be expression"); + ValuePtr expression_code=params->as_junction(0, "must be expression"); Table& table=GET_SELF(r, VTable).table(method_name); int saved_current=table.current(); @@ -513,37 +528,37 @@ static bool _locate_expression(Request& 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, const String& method_name, MethodParams* params) { + if(params->count()>2) throw Exception("parser.runtime", method_name, "locate by name and value has only two parameters - name and value"); Table& table=GET_SELF(r, VTable).table(method_name); 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()? +static void _locate(Request& r, const String& method_name, MethodParams* params) { + =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 _flip(Request& r, StringPtr method_name, MethodParams& params) { - Pool& pool=r.pool(); +static void _flip(Request& r, const String& method_name, MethodParams* params) { + =r.pool(); Table& old_table=GET_SELF(r, VTable).table(method_name); - TablePtr new_table(new Table(method_name, old_table.columns())); + Table* new_table(new Table(method_name, 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):String* (new String); } *new_table+=new_row; } @@ -551,23 +566,23 @@ static void _flip(Request& r, StringPtr r.write_no_lang(ValuePtr(new VTable(new_table))); } -static void _append(Request& r, StringPtr method_name, MethodParams& params) { - Pool& pool=r.pool(); +static void _append(Request& r, const String& method_name, MethodParams* params) { + =r.pool(); // data Temp_lang temp_lang(r, String::UL_PASS_APPENDED); - StringPtr string=r.process_to_string(params.as_junction(0, "body must be code")); + const String& string=r.process_to_string(params->as_junction(0, "body must be code")); // parse cells - ArrayStringPtr row(new ArrayString); + ArrayString& row(new ArrayString); string->split(*row, 0, "\t", 1, String::UL_AS_IS); GET_SELF(r, VTable).table(method_name)+=row; } -static void _join(Request& r, StringPtr method_name, MethodParams& params) { - Pool& pool=r.pool(); +static void _join(Request& r, const String& method_name, MethodParams* params) { + =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, @@ -594,8 +609,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:String* (new String); } dest+=dest_row; } @@ -608,26 +623,23 @@ 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; + const String& method_name; + const String& statement_string; const char* statement_cstr; + 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), + Table_sql_event_handlers(const String& amethod_name, + const String& astatement_string, const char* astatement_cstr) : method_name(amethod_name), - statement_string(astatement_string), - statement_cstr(astatement_cstr), - columns(new ArrayString) - {} + statement_string(astatement_string), statement_cstr(astatement_cstr), + columns(new ArrayString), row(0) { + } bool add_column(SQL_Error& error, void *ptr, size_t size) { try { - StringPtr column(new String); + const String& column(new String); column->APPEND_TAINTED( (const char* )ptr, size, statement_cstr, 0); @@ -640,7 +652,7 @@ public: } bool before_rows(SQL_Error& error) { try { - table=TablePtr(new Table( method_name, columns)); + table=Table*(new Table( method_name, columns)); return false; } catch(...) { error=SQL_Error("exception occured in Table_sql_event_handlers::before_rows"); @@ -649,7 +661,7 @@ public: } bool add_row(SQL_Error& error) { try { - *table+=(ArrayStringPtr(row=new ArrayString)); + *table+=(ArrayString* (row=new ArrayString)); return false; } catch(...) { error=SQL_Error("exception occured in Table_sql_event_handlers::add_row"); @@ -658,7 +670,7 @@ public: } bool add_row_cell(SQL_Error& error, void *ptr, size_t size) { try { - StringPtr cell(new String); + const String& cell(new String); if(size) cell->APPEND_TAINTED( (const char* )ptr, size, @@ -672,15 +684,15 @@ public: } }; #endif -static void _sql(Request& r, StringPtr method_name, MethodParams& params) { - Pool& pool=r.pool(); +static void _sql(Request& r, const String& method_name, MethodParams* params) { + =r.pool(); - ValuePtr statement=params.as_junction(0, "statement must be code"); + ValuePtr 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(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)) { int valid_options=0; @@ -703,10 +715,10 @@ static void _sql(Request& r, StringPtr m } Temp_lang temp_lang(r, String::UL_SQL); - StringPtr statement_string=r.process_to_string(statement); + 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, + Table_sql_event_handlers handlers(method_name, statement_string, statement_cstr); #ifdef RESOURCES_DEBUG struct timeval mt[2]; @@ -729,24 +741,24 @@ static void _sql(Request& r, StringPtr m r.sql_request_time+=t[1]-t[0]; #endif - TablePtr result= + Table* 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*(new Table(method_name, 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, const String& method_name, MethodParams* ) { + =r.pool(); Table::columns_type result_columns(new ArrayString); - *result_columns+=StringPtr(new String("column")); - TablePtr result_table(new Table(method_name, result_columns)); + *result_columns+=String* (new String("column")); + Table* result_table(new Table(method_name, result_columns)); Table& source_table=GET_SELF(r, VTable).table(method_name); 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(); @@ -757,13 +769,13 @@ static void _columns(Request& r, StringP r.write_no_lang(ValuePtr(new VTable(result_table))); } -static void _select(Request& r, StringPtr method_name, MethodParams& params) { - Pool& pool=r.pool(); +static void _select(Request& r, const String& method_name, MethodParams* params) { + =r.pool(); - ValuePtr vcondition=params.as_junction(0, "condition must be expression"); + ValuePtr vcondition=params->as_junction(0, "condition must be expression"); Table& source_table=GET_SELF(r, VTable).table(method_name); - TablePtr result_table(new Table( + Table* result_table(new Table( source_table.origin_string(), source_table.columns() ));