Clickhouse fix (#698)

* include select with newline in clickhouse queries Signed-off-by: jnichols <mail@jnichols.info> * remove unused body = make(...) call Signed-off-by: jnichols <mail@jnichols.info> * ensure negative cache is disabled when testing empty config for opc Signed-off-by: jnichols <mail@jnichols.info> --------- Signed-off-by: jnichols <mail@jnichols.info>
trickstercache · Feb 17, 2024 · 7522d5c · 7522d5c
1 parent f31766c
commit 7522d5c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/pkg/backends/clickhouse/handler_query.go b/pkg/backends/clickhouse/handler_query.go
@@ -41,7 +41,6 @@ func (c *Client) QueryHandler(w http.ResponseWriter, r *http.Request) {
 		}
 		var body []byte
 		if sqlQuery != "" {
-			body = make([]byte, 0, len(sqlQuery)+len(b))
 			body = append([]byte(sqlQuery), b...)
 			q.Del(upQuery)
 			r.URL.RawQuery = q.Encode()
@@ -52,7 +51,9 @@ func (c *Client) QueryHandler(w http.ResponseWriter, r *http.Request) {
 		r = request.SetBody(r, body)
 	}
 	sqlQuery = strings.ToLower(sqlQuery)
-	if (!strings.HasPrefix(sqlQuery, "select ")) && (!(strings.Index(sqlQuery, " select ") > 0)) {
+	if !(strings.HasPrefix(sqlQuery, "select ") ||
+		strings.HasPrefix(sqlQuery, "select\n") ||
+		strings.Contains(sqlQuery, " select ")) {
 		c.ProxyHandler(w, r)
 		return
 	}

diff --git a/pkg/proxy/engines/objectproxycache_chunk_test.go b/pkg/proxy/engines/objectproxycache_chunk_test.go
@@ -729,6 +729,9 @@ func TestObjectProxyCacheRequestNegativeCacheChunks(t *testing.T) {
 	r = r.WithContext(tc.WithResources(r.Context(), request.NewResources(cfg, pc, rsc.CacheConfig,
 		rsc.CacheClient, rsc.BackendClient, nil, rsc.Logger)))
 
+	// Remove negative cache for first request
+	delete(cfg.NegativeCache, 404)
+
 	_, e := testFetchOPC(r, http.StatusNotFound, "test", map[string]string{"status": "kmiss"})
 	for _, err = range e {
 		t.Error(err)

diff --git a/pkg/proxy/engines/objectproxycache_test.go b/pkg/proxy/engines/objectproxycache_test.go
@@ -798,6 +798,9 @@ func TestObjectProxyCacheRequestNegativeCache(t *testing.T) {
 	r = r.WithContext(tc.WithResources(r.Context(), request.NewResources(cfg, pc, rsc.CacheConfig,
 		rsc.CacheClient, rsc.BackendClient, nil, rsc.Logger)))
 
+	// Remove negative cache for first request
+	delete(cfg.NegativeCache, 404)
+
 	_, e := testFetchOPC(r, http.StatusNotFound, "test", map[string]string{"status": "kmiss"})
 	for _, err = range e {
 		t.Error(err)