Chris Lu 5 years ago
parent
commit
939e4b57a8

+ 1 - 1
weed/query/json/query_json.go

@@ -26,7 +26,7 @@ func QueryJson(jsonLine string, projections []string, query Query) (passedFilter
 	return false, nil
 }
 
-func filterJson(jsonLine string, query Query) bool{
+func filterJson(jsonLine string, query Query) bool {
 
 	value := gjson.Get(jsonLine, query.Field)
 

+ 2 - 5
weed/query/json/query_json_test.go

@@ -55,9 +55,9 @@ func TestGjson(t *testing.T) {
 
 `
 
-	projections := []string{"quiz","fruit"}
+	projections := []string{"quiz", "fruit"}
 
-	gjson.ForEachLine(data, func(line gjson.Result) bool{
+	gjson.ForEachLine(data, func(line gjson.Result) bool {
 		println(line.Raw)
 		println("+++++++++++")
 		results := gjson.GetMany(line.Raw, projections...)
@@ -68,8 +68,6 @@ func TestGjson(t *testing.T) {
 		return true
 	})
 
-
-
 }
 
 func TestJsonQueryRow(t *testing.T) {
@@ -133,4 +131,3 @@ func TestJsonQueryNumber(t *testing.T) {
 	println(string(buf))
 
 }
-

+ 25 - 26
weed/query/sqltypes/type.go

@@ -73,30 +73,29 @@ func IsTemporal(t Type) bool {
 // Vitess data types. These are idiomatically
 // named synonyms for the Type values.
 const (
-	Null       = Type_NULL_TYPE
-	Int8       = Type_INT8
-	Uint8      = Type_UINT8
-	Int16      = Type_INT16
-	Uint16     = Type_UINT16
-	Int32      = Type_INT32
-	Uint32     = Type_UINT32
-	Int64      = Type_INT64
-	Uint64     = Type_UINT64
-	Float32    = Type_FLOAT32
-	Float64    = Type_FLOAT64
-	Timestamp  = Type_TIMESTAMP
-	Date       = Type_DATE
-	Time       = Type_TIME
-	Datetime   = Type_DATETIME
-	Year       = Type_YEAR
-	Decimal    = Type_DECIMAL
-	Text       = Type_TEXT
-	Blob       = Type_BLOB
-	VarChar    = Type_VARCHAR
-	VarBinary  = Type_VARBINARY
-	Char       = Type_CHAR
-	Binary     = Type_BINARY
-	Bit        = Type_BIT
-	TypeJSON   = Type_JSON
+	Null      = Type_NULL_TYPE
+	Int8      = Type_INT8
+	Uint8     = Type_UINT8
+	Int16     = Type_INT16
+	Uint16    = Type_UINT16
+	Int32     = Type_INT32
+	Uint32    = Type_UINT32
+	Int64     = Type_INT64
+	Uint64    = Type_UINT64
+	Float32   = Type_FLOAT32
+	Float64   = Type_FLOAT64
+	Timestamp = Type_TIMESTAMP
+	Date      = Type_DATE
+	Time      = Type_TIME
+	Datetime  = Type_DATETIME
+	Year      = Type_YEAR
+	Decimal   = Type_DECIMAL
+	Text      = Type_TEXT
+	Blob      = Type_BLOB
+	VarChar   = Type_VARCHAR
+	VarBinary = Type_VARBINARY
+	Char      = Type_CHAR
+	Binary    = Type_BINARY
+	Bit       = Type_BIT
+	TypeJSON  = Type_JSON
 )
-

+ 0 - 2
weed/query/sqltypes/value.go

@@ -19,7 +19,6 @@ type Value struct {
 	val []byte
 }
 
-
 // NewValue builds a Value using typ and val. If the value and typ
 // don't match, it returns an error.
 func NewValue(typ Type, val []byte) (v Value, err error) {
@@ -62,7 +61,6 @@ func MakeTrusted(typ Type, val []byte) Value {
 	return Value{typ: typ, val: val}
 }
 
-
 // NewInt64 builds an Int64 Value.
 func NewInt64(v int64) Value {
 	return MakeTrusted(Int64, strconv.AppendInt(nil, v, 10))

+ 7 - 9
weed/server/volume_grpc_query.go

@@ -34,24 +34,22 @@ func (vs *VolumeServer) Query(req *volume_server_pb.QueryRequest, stream volume_
 			return err
 		}
 
-		if req.InputSerialization.CsvInput!=nil{
-
-
+		if req.InputSerialization.CsvInput != nil {
 
 		}
 
-		if req.InputSerialization.JsonInput!=nil{
+		if req.InputSerialization.JsonInput != nil {
 
 			stripe := &volume_server_pb.QueriedStripe{
-				Records:nil,
+				Records: nil,
 			}
 
 			filter := json.Query{
 				Field: req.Filter.Field,
-				Op: req.Filter.Operand,
-				Value:req.Filter.Value,
+				Op:    req.Filter.Operand,
+				Value: req.Filter.Value,
 			}
-			gjson.ForEachLine(string(n.Data), func(line gjson.Result) bool{
+			gjson.ForEachLine(string(n.Data), func(line gjson.Result) bool {
 				passedFilter, values := json.QueryJson(line.Raw, req.Selections, filter)
 				if !passedFilter {
 					return true
@@ -68,4 +66,4 @@ func (vs *VolumeServer) Query(req *volume_server_pb.QueryRequest, stream volume_
 	}
 
 	return nil
-}
+}