From 0ec797fde66d5254dcd6aa01ed42fbde71560370 Mon Sep 17 00:00:00 2001
From: John <john@johng.cn>
Date: Mon, 16 Apr 2018 11:57:36 +0800
Subject: [PATCH] =?UTF-8?q?garray=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../{garray_interface.go => garray_int.go}    |   2 +-
 g/container/garray/garray_sorted_int.go       | 112 ++++++++++++++++++
 g/container/garray/garray_sorted_interface.go |  65 ----------
 3 files changed, 113 insertions(+), 66 deletions(-)
 rename g/container/garray/{garray_interface.go => garray_int.go} (99%)
 create mode 100644 g/container/garray/garray_sorted_int.go
 delete mode 100644 g/container/garray/garray_sorted_interface.go

diff --git a/g/container/garray/garray_interface.go b/g/container/garray/garray_int.go
similarity index 99%
rename from g/container/garray/garray_interface.go
rename to g/container/garray/garray_int.go
index fe94377eb..e58e2dc0a 100644
--- a/g/container/garray/garray_interface.go
+++ b/g/container/garray/garray_int.go
@@ -75,4 +75,4 @@ func (a *IntArray) Slice() []int {
     array := a.array
     a.mu.RUnlock()
     return array
-}
\ No newline at end of file
+}
diff --git a/g/container/garray/garray_sorted_int.go b/g/container/garray/garray_sorted_int.go
new file mode 100644
index 000000000..42fbe77e8
--- /dev/null
+++ b/g/container/garray/garray_sorted_int.go
@@ -0,0 +1,112 @@
+// Copyright 2018 gf Author(https://gitee.com/johng/gf). All Rights Reserved.
+//
+// This Source Code Form is subject to the terms of the MIT License.
+// If a copy of the MIT was not distributed with this file,
+// You can obtain one at https://gitee.com/johng/gf.
+
+package garray
+
+import (
+    "sync"
+    "sort"
+    "gitee.com/johng/gf/g/encoding/gbinary"
+    "bytes"
+)
+
+type SortedIntArray struct {
+    mu          sync.RWMutex           // 互斥锁
+    array       []int                  // 底层数组
+    compareFunc func(v1, v2 int) int   // 比较函数，返回值 -1: v1 < v2；0: v1==v2；1: v1 > v2
+}
+
+func NewSortedIntArray(size int, cap ... int) *SortedIntArray {
+    a := &SortedIntArray{}
+    if len(cap) > 0 {
+        a.array = make([]int, size, cap[0])
+    } else {
+        a.array = make([]int, size)
+    }
+    a.compareFunc = func(v1, v2 int) int {
+        return v1 < v2
+    }
+    return a
+}
+
+// 添加加数据项
+func (a *SortedIntArray) Add(value int) {
+    a.mu.Lock()
+    a.array = append(a.array, value)
+    a.mu.Unlock()
+}
+
+// 获取指定索引的数据项, 调用方注意判断数组边界
+func (a *SortedIntArray) Get(index int) int {
+    a.mu.RLock()
+    value := a.array[index]
+    a.mu.RUnlock()
+    return value
+}
+
+// 删除指定索引的数据项, 调用方注意判断数组边界
+func (a *SortedIntArray) Remove(index int) {
+    a.mu.Lock()
+    a.array = append(a.array[ : index], a.array[index + 1 : ]...)
+    a.mu.RUnlock()
+}
+
+// 数组长度
+func (a *SortedIntArray) Len() int {
+    a.mu.RLock()
+    length := len(a.array)
+    a.mu.RUnlock()
+    return length
+}
+
+// 返回原始数据数组
+func (a *SortedIntArray) Slice() []int {
+    a.mu.RLock()
+    array := a.array
+    a.mu.RUnlock()
+    return array
+}
+
+// 查找指定数值的索引位置
+func (a *SortedIntArray) Search(value int) int {
+    a.mu.RLock()
+    min := 0
+    max := len(a.array) - 1
+    mid := 0
+    cmp := -2
+    for {
+        if cmp == 0 || min > max {
+            break
+        }
+        for {
+            mid = int((min + max) / 2)
+            if a.lessFunc(a.array[mid], value) {
+                max = mid - 1
+                cmp = -1
+            } else if record.hash64 > hash64 {
+                min = mid + 1
+                cmp = 1
+            } else {
+                // 其次对比键名长度
+                klen := int(gbinary.DecodeBits(bits[64 : 72]))
+                if len(record.key) < klen {
+                    max = mid - 1
+                    cmp = -1
+                } else if len(record.key) > klen {
+                    min = mid + 1
+                    cmp = 1
+                } else {
+
+                }
+            }
+            if cmp == 0 || min > max {
+                break
+            }
+        }
+    }
+    a.mu.RUnlock()
+    return array
+}
\ No newline at end of file
diff --git a/g/container/garray/garray_sorted_interface.go b/g/container/garray/garray_sorted_interface.go
deleted file mode 100644
index 9c68adf62..000000000
--- a/g/container/garray/garray_sorted_interface.go
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright 2018 gf Author(https://gitee.com/johng/gf). All Rights Reserved.
-//
-// This Source Code Form is subject to the terms of the MIT License.
-// If a copy of the MIT was not distributed with this file,
-// You can obtain one at https://gitee.com/johng/gf.
-
-package garray
-
-//import "sync"
-//
-//type IntArray struct {
-//    mu           sync.RWMutex           // 互斥锁
-//    array        []int                  // 底层数组
-//    lessThanFunc func(v1, v2 int) bool  // 比较函数，如何判断v1比v2小
-//}
-//
-//func NewIntArray(size int, cap ... int) *IntArray {
-//    a := &IntArray{}
-//    if len(cap) > 0 {
-//        a.array = make([]int, size, cap[0])
-//    } else {
-//        a.array = make([]int, size)
-//    }
-//    a.lessThanFunc = func(v1, v2 int) bool {
-//        return v1 < v2
-//    }
-//    return a
-//}
-//
-//// 获取指定索引的数据项, 调用方注意判断数组边界
-//func (a *IntArray) Get(index int) int {
-//    a.mu.RLock()
-//    value := a.array[index]
-//    a.mu.RUnlock()
-//    return value
-//}
-//
-//// 设置指定索引的数据项, 调用方注意判断数组边界
-//func (a *IntArray) Set(index int, value int) {
-//    a.mu.Lock()
-//    a.array[index] = value
-//    a.mu.Unlock()
-//}
-//
-//// 删除指定索引的数据项, 调用方注意判断数组边界
-//func (a *IntArray) Remove(index int) {
-//    a.mu.Lock()
-//    a.array = append(a.array[ : index], a.array[index + 1 : ]...)
-//    a.mu.RUnlock()
-//}
-//
-//// 追加数据项
-//func (a *IntArray) Append(value int) {
-//    a.mu.Lock()
-//    a.array = append(a.array, value)
-//    a.mu.Unlock()
-//}
-//
-//// 数组长度
-//func (a *IntArray) Len() int {
-//    a.mu.RLock()
-//    length := len(a.array)
-//    a.mu.RUnlock()
-//    return length
-//}
\ No newline at end of file