Revert "deprecate embedded browser (#12163)"

This reverts commit 736d8cbac4.

Bring contrib files for older contributions

pkg/s3select/sql/stringfuncs_contrib_test.go

@@ -0,0 +1,43 @@
+/*
+ * MinIO Object Storage (c) 2021 MinIO, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package sql
+
+import "testing"
+
+func TestEvalSQLSubstring(t *testing.T) {
+	evalCases := []struct {
+		s           string
+		startIdx    int
+		length      int
+		resExpected string
+		errExpected error
+	}{
+		{"abcd", 1, 1, "a", nil},
+		{"abcd", -1, 1, "a", nil},
+		{"abcd", 999, 999, "", nil},
+		{"", 999, 999, "", nil},
+		{"测试abc", 1, 1, "测", nil},
+		{"测试abc", 5, 5, "c", nil},
+	}
+
+	for i, tc := range evalCases {
+		res, err := evalSQLSubstring(tc.s, tc.startIdx, tc.length)
+		if res != tc.resExpected || err != tc.errExpected {
+			t.Errorf("Eval Case %d failed: %v %v", i, res, err)
+		}
+	}
+}

pkg/s3select/sql/stringfuncs_test.go

@@ -106,27 +106,3 @@ func TestEvalSQLLike(t *testing.T) {
 		}
 	}
 }
-
-func TestEvalSQLSubstring(t *testing.T) {
-	evalCases := []struct {
-		s           string
-		startIdx    int
-		length      int
-		resExpected string
-		errExpected error
-	}{
-		{"abcd", 1, 1, "a", nil},
-		{"abcd", -1, 1, "a", nil},
-		{"abcd", 999, 999, "", nil},
-		{"", 999, 999, "", nil},
-		{"测试abc", 1, 1, "测", nil},
-		{"测试abc", 5, 5, "c", nil},
-	}
-
-	for i, tc := range evalCases {
-		res, err := evalSQLSubstring(tc.s, tc.startIdx, tc.length)
-		if res != tc.resExpected || err != tc.errExpected {
-			t.Errorf("Eval Case %d failed: %v %v", i, res, err)
-		}
-	}
-}

pkg/s3select/sql/value.go

@@ -852,25 +852,6 @@ func arrayCompare(op string, left, right []Value) (bool, error) {
 	}
 }
 
-func timestampCompare(op string, left, right time.Time) bool {
-	switch op {
-	case opLt:
-		return left.Before(right)
-	case opLte:
-		return left.Before(right) || left.Equal(right)
-	case opGt:
-		return left.After(right)
-	case opGte:
-		return left.After(right) || left.Equal(right)
-	case opEq:
-		return left.Equal(right)
-	case opIneq:
-		return !left.Equal(right)
-	}
-	// This case does not happen
-	return false
-}
-
 func isValidArithOperator(op string) bool {
 	switch op {
 	case opPlus:

pkg/s3select/sql/value_contrib.go

@@ -0,0 +1,38 @@
+/*
+ * MinIO Object Storage (c) 2021 MinIO, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package sql
+
+import "time"
+
+func timestampCompare(op string, left, right time.Time) bool {
+	switch op {
+	case opLt:
+		return left.Before(right)
+	case opLte:
+		return left.Before(right) || left.Equal(right)
+	case opGt:
+		return left.After(right)
+	case opGte:
+		return left.After(right) || left.Equal(right)
+	case opEq:
+		return left.Equal(right)
+	case opIneq:
+		return !left.Equal(right)
+	}
+	// This case does not happen
+	return false
+}