Fix parent_tree desc sorting for performance test (fix #27)

Author: bozaro

tests/check_thread_get_posts.go

@@ -61,9 +61,22 @@ type PPostSortTree []*PPost
 func (a PPostSortTree) Len() int      { return len(a) }
 func (a PPostSortTree) Swap(i, j int) { a[i], a[j] = a[j], a[i] }
 func (a PPostSortTree) Less(i, j int) bool {
-	return a.ComparePath(&a[i].Path, &a[j].Path) < 0
+	return comparePath(&a[i].Path, &a[j].Path) < 0
 }
-func (a PPostSortTree) ComparePath(p1 *[]int32, p2 *[]int32) int {
+
+type PPostSortParentDesc []*PPost
+
+func (a PPostSortParentDesc) Len() int      { return len(a) }
+func (a PPostSortParentDesc) Swap(i, j int) { a[i], a[j] = a[j], a[i] }
+func (a PPostSortParentDesc) Less(i, j int) bool {
+	iTop := a[i].Path[0]
+	jTop := a[j].Path[0]
+	if iTop != jTop {
+		return iTop > jTop
+	}
+	return comparePath(&a[i].Path, &a[j].Path) < 0
+}
+func comparePath(p1 *[]int32, p2 *[]int32) int {
 	l1 := len(*p1)
 	l2 := len(*p2)
 	for i := 0; (i < l1) && (i < l2); i++ {
@@ -372,29 +385,32 @@ func PerfThreadGetPostsSuccess(p *Perf, f *Factory) {
 
 	slugOrId := GetSlugOrId(thread.Slug, int64(thread.ID))
 	limit := GetRandomLimit()
-	ff := true
-	desc := &ff // GetRandomDesc()
+	desc :=  GetRandomDesc()
 	order := GetRandomSort()
 
 	// Sort
 	limitType := func(post *PPost) int32 {
 		return post.Index
 	}
 	var expected []*PPost
+	reverse := (desc != nil) && (*desc == true)
 	switch order {
 	case SORT_FLAT:
 		expected = p.data.GetThreadPostsFlat(thread)
 	case SORT_TREE:
 		expected = p.data.GetThreadPostsTree(thread)
 	case SORT_PARENT:
 		expected = p.data.GetThreadPostsTree(thread)
+		if reverse {
+			expected = p.data.GetThreadPostsParentDesc(thread)
+			reverse = false
+		}
 		limitType = func(post *PPost) int32 {
 			return post.Path[0]
 		}
 	default:
 		panic("Unexpected sort type: " + order)
 	}
-	reverse := (desc != nil) && (*desc == true)
 	var last_id *int64 = nil
 	index := -1
 	if reverse {

tests/filler.go

@@ -284,7 +284,7 @@ func (self *Perf) Fill(threads int, timeout_sec int, config *PerfConfig) {
 	log.Infof("Creating posts (%d threads)", threads)
 	FillPosts(self, threads, timeout, config.PostCount, config.PostBatch)
 
-	log.Info("Normalize data")
+	log.Info("Prepare for saving data")
 	self.data.Normalize()
 
 	log.Info("Done")

tests/perf_data.go

@@ -33,6 +33,7 @@ type PerfData struct {
 	usersByForum      map[string][]*PUser
 	postsByThreadFlat map[int32][]*PPost
 	postsByThreadTree map[int32][]*PPost
+	postsByThreadParentDesc map[int32][]*PPost
 	userByNickname    map[string]*PUser
 	forumBySlug       map[string]*PForum
 	postById          map[int64]*PPost
@@ -104,6 +105,7 @@ func NewPerfData(config *PerfConfig) *PerfData {
 		threadsByForum:    map[string][]*PThread{},
 		usersByForum:      map[string][]*PUser{},
 		postsByThreadTree: map[int32][]*PPost{},
+		postsByThreadParentDesc: map[int32][]*PPost{},
 		postsByThreadFlat: map[int32][]*PPost{},
 		userByNickname:    map[string]*PUser{},
 		forumBySlug:       map[string]*PForum{},
@@ -205,6 +207,7 @@ func (self *PerfData) AddThread(thread *PThread) {
 	self.threads = append(self.threads, thread)
 	self.threadById[thread.ID] = thread
 	self.postsByThreadTree[thread.ID] = []*PPost{}
+	self.postsByThreadParentDesc[thread.ID] = []*PPost{}
 	self.postsByThreadFlat[thread.ID] = []*PPost{}
 	self.threadsByForum[thread.Forum.Slug] = append(self.threadsByForum[thread.Forum.Slug], thread)
 	self.usersByForum[thread.Forum.Slug] = append(self.usersByForum[thread.Forum.Slug], thread.Author)
@@ -343,6 +346,13 @@ func (self *PerfData) GetThreadPostsTree(thread *PThread) []*PPost {
 	return self.postsByThreadTree[thread.ID]
 }
 
+func (self *PerfData) GetThreadPostsParentDesc(thread *PThread) []*PPost {
+	self.mutex.RLock()
+	defer self.mutex.RUnlock()
+
+	return self.postsByThreadParentDesc[thread.ID]
+}
+
 func (self *PerfData) AddPost(post *PPost) {
 	self.mutex.Lock()
 	defer self.mutex.Unlock()
@@ -363,9 +373,9 @@ func (self *PerfData) AddPost(post *PPost) {
 		post.Path = []int32{post.Index}
 	}
 
-	tree := append(self.postsByThreadTree[post.Thread.ID], post)
 	self.postsByThreadFlat[post.Thread.ID] = append(self.postsByThreadFlat[post.Thread.ID], post)
-	self.postsByThreadTree[post.Thread.ID] = tree
+	self.postsByThreadTree[post.Thread.ID] = append(self.postsByThreadTree[post.Thread.ID], post)
+	self.postsByThreadParentDesc[post.Thread.ID] = append(self.postsByThreadParentDesc[post.Thread.ID], post)
 
 	post.Thread.Forum.Posts++
 	post.Thread.Posts++
@@ -379,6 +389,9 @@ func (self *PerfData) Normalize() {
 	for _, threads := range self.threadsByForum {
 		sort.Sort(PThreadByCreated(threads))
 	}
+	for _, posts := range self.postsByThreadParentDesc {
+		sort.Sort(PPostSortParentDesc(posts))
+	}
 	for key, users := range self.usersByForum {
 		sort.Sort(PUserByNickname(users))
 		size := 0