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

Commit 92576a3

Browse files
pmenonapavlo
authored andcommitted
Small fixes
1 parent c43f6e1 commit 92576a3

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

src/include/index/index.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
#include <string>
1919
#include <vector>
2020

21+
#include "common/internal_types.h"
2122
#include "common/item_pointer.h"
2223
#include "common/logger.h"
2324
#include "common/printable.h"
24-
#include "common/internal_types.h"
2525
#include "type/value.h"
2626

2727
namespace peloton {
@@ -57,8 +57,6 @@ class ConjunctionScanPredicate;
5757
* mapping relation and does the conversion between tuple key and index key
5858
*/
5959
class IndexMetadata : public Printable {
60-
IndexMetadata() = delete;
61-
6260
public:
6361
IndexMetadata(std::string index_name, oid_t index_oid, oid_t table_oid,
6462
oid_t database_oid, IndexType index_type,

src/index/art_index.cpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -351,10 +351,11 @@ void ArtIndex::KeyConstructor::ConstructKey(const AbstractTuple &input_key,
351351
break;
352352
}
353353
default: {
354-
LOG_ERROR("Column type '%s' not supported in ART",
355-
TypeIdToString(column.GetType()).c_str());
356-
PL_ASSERT(false && "Unsupported key column type for ART index");
357-
__builtin_unreachable();
354+
auto error =
355+
StringUtil::Format("Column type '%s' not supported in ART index",
356+
TypeIdToString(column.GetType()).c_str());
357+
LOG_ERROR(error.c_str());
358+
throw IndexException{error};
358359
}
359360
}
360361
}

0 commit comments

Comments
 (0)