Address PR comments and use temp dir as root data dir.

xichen2020 · Mar 1, 2019 · 51ba7fc · 51ba7fc
1 parent 3ee0549
commit 51ba7fc
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/integration/config.go b/integration/config.go
@@ -83,7 +83,7 @@ database:
     - id: testNamespace
       retention: 87600h # 10 years in hours, DB has a default data retention of 24 hours that will break fixtures if we run them in the future (fixtures have hard coded timestamps).
   numShards: 8
-  filePathPrefix: /var/lib/eventdb
+  filePathPrefix: /tmp/eventdb
   fieldPathSeparator: .
   namespaceFieldName: service
   timestampFieldName: "@timestamp"

diff --git a/values/decoding/raw_size_string_iterator.go b/values/decoding/raw_size_string_iterator.go
@@ -6,6 +6,7 @@ import (
 
 	"github.com/xichen2020/eventdb/x/bytes"
 	xio "github.com/xichen2020/eventdb/x/io"
+	"github.com/xichen2020/eventdb/x/safe"
 )
 
 const (
@@ -52,7 +53,7 @@ func (it *rawSizeStringIterator) Next() bool {
 		return false
 	}
 
-	it.curr = string(it.buf[:rawSizeBytes])
+	it.curr = safe.ToString(it.buf[:rawSizeBytes])
 	return true
 }
 

diff --git a/x/hash/hash.go b/x/hash/hash.go
@@ -1,7 +1,7 @@
 package hash
 
 import (
-	"github.com/xichen2020/eventdb/x/safe"
+	"github.com/xichen2020/eventdb/x/unsafe"
 
 	murmur3 "github.com/m3db/stackmurmur3"
 )
@@ -22,7 +22,7 @@ func BytesHash(d []byte) Hash {
 
 // StringHash returns the hash of a string.
 func StringHash(s string) Hash {
-	return BytesHash(safe.ToBytes(s))
+	return BytesHash(unsafe.ToBytes(s))
 }
 
 // StringArrayHash returns the hash of a string array
@@ -35,7 +35,7 @@ func StringArrayHash(d []string, sep byte) Hash {
 	)
 	// NB: If needed, can fork murmur3 to do this more properly
 	for i := 0; i < len(d); i++ {
-		h = h.Write(safe.ToBytes(d[i]))
+		h = h.Write(unsafe.ToBytes(d[i]))
 		if i < len(d)-1 {
 			h = h.Write(b)
 		}