--- parser3/src/classes/hash.C 2002/12/09 11:07:39 1.52 +++ parser3/src/classes/hash.C 2003/02/04 14:12:41 1.54.2.4 @@ -1,13 +1,15 @@ /** @file Parser: @b hash 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) */ -static const char* IDENT_HASH_C="$Date: 2002/12/09 11:07:39 $"; +static const char* IDENT_HASH_C="$Date: 2003/02/04 14:12:41 $"; #include "classes.h" +#include "pa_vmethod_frame.h" + #include "pa_request.h" #include "pa_vhash.h" #include "pa_vvoid.h" @@ -20,7 +22,7 @@ static const char* IDENT_HASH_C="$Date: class MHash : public Methoded { public: // VStateless_class - Value *create_new_value(Pool& pool) { return new(pool) VHash(pool); } + ValuePtr create_new_value() { return ValuePtr(new VHash()); } public: MHash(Pool& pool); @@ -34,7 +36,7 @@ public: // Methoded class Hash_sql_event_handlers: public SQL_Driver_query_event_handlers { public: Hash_sql_event_handlers(Pool& apool, const String& amethod_name, - const String& astatement_string, const char *astatement_cstr, + const String& astatement_string, const char* astatement_cstr, bool adistinct, Hash& arows_hash): pool(apool), @@ -46,45 +48,66 @@ public: columns(pool), row_index(0) { } - 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; + 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, 0); + columns+=column; + + return false; + } catch(...) { + error=SQL_Error("exception occured in Hash_sql_event_handlers::add_column"); + return true; + } } - void before_rows() { - if(columns.size()<=1) - throw SQL_Exception("parser.runtime", + bool before_rows(SQL_Error& error) { + if(columns.size()<=1) { + error=SQL_Error("parser.runtime", &method_name, "column count must be more than 1 to create a hash"); + return true; + } + + return false; } - void add_row() { + bool add_row(SQL_Error& /*error*/) { column_index=0; + return false; } - void add_row_cell(void *ptr, size_t size) { - String *cell=new(pool) String(pool); - if(size) - cell->APPEND_TAINTED( - (const char *)ptr, size, - statement_cstr, row_index++); - if(column_index==0) { - VHash *row_vhash=new(pool) VHash(pool); - row_hash=row_vhash->get_hash(0); - if(rows_hash.put_dont_replace(*cell, row_vhash)) // put. existed? - if(!distinct) - throw SQL_Exception("parser.runtime", - cell, - "duplicate key"); - } else - row_hash->put(*columns.get_string(column_index), new(pool) VString(*cell)); - column_index++; + 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, row_index++); + if(column_index==0) { + VHash *row_vhash=new(pool) VHash(pool); + row_hash=row_vhash->get_hash(0); + if(rows_hash.put_dont_replace(*cell, row_vhash)) // put. existed? + if(!distinct) { + error=SQL_Error("parser.runtime", + cell, + "duplicate key"); + return true; + } + } else + row_hash->put(*columns.get_string(column_index), new(pool) VString(*cell)); + column_index++; + + return false; + } catch(...) { + error=SQL_Error("exception occured in Hash_sql_event_handlers::add_row_cell"); + return true; + } } private: Pool& pool; const String& method_name; - const String& statement_string; const char *statement_cstr; + const String& statement_string; const char* statement_cstr; bool distinct; Hash& rows_hash; Hash *row_hash; @@ -98,11 +121,11 @@ static void copy_all_overwrite_to(const Hash& dest=*static_cast(info); dest.put(key, value); } -static void _create_or_add(Request& r, const String& method_name, MethodParams *params) { +static void _create_or_add(Request& r, StringPtr method_name, MethodParams& params) { Pool& pool=r.pool(); - if(params->size()) { - Value& vb=params->as_no_junction(0, "param must be hash"); + if(params.count()) { + Value& vb=params.as_no_junction(0, "param must be hash"); if(Hash *b=vb.get_hash(&method_name)) b->for_each(copy_all_overwrite_to, &static_cast(r.get_self())->hash(&method_name)); } @@ -112,10 +135,10 @@ static void remove_key_from(const Hash:: Hash& dest=*static_cast(info); dest.remove(key); } -static void _sub(Request& r, const String& method_name, MethodParams *params) { +static void _sub(Request& r, StringPtr method_name, MethodParams& params) { Pool& pool=r.pool(); - Value& vb=params->as_no_junction(0, "param must be hash"); + Value& vb=params.as_no_junction(0, "param must be hash"); if(Hash *b=vb.get_hash(&method_name)) b->for_each(remove_key_from, &static_cast(r.get_self())->hash(&method_name)); } @@ -124,13 +147,13 @@ static void copy_all_dontoverwrite_to(co Hash& dest=*static_cast(info); dest.put_dont_replace(key, value); } -static void _union(Request& r, const String& method_name, MethodParams *params) { +static void _union(Request& r, StringPtr method_name, MethodParams& params) { Pool& pool=r.pool(); // dest = copy of self Hash& dest=*new(pool) Hash(static_cast(r.get_self())->hash(&method_name)); // dest += b - Value& vb=params->as_no_junction(0, "param must be hash"); + Value& vb=params.as_no_junction(0, "param must be hash"); if(Hash *b=vb.get_hash(&method_name)) b->for_each(copy_all_dontoverwrite_to, &dest); @@ -152,13 +175,13 @@ static void copy_intersection_to(const H if(i.b->get(key)) i.dest->put_dont_replace(key, value); } -static void _intersection(Request& r, const String& method_name, MethodParams *params) { +static void _intersection(Request& r, StringPtr method_name, MethodParams& params) { Pool& pool=r.pool(); // dest = copy of self Hash& dest=*new(pool) Hash(pool); // dest += b - Value& vb=params->as_no_junction(0, "param must be hash"); + Value& vb=params.as_no_junction(0, "param must be hash"); if(Hash *b=vb.get_hash(&method_name)) { Copy_intersection_to_info info={ b, @@ -175,7 +198,7 @@ static void *intersects(const Hash::Key& return static_cast(info)->get(key); } -static void _intersects(Request& r, const String& method_name, MethodParams *params) { +static void _intersects(Request& r, StringPtr method_name, MethodParams& params) { Pool& pool=r.pool(); bool yes=false; @@ -183,7 +206,7 @@ static void _intersects(Request& r, cons // dest = copy of self Hash& dest=*new(pool) Hash(pool); // dest += b - Value& vb=params->as_no_junction(0, "param must be hash"); + Value& vb=params.as_no_junction(0, "param must be hash"); if(Hash *b=vb.get_hash(&method_name)) yes=static_cast(r.get_self())->hash(&method_name).first_that(intersects, b)!=0; @@ -192,16 +215,16 @@ static void _intersects(Request& r, cons } -static void _sql(Request& r, const String& method_name, MethodParams *params) { +static void _sql(Request& r, StringPtr method_name, MethodParams& params) { Pool& pool=r.pool(); - Value& statement=params->as_junction(0, "statement must be code"); + Value& statement=params.as_junction(0, "statement must be code"); ulong limit=0; ulong offset=0; bool distinct=false; - if(params->size()>1) { - Value& voptions=params->as_no_junction(1, "options must be hash, not code"); + if(params.count()>1) { + Value& voptions=params.as_no_junction(1, "options must be hash, not code"); if(!voptions.is_string()) if(Hash *options=voptions.get_hash(&method_name)) { int valid_options=0; @@ -229,7 +252,7 @@ static void _sql(Request& r, const Strin Temp_lang temp_lang(r, String::UL_SQL); const String& statement_string=r.process_to_string(statement); - const char *statement_cstr= + const char* statement_cstr= statement_string.cstr(String::UL_UNSPECIFIED, r.connection(&method_name)); Hash& hash=static_cast(r.get_self())->hash(&method_name); hash.clear(); @@ -252,7 +275,7 @@ static void keys_collector(const Hash::K row+=&key; table+=&row; } -static void _keys(Request& r, const String& method_name, MethodParams *) { +static void _keys(Request& r, StringPtr method_name, MethodParams& ) { Pool& pool=r.pool(); Array& columns=*new(pool) Array(pool); @@ -264,17 +287,17 @@ static void _keys(Request& r, const Stri r.write_no_lang(*new(pool) VTable(pool, &table)); } -static void _count(Request& r, const String& method_name, MethodParams *) { +static void _count(Request& r, StringPtr method_name, MethodParams& ) { Pool& pool=r.pool(); r.write_no_lang( *new(pool) VInt(pool, static_cast(r.get_self())->hash(&method_name).size())); } -static void _delete(Request& r, const String& method_name, MethodParams *params) { +static void _delete(Request& r, StringPtr method_name, MethodParams& params) { Pool& pool=r.pool(); - static_cast(r.get_self())->hash(&method_name).remove(params->as_string(0, "key must be string")); + static_cast(r.get_self())->hash(&method_name).remove(params.as_string(0, "key must be string")); } #ifndef DOXYGEN @@ -308,12 +331,12 @@ static void one_foreach_cycle(const Hash } i.r->write_pass_lang(sv_processed); } -static void _foreach(Request& r, const String& method_name, MethodParams *params) { +static void _foreach(Request& r, StringPtr method_name, MethodParams& params) { Pool& pool=r.pool(); - const String& key_var_name=params->as_string(0, "key-var name must be string"); - const String& value_var_name=params->as_string(1, "value-var name must be string"); - Value& body_code=params->as_junction(2, "body must be code"); - Value *delim_maybe_code=params->size()>3?¶ms->get(3):0; + const String& key_var_name=params.as_string(0, "key-var name must be string"); + const String& value_var_name=params.as_string(1, "value-var name must be string"); + Value& body_code=params.as_junction(2, "body must be code"); + Value *delim_maybe_code=params.count()>3?¶ms.get(3):0; Foreach_info info={ &r,