Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(tianmu): To support volcano framwork #1543

Merged
merged 3 commits into from
Apr 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sql/sql_load.cc
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@

#include <algorithm>

#include "../storage/tianmu/handler/ha_my_tianmu.h" // tianmu code
#include "../storage/tianmu/sql/ha_my_tianmu.h" // tianmu code

using std::min;
using std::max;
Expand Down
2 changes: 1 addition & 1 deletion sql/sql_parse.cc
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
#include "rpl_group_replication.h"
#include <algorithm>

#include "../storage/tianmu/handler/ha_my_tianmu.h" // tianmu code
#include "../storage/tianmu/sql/ha_my_tianmu.h" // tianmu code
using std::max;

/**
Expand Down
2 changes: 1 addition & 1 deletion sql/sql_show.cc
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
#include <algorithm>
#include <functional>

#include "../storage/tianmu/handler/ha_my_tianmu.h" // TIANMU UPGRADE
#include "../storage/tianmu/sql/ha_my_tianmu.h" // TIANMU UPGRADE
using std::max;
using std::min;

Expand Down
19 changes: 18 additions & 1 deletion storage/tianmu/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,14 @@ AUX_SOURCE_DIRECTORY(base/core SOURCE_base_core)
AUX_SOURCE_DIRECTORY(base/fmt SOURCE_base_fmt)
AUX_SOURCE_DIRECTORY(base/net SOURCE_base_net)
AUX_SOURCE_DIRECTORY(base/util SOURCE_base_util)
AUX_SOURCE_DIRECTORY(optimizer SOURCE_optimizer)
AUX_SOURCE_DIRECTORY(optimizer/compile SOURCE_compile)
AUX_SOURCE_DIRECTORY(optimizer/iterators SOURCE_iterators)
AUX_SOURCE_DIRECTORY(optimizer/statistics SOURCE_statistics)
AUX_SOURCE_DIRECTORY(optimizer/plan SOURCE_plan)
AUX_SOURCE_DIRECTORY(executor SOURCE_executor)
AUX_SOURCE_DIRECTORY(data SOURCE_data)
AUX_SOURCE_DIRECTORY(sql SOURCE_sql)

SET(TIANMU_SOURCES ${SOURCE_common}
${SOURCE_compress}
Expand All @@ -72,7 +80,16 @@ SET(TIANMU_SOURCES ${SOURCE_common}
${SOURCE_base_core}
${SOURCE_base_fmt}
${SOURCE_base_net}
${SOURCE_base_util})
${SOURCE_base_util}
${SOURCE_optimizer}
${SOURCE_compile}
${SOURCE_iterators}
${SOURCE_statistics}
${SOURCE_plan}
${SOURCE_executor}
${SOURCE_data}
${SOURCE_sql}
)

MYSQL_ADD_PLUGIN(tianmu ${TIANMU_SOURCES}
STORAGE_ENGINE
Expand Down
2 changes: 1 addition & 1 deletion storage/tianmu/async_tests/task_executor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

#include "base/core/app_template.h"
#include "base/core/future.h"
#include "core/task_executor.h"
#include "executor/task_executor.h"

#ifndef DISABLE_USED_FOR_TIANMU
#include "core/engine.h"
Expand Down
2 changes: 1 addition & 1 deletion storage/tianmu/compress/basic_data_filt.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@

#include "compress/data_filt.h"
#include "compress/dictionary.h"
#include "core/bin_tools.h"
#include "core/quick_math.h"
#include "util/bin_tools.h"

namespace Tianmu {
namespace compress {
Expand Down
2 changes: 1 addition & 1 deletion storage/tianmu/compress/dictionary.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

#include <cstring>

#include "core/bin_tools.h"
#include "util/bin_tools.h"
#include "util/qsort.h"

namespace Tianmu {
Expand Down
2 changes: 1 addition & 1 deletion storage/tianmu/compress/num_compressor.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
#include "compress/range_code.h"
#include "compress/top_bit_dict.h"
#include "core/quick_math.h"
#include "core/tools.h"
#include "system/fet.h"
#include "util/tools.h"

namespace Tianmu {
namespace compress {
Expand Down
2 changes: 1 addition & 1 deletion storage/tianmu/compress/range_code.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include "common/assert.h"
#include "common/exception.h"
#include "compress/defs.h"
#include "core/bin_tools.h"
#include "util/bin_tools.h"

namespace Tianmu {
namespace compress {
Expand Down
2 changes: 1 addition & 1 deletion storage/tianmu/core/data_cache.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

#include "data_cache.h"

#include "core/tianmu_attr.h"
#include "vc/tianmu_attr.h"

namespace Tianmu {
namespace core {
Expand Down
2 changes: 1 addition & 1 deletion storage/tianmu/core/data_cache.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include <unordered_set>
#include <utility>

#include "core/pack.h"
#include "data/pack.h"

namespace Tianmu {
namespace core {
Expand Down
2 changes: 1 addition & 1 deletion storage/tianmu/core/delta_table.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@

#include "common/exception.h"
#include "core/delta_record_head.h"
#include "core/tianmu_attr.h"
#include "index/kv_store.h"
#include "rocksdb/db.h"
#include "rocksdb/iterator.h"
#include "rocksdb/slice.h"
#include "types/tianmu_data_types.h"
#include "util/bitset.h"
#include "vc/tianmu_attr.h"

namespace Tianmu {
namespace core {
Expand Down
6 changes: 3 additions & 3 deletions storage/tianmu/core/dimension_group.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
#define TIANMU_CORE_DIMENSION_GROUP_H_
#pragma once

#include "core/bin_tools.h"
#include "core/dimension_vector.h"
#include "core/filter.h"
#include "core/index_table.h"
#include "executor/filter.h"
#include "index/index_table.h"
#include "util/bin_tools.h"

namespace Tianmu {
namespace core {
Expand Down
6 changes: 3 additions & 3 deletions storage/tianmu/core/dimension_group_multiple.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@

#include <list>

#include "core/bin_tools.h"
#include "core/dimension_group.h"
#include "core/filter.h"
#include "core/index_table.h"
#include "executor/filter.h"
#include "index/index_table.h"
#include "util/bin_tools.h"

namespace Tianmu {
namespace core {
Expand Down
4 changes: 2 additions & 2 deletions storage/tianmu/core/engine.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,9 @@
#include "common/mysql_gate.h"
#include "core/delta_table.h"
#include "core/table_share.h"
#include "core/task_executor.h"
#include "core/temp_table.h"
#include "core/tools.h"
#include "core/transaction.h"
#include "executor/task_executor.h"
#include "mm/initializer.h"
#include "mm/memory_statistics.h"
#include "mysql/thread_pool_priv.h"
Expand All @@ -43,6 +42,7 @@
#include "util/bitset.h"
#include "util/fs.h"
#include "util/thread_pool.h"
#include "util/tools.h"

namespace Tianmu {
namespace DBHandler {
Expand Down
2 changes: 1 addition & 1 deletion storage/tianmu/core/engine.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@

#include "common/assert.h"
#include "common/exception.h"
#include "core/combined_iterator.h"
#include "core/data_cache.h"
#include "core/object_cache.h"
#include "core/query.h"
#include "core/table_share.h"
#include "core/temp_table.h"
#include "core/tianmu_table.h"
#include "executor/combined_iterator.h"
#include "exporter/data_exporter.h"
#include "exporter/export2file.h"
#include "index/tianmu_table_index.h"
Expand Down
7 changes: 5 additions & 2 deletions storage/tianmu/core/engine_execute.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,11 @@
#include <sys/syscall.h>
#include <time.h>

#include "core/compilation_tools.h"
#include "core/compiled_query.h"
#include "optimizer/compile//compiled_query.h"
#include "optimizer/compile/compilation_tools.h"
#include "optimizer/compile/compiler.h"
#include "optimizer/plan/query_plan.h"

#include "core/engine.h"
#include "core/query.h"
#include "core/transaction.h"
Expand Down
2 changes: 1 addition & 1 deletion storage/tianmu/core/ftree.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
#define TIANMU_CORE_FTREE_H_
#pragma once

#include "core/bin_tools.h"
#include "mm/traceable_object.h"
#include "types/tianmu_data_types.h"
#include "util/bin_tools.h"
#include "util/fs.h"

namespace Tianmu {
Expand Down
2 changes: 1 addition & 1 deletion storage/tianmu/core/hash_table.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@

#include "common/assert.h"
#include "core/hash_table.h"
#include "core/rough_multi_index.h"
#include "core/transaction.h"
#include "index/rough_multi_index.h"
#include "system/fet.h"

namespace Tianmu {
Expand Down
2 changes: 1 addition & 1 deletion storage/tianmu/core/hash_table.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
#include <vector>

#include "base/util/spinlock.h"
#include "core/bin_tools.h"
#include "mm/traceable_object.h"
#include "util/bin_tools.h"

namespace Tianmu {
namespace core {
Expand Down
2 changes: 1 addition & 1 deletion storage/tianmu/core/item_tianmu_field.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
#include "item_tianmu_field.h"

#include "common/assert.h"
#include "core/compilation_tools.h"
#include "core/quick_math.h"
#include "core/transaction.h"
#include "optimizer/compile/compilation_tools.h"

namespace Tianmu {
namespace core {
Expand Down
2 changes: 1 addition & 1 deletion storage/tianmu/core/item_tianmu_field.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
#include <set>

#include "common/common_definitions.h"
#include "core/data_type.h"
#include "core/value_or_null.h"
#include "core/var_id.h"
#include "types/data_type.h"

namespace Tianmu {
namespace core {
Expand Down
4 changes: 2 additions & 2 deletions storage/tianmu/core/joner_hash.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
#define TIANMU_CORE_JONER_HASH_H_
#pragma once

#include "core/joiner.h"
#include "core/joiner_hash_table.h"
#include "optimizer/joiner.h"
#include "optimizer/joiner_hash_table.h"

namespace Tianmu {
namespace core {
Expand Down
4 changes: 2 additions & 2 deletions storage/tianmu/core/just_a_table.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
#include "just_a_table.h"

#include "common/assert.h"
#include "core/cq_term.h"
#include "core/filter.h"
#include "core/temp_table.h"
#include "executor/filter.h"
#include "optimizer/compile/cq_term.h"

namespace Tianmu {
namespace core {
Expand Down
2 changes: 1 addition & 1 deletion storage/tianmu/core/mysql_expression.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
#include "mysql_expression.h"

#include "common/assert.h"
#include "core/compilation_tools.h"
#include "core/engine.h"
#include "core/transaction.h"
#include "item_timefunc.h"
#include "optimizer/compile/compilation_tools.h"
#include "types/value_parser4txt.h"

namespace Tianmu {
Expand Down
6 changes: 3 additions & 3 deletions storage/tianmu/core/parallel_hash_join.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@

#include "common/assert.h"
#include "core/engine.h"
#include "core/join_thread_table.h"
#include "core/joiner_hash.h"
#include "core/parallel_hash_join.h"
#include "core/proxy_hash_joiner.h"
#include "core/task_executor.h"
#include "core/temp_table.h"
#include "core/transaction.h"
#include "executor/join_thread_table.h"
#include "executor/task_executor.h"
#include "optimizer/joiner_hash.h"
#include "system/fet.h"
#include "util/thread_pool.h"
#include "vc/virtual_column.h"
Expand Down
6 changes: 3 additions & 3 deletions storage/tianmu/core/parallel_hash_join.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
#include <list>
#include <vector>

#include "core/column_bin_encoder.h"
#include "core/hash_table.h"
#include "core/joiner.h"
#include "core/multi_index_builder.h"
#include "index/multi_index_builder.h"
#include "optimizer/joiner.h"
#include "vc/column_bin_encoder.h"

namespace Tianmu {
namespace core {
Expand Down
12 changes: 6 additions & 6 deletions storage/tianmu/core/parameterized_filter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,17 @@

#include "parameterized_filter.h"

#include "core/condition_encoder.h"
#include "core/engine.h"
#include "core/joiner.h"
#include "core/mi_iterator.h"
#include "core/mi_updating_iterator.h"
#include "core/pack_orderer.h"
#include "core/query.h"
#include "core/rough_multi_index.h"
#include "core/temp_table.h"
#include "core/transaction.h"
#include "core/value_set.h"
#include "data/pack_orderer.h"
#include "index/rough_multi_index.h"
#include "optimizer/condition_encoder.h"
#include "optimizer/iterators/mi_iterator.h"
#include "optimizer/iterators/mi_updating_iterator.h"
#include "optimizer/joiner.h"
#include "util/thread_pool.h"
#include "vc/const_column.h"
#include "vc/const_expr_column.h"
Expand Down
8 changes: 4 additions & 4 deletions storage/tianmu/core/parameterized_filter.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@
#define TIANMU_CORE_PARAMETERIZED_FILTER_H_
#pragma once

#include "core/condition.h"
#include "core/cq_term.h"
#include "core/joiner.h"
#include "core/just_a_table.h"
#include "core/multi_index.h"
#include "index/multi_index.h"
#include "optimizer/compile/cq_term.h"
#include "optimizer/condition.h"
#include "optimizer/joiner.h"

namespace Tianmu {
namespace core {
Expand Down
10 changes: 5 additions & 5 deletions storage/tianmu/core/proxy_hash_joiner.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,16 @@
#include "base/util/defer.h"
#include "common/assert.h"
#include "common/exception.h"
#include "core/column_bin_encoder.h"
#include "core/engine.h"
#include "core/join_thread_table.h"
#include "core/mi_step_iterator.h"
#include "core/multi_index_builder.h"
#include "core/task_executor.h"
#include "core/temp_table.h"
#include "core/transaction.h"
#include "executor/join_thread_table.h"
#include "executor/task_executor.h"
#include "index/multi_index_builder.h"
#include "optimizer/iterators/mi_step_iterator.h"
#include "proxy_hash_joiner.h"
#include "system/fet.h"
#include "vc/column_bin_encoder.h"
#include "vc/virtual_column.h"

namespace Tianmu {
Expand Down
Loading