Skip to content
This repository was archived by the owner on Sep 27, 2019. It is now read-only.

Commit b29e4a0

Browse files
tli2tli2
committed
Rename to tuning
1 parent 19f2b0c commit b29e4a0

18 files changed

+99
-99
lines changed

‎src/common/init.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
#include <gflags/gflags.h>
1616
#include <google/protobuf/stubs/common.h>
1717

18-
#include "indextuner/index_tuner.h"
19-
#include "indextuner/layout_tuner.h"
18+
#include "tuning/index_tuner.h"
19+
#include "tuning/layout_tuner.h"
2020
#include "catalog/catalog.h"
2121
#include "common/statement_cache_manager.h"
2222
#include "common/thread_pool.h"
@@ -62,13 +62,13 @@ void PelotonInit::Initialize() {
6262
if (settings::SettingsManager::GetBool(settings::SettingId::index_tuner)) {
6363
// Set the default visibility flag for all indexes to false
6464
index::IndexMetadata::SetDefaultVisibleFlag(false);
65-
auto &index_tuner = indextuner::IndexTuner::GetInstance();
65+
auto &index_tuner = tuning::IndexTuner::GetInstance();
6666
index_tuner.Start();
6767
}
6868

6969
// start layout tuner
7070
if (settings::SettingsManager::GetBool(settings::SettingId::layout_tuner)) {
71-
auto &layout_tuner = indextuner::LayoutTuner::GetInstance();
71+
auto &layout_tuner = tuning::LayoutTuner::GetInstance();
7272
layout_tuner.Start();
7373
}
7474

@@ -94,13 +94,13 @@ void PelotonInit::Initialize() {
9494
void PelotonInit::Shutdown() {
9595
// shut down index tuner
9696
if (settings::SettingsManager::GetBool(settings::SettingId::index_tuner)) {
97-
auto &index_tuner = indextuner::IndexTuner::GetInstance();
97+
auto &index_tuner = tuning::IndexTuner::GetInstance();
9898
index_tuner.Stop();
9999
}
100100

101101
// shut down layout tuner
102102
if (settings::SettingsManager::GetBool(settings::SettingId::layout_tuner)) {
103-
auto &layout_tuner = indextuner::LayoutTuner::GetInstance();
103+
auto &layout_tuner = tuning::LayoutTuner::GetInstance();
104104
layout_tuner.Stop();
105105
}
106106

‎src/include/storage/data_table.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ extern std::vector<peloton::oid_t> sdbench_column_ids;
3333

3434
namespace peloton {
3535

36-
namespace indextuner {
36+
namespace tuning {
3737
class Sample;
3838
} // namespace indextuner
3939

@@ -241,9 +241,9 @@ class DataTable : public AbstractTable {
241241
// LAYOUT TUNER
242242
//===--------------------------------------------------------------------===//
243243

244-
void RecordLayoutSample(const indextuner::Sample &sample);
244+
void RecordLayoutSample(const tuning::Sample &sample);
245245

246-
std::vector<indextuner::Sample> GetLayoutSamples();
246+
std::vector<tuning::Sample> GetLayoutSamples();
247247

248248
void ClearLayoutSamples();
249249

@@ -255,9 +255,9 @@ class DataTable : public AbstractTable {
255255
// INDEX TUNER
256256
//===--------------------------------------------------------------------===//
257257

258-
void RecordIndexSample(const indextuner::Sample &sample);
258+
void RecordIndexSample(const tuning::Sample &sample);
259259

260-
std::vector<indextuner::Sample> GetIndexSamples();
260+
std::vector<tuning::Sample> GetIndexSamples();
261261

262262
void ClearIndexSamples();
263263

@@ -418,13 +418,13 @@ class DataTable : public AbstractTable {
418418
column_map_type default_partition_;
419419

420420
// samples for layout tuning
421-
std::vector<indextuner::Sample> layout_samples_;
421+
std::vector<tuning::Sample> layout_samples_;
422422

423423
// layout samples mutex
424424
std::mutex layout_samples_mutex_;
425425

426426
// samples for layout tuning
427-
std::vector<indextuner::Sample> index_samples_;
427+
std::vector<tuning::Sample> index_samples_;
428428

429429
// index samples mutex
430430
std::mutex index_samples_mutex_;

‎src/include/indextuner/brain_util.h renamed to ‎src/include/tuning/brain_util.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
//
55
// brain_util.h
66
//
7-
// Identification: /peloton/src/include/indextuner/brain_util.h
7+
// Identification: /peloton/src/include/tuning/brain_util.h
88
//
99
// Copyright (c) 2015-2017, Carnegie Mellon University Database Group
1010
//
@@ -22,7 +22,7 @@
2222
#include "sample.h"
2323

2424
namespace peloton {
25-
namespace indextuner {
25+
namespace tuning {
2626

2727
/**
2828
* Brain Utility Functions
@@ -34,9 +34,9 @@ class BrainUtil {
3434
* It's a vector because there could be more multiple samples per table.
3535
* TableName -> Sample
3636
*/
37-
static std::unordered_map<std::string, std::vector<indextuner::Sample>> LoadSamplesFile(
37+
static std::unordered_map<std::string, std::vector<tuning::Sample>> LoadSamplesFile(
3838
const std::string file_path) {
39-
std::unordered_map<std::string, std::vector<indextuner::Sample>> samples;
39+
std::unordered_map<std::string, std::vector<tuning::Sample>> samples;
4040

4141
// Parse the input file line-by-line
4242
std::ifstream infile(file_path);
@@ -60,7 +60,7 @@ class BrainUtil {
6060
}
6161
std::transform(name.begin(), name.end(), name.begin(), ::tolower);
6262

63-
indextuner::Sample sample(columns, weight, indextuner::SampleType::ACCESS);
63+
tuning::Sample sample(columns, weight, tuning::SampleType::ACCESS);
6464
samples[name].push_back(sample);
6565

6666
} // WHILE

‎src/include/indextuner/clusterer.h renamed to ‎src/include/tuning/clusterer.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
//
55
// clusterer.h
66
//
7-
// Identification: src/include/indextuner/clusterer.h
7+
// Identification: src/include/tuning/clusterer.h
88
//
99
// Copyright (c) 2015-16, Carnegie Mellon University Database Group
1010
//
@@ -22,7 +22,7 @@
2222
#include "common/internal_types.h"
2323

2424
namespace peloton {
25-
namespace indextuner {
25+
namespace tuning {
2626

2727
#define NEW_SAMPLE_WEIGHT 0.01
2828

‎src/include/indextuner/index_tuner.h renamed to ‎src/include/tuning/index_tuner.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
//
55
// indextuner.h
66
//
7-
// Identification: src/include/indextuner/indextuner.h
7+
// Identification: src/include/tuning/indextuner.h
88
//
99
// Copyright (c) 2015-16, Carnegie Mellon University Database Group
1010
//
@@ -29,7 +29,7 @@ namespace storage {
2929
class DataTable;
3030
}
3131

32-
namespace indextuner {
32+
namespace tuning {
3333

3434
/**
3535
* Load statistics for Index Tuner from a file
@@ -224,7 +224,7 @@ class IndexTuner {
224224
*
225225
* @return The workload write ratio.
226226
*/
227-
double ComputeWorkloadWriteRatio(const std::vector<indextuner::Sample> &samples);
227+
double ComputeWorkloadWriteRatio(const std::vector<tuning::Sample> &samples);
228228

229229
void DropIndexes(storage::DataTable *table);
230230

‎src/include/indextuner/layout_tuner.h renamed to ‎src/include/tuning/layout_tuner.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
//
55
// layout_tuner.h
66
//
7-
// Identification: src/include/indextuner/layout_tuner.h
7+
// Identification: src/include/tuning/layout_tuner.h
88
//
99
// Copyright (c) 2015-16, Carnegie Mellon University Database Group
1010
//
@@ -27,7 +27,7 @@ namespace storage {
2727
class DataTable;
2828
}
2929

30-
namespace indextuner {
30+
namespace tuning {
3131

3232
//===--------------------------------------------------------------------===//
3333
// Layout Tuner

‎src/include/indextuner/sample.h renamed to ‎src/include/tuning/sample.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
//
55
// sample.h
66
//
7-
// Identification: src/include/indextuner/sample.h
7+
// Identification: src/include/tuning/sample.h
88
//
99
// Copyright (c) 2015-16, Carnegie Mellon University Database Group
1010
//
@@ -19,7 +19,7 @@
1919
#include "common/internal_types.h"
2020

2121
namespace peloton {
22-
namespace indextuner {
22+
namespace tuning {
2323

2424
#define DEFAULT_SAMPLE_WEIGHT 1.0
2525
#define DEFAULT_COLUMN_VALUE 0.5
@@ -176,8 +176,8 @@ class Sample : public Printable {
176176
namespace std {
177177

178178
template <>
179-
struct hash<peloton::indextuner::Sample> {
180-
size_t operator()(const peloton::indextuner::Sample &sample) const {
179+
struct hash<peloton::tuning::Sample> {
180+
size_t operator()(const peloton::tuning::Sample &sample) const {
181181
// Compute individual hash values using XOR and bit shifting:
182182
long hash = 31;
183183
auto columns = sample.GetColumnsAccessed();

‎src/main/sdbench/sdbench_workload.cpp

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
#include <unordered_map>
2121
#include <vector>
2222

23-
#include "indextuner/index_tuner.h"
24-
#include "indextuner/layout_tuner.h"
25-
#include "indextuner/sample.h"
23+
#include "tuning/index_tuner.h"
24+
#include "tuning/layout_tuner.h"
25+
#include "tuning/sample.h"
2626

2727
#include "benchmark/sdbench/sdbench_loader.h"
2828
#include "benchmark/sdbench/sdbench_workload.h"
@@ -99,10 +99,10 @@ oid_t sdbench_tuple_counter = -1000000;
9999
std::vector<oid_t> column_counts = {50, 500};
100100

101101
// Index tuner
102-
indextuner::IndexTuner &index_tuner = indextuner::IndexTuner::GetInstance();
102+
tuning::IndexTuner &index_tuner = tuning::IndexTuner::GetInstance();
103103

104104
// Layout tuner
105-
indextuner::LayoutTuner &layout_tuner = indextuner::LayoutTuner::GetInstance();
105+
tuning::LayoutTuner &layout_tuner = tuning::LayoutTuner::GetInstance();
106106

107107
// Predicate generator
108108
std::vector<std::vector<oid_t>> predicate_distribution;
@@ -381,7 +381,7 @@ static std::vector<double> GetColumnsAccessed(
381381
* @param selectivity The selectivity of the operation.
382382
*/
383383
static void ExecuteTest(std::vector<executor::AbstractExecutor *> &executors,
384-
indextuner::SampleType sample_type,
384+
tuning::SampleType sample_type,
385385
std::vector<std::vector<double>> index_columns_accessed,
386386
std::vector<std::vector<oid_t>> tuple_columns_accessed,
387387
UNUSED_ATTRIBUTE double selectivity) {
@@ -448,7 +448,7 @@ static void ExecuteTest(std::vector<executor::AbstractExecutor *> &executors,
448448

449449
// Record index sample
450450
for (auto &index_columns : index_columns_accessed) {
451-
indextuner::Sample index_access_sample(
451+
tuning::Sample index_access_sample(
452452
index_columns, duration / index_columns_accessed.size(), sample_type);
453453
// ???, selectivity);
454454
sdbench_table->RecordIndexSample(index_access_sample);
@@ -457,7 +457,7 @@ static void ExecuteTest(std::vector<executor::AbstractExecutor *> &executors,
457457
// Record layout sample
458458
for (auto &tuple_columns : tuple_columns_accessed) {
459459
// Record layout sample
460-
indextuner::Sample tuple_access_bitmap(GetColumnsAccessed(tuple_columns),
460+
tuning::Sample tuple_access_bitmap(GetColumnsAccessed(tuple_columns),
461461
duration / tuple_columns_accessed.size());
462462
sdbench_table->RecordLayoutSample(tuple_access_bitmap);
463463
}
@@ -808,7 +808,7 @@ static void JoinQueryHelper(
808808
auto selectivity = state.selectivity;
809809

810810
ExecuteTest(
811-
executors, indextuner::SampleType::ACCESS,
811+
executors, tuning::SampleType::ACCESS,
812812
{left_table_index_columns_accessed, right_table_index_columns_accessed},
813813
{left_table_tuple_columns_accessed, right_table_tuple_columns_accessed},
814814
selectivity);
@@ -966,7 +966,7 @@ static void AggregateQueryHelper(const std::vector<oid_t> &tuple_key_attrs,
966966
tuple_columns_accessed.push_back(column_id);
967967
}
968968

969-
ExecuteTest(executors, indextuner::SampleType::ACCESS, {index_columns_accessed},
969+
ExecuteTest(executors, tuning::SampleType::ACCESS, {index_columns_accessed},
970970
{tuple_columns_accessed}, selectivity);
971971

972972
auto result = txn_manager.CommitTransaction(txn);
@@ -1077,7 +1077,7 @@ static void UpdateHelper(const std::vector<oid_t> &tuple_key_attrs,
10771077
tuple_columns_accessed.push_back(update_attr);
10781078
}
10791079

1080-
ExecuteTest(executors, indextuner::SampleType::ACCESS, {index_columns_accessed},
1080+
ExecuteTest(executors, tuning::SampleType::ACCESS, {index_columns_accessed},
10811081
{tuple_columns_accessed}, selectivity);
10821082

10831083
auto result = txn_manager.CommitTransaction(txn);
@@ -1143,7 +1143,7 @@ static void InsertHelper() {
11431143
std::vector<double> index_columns_accessed;
11441144
double selectivity = 0;
11451145

1146-
ExecuteTest(executors, indextuner::SampleType::UPDATE, {{}}, {}, selectivity);
1146+
ExecuteTest(executors, tuning::SampleType::UPDATE, {{}}, {}, selectivity);
11471147

11481148
auto result = txn_manager.CommitTransaction(txn);
11491149

@@ -1473,8 +1473,8 @@ static void SDBenchHelper() {
14731473
predicate.end());
14741474
// double selectivity = state.selectivity;
14751475
double duration = rand() % 100;
1476-
indextuner::Sample index_access_sample(index_columns_accessed, duration,
1477-
indextuner::SampleType::ACCESS);
1476+
tuning::Sample index_access_sample(index_columns_accessed, duration,
1477+
tuning::SampleType::ACCESS);
14781478
// ??? , selectivity);
14791479
for (oid_t i = 0; i < state.analyze_sample_count_threshold; i++) {
14801480
sdbench_table->RecordIndexSample(index_access_sample);

‎src/storage/data_table.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
#include <mutex>
1414
#include <utility>
1515

16-
#include "indextuner/clusterer.h"
17-
#include "indextuner/sample.h"
16+
#include "tuning/clusterer.h"
17+
#include "tuning/sample.h"
1818
#include "catalog/foreign_key.h"
1919
#include "catalog/table_catalog.h"
2020
#include "catalog/trigger_catalog.h"
@@ -1317,15 +1317,15 @@ storage::TileGroup *DataTable::TransformTileGroup(
13171317
return new_tile_group.get();
13181318
}
13191319

1320-
void DataTable::RecordLayoutSample(const indextuner::Sample &sample) {
1320+
void DataTable::RecordLayoutSample(const tuning::Sample &sample) {
13211321
// Add layout sample
13221322
{
13231323
std::lock_guard<std::mutex> lock(layout_samples_mutex_);
13241324
layout_samples_.push_back(sample);
13251325
}
13261326
}
13271327

1328-
std::vector<indextuner::Sample> DataTable::GetLayoutSamples() {
1328+
std::vector<tuning::Sample> DataTable::GetLayoutSamples() {
13291329
{
13301330
std::lock_guard<std::mutex> lock(layout_samples_mutex_);
13311331
return layout_samples_;
@@ -1340,15 +1340,15 @@ void DataTable::ClearLayoutSamples() {
13401340
}
13411341
}
13421342

1343-
void DataTable::RecordIndexSample(const indextuner::Sample &sample) {
1343+
void DataTable::RecordIndexSample(const tuning::Sample &sample) {
13441344
// Add index sample
13451345
{
13461346
std::lock_guard<std::mutex> lock(index_samples_mutex_);
13471347
index_samples_.push_back(sample);
13481348
}
13491349
}
13501350

1351-
std::vector<indextuner::Sample> DataTable::GetIndexSamples() {
1351+
std::vector<tuning::Sample> DataTable::GetIndexSamples() {
13521352
{
13531353
std::lock_guard<std::mutex> lock(index_samples_mutex_);
13541354
return index_samples_;

‎src/indextuner/clusterer.cpp renamed to ‎src/tuning/clusterer.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
//
55
// clusterer.cpp
66
//
7-
// Identification: src/indextuner/clusterer.cpp
7+
// Identification: src/tuning/clusterer.cpp
88
//
99
// Copyright (c) 2015-16, Carnegie Mellon University Database Group
1010
//
@@ -16,13 +16,13 @@
1616
#include <iostream>
1717
#include <map>
1818

19-
#include "indextuner/clusterer.h"
19+
#include "tuning/clusterer.h"
2020
#include "common/logger.h"
2121
#include "common/macros.h"
2222
#include "util/string_util.h"
2323

2424
namespace peloton {
25-
namespace indextuner {
25+
namespace tuning {
2626

2727
// http://www.cs.princeton.edu/courses/archive/fall08/cos436/Duda/C/sk_means.htm
2828
void Clusterer::ProcessSample(const Sample &sample) {

0 commit comments

Comments
 (0)