bitmapper 0.1.0 → 0.1.1

data/ext/bitmapper/bit_mapper_wrap.c

@@ -29,6 +29,7 @@ void allocate_map(Bitmapper* map, int index_len){
   map->bkt_size = pow(10, 10 - index_len);
   map->bkt_count = size;
   map->index_len = index_len;
+  map->white_list_char = NULL;
   sprintf(map->fill_str, "%%llu%%0%illu\n",10-index_len);
 }
 
@@ -45,8 +46,19 @@ void free_map(Bitmapper* map){
       map->bkts[i] = NULL;
     }
   }
+  if(map->white_list_char != NULL) free(map->white_list_char);
   if(map->bkts != NULL) free(map->bkts);
+}
+
+void set_white_list_char(Bitmapper* map, char c){
+  if(map->white_list_char !=NULL) free(map->white_list_char);
+  map->white_list_char = (char*)malloc(sizeof(char));
+  map->white_list_char[0] = c;
+}
 
+void clear_white_list_char(Bitmapper* map){
+  if(map->white_list_char !=NULL) free(map->white_list_char);
+  map->white_list_char = NULL;
 }
 
 /*
@@ -161,11 +173,14 @@ int status_num(Bitmapper* map,unsigned long long int full_num){
  */
 int add_numbers_in_file(Bitmapper* map,FILE *in){
   char scan_str[20];
-  char msisdn[15], index[map->index_len], rest_num[10-map->index_len];
+  char msisdn[15], index[map->index_len+1], rest_num[10-map->index_len+1];
   sprintf(scan_str, "%%%is%%%is\n",map->index_len, 10-map->index_len);
   while(fgets(msisdn, 15, in)!=NULL){
     sscanf(msisdn,scan_str, index, rest_num);
-    add_num_in_bkt(map, atoll(rest_num), atoll(index) );
+    if(map->white_list_char !=NULL && strncmp(index, map->white_list_char, 1) != 0){
+    }else{
+      add_num_in_bkt(map, atoll(rest_num), atoll(index) );
+    }
   }
 }
 
@@ -179,7 +194,7 @@ int add_numbers_in_file(Bitmapper* map,FILE *in){
  */
 int remove_numbers_in_file(Bitmapper* map,FILE *del){
   char scan_str[20];
-  char msisdn[15], index[map->index_len], rest_num[10-map->index_len];
+  char msisdn[15], index[map->index_len+1], rest_num[10-map->index_len+1];
   sprintf(scan_str, "%%%is%%%is\n",map->index_len, 10-map->index_len);
   while(fgets(msisdn, 15, del)!=NULL){
     sscanf(msisdn,scan_str, index, rest_num);

data/ext/bitmapper/bit_mapper_wrap.h

@@ -12,6 +12,7 @@ typedef struct Bitmapper{
   unsigned long long int bkt_size;   /* size of each bucket in bits */
   /* the format specifier used to dump number to file from buckets */
   int index_len;
+  char *white_list_char;
   char fill_str[20];
 } Bitmapper;
 
@@ -19,6 +20,9 @@ Bitmapper* create_map();
 void allocate_map(Bitmapper*, int);
 void free_map(Bitmapper*);
 BitBucket* create_bucket_for(BitBucket*, unsigned long long int);
+void set_white_list_char(Bitmapper*, char);
+void clear_white_list_char(Bitmapper*);
+
 int add_num_in_bkt(Bitmapper* ,unsigned long long int, unsigned long long int);
 int add_num(Bitmapper* ,unsigned long long int);
 int remove_num_in_bkt(Bitmapper* ,unsigned long long int, unsigned long long int);

data/ext/bitmapper/bitmapper.c

@@ -155,7 +155,6 @@ VALUE bm_set(VALUE self, VALUE num){
     return (VALUE)Qtrue;
   else
     rb_raise(rb_eTypeError, "not valid number");
-  return (VALUE)Qfalse;
 }
 
 /*
@@ -171,7 +170,6 @@ VALUE bm_clear(VALUE self, VALUE num){
     return (VALUE)Qtrue;
   else
     rb_raise(rb_eTypeError, "not valid number");
-  return (VALUE)Qfalse;
 }
 
 /*
@@ -192,7 +190,29 @@ VALUE bm_num_status(VALUE self, VALUE num){
   else
     rb_raise(rb_eTypeError, "not valid number");
   return (VALUE)Qfalse;
+}
+
+
+VALUE bm_set_filter(VALUE self, VALUE vCh){
+  int status;
+  char ch;
+  Bitmapper* map;
+
+  Data_Get_Struct(self, Bitmapper, map);
+  vCh = rb_funcall(vCh, rb_intern("to_s"), 0); /* hack */
+  ch = NUM2CHR(vCh);
+  set_white_list_char(map, ch);
+  return (VALUE)Qtrue;
+}
+
+VALUE bm_clear_filter(VALUE self){
+  int status;
+  VALUE return_val;
+  Bitmapper* map;
 
+  Data_Get_Struct(self, Bitmapper, map);
+  clear_white_list_char(map);
+  return (VALUE)Qtrue;
 }
 
 void Init_bitmapper(){
@@ -204,11 +224,12 @@ void Init_bitmapper(){
   rb_define_method(rb_cBitmapper, "add", bm_add_from_file, 1);
   rb_define_method(rb_cBitmapper, "remove", bm_remove_from_file, 1);
   rb_define_method(rb_cBitmapper, "dump_to", bm_dump_to_file, 1);
+  rb_define_method(rb_cBitmapper, "set_filter", bm_set_filter, 1);
+  rb_define_method(rb_cBitmapper, "clear_filter", bm_clear_filter, 0);
   rb_define_method(rb_cBitmapper, "load_from_str", bm_load_str_to_bkt, 2);
   rb_define_method(rb_cBitmapper, "dump_to_str", bm_dump_bkt_str, 2);
 
   rb_define_method(rb_cBitmapper, "status?", bm_num_status, 1);
   rb_define_method(rb_cBitmapper, "set", bm_set, 1);
   rb_define_method(rb_cBitmapper, "clear", bm_clear, 1);
-
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bitmapper
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors: