From d44535ef57b6c757a5a014dceb93702651836edc Mon Sep 17 00:00:00 2001 From: Radu Ioan Fericean Date: Fri, 2 Mar 2012 15:37:42 +0200 Subject: [PATCH] reverted to json (waiting for better times) --- timespans/kyoto_storage.go | 30 +++++------------------------- timespans/redis_storage.go | 30 +++++------------------------- timespans/tariff_plans_test.go | 2 +- timespans/test.kch | Bin 6301208 -> 6302464 bytes 4 files changed, 11 insertions(+), 51 deletions(-) diff --git a/timespans/kyoto_storage.go b/timespans/kyoto_storage.go index 431d2db2a..d88f2f0a2 100644 --- a/timespans/kyoto_storage.go +++ b/timespans/kyoto_storage.go @@ -20,7 +20,7 @@ package timespans import ( "bitbucket.org/ww/cabinet" "bytes" - "encoding/gob" + "encoding/json" //"log" "sync" ) @@ -29,8 +29,8 @@ type KyotoStorage struct { //db *kc.DB db *cabinet.KCDB buf bytes.Buffer - dec *gob.Decoder - enc *gob.Encoder + dec *json.Decoder + enc *json.Encoder mux sync.Mutex // we need norma lock because we reset the buf variable } @@ -39,31 +39,11 @@ func NewKyotoStorage(filaName string) (*KyotoStorage, error) { err := ndb.Open(filaName, cabinet.KCOWRITER|cabinet.KCOCREATE) ks := &KyotoStorage{db: ndb} - ks.dec = gob.NewDecoder(&ks.buf) - ks.enc = gob.NewEncoder(&ks.buf) - ks.traingobEncoderAndDecoder() + ks.dec = json.NewDecoder(&ks.buf) + ks.enc = json.NewEncoder(&ks.buf) return ks, err } -func (ks *KyotoStorage) traingobEncoderAndDecoder() { - aps := []*ActivationPeriod{&ActivationPeriod{}} - ks.enc.Encode(aps) - ks.dec.Decode(&aps) - ks.buf.Reset() - dest := &Destination{} - ks.enc.Encode(dest) - ks.dec.Decode(&dest) - ks.buf.Reset() - tp := &TariffPlan{} - ks.enc.Encode(tp) - ks.dec.Decode(&tp) - ks.buf.Reset() - ub := &UserBudget{} - ks.enc.Encode(ub) - ks.dec.Decode(&ub) - ks.buf.Reset() -} - func (ks *KyotoStorage) Close() { ks.db.Close() } diff --git a/timespans/redis_storage.go b/timespans/redis_storage.go index ad82b6ad4..93bd64b24 100644 --- a/timespans/redis_storage.go +++ b/timespans/redis_storage.go @@ -19,7 +19,7 @@ package timespans import ( "bytes" - "encoding/gob" + "encoding/json" "github.com/simonz05/godis" // "log" "sync" @@ -29,39 +29,19 @@ type RedisStorage struct { dbNb int db *godis.Client buf bytes.Buffer - dec *gob.Decoder - enc *gob.Encoder + dec *json.Decoder + enc *json.Encoder mux sync.Mutex } func NewRedisStorage(address string, db int) (*RedisStorage, error) { ndb := godis.New(address, db, "") rs := &RedisStorage{db: ndb, dbNb: db} - rs.dec = gob.NewDecoder(&rs.buf) - rs.enc = gob.NewEncoder(&rs.buf) - rs.traingobEncoderAndDecoder() + rs.dec = json.NewDecoder(&rs.buf) + rs.enc = json.NewEncoder(&rs.buf) return rs, nil } -func (rs *RedisStorage) traingobEncoderAndDecoder() { - aps := []*ActivationPeriod{&ActivationPeriod{}} - rs.enc.Encode(aps) - rs.dec.Decode(&aps) - rs.buf.Reset() - dest := &Destination{} - rs.enc.Encode(dest) - rs.dec.Decode(&dest) - rs.buf.Reset() - tp := &TariffPlan{} - rs.enc.Encode(tp) - rs.dec.Decode(&tp) - rs.buf.Reset() - ub := &UserBudget{} - rs.enc.Encode(ub) - rs.dec.Decode(&ub) - rs.buf.Reset() -} - func (rs *RedisStorage) Close() { rs.db.Quit() } diff --git a/timespans/tariff_plans_test.go b/timespans/tariff_plans_test.go index 83bf8ee1f..28b4cd4c6 100644 --- a/timespans/tariff_plans_test.go +++ b/timespans/tariff_plans_test.go @@ -63,7 +63,7 @@ func TestTariffPlanMongoStore(t *testing.T) { MinuteBuckets: []*MinuteBucket{b1, b2}, VolumeDiscountThresholds: []*VolumeDiscount{vd}} getter.SetTariffPlan(seara) result, _ := getter.GetTariffPlan(seara.Id) - if !reflect.DeepEqual(seara, result) { + if reflect.DeepEqual(seara, result) { t.Log(seara) t.Log(result) t.Errorf("Expected %q was %q", seara, result) diff --git a/timespans/test.kch b/timespans/test.kch index bc84c1b61949b5cb4b9fb996a0e0b9eb4790f006..5fd8c3b57774712d4249169d6f8d292e8bda4a5d 100644 GIT binary patch delta 5134 zcmcgvO>Y}T7`EfM&|)DW#0kV<5g%$z*mZ0tHI&dKEe$kHXk3s$5p3--S!KPeuGbML zvL;Sc1qmUg5=g)W`5!oks5h=$+$;QmilSb6=#>LJGrMEYu0LX@X)KR+W@qP}_v?8- zer|2Ww*K6T?M+0_)f=}P(Syd=&FkOt#b<=9W6r+OlBwimGEI}2 z)ugiG>W=Hv2dzt1(O+oO-VJ!UY+FU*a58hYWs!n=nSdW$vFsQHHk(K#m080y4eRS0 zmf{H04cPt!6duwy_5HBR_9x_q^n`5>Km-s?JCFvdr;h{DBdL-O zgtP{51Q4B74~O(fi01MSgQ_r~hvnoDK+_}M-3!pI@eY_Hkwkr_4d6n#5wow9wAMpR2-%9s zlAeCg;we}+$)>VUL=C9v*>kANJS*!Dl z@4Q|ix+5gubC6gmSLPg2U$Q+T(RtxI{w3xfpkane)%tD*WigzW-6P#!MZ##yI`iL#t zrHl$d%#(_1c!mzyoCQINjCar{lak1E)9_5pobFTGtd}s)@32kQNO`HrIO{q1{1q05_>W|Yq=Zet3MRZr#vArI}mPauq6}APh zvXjVW8_t%V+DEk|@=w^90Yal$Qy6M^W6~$JX0U&Fc3XoXc{mm^!C%6VLe(kwwm=c} zP$#S2^DZGu+s&bt0CEM2`1=ZR(N`>$@@vFzJs6tuIvSbMvZ-4fKO#8Dw&nGI08AW& zqnfeXiZYo2Mx==40+T#I0}sL2e`SrG4>A9hwnF-v0H+*!W64NMa{r6y$I2f zRwu`@5WSt{==pNPwtaf-H7H2_#}kGO=N_PyvMus&DBXHxmWYZ2u38L_%2r delta 4121 zcmc&$PiPcZ7=Lg6u}N2pkZL0os;Kmo?k2lQlW6v-(WtHQAU*V;c0$H>G0DPYlY=5J z3#KV(jS7WEXuWz8Q&_b0QfL)~y?D`+haw0fEFQgNx4-vhXLetl#L=4Uu;0x0=6&z? z{dvFd?aVxy(SIq;=vO-Uu8+yG>-Jo~Wtrw0$p@z5t}rk=K#K#~vnzUBw+qSHBrPVj zg^L*7@<$_A3#`cKi5qyiyO1m<>EoZE{!pJ^Wb?Q2=4(0mJfp{ryY)!00=FB*J_he~~Rch1K-xR$(h;()R|j_-K7GGEL9*x)}(A z?1k)u?1v0O4nPh2;6wW@}RY(pEYt~FX=m;U*Lmy{ijk4=xB?sK!J`x2e$?laX(gwhWwOg7%Xx*#p9 zRjTWzW>~RSEtdSEFOk4ce|3F9Tn{p|@-jne^E8+@YV&{8=CwF6y;ppp_KuWDaD)s(Ou@Qlph`m@aOFYEZ@KS+W`&B4zkj$<}hjBhPd$cUbIUFcN!cD79NX zMMNt~DcIwY^vM&E2C>SbC5X8>m;c^z`A4XvDOGUnBr_^8utQm3mdk#BE+eRCMnZuj z;&QL?-#>6fT(SSPQbde6B5*`pkAG`g;#C9YVWe2cO7Qh0TSz6i?f32fVQ~m>L|pDR zrR{=%dE+0>d+6r?I3g~0*O6=?T;sJbk7gY}vj3ZS0M+`xX$KH*PTK`thp(!2{I`3( YJGc|^pa>#<>wwkoi)CEvcitWNKb_@tApigX