From 955eae3500ef64be7ff4cd33396253d0da333633 Mon Sep 17 00:00:00 2001
From: Chris Lu <chris.lu@gmail.com>
Date: Sat, 26 May 2018 14:08:55 -0700
Subject: [PATCH] this works great and support long file names

---
 weed/filer2/abstract_sql/abstract_sql_store.go | 18 +++++++++++-------
 weed/filer2/abstract_sql/hashing.go            | 13 +++++++++++++
 weed/filer2/configuration.go                   |  9 ++++++---
 3 files changed, 30 insertions(+), 10 deletions(-)
 create mode 100644 weed/filer2/abstract_sql/hashing.go

diff --git a/weed/filer2/abstract_sql/abstract_sql_store.go b/weed/filer2/abstract_sql/abstract_sql_store.go
index dd037b6af..3d15c632d 100644
--- a/weed/filer2/abstract_sql/abstract_sql_store.go
+++ b/weed/filer2/abstract_sql/abstract_sql_store.go
@@ -20,7 +20,8 @@ func (store *AbstractSqlStore) InsertEntry(entry *filer2.Entry) (err error) {
 		return fmt.Errorf("mysql encode %s: %s", entry.FullPath, err)
 	}
 
-	res, err := store.DB.Exec("INSERT INTO filemeta (directory,name,meta) VALUES(?,?,?)", dir, name, meta)
+	res, err := store.DB.Exec("INSERT INTO filemeta (dirhash,name,directory,meta) VALUES(?,?,?,?)",
+		md5hash(dir), name, dir, meta)
 	if err != nil {
 		return fmt.Errorf("mysql insert %s: %s", entry.FullPath, err)
 	}
@@ -40,7 +41,8 @@ func (store *AbstractSqlStore) UpdateEntry(entry *filer2.Entry) (err error) {
 		return fmt.Errorf("mysql encode %s: %s", entry.FullPath, err)
 	}
 
-	res, err := store.DB.Exec("UPDATE filemeta SET meta=? WHERE directory=? and name=?", dir, name, meta)
+	res, err := store.DB.Exec("UPDATE filemeta SET meta=? WHERE dirhash=? AND name=? AND directory=?",
+		meta, md5hash(dir), name, dir)
 	if err != nil {
 		return fmt.Errorf("mysql update %s: %s", entry.FullPath, err)
 	}
@@ -55,7 +57,8 @@ func (store *AbstractSqlStore) UpdateEntry(entry *filer2.Entry) (err error) {
 func (store *AbstractSqlStore) FindEntry(fullpath filer2.FullPath) (*filer2.Entry, error) {
 
 	dir, name := fullpath.DirAndName()
-	row := store.DB.QueryRow("SELECT meta FROM filemeta WHERE directory=? and name=?", dir, name)
+	row := store.DB.QueryRow("SELECT meta FROM filemeta WHERE dirhash=? AND name=? AND directory=?",
+		md5hash(dir), name, dir)
 	var data []byte
 	if err := row.Scan(&data); err != nil {
 		return nil, fmt.Errorf("mysql read entry %s: %v", fullpath, err)
@@ -77,7 +80,8 @@ func (store *AbstractSqlStore) DeleteEntry(fullpath filer2.FullPath) (*filer2.En
 
 	dir, name := fullpath.DirAndName()
 
-	res, err := store.DB.Exec("DELETE FROM filemeta WHERE directory=? and name=?", dir, name)
+	res, err := store.DB.Exec("DELETE FROM filemeta WHERE dirhash=? AND name=? AND directory=?",
+		md5hash(dir), name, dir)
 	if err != nil {
 		return nil, fmt.Errorf("mysql delete %s: %s", fullpath, err)
 	}
@@ -92,12 +96,12 @@ func (store *AbstractSqlStore) DeleteEntry(fullpath filer2.FullPath) (*filer2.En
 
 func (store *AbstractSqlStore) ListDirectoryEntries(fullpath filer2.FullPath, startFileName string, inclusive bool, limit int) (entries []*filer2.Entry, err error) {
 
-	sqlText := "SELECT NAME, meta FROM filemeta WHERE directory=? and name>? LIMIT ?"
+	sqlText := "SELECT NAME, meta FROM filemeta WHERE dirhash=? AND name>? AND directory=? LIMIT ?"
 	if inclusive {
-		sqlText = "SELECT NAME, meta FROM filemeta WHERE directory=? and name>=? LIMIT ?"
+		sqlText = "SELECT NAME, meta FROM filemeta WHERE dirhash=? AND name>=? AND directory=? LIMIT ?"
 	}
 
-	rows, err := store.DB.Query(sqlText, string(fullpath), startFileName, limit)
+	rows, err := store.DB.Query(sqlText, md5hash(string(fullpath)), startFileName, string(fullpath), limit)
 	if err != nil {
 		return nil, fmt.Errorf("mysql list %s : %v", fullpath, err)
 	}
diff --git a/weed/filer2/abstract_sql/hashing.go b/weed/filer2/abstract_sql/hashing.go
new file mode 100644
index 000000000..5e1390233
--- /dev/null
+++ b/weed/filer2/abstract_sql/hashing.go
@@ -0,0 +1,13 @@
+package abstract_sql
+
+import (
+	"crypto/md5"
+	"io"
+)
+
+// returns a 128 bit hash
+func md5hash(dir string) []byte {
+	h := md5.New()
+	io.WriteString(h, dir)
+	return h.Sum(nil)
+}
diff --git a/weed/filer2/configuration.go b/weed/filer2/configuration.go
index ddd06a568..910ddcbbc 100644
--- a/weed/filer2/configuration.go
+++ b/weed/filer2/configuration.go
@@ -25,12 +25,15 @@ dir = "."					# directory to store level db files
 #
 # need to choose or create a database.
 # need to manually create a table "filemeta".
+#
 # CREATE TABLE IF NOT EXISTS filemeta (
-#   directory   VARCHAR(512) NOT NULL DEFAULT "" COMMENT 'full path to parent directory',
-#   name        VARCHAR(512) NOT NULL DEFAULT "" COMMENT 'directory or file name',
+#   dirhash     BINARY(16)   COMMENT 'MD5 hash value of directory field',
+#   name        VARCHAR(1000) NOT NULL DEFAULT "" COMMENT 'directory or file name',
+#   directory   VARCHAR(4096) NOT NULL DEFAULT "" COMMENT 'full path to parent directory',
 #   meta        BLOB,
-#   PRIMARY KEY (directory, name)
+#   PRIMARY KEY (dirhash, name)
 # ) DEFAULT CHARSET=utf8;
+#
 enabled = true
 server = "localhost"
 port = 3306