Skip to content

Commit 5101c09

Browse files
iddqdexiddqdex
authored
fix tpcds build (#9314)
1 parent cb655a4 commit 5101c09

File tree

8 files changed

+75
-64
lines changed

8 files changed

+75
-64
lines changed

‎ydb/library/benchmarks/gen/tpcds-dbgen/ya.make

Lines changed: 42 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,13 @@ CONLYFLAGS(
99
-Wno-unused-but-set-variable
1010
)
1111

12-
CONLYFLAGS(GLOBAL -DLINUX)
13-
NO_WERROR()
12+
IF(OS_WINDOWS)
13+
CONLYFLAGS(-DWIN32 -DUSE_STDLIB_H)
14+
ELSEIF(OS_DARWIN OR OS_MACOS)
15+
CONLYFLAGS(-DINTERIX -DUSE_STDLIB_H -D_POSIX_SOURCE)
16+
ELSE()
17+
CONLYFLAGS(-DLINUX)
18+
ENDIF()
1419

1520
SRCS(
1621
address.c
@@ -40,43 +45,43 @@ SRCS(
4045
release.c
4146
sparse.c
4247
validate.c
43-
s_brand.c
48+
# s_brand.c
4449
# s_customer_address.c
45-
s_call_center.c
46-
s_catalog.c
47-
s_catalog_order.c
48-
s_catalog_order_lineitem.c
49-
s_catalog_page.c
50-
s_catalog_promotional_item.c
51-
s_catalog_returns.c
52-
s_category.c
53-
s_class.c
54-
s_company.c
50+
# s_call_center.c
51+
# s_catalog.c
52+
# s_catalog_order.c
53+
# s_catalog_order_lineitem.c
54+
# s_catalog_page.c
55+
# s_catalog_promotional_item.c
56+
# s_catalog_returns.c
57+
# s_category.c
58+
# s_class.c
59+
# s_company.c
5560
# s_customer.c
56-
s_division.c
57-
s_inventory.c
58-
s_item.c
59-
s_manager.c
60-
s_manufacturer.c
61-
s_market.c
62-
s_pline.c
63-
s_product.c
64-
s_promotion.c
65-
s_purchase.c
66-
s_reason.c
67-
s_store.c
68-
s_store_promotional_item.c
69-
s_store_returns.c
70-
s_subcategory.c
71-
s_subclass.c
72-
s_warehouse.c
73-
s_web_order.c
74-
s_web_order_lineitem.c
75-
s_web_page.c
76-
s_web_promotinal_item.c
77-
s_web_returns.c
78-
s_web_site.c
79-
s_zip_to_gmt.c
61+
# s_division.c
62+
# s_inventory.c
63+
# s_item.c
64+
# s_manager.c
65+
# s_manufacturer.c
66+
# s_market.c
67+
# s_pline.c
68+
# s_product.c
69+
# s_promotion.c
70+
# s_purchase.c
71+
# s_reason.c
72+
# s_store.c
73+
# s_store_promotional_item.c
74+
# s_store_returns.c
75+
# s_subcategory.c
76+
# s_subclass.c
77+
# s_warehouse.c
78+
# s_web_order.c
79+
# s_web_order_lineitem.c
80+
# s_web_page.c
81+
# s_web_promotinal_item.c
82+
# s_web_returns.c
83+
# s_web_site.c
84+
# s_zip_to_gmt.c
8085
w_call_center.c
8186
w_catalog_page.c
8287
w_catalog_returns.c

‎ydb/library/benchmarks/gen/tpch-dbgen/ya.make

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ CONLYFLAGS(
1414
)
1515

1616
IF (OS_MACOS OR OS_DARWIN)
17-
CONLYFLAGS(-D_POSIX_SOURCE)
17+
CONLYFLAGS(-D_POSIX_SOURCE -DLINUX)
18+
ELSEIF (OS_WINDOWS)
19+
CXXFLAGS(-D_POSIX_)
20+
ELSEIF (OS_LINUX)
21+
CONLYFLAGS(-D_POSIX_SOURCE -DLINUX)
1822
ENDIF()
1923

20-
IF (OS_WINDOWS)
21-
CXXFLAGS(GLOBAL -D_POSIX_)
22-
ENDIF()
23-
24-
CONLYFLAGS(GLOBAL -DVECTORWISE GLOBAL -DLINUX GLOBAL -DTPCH GLOBAL -DRNG_TEST)
24+
CONLYFLAGS(GLOBAL -DVECTORWISE GLOBAL -DTPCH GLOBAL -DRNG_TEST)
2525

2626
SRCS(
2727
build.c

‎ydb/library/workload/tpcds/driver.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
#ifndef LINUX
2-
#define LINUX
3-
#endif
41
#include <stdio.h>
52

63
#define DECLARER

‎ydb/library/workload/tpcds/driver.cpp

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
#include "driver.h"
21
#include <library/cpp/resource/resource.h>
32
#include <util/generic/algorithm.h>
43
#include <util/generic/map.h>
54
#include <util/string/cast.h>
65
#include <util/stream/mem.h>
6+
7+
#ifdef _unix_
78
#include <netinet/in.h>
9+
#else
10+
#include <winsock2.h>
11+
#endif
812

913
extern "C" {
1014
#include <ydb/library/benchmarks/gen/tpcds-dbgen/dist.h>
1115
#include <ydb/library/benchmarks/gen/tpcds-dbgen/genrand.h>
1216
#include <ydb/library/benchmarks/gen/tpcds-dbgen/dcomp.h>
1317
}
1418

15-
#ifndef LINUX
16-
#define LINUX
17-
#endif
18-
1919
#define FL_LOADED 0x01
2020

2121
extern "C" int di_compare(const void *op1, const void *op2) {
@@ -134,11 +134,8 @@ extern "C" int dist_weight(int *dest, char *d, int index, int wset) {
134134
dist_t *dist;
135135
int res;
136136

137-
if ((d_idx = find_dist(d)) == NULL)
138-
{
139-
char msg[80];
140-
sprintf(msg, "Invalid distribution name '%s'", d);
141-
INTERNAL(msg);
137+
if ((d_idx = find_dist(d)) == NULL) {
138+
Cerr << "Invalid distribution name '" << d << "'" << Endl;
142139
}
143140

144141
dist = d_idx->dist;
@@ -176,9 +173,7 @@ extern "C" int dist_op(void *dest, int op, char *d_name, int vset, int wset, int
176173
int i_res = 1;
177174

178175
if ((d = find_dist(d_name)) == NULL) {
179-
char msg[80];
180-
sprintf(msg, "Invalid distribution name '%s'", d_name);
181-
INTERNAL(msg);
176+
Cerr << "Invalid distribution name '" << d_name << "'" << Endl;
182177
assert(d != NULL);
183178
}
184179

‎ydb/library/workload/tpcds/driver.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
extern "C" {
22

3-
#ifndef LINUX
4-
#define LINUX
5-
#endif
6-
73
#include <ydb/library/benchmarks/gen/tpcds-dbgen/config.h>
84
#include <ydb/library/benchmarks/gen/tpcds-dbgen/porting.h>
95
#include <ydb/library/benchmarks/gen/tpcds-dbgen/constants.h>

‎ydb/library/workload/tpcds/ya.make

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
LIBRARY()
22

3+
IF(OS_WINDOWS)
4+
CONLYFLAGS(-DWIN32 -DUSE_STDLIB_H)
5+
ELSEIF(OS_DARWIN OR OS_MACOS)
6+
CONLYFLAGS(-DUSE_STDLIB_H)
7+
CFLAGS(-DINTERIX)
8+
ELSE()
9+
CFLAGS(-DLINUX)
10+
ENDIF()
11+
312
SRCS(
413
driver.c
514
driver.cpp

‎ydb/library/workload/tpch/driver.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
extern "C" {
22

33
#define VECTORWISE
4-
#define LINUX
54
#define TPCH
65
#define RNG_TEST
76

‎ydb/library/workload/tpch/ya.make

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,16 @@ SRCS(
88
tpch.cpp
99
)
1010

11+
IF (OS_MACOS OR OS_DARWIN)
12+
CFLAGS(-DLINUX)
13+
ELSEIF (OS_WINDOWS)
14+
CONLYFLAGS(-DWIN32)
15+
CXXFLAGS(-D_POSIX_ -DLINUX)
16+
ELSEIF (OS_LINUX)
17+
CONLYFLAGS(-D_POSIX_SOURCE)
18+
CFLAGS(-DLINUX)
19+
ENDIF()
20+
1121
RESOURCE(
1222
tpch_schema.sql tpch_schema.sql
1323
ydb/library/benchmarks/gen/tpch-dbgen/dists.dss dists.dss

0 commit comments

Comments
 (0)