--- parser3/src/classes/hash.C 2004/02/11 15:33:12 1.65 +++ parser3/src/classes/hash.C 2009/05/13 07:36:05 1.92 @@ -1,11 +1,11 @@ /** @file Parser: @b hash parser class. - Copyright (c) 2001-2004 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_HASH_C="$Date: 2004/02/11 15:33:12 $"; +static const char * const IDENT_HASH_C="$Date: 2009/05/13 07:36:05 $"; #include "classes.h" #include "pa_vmethod_frame.h" @@ -22,7 +22,7 @@ static const char * const IDENT_HASH_C=" class MHash: public Methoded { public: // VStateless_class - Value* create_new_value(Pool&) { return new VHash(); } + Value* create_new_value(Pool&, HashStringValue&) { return new VHash(); } public: MHash(); @@ -34,6 +34,10 @@ public: // Methoded DECLARE_CLASS_VAR(hash, new MHash, 0); +// externs + +extern String cycle_data_name; + // methods #ifndef DOXYGEN @@ -41,62 +45,146 @@ class Hash_sql_event_handlers: public SQ const String& statement_string; const char* statement_cstr; bool distinct; HashStringValue& rows_hash; - HashStringValue* row_hash; + Value* row_value; int column_index; - ArrayString columns; + ArrayString& columns; + bool one_bool_column; + static VBool only_one_column_value; + Table2hash_value_type value_type; + int columns_count; +public: + Table* empty; public: Hash_sql_event_handlers( - const String& astatement_string, const char* astatement_cstr, + const String& astatement_string, + const char* astatement_cstr, bool adistinct, - HashStringValue& arows_hash): - statement_string(astatement_string), statement_cstr(astatement_cstr), + HashStringValue& arows_hash, + Table2hash_value_type avalue_type) + : + statement_string(astatement_string), + statement_cstr(astatement_cstr), distinct(adistinct), rows_hash(arows_hash), - row_hash(0), - column_index(0) { + value_type(avalue_type), + row_value(0), + column_index(0), + one_bool_column(false), + columns(*new ArrayString), + empty(0) { } - bool add_column(SQL_Error& error, const char* str, size_t length) { + + bool add_column(SQL_Error& error, const char* str, size_t) { try { - columns+=new String(str, length, true); + columns+=new String(str, true); return false; } catch(...) { error=SQL_Error("exception occured in Hash_sql_event_handlers::add_column"); return true; } } + 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; } - + switch(value_type){ + case C_STRING: { + if(columns.count()>2){ + error=SQL_Error(PARSER_RUNTIME, "only 2 columns allowed for $.type[string]."); + return true; + } + } + case C_TABLE: { + // create empty table which we'll copy later + empty=new Table(&columns); + columns_count=columns.count(); + } + case C_HASH: { + one_bool_column=columns.count()==1; + } + } return false; } + bool add_row(SQL_Error& /*error*/) { column_index=0; return false; } + bool add_row_cell(SQL_Error& error, const char *ptr, size_t length) { try { String& cell=*new String; if(length) cell.append_know_length(ptr, length, String::L_TAINTED); - 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; + + bool duplicate=false; + if(one_bool_column) { + duplicate=rows_hash.put_dont_replace(cell, &only_one_column_value); // put. existed? + } else if(column_index==0) { + switch(value_type){ + case C_HASH: { + VHash* row_vhash=new VHash; + row_value=row_vhash; + duplicate=rows_hash.put_dont_replace(cell, row_vhash); // put. existed? + break; } - } else - row_hash->put(*columns[column_index], new VString(cell)); - column_index++; + case C_STRING: { + VString* row_vstring=new VString(); + row_value=row_vstring; + duplicate=rows_hash.put_dont_replace(cell, row_vstring); // put. existed? + break; + } + case C_TABLE: { + VTable* vtable=(VTable*)rows_hash.get(cell); + Table* table; + + if(vtable) { // table with this key exist? + if(!distinct) { + duplicate=true; + break; + } + table=vtable->get_table(); + } else { + // no? creating table of same structure as source + Table::Action_options table_options(0, 0); + table=new Table(*empty, table_options/*no rows, just structure*/); + vtable=new VTable(table); + rows_hash.put(cell, vtable); // put + } + ArrayString* row=new ArrayString(columns_count); + row_value=(Value*)row; + *row+=&cell; + *table+=row; + break; + } + } + } else { + switch(value_type) { + case C_HASH: { + row_value->get_hash()->put(*columns[column_index], new VString(cell)); + break; + } + case C_STRING: { + VString* row_string=(VString*)row_value; + row_string->set_string(cell); + break; + } + case C_TABLE: { + ArrayString* row=(ArrayString*)row_value; + *row+=&cell; + break; + } + } + } + + 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,32 +193,44 @@ public: } }; +VBool Hash_sql_event_handlers::only_one_column_value(true); + #endif -static void copy_all_overwrite_to( - HashStringValue::key_type key, - HashStringValue::value_type value, - 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())); + Value& vsrc=params.as_no_junction(0, "param must be hash"); + if(HashStringValue* src=vsrc.get_hash()) { + VHash& self=GET_SELF(r, VHash); + HashStringValue* self_hash=&(self.hash()); + if(src==self_hash) // same: doing nothing + return; + src->for_each(copy_all_overwrite_to, self_hash); + + if(VHash* vhash_src=static_cast(vsrc.as(VHASH_TYPE, false))) + { + if(Value* vdefault=vhash_src->get_default()) + { + if(vdefault->is_defined()) + { + self.set_default(vdefault); + } + } + } + } } } -static void remove_key_from( - HashStringValue::key_type key, - HashStringValue::value_type /*value*/, - 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()); + 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( @@ -143,9 +243,9 @@ static void _union(Request& r, MethodPar // 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); @@ -170,7 +270,7 @@ static void _intersection(Request& r, Me 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); + GET_SELF(r, VHash).hash().for_each(copy_intersection_to, &info); } // return result @@ -189,28 +289,40 @@ static void _intersects(Request& r, Meth 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; + result=GET_SELF(r, VHash).hash().first_that(intersects, b)!=0; // return result - r.write_no_lang(*new VBool(result)); + r.write_no_lang(VBool::get(result)); } +extern String sql_bind_name; extern String sql_limit_name; extern String sql_offset_name; extern String sql_default_name; extern String sql_distinct_name; +extern String sql_value_type_name; +extern Table2hash_value_type get_value_type(Value& vvalue_type); +extern int marshal_binds(HashStringValue& hash, SQL_Driver::Placeholder*& placeholders); +extern void unmarshal_bind_updates(HashStringValue& hash, int placeholder_count, SQL_Driver::Placeholder* placeholders); + static void _sql(Request& r, MethodParams& params) { Value& statement=params.as_junction(0, "statement must be code"); - ulong limit=0; + HashStringValue* bind=0; + ulong limit=SQL_NO_LIMIT; ulong offset=0; bool distinct=false; + Table2hash_value_type value_type=C_HASH; if(params.count()>1) { Value& voptions=params.as_no_junction(1, "options must be hash, not code"); - if(!voptions.is_string()) + if(voptions.is_defined() && !voptions.is_string()) if(HashStringValue* options=voptions.get_hash()) { int valid_options=0; + if(Value* vbind=options->get(sql_bind_name)) { + valid_options++; + bind=vbind->get_hash(); + } if(Value* vlimit=options->get(sql_limit_name)) { valid_options++; limit=(ulong)r.process_to_value(*vlimit).as_double(); @@ -223,16 +335,25 @@ static void _sql(Request& r, MethodParam valid_options++; distinct=r.process_to_value(*vdistinct).as_bool(); } + if(Value* vvalue_type=options->get(sql_value_type_name)) { + valid_options++; + value_type=get_value_type(r.process_to_value(*vvalue_type)); + } if(valid_options!=options->count()) - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, 0, "called with invalid option"); } else - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, 0, "options must be hash"); } + SQL_Driver::Placeholder* placeholders=0; + uint placeholders_count=0; + if(bind) + placeholders_count=marshal_binds(*bind, placeholders); + Temp_lang temp_lang(r, String::L_SQL); const String& statement_string=r.process_to_string(statement); const char* statement_cstr= @@ -242,11 +363,18 @@ static void _sql(Request& r, MethodParam Hash_sql_event_handlers handlers( statement_string, statement_cstr, distinct, - hash); + hash, + value_type); + r.connection()->query( - statement_cstr, offset, limit, + statement_cstr, + placeholders_count, placeholders, + offset, limit, handlers, statement_string); + + if(bind) + unmarshal_bind_updates(*bind, placeholders_count, placeholders); } static void keys_collector( @@ -257,12 +385,18 @@ static void keys_collector( *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); + GET_SELF(r, VHash).hash().for_each(keys_collector, table); r.write_no_lang(*new VTable(table)); } @@ -276,6 +410,11 @@ static void _delete(Request& r, MethodPa GET_SELF(r, VHash).hash().remove(params.as_string(0, "key must be string")); } +static void _contains(Request& r, MethodParams& params) { + bool result=GET_SELF(r, VHash).hash().contains(params.as_string(0, "key must be string")); + r.write_no_lang(VBool::get(result)); +} + #ifndef DOXYGEN struct Foreach_info { Request *r; @@ -284,35 +423,56 @@ struct Foreach_info { Value* body_code; Value* delim_maybe_code; + Value* var_context; VString* vkey; bool need_delim; }; #endif -static void one_foreach_cycle( - HashStringValue::key_type akey, - HashStringValue::value_type avalue, - Foreach_info *info) { - info->vkey->set_string(*new String(akey, String::L_TAINTED)); - Value& ncontext=*info->r->get_method_frame()->caller(); - ncontext.put_element(*info->key_var_name, info->vkey, false); - ncontext.put_element(*info->value_var_name, avalue, false); - - StringOrValue sv_processed=info->r->process(*info->body_code); - const String* s_processed=sv_processed.get_string(); - if(info->delim_maybe_code && s_processed && s_processed->length()) { // delimiter set and we have body - if(info->need_delim) // need delim & iteration produced string? - info->r->write_pass_lang(info->r->process(*info->delim_maybe_code)); - info->need_delim=true; +static bool one_foreach_cycle( + HashStringValue::key_type akey, + HashStringValue::value_type avalue, + Foreach_info *info) { + Value& var_context=*info->var_context; + if(info->key_var_name){ + info->vkey->set_string(*new String(akey, String::L_TAINTED)); + var_context.put_element(var_context, *info->key_var_name, info->vkey, false); + } + if(info->value_var_name) + var_context.put_element(var_context, *info->value_var_name, avalue, false); + + if(info->delim_maybe_code){ // delimiter set + StringOrValue sv_processed=info->r->process(*info->body_code); + Request::Skip lskip=info->r->get_skip(); info->r->set_skip(Request::SKIP_NOTHING); + + const String* s_processed=sv_processed.get_string(); + if(s_processed && !s_processed->is_empty()) { // we have body + if(info->need_delim) // need delim & iteration produced string? + info->r->write_pass_lang(info->r->process(*info->delim_maybe_code)); + else + info->need_delim=true; + } + info->r->write_pass_lang(sv_processed); + return lskip==Request::SKIP_BREAK; + } else { + info->r->process_write(*info->body_code); + Request::Skip lskip=info->r->get_skip(); info->r->set_skip(Request::SKIP_NOTHING); + return lskip==Request::SKIP_BREAK; } - info->r->write_pass_lang(sv_processed); } static void _foreach(Request& r, MethodParams& params) { + Temp_hash_value + cycle_data_setter(r.classes_conf, cycle_data_name, /*any not null flag*/&r); + + 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"); + Foreach_info info={ &r, - ¶ms.as_string(0, "key-var name must be string"), - ¶ms.as_string(1, "value-var name must be string"), + key_var_name.is_empty()? 0 : &key_var_name, + value_var_name.is_empty()? 0 : &value_var_name, ¶ms.as_junction(2, "body must be code"), - params.count()>3?params.get(3):0, + /*delimiter*/params.count()>3?params.get(3):0, + /*var_context*/r.get_method_frame()->caller(), /*vkey=*/new VString, false }; @@ -320,7 +480,7 @@ static void _foreach(Request& r, MethodP VHash& self=GET_SELF(r, VHash); HashStringValue& hash=self.hash(); VHash_lock lock(self); - hash.for_each(one_foreach_cycle, &info); + hash.first_that(one_foreach_cycle, &info); } // constructor @@ -343,11 +503,16 @@ MHash::MHash(): Methoded("hash") // ^a.delete[key] add_native_method("delete", Method::CT_DYNAMIC, _delete, 1, 1); - // ^hash:sql[query][$.limit(1) $.offset(2)] + // ^a.contains[key] + add_native_method("contains", Method::CT_DYNAMIC, _contains, 1, 1); + // backward + add_native_method("contain", Method::CT_DYNAMIC, _contains, 1, 1); + + // ^hash::sql[query][options hash] 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);