Skip to content

Commit 06ce877

Browse files
committed
Drop commented out lines
1 parent 508fc80 commit 06ce877

File tree

9 files changed

+6
-54
lines changed

9 files changed

+6
-54
lines changed

ydb/library/yql/providers/generic/connector/libcpp/client.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ namespace NYql::NConnector {
3030
Y_ENSURE(config.GetEndpoint().port(), TStringBuilder() << "Empty port in TGenericConnectorConfig: " << config.DebugString());
3131
GrpcConfig_.Locator = TStringBuilder() << config.GetEndpoint().host() << ":" << config.GetEndpoint().port();
3232
GrpcConfig_.EnableSsl = config.GetUseSsl();
33-
// FIXME: remove me after debug
34-
GrpcConfig_.SslTargetNameOverride = "connector.yandex-query.cloud-preprod.yandex.net";
3533

3634
YQL_CLOG(INFO, ProviderGeneric) << "Connector endpoint: " << (config.GetUseSsl() ? "grpcs" : "grpc") << "://" << GrpcConfig_.Locator;
3735

ydb/library/yql/providers/generic/connector/tests/datasource/clickhouse/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ services:
1212
- 8123
1313
fq-connector-go:
1414
container_name: fq-tests-ch-fq-connector-go
15-
image: ghcr.io/ydb-platform/fq-connector-go:v0.4.17@sha256:3763344ab70f9a6b8c1546f15c0b31465590e8ac6636be15ca2d29c4f4cd9b19
15+
image: ghcr.io/ydb-platform/fq-connector-go:v0.5.0@sha256:6d3cec43478bef88dda195cd38c10e4df719c8ce6d13c9bd288c7ec40410e9d8
1616
ports:
1717
- 2130
1818
volumes:

ydb/library/yql/providers/generic/connector/tests/datasource/mysql/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
services:
22
fq-connector-go:
33
container_name: fq-tests-my-fq-connector-go
4-
image: ghcr.io/ydb-platform/fq-connector-go:v0.4.17@sha256:3763344ab70f9a6b8c1546f15c0b31465590e8ac6636be15ca2d29c4f4cd9b19
4+
image: ghcr.io/ydb-platform/fq-connector-go:v0.5.0@sha256:6d3cec43478bef88dda195cd38c10e4df719c8ce6d13c9bd288c7ec40410e9d8
55
ports:
66
- 2130
77
volumes:

ydb/library/yql/providers/generic/connector/tests/datasource/postgresql/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
services:
22
fq-connector-go:
33
container_name: fq-tests-pg-fq-connector-go
4-
image: ghcr.io/ydb-platform/fq-connector-go:v0.4.17@sha256:3763344ab70f9a6b8c1546f15c0b31465590e8ac6636be15ca2d29c4f4cd9b19
4+
image: ghcr.io/ydb-platform/fq-connector-go:v0.5.0@sha256:6d3cec43478bef88dda195cd38c10e4df719c8ce6d13c9bd288c7ec40410e9d8
55
ports:
66
- 2130
77
volumes:

ydb/library/yql/providers/generic/connector/tests/datasource/ydb/docker-compose.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,7 @@ services:
55
echo \"$$(dig fq-tests-ydb-ydb +short) fq-tests-ydb-ydb\" >> /etc/hosts; cat /etc/hosts;
66
/opt/ydb/bin/fq-connector-go server -c /opt/ydb/cfg/fq-connector-go.yaml"
77
container_name: fq-tests-ydb-fq-connector-go
8-
# image: ghcr.io/ydb-platform/fq-connector-go:v0.4.17@sha256:3763344ab70f9a6b8c1546f15c0b31465590e8ac6636be15ca2d29c4f4cd9b19
9-
build:
10-
context: /home/vitalyisaev/projects/fq-connector-go
11-
dockerfile: Dockerfile.release
8+
image: ghcr.io/ydb-platform/fq-connector-go:v0.5.0@sha256:6d3cec43478bef88dda195cd38c10e4df719c8ce6d13c9bd288c7ec40410e9d8
129
ports:
1310
- 2130
1411
volumes:

ydb/library/yql/providers/generic/connector/tests/join/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ services:
1212
- 8123
1313
fq-connector-go:
1414
container_name: fq-tests-join-fq-connector-go
15-
image: ghcr.io/ydb-platform/fq-connector-go:v0.4.17@sha256:3763344ab70f9a6b8c1546f15c0b31465590e8ac6636be15ca2d29c4f4cd9b19
15+
image: ghcr.io/ydb-platform/fq-connector-go:v0.5.0@sha256:6d3cec43478bef88dda195cd38c10e4df719c8ce6d13c9bd288c7ec40410e9d8
1616
ports:
1717
- 2130
1818
volumes:

ydb/library/yql/providers/generic/provider/yql_generic_dq_integration.cpp

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -269,15 +269,6 @@ namespace NYql {
269269
const auto& clusterConfig = State_->Configuration->ClusterNamesToClusterConfigs[clusterName];
270270
const auto& endpoint = clusterConfig.endpoint();
271271

272-
/*
273-
// for backward compability full path can be used (cluster_name.`db_name.table`)
274-
// TODO: simplify during https://st.yandex-team.ru/YQ-2494
275-
TStringBuf db, dbTable;
276-
if (!TStringBuf(table).TrySplit('.', db, dbTable)) {
277-
dbTable = table;
278-
}
279-
*/
280-
281272
YQL_CLOG(INFO, ProviderGeneric)
282273
<< "Filling lookup source settings"
283274
<< ": cluster: " << clusterName

ydb/library/yql/providers/generic/provider/yql_generic_load_meta.cpp

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -378,40 +378,6 @@ namespace NYql {
378378

379379
void FillTablePath(NConnector::NApi::TDescribeTableRequest& request, const TGenericClusterConfig& clusterConfig,
380380
const TString& tablePath) {
381-
/*
382-
// for backward compability full path can be used (cluster_name.`db_name.table`)
383-
// TODO: simplify during https://st.yandex-team.ru/YQ-2494
384-
const auto dataSourceKind = clusterConfig.GetKind();
385-
const auto& dbNameFromConfig = clusterConfig.GetDatabaseName();
386-
TStringBuf dbNameTarget, tableName;
387-
auto isFullPath = TStringBuf(tablePath).TrySplit('.', dbNameTarget, tableName);
388-
389-
if (!dbNameFromConfig.empty()) {
390-
dbNameTarget = dbNameFromConfig;
391-
if (!isFullPath) {
392-
tableName = tablePath;
393-
}
394-
} else if (!isFullPath) {
395-
tableName = tablePath;
396-
switch (dataSourceKind) {
397-
case NYql::NConnector::NApi::CLICKHOUSE:
398-
dbNameTarget = "default";
399-
break;
400-
case NYql::NConnector::NApi::POSTGRESQL:
401-
dbNameTarget = "postgres";
402-
break;
403-
case NYql::NConnector::NApi::MS_SQL_SERVER:
404-
dbNameTarget = "mssqlserver";
405-
break;
406-
default:
407-
ythrow yexception() << "You must provide database name explicitly for data source kind: '"
408-
<< NYql::NConnector::NApi::EDataSourceKind_Name(dataSourceKind) << "'";
409-
}
410-
} // else take database name from table path
411-
412-
request.mutable_data_source_instance()->set_database(TString(dbNameTarget));
413-
request.set_table(TString(tableName));
414-
*/
415381
request.mutable_data_source_instance()->set_database(clusterConfig.GetDatabaseName());
416382
request.set_table(tablePath);
417383
}

ydb/tests/fq/generic/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ services:
1515
echo \"$$(dig tests-fq-generic-ydb +short) tests-fq-generic-ydb\" >> /etc/hosts; cat /etc/hosts;
1616
/opt/ydb/bin/fq-connector-go server -c /opt/ydb/cfg/fq-connector-go.yaml"
1717
container_name: tests-fq-generic-fq-connector-go
18-
image: ghcr.io/ydb-platform/fq-connector-go:v0.4.17@sha256:3763344ab70f9a6b8c1546f15c0b31465590e8ac6636be15ca2d29c4f4cd9b19
18+
image: ghcr.io/ydb-platform/fq-connector-go:v0.5.0@sha256:6d3cec43478bef88dda195cd38c10e4df719c8ce6d13c9bd288c7ec40410e9d8
1919
ports:
2020
- "2130"
2121
postgresql:

0 commit comments

Comments
 (0)