damn

src/pkg/gearman/Makefile

@@ -7,10 +7,10 @@ include $(GOROOT)/src/Make.inc
 TARG=gearman
 GOFILES=\
 	gearman.go\
-	workerjob.go\
-	workerjobclient.go\
+	worker/job.go\
+	worker/jobclient.go\
 	worker.go\
-	clientjob.go\
+	client/job.go\
 	client.go\
 
 CLEANFILES+=gearman_test

src/pkg/gearman/client/job.go

@@ -0,0 +1,99 @@
+// Copyright 2011 Xing Xing <mikespook@gmail.com> All rights reserved.
+// Use of this source code is governed by a MIT
+// license that can be found in the LICENSE file.
+
+package gearman
+
+import (
+    "os"
+    "bytes"
+    //    "log"
+)
+
+// Client side job
+type ClientJob struct {
+    Data                []byte
+    Handle, UniqueId    string
+    magicCode, DataType uint32
+}
+
+// Create a new job
+func NewClientJob(magiccode, datatype uint32, data []byte) (job *ClientJob) {
+    return &ClientJob{magicCode: magiccode,
+        DataType: datatype,
+        Data:     data}
+}
+
+// Decode a job from byte slice
+func DecodeClientJob(data []byte) (job *ClientJob, err os.Error) {
+    if len(data) < 12 {
+        err = os.NewError("Data length is too small.")
+        return
+    }
+    datatype := byteToUint32([4]byte{data[4], data[5], data[6], data[7]})
+    l := byteToUint32([4]byte{data[8], data[9], data[10], data[11]})
+    if len(data[12:]) != int(l) {
+        err = os.NewError("Invalid data length.")
+        return
+    }
+    data = data[12:]
+    job = NewClientJob(RES, datatype, data)
+    return
+}
+
+// Encode a job to byte slice
+func (job *ClientJob) Encode() (data []byte) {
+    magiccode := uint32ToByte(job.magicCode)
+    datatype := uint32ToByte(job.DataType)
+    data = make([]byte, 0, 1024*64)
+    data = append(data, magiccode[:]...)
+    data = append(data, datatype[:]...)
+    l := len(job.Data)
+    datalength := uint32ToByte(uint32(l))
+    data = append(data, datalength[:]...)
+    data = append(data, job.Data...)
+    return
+}
+
+// Extract the job's result.
+func (job *ClientJob) Result() (data []byte, err os.Error) {
+    switch job.DataType {
+    case WORK_FAIL:
+        job.Handle = string(job.Data)
+        err = os.NewError("Work fail.")
+        return
+    case WORK_EXCEPTION:
+        err = os.NewError("Work exception.")
+        fallthrough
+    case WORK_COMPLETE:
+        s := bytes.SplitN(job.Data, []byte{'\x00'}, 2)
+        if len(s) != 2 {
+            err = os.NewError("Invalid data.")
+            return
+        }
+        job.Handle = string(s[0])
+        data = s[1]
+    default:
+        err = os.NewError("The job is not a result.")
+    }
+    return
+}
+
+// Extract the job's update
+func (job *ClientJob) Update() (data []byte, err os.Error) {
+    if job.DataType != WORK_DATA && job.DataType != WORK_WARNING {
+        err = os.NewError("The job is not a update.")
+        return
+    }
+    s := bytes.SplitN(job.Data, []byte{'\x00'}, 2)
+    if len(s) != 2 {
+        err = os.NewError("Invalid data.")
+        return
+    }
+    if job.DataType == WORK_WARNING {
+        err = os.NewError("Work warning")
+    }
+    job.Handle = string(s[0])
+    data = s[1]
+    return
+}

src/pkg/gearman/clientjob.go

@@ -1,99 +0,0 @@
-// Copyright 2011 Xing Xing <mikespook@gmail.com> All rights reserved.
-// Use of this source code is governed by a MIT
-// license that can be found in the LICENSE file.
-
-package gearman
-
-import (
-	"os"
-	"bytes"
-	//    "log"
-)
-
-// Client side job
-type ClientJob struct {
-	Data                []byte
-	Handle, UniqueId    string
-	magicCode, DataType uint32
-}
-
-// Create a new job
-func NewClientJob(magiccode, datatype uint32, data []byte) (job *ClientJob) {
-	return &ClientJob{magicCode: magiccode,
-		DataType: datatype,
-		Data:     data}
-}
-
-// Decode a job from byte slice
-func DecodeClientJob(data []byte) (job *ClientJob, err os.Error) {
-	if len(data) < 12 {
-		err = os.NewError("Data length is too small.")
-		return
-	}
-	datatype := byteToUint32([4]byte{data[4], data[5], data[6], data[7]})
-	l := byteToUint32([4]byte{data[8], data[9], data[10], data[11]})
-	if len(data[12:]) != int(l) {
-		err = os.NewError("Invalid data length.")
-		return
-	}
-	data = data[12:]
-	job = NewClientJob(RES, datatype, data)
-	return
-}
-
-// Encode a job to byte slice
-func (job *ClientJob) Encode() (data []byte) {
-	magiccode := uint32ToByte(job.magicCode)
-	datatype := uint32ToByte(job.DataType)
-	data = make([]byte, 0, 1024*64)
-	data = append(data, magiccode[:]...)
-	data = append(data, datatype[:]...)
-	l := len(job.Data)
-	datalength := uint32ToByte(uint32(l))
-	data = append(data, datalength[:]...)
-	data = append(data, job.Data...)
-	return
-}
-
-// Extract the job's result.
-func (job *ClientJob) Result() (data []byte, err os.Error) {
-	switch job.DataType {
-	case WORK_FAIL:
-		job.Handle = string(job.Data)
-		err = os.NewError("Work fail.")
-		return
-	case WORK_EXCEPTION:
-		err = os.NewError("Work exception.")
-		fallthrough
-	case WORK_COMPLETE:
-		s := bytes.SplitN(job.Data, []byte{'\x00'}, 2)
-		if len(s) != 2 {
-			err = os.NewError("Invalid data.")
-			return
-		}
-		job.Handle = string(s[0])
-		data = s[1]
-	default:
-		err = os.NewError("The job is not a result.")
-	}
-	return
-}
-
-// Extract the job's update
-func (job *ClientJob) Update() (data []byte, err os.Error) {
-	if job.DataType != WORK_DATA && job.DataType != WORK_WARNING {
-		err = os.NewError("The job is not a update.")
-		return
-	}
-	s := bytes.SplitN(job.Data, []byte{'\x00'}, 2)
-	if len(s) != 2 {
-		err = os.NewError("Invalid data.")
-		return
-	}
-	if job.DataType == WORK_WARNING {
-		err = os.NewError("Work warning")
-	}
-	job.Handle = string(s[0])
-	data = s[1]
-	return
-}

src/pkg/gearman/worker_test.go

@@ -27,7 +27,6 @@ func foobar(job *WorkerJob) ([]byte, os.Error) {
     return nil, nil
 }
 
-
 func TestWorkerAddFunction(t *testing.T) {
     if err := worker.AddFunction("foobar", foobar, 0); err != nil {
         t.Error(err)