import session id is now of type uint64

importer/session_store.go

@@ -25,17 +25,16 @@
 package importer
 
 import (
-	"crypto/rand"
-	"encoding/base64"
 	"fmt"
 	"log"
+	"math/rand"
 	"net/http"
 	"strings"
 	"time"
 )
 
 type newSessionResponse struct {
-	id           string
+	id           uint64
 	session      *Session
 	responsecode int
 	errorstring  string
@@ -56,11 +55,11 @@ type getSessionResponse struct {
 
 type getSessionRequest struct {
 	group    string
-	id       string
+	id       uint64
 	response chan getSessionResponse
 }
 
-type SessionsUpdateCB func(added, removed map[string]string, userdata interface{}) bool
+type SessionsUpdateCB func(added, removed map[uint64]string, userdata interface{}) bool
 
 type SessionsListCB struct {
 	cb       SessionsUpdateCB
@@ -68,7 +67,7 @@ type SessionsListCB struct {
 }
 
 type listSessionsResponse struct {
-	sessions     map[string]string
+	sessions     map[uint64]string
 	responsecode int
 	errorstring  string
 }
@@ -87,7 +86,7 @@ type removeSessionResponse struct {
 
 type removeSessionRequest struct {
 	group    string
-	id       string
+	id       uint64
 	response chan removeSessionResponse
 }
 
@@ -97,11 +96,11 @@ type sessionStoreSessionElement struct {
 }
 
 type sessionStoreGroupElement struct {
-	sessions  map[string]*sessionStoreSessionElement
+	sessions  map[uint64]*sessionStoreSessionElement
 	updateCBs []SessionsListCB
 }
 
-func (group *sessionStoreGroupElement) callUpdateHandler(added, removed map[string]string) {
+func (group *sessionStoreGroupElement) callUpdateHandler(added, removed map[uint64]string) {
 	var keptCBs []SessionsListCB
 	for _, cb := range group.updateCBs {
 		if cb.cb != nil {
@@ -113,14 +112,14 @@ func (group *sessionStoreGroupElement) callUpdateHandler(added, removed map[stri
 	group.updateCBs = keptCBs
 }
 
-func (group *sessionStoreGroupElement) callUpdateHandlerAdd(id, refId string) {
-	added := make(map[string]string)
+func (group *sessionStoreGroupElement) callUpdateHandlerAdd(id uint64, refId string) {
+	added := make(map[uint64]string)
 	added[id] = refId
 	group.callUpdateHandler(added, nil)
 }
 
-func (group *sessionStoreGroupElement) callUpdateHandlerRemove(id, refId string) {
-	removed := make(map[string]string)
+func (group *sessionStoreGroupElement) callUpdateHandlerRemove(id uint64, refId string) {
+	removed := make(map[uint64]string)
 	removed[id] = refId
 	group.callUpdateHandler(nil, removed)
 }
@@ -140,28 +139,19 @@ type SessionStore struct {
 	workerChan chan<- workerRequest
 }
 
-func generateSessionId() (string, error) {
-	var b [32]byte
-	if _, err := rand.Read(b[:]); err != nil {
-		return "", err
-	}
-	return base64.RawURLEncoding.EncodeToString(b[:]), nil
+func generateSessionId() uint64 {
+	// TODO: get this from store import object
+	return uint64(rand.Int63())
 }
 
 func (store *SessionStore) new(ctx *ImportContext, refId string) (resp newSessionResponse) {
 	resp.responsecode = http.StatusOK
 	resp.errorstring = "OK"
-	id, err := generateSessionId()
-	if err != nil {
-		resp.responsecode = http.StatusInternalServerError
-		resp.errorstring = err.Error()
-		return
-	}
 
-	resp.id = id
+	resp.id = generateSessionId()
 	if _, exists := store.store[ctx.GroupName]; !exists {
 		newgroup := &sessionStoreGroupElement{}
-		newgroup.sessions = make(map[string]*sessionStoreSessionElement)
+		newgroup.sessions = make(map[uint64]*sessionStoreSessionElement)
 		store.store[ctx.GroupName] = newgroup
 	}
 	ctx.conf = store.conf
@@ -188,7 +178,7 @@ func (store *SessionStore) new(ctx *ImportContext, refId string) (resp newSessio
 	return
 }
 
-func (store *SessionStore) get(groupname, id string) (resp getSessionResponse) {
+func (store *SessionStore) get(groupname string, id uint64) (resp getSessionResponse) {
 	resp.responsecode = http.StatusOK
 	resp.errorstring = "OK"
 
@@ -212,7 +202,7 @@ func (store *SessionStore) get(groupname, id string) (resp getSessionResponse) {
 func (store *SessionStore) list(groupname string, userdata interface{}, cb SessionsUpdateCB) (resp listSessionsResponse) {
 	resp.responsecode = http.StatusOK
 	resp.errorstring = "OK"
-	resp.sessions = make(map[string]string)
+	resp.sessions = make(map[uint64]string)
 	if group, exists := store.store[groupname]; exists {
 		for id, e := range group.sessions {
 			resp.sessions[id] = e.refId
@@ -222,14 +212,14 @@ func (store *SessionStore) list(groupname string, userdata interface{}, cb Sessi
 		}
 	} else if cb != nil {
 		newgroup := &sessionStoreGroupElement{}
-		newgroup.sessions = make(map[string]*sessionStoreSessionElement)
+		newgroup.sessions = make(map[uint64]*sessionStoreSessionElement)
 		newgroup.updateCBs = []SessionsListCB{SessionsListCB{cb, userdata}}
 		store.store[groupname] = newgroup
 	}
 	return
 }
 
-func (store *SessionStore) remove(groupname, id string) (resp removeSessionResponse) {
+func (store *SessionStore) remove(groupname string, id uint64) (resp removeSessionResponse) {
 	resp.responsecode = http.StatusOK
 	resp.errorstring = "OK"
 
@@ -295,7 +285,7 @@ func (store *SessionStore) dispatchRequests() {
 // *********************************************************
 // Public Interface
 
-func (store *SessionStore) New(ctx *ImportContext, refId string) (string, *Session, int, string) {
+func (store *SessionStore) New(ctx *ImportContext, refId string) (uint64, *Session, int, string) {
 	resCh := make(chan newSessionResponse)
 	req := newSessionRequest{}
 	req.ctx = ctx
@@ -307,7 +297,7 @@ func (store *SessionStore) New(ctx *ImportContext, refId string) (string, *Sessi
 	return res.id, res.session, res.responsecode, res.errorstring
 }
 
-func (store *SessionStore) Get(group, id string) (*Session, string, int, string) {
+func (store *SessionStore) Get(group string, id uint64) (*Session, string, int, string) {
 	resCh := make(chan getSessionResponse)
 	req := getSessionRequest{}
 	req.group = group
@@ -319,7 +309,7 @@ func (store *SessionStore) Get(group, id string) (*Session, string, int, string)
 	return res.session, res.refId, res.responsecode, res.errorstring
 }
 
-func (store *SessionStore) List(group string, userdata interface{}, cb SessionsUpdateCB) (map[string]string, int, string) {
+func (store *SessionStore) List(group string, userdata interface{}, cb SessionsUpdateCB) (map[uint64]string, int, string) {
 	resCh := make(chan listSessionsResponse)
 	req := listSessionsRequest{}
 	req.group = group
@@ -332,7 +322,7 @@ func (store *SessionStore) List(group string, userdata interface{}, cb SessionsU
 	return res.sessions, res.responsecode, res.errorstring
 }
 
-func (store *SessionStore) Remove(group, id string) (int, string) {
+func (store *SessionStore) Remove(group string, id uint64) (int, string) {
 	resCh := make(chan removeSessionResponse)
 	req := removeSessionRequest{}
 	req.group = group