fix table reference

Author: jiacai2050

integration_tests/Makefile

@@ -37,21 +37,21 @@ build-ceresdb:
 build-test:
 	cargo build
 
-build: build-ceresdb build-test build-meta
+build: build-ceresdb build-test
 
 kill-old-process:
 	killall ceresdb-server | true
 	killall ceresmeta | true
 
 prepare: clean build kill-old-process
 
-run: prepare
+run: prepare build-meta
 	$(CERESDB_TEST_BINARY)
 
 run-local: prepare
 	CERESDB_ENV_FILTER=local $(CERESDB_TEST_BINARY)
 
-run-cluster: prepare
+run-cluster: prepare build-meta
 	CERESDB_ENV_FILTER=cluster $(CERESDB_TEST_BINARY)
 
 run-java:

integration_tests/build_meta.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-set -exo
+set -e
 
 SRC=/tmp/ceresmeta-src
 TARGET=$(pwd)/ceresmeta

integration_tests/prom/remote-query.py

@@ -14,6 +14,7 @@ def now():
     return int(time.time()) * 1000
 
 table = 'prom_remote_query_test' + str(now())
+table2 = 'PROM_REMOTE_QUERY_TEST' + str(now())
 
 def execute_sql(sql):
     r = requests.post('{}/sql'.format(api_root), json={'query': sql}, headers=headers)
@@ -25,7 +26,8 @@ def execute_pql(pql):
     return r.json()
 
 def prepare_data(ts):
-    execute_sql("""
+    for t in [table, table2]:
+        execute_sql("""
 CREATE TABLE if not exists `{}` (
     `t` timestamp NOT NULL,
     `tag1` string TAG,
@@ -34,7 +36,7 @@ def prepare_data(ts):
     `VALUE2` double NOT NULL,
     timestamp KEY (t)
 );
-    """.format(table))
+        """.format(table))
 
     execute_sql("""
 insert into {}(t, tag1, tag2, value, VALUE2)
@@ -44,6 +46,14 @@ def prepare_data(ts):
     ;
     """.format(table, ts-5000, ts))
 
+    execute_sql("""
+insert into {}(t, tag1, tag2, value, VALUE2)
+values
+({}, "v1", "v2", 10, 20),
+({}, "v1", "v2", 110, 220)
+    ;
+    """.format(table2, ts-5000, ts))
+
 
 def remote_query(ts):
     ts = ts/1000 # prom return seconds
@@ -64,10 +74,16 @@ def remote_query(ts):
     result = r['data']['result']
     assert result == []
 
+    # uppercase field
     r = execute_pql(table + '{tag1="v1",__ceresdb_field__="VALUE2"}[5m]')
     result = r['data']['result']
     assert result == [{'metric': {'__name__': table, 'tag1': 'v1', 'tag2': 'v2'}, 'values': [[ts-5, '2'], [ts, '22']]}]
 
+    # uppercase table
+    r = execute_pql(table2 + '{tag1="v1"}[5m]')
+    result = r['data']['result']
+    assert result == [{'metric': {'__name__': table2, 'tag1': 'v1', 'tag2': 'v2'}, 'values': [[ts-5, '1'], [ts, '11']]}]
+
 def main():
     ts = now()
     prepare_data(ts)

integration_tests/prom/run-tests.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 VERSION=prometheus-2.43.0.linux-amd64
-wget "https://github.com/prometheus/prometheus/releases/download/v2.43.0/${VERSION}.tar.gz"
+wget -q "https://github.com/prometheus/prometheus/releases/download/v2.43.0/${VERSION}.tar.gz"
 
 tar xvf prometheus*.tar.gz
 nohup ./${VERSION}/prometheus --config.file ./prometheus.yml &

query_frontend/src/promql/remote.rs

@@ -46,15 +46,8 @@ pub fn remote_query_to_plan<P: MetaProvider>(
 ) -> Result<RemoteQueryPlan> {
     let (metric, field, mut filters) = normalize_matchers(query.matchers)?;
 
-    // get table schema
-    let table_ref = meta_provider
-        .table(TableReference::parse_str(&metric))
-        .context(MetaProviderError {
-            msg: format!("Failed to find table, name:{metric}"),
-        })?
-        .context(TableNotFound { name: &metric })?;
     let table_provider = meta_provider
-        .get_table_provider(table_ref.name().into())
+        .get_table_provider(TableReference::bare(&metric))
         .context(TableProviderNotFound { name: &metric })?;
     let schema = Schema::try_from(table_provider.schema()).context(BuildTableSchema)?;
     let timestamp_col_name = schema.timestamp_name();