--- parser3/src/classes/hash.C 2003/03/24 09:54:41 1.54.2.13.2.9 +++ parser3/src/classes/hash.C 2004/06/18 15:55:47 1.70 @@ -1,11 +1,11 @@ /** @file Parser: @b hash parser class. - Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2004 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_HASH_C="$Date: 2003/03/24 09:54:41 $"; +static const char * const IDENT_HASH_C="$Date: 2004/06/18 15:55:47 $"; #include "classes.h" #include "pa_vmethod_frame.h" @@ -22,7 +22,7 @@ static const char* IDENT_HASH_C="$Date: class MHash: public Methoded { public: // VStateless_class - Value* create_new_value() { return new VHash(); } + Value* create_new_value(Pool&) { return new VHash(); } public: MHash(); @@ -44,6 +44,8 @@ class Hash_sql_event_handlers: public SQ HashStringValue* row_hash; int column_index; ArrayString columns; + bool only_one_column; + static VBool only_one_column_value; public: Hash_sql_event_handlers( const String& astatement_string, const char* astatement_cstr, @@ -53,11 +55,12 @@ public: distinct(adistinct), rows_hash(arows_hash), row_hash(0), - column_index(0) { + column_index(0), + only_one_column(false) { } - bool add_column(SQL_Error& error, void *ptr, size_t size) { + bool add_column(SQL_Error& error, const char* str, size_t length) { try { - columns+=new String((const char* )ptr, size, true); + columns+=new String(str, length, true); return false; } catch(...) { error=SQL_Error("exception occured in Hash_sql_event_handlers::add_column"); @@ -65,12 +68,11 @@ public: } } bool before_rows(SQL_Error& error) { - if(columns.count()<=1) { - error=SQL_Error("parser.runtime", - /*method_name,*/ - "column count must be more than 1 to create a hash"); + if(columns.count()<1) { + error=SQL_Error("parser.runtime", "no columns"); return true; } + only_one_column=columns.count()==1; return false; } @@ -78,25 +80,27 @@ public: column_index=0; return false; } - bool add_row_cell(SQL_Error& error, void *ptr, size_t size) { + bool add_row_cell(SQL_Error& error, const char *ptr, size_t length) { try { String& cell=*new String; - if(size) - cell.append((const char* )ptr, size, String::L_TAINTED); - if(column_index==0) { + if(length) + cell.append_know_length(ptr, length, String::L_TAINTED); + bool duplicate=false; + if(only_one_column) { + duplicate=rows_hash.put_dont_replace(cell, &only_one_column_value); // put. existed? + } else if(column_index==0) { VHash* row_vhash=new VHash; row_hash=&row_vhash->hash(); - if(rows_hash.put_dont_replace(cell, row_vhash)) // put. existed? - if(!distinct) { - error=SQL_Error("parser.runtime", - /*cell,*/ - "duplicate key"); - return true; - } + duplicate=rows_hash.put_dont_replace(cell, row_vhash); // put. existed? } else row_hash->put(*columns[column_index], new VString(cell)); - column_index++; + if(duplicate & !distinct) { + error=SQL_Error("parser.runtime", "duplicate key"); + return true; + } + + column_index++; return false; } catch(...) { error=SQL_Error("exception occured in Hash_sql_event_handlers::add_row_cell"); @@ -105,6 +109,8 @@ public: } }; +VBool Hash_sql_event_handlers::only_one_column_value(true); + #endif static void copy_all_overwrite_to( @@ -113,11 +119,15 @@ static void copy_all_overwrite_to( HashStringValue* dest) { dest->put(key, value); } -static void _create_or_add(Request& r, MethodParams* params) { - if(params->count()) { - Value& vb=params->as_no_junction(0, "param must be hash"); - if(HashStringValue* b=vb.get_hash()) - b->for_each(copy_all_overwrite_to, &(GET_SELF(r, VHash).hash())); +static void _create_or_add(Request& r, MethodParams& params) { + if(params.count()) { + Value& vsrc=params.as_no_junction(0, "param must be hash"); + if(HashStringValue* src=vsrc.get_hash()) { + HashStringValue* self=&(GET_SELF(r, VHash).hash()); + if(src==self) // same: doing nothing + return; + src->for_each(copy_all_overwrite_to, self); + } } } @@ -127,10 +137,16 @@ static void remove_key_from( HashStringValue* dest) { dest->remove(key); } -static void _sub(Request& r, MethodParams* params) { - Value& vb=params->as_no_junction(0, "param must be hash"); - if(HashStringValue* b=vb.get_hash()) - b->for_each(remove_key_from, &GET_SELF(r, VHash).hash()); +static void _sub(Request& r, MethodParams& params) { + Value& vsrc=params.as_no_junction(0, "param must be hash"); + if(HashStringValue* src=vsrc.get_hash()) { + HashStringValue* self=&(GET_SELF(r, VHash).hash()); + if(src==self) { // same: clearing + self->clear(); + return; + } + src->for_each(remove_key_from, self); + } } static void copy_all_dontoverwrite_to( @@ -139,13 +155,13 @@ static void copy_all_dontoverwrite_to( HashStringValue* dest) { dest->put_dont_replace(key, value); } -static void _union(Request& r, MethodParams* params) { +static void _union(Request& r, MethodParams& params) { // dest = copy of self Value& result=*new VHash(GET_SELF(r, VHash).hash()); // dest += b - Value& vb=params->as_no_junction(0, "param must be hash"); - if(HashStringValue* b=vb.get_hash()) - b->for_each(copy_all_dontoverwrite_to, result.get_hash()); + Value& vsrc=params.as_no_junction(0, "param must be hash"); + if(HashStringValue* src=vsrc.get_hash()) + src->for_each(copy_all_dontoverwrite_to, result.get_hash()); // return result r.write_no_lang(result); @@ -164,10 +180,10 @@ static void copy_intersection_to( if(info->b->get(key)) info->dest->put_dont_replace(key, value); } -static void _intersection(Request& r, MethodParams* params) { +static void _intersection(Request& r, MethodParams& params) { Value& result=*new VHash; // 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(HashStringValue* b=vb.get_hash()) { Copy_intersection_to_info info={b, result.get_hash()}; GET_SELF(r, VHash).hash().for_each(copy_intersection_to, &info); @@ -184,10 +200,10 @@ static bool intersects( return b->get(key)!=0; } -static void _intersects(Request& r, MethodParams* params) { +static void _intersects(Request& r, MethodParams& params) { bool result=false; - Value& vb=params->as_no_junction(0, "param must be hash"); + Value& vb=params.as_no_junction(0, "param must be hash"); if(HashStringValue* b=vb.get_hash()) result=GET_SELF(r, VHash).hash().first_that(intersects, b)!=0; @@ -196,18 +212,18 @@ static void _intersects(Request& r, Meth } -extern const String& sql_limit_name; -extern const String& sql_offset_name; -extern const String& sql_default_name; -extern const String& sql_distinct_name; -static void _sql(Request& r, MethodParams* params) { - Value& statement=params->as_junction(0, "statement must be code"); +extern String sql_limit_name; +extern String sql_offset_name; +extern String sql_default_name; +extern String sql_distinct_name; +static void _sql(Request& r, MethodParams& params) { + Value& statement=params.as_junction(0, "statement must be code"); ulong limit=0; ulong offset=0; bool distinct=false; - if(params->count()>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(HashStringValue* options=voptions.get_hash()) { int valid_options=0; @@ -244,22 +260,30 @@ static void _sql(Request& r, MethodParam distinct, hash); r.connection()->query( - statement_cstr, offset, limit, + statement_cstr, + 0, 0, + offset, limit, handlers, statement_string); } static void keys_collector( HashStringValue::key_type key, - HashStringValue::value_type value, + HashStringValue::value_type, Table *table) { Table::element_type row(new ArrayString); *row+=new String(key, String::L_TAINTED); *table+=row; } -static void _keys(Request& r, MethodParams* ) { +static void _keys(Request& r, MethodParams& params) { + const String* keys_column_name; + if(params.count()>0) + keys_column_name=¶ms.as_string(0, "column name must be string"); + else + keys_column_name=new String("key"); + Table::columns_type columns(new ArrayString); - *columns+=new String("key"); + *columns+=keys_column_name; Table* table=new Table(columns); GET_SELF(r, VHash).hash().for_each(keys_collector, table); @@ -267,13 +291,13 @@ static void _keys(Request& r, MethodPara r.write_no_lang(*new VTable(table)); } -static void _count(Request& r, MethodParams* ) { +static void _count(Request& r, MethodParams&) { r.write_no_lang(*new VInt(GET_SELF(r, VHash).hash().count())); } -static void _delete(Request& r, MethodParams* params) { +static void _delete(Request& r, MethodParams& params) { - GET_SELF(r, VHash).hash().remove(params->as_string(0, "key must be string")); + GET_SELF(r, VHash).hash().remove(params.as_string(0, "key must be string")); } #ifndef DOXYGEN @@ -306,14 +330,16 @@ static void one_foreach_cycle( } info->r->write_pass_lang(sv_processed); } -static void _foreach(Request& r, MethodParams* params) { - Foreach_info info; - info.r=&r; - info.key_var_name=¶ms->as_string(0, "key-var name must be string"); - info.value_var_name=¶ms->as_string(1, "value-var name must be string"); - info.body_code=¶ms->as_junction(2, "body must be code"); - info.delim_maybe_code=params->count()>3?params->get(3):0; - info.vkey=new VString; +static void _foreach(Request& r, MethodParams& params) { + Foreach_info info={ + &r, + ¶ms.as_string(0, "key-var name must be string"), + ¶ms.as_string(1, "value-var name must be string"), + ¶ms.as_junction(2, "body must be code"), + params.count()>3?params.get(3):0, + /*vkey=*/new VString, + false + }; VHash& self=GET_SELF(r, VHash); HashStringValue& hash=self.hash(); @@ -344,8 +370,8 @@ MHash::MHash(): Methoded("hash") // ^hash:sql[query][$.limit(1) $.offset(2)] add_native_method("sql", Method::CT_DYNAMIC, _sql, 1, 2); - // ^hash._keys[] - add_native_method("_keys", Method::CT_DYNAMIC, _keys, 0, 0); + // ^hash._keys[[column name]] + add_native_method("_keys", Method::CT_DYNAMIC, _keys, 0, 1); // ^hash._count[] add_native_method("_count", Method::CT_DYNAMIC, _count, 0, 0);