Fix rocksdb include path for CXXFLAGS

BBVA · Mar 25, 2019 · 6cae8c3 · 6cae8c3
1 parent 1da0db6
commit 6cae8c3
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 13 deletions.
diff --git a/rocksdb/extended.cpp b/rocksdb/extended.cpp
@@ -126,10 +126,6 @@ uint64_t rocksdb_histogram_get_sum(rocksdb_histogram_data_t* data) {
     return data->rep->sum;
 }
 
-double rocksdb_histogram_get_min(rocksdb_histogram_data_t* data) {
-    return data->rep->min;
-}
-
 void rocksdb_histogram_data_destroy(rocksdb_histogram_data_t* data);
 
 void rocksdb_histogram_data_destroy(rocksdb_histogram_data_t* data) {

diff --git a/rocksdb/extended.h b/rocksdb/extended.h
@@ -507,8 +507,6 @@ extern uint64_t rocksdb_histogram_get_count(rocksdb_histogram_data_t* data);
 
 extern uint64_t rocksdb_histogram_get_sum(rocksdb_histogram_data_t* data);
 
-extern double rocksdb_histogram_get_min(rocksdb_histogram_data_t* data);
-
 extern void rocksdb_histogram_data_destroy(rocksdb_histogram_data_t* data);
 
 #ifdef __cplusplus

diff --git a/rocksdb/flags.go b/rocksdb/flags.go
@@ -17,7 +17,7 @@
 package rocksdb
 
 // #cgo CFLAGS: -I${SRCDIR}/../c-deps/rocksdb/include
-// #cgo CXXFLAGS: -std=c++11 -O3 -I${SRCDIR}
+// #cgo CXXFLAGS: -std=c++11 -O3 -I${SRCDIR}/../c-deps/rocksdb/include
 // #cgo LDFLAGS: -L${SRCDIR}/../c-deps/libs
 // #cgo LDFLAGS: -lrocksdb
 // #cgo LDFLAGS: -ljemalloc

diff --git a/rocksdb/histogram.go b/rocksdb/histogram.go
@@ -70,11 +70,6 @@ func (d *HistogramData) GetSum() uint64 {
 	return uint64(C.rocksdb_histogram_get_sum(d.c))
 }
 
-// GetMin returns the min value.
-func (d *HistogramData) GetMin() float64 {
-	return float64(C.rocksdb_histogram_get_min(d.c))
-}
-
 // Destroy deallocates the HistogramData object.
 func (d *HistogramData) Destroy() {
 	C.rocksdb_histogram_data_destroy(d.c)

diff --git a/rocksdb/statistics_test.go b/rocksdb/statistics_test.go
@@ -108,7 +108,6 @@ func TestGetHistogramData(t *testing.T) {
 	require.True(t, histogramData.GetMax() > 0)
 	require.True(t, histogramData.GetCount() > 0)
 	require.True(t, histogramData.GetSum() > 0)
-	require.True(t, histogramData.GetMin() > 0)
 }
 
 func TestReset(t *testing.T) {