Skip to content

Commit d44127e

Browse files
Address reviewer comments
1 parent 8911bc9 commit d44127e

File tree

6 files changed

+14
-15
lines changed

6 files changed

+14
-15
lines changed

doc/api.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ Externals
5959
externals.stdio
6060

6161

62-
OmniSciDB Backend
63-
=================
62+
HeavyDB Backend
63+
===============
6464

6565
The table below contains the data structures available for the HeavyDB backend.
6666
It should be noticed that the following types are not regular Python types but

rbc/heavyai/array.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from rbc import typesystem, errors
77
from .buffer import (BufferPointer, Buffer,
88
OmnisciBufferType,
9-
omnisci_buffer_constructor)
9+
heavydb_buffer_constructor)
1010
from numba.core import extending, types
1111
from typing import Union, TypeVar
1212

@@ -135,7 +135,7 @@ def T(self):
135135
@extending.lower_builtin(Array, types.Integer, types.StringLiteral)
136136
@extending.lower_builtin(Array, types.Integer, types.NumberClass)
137137
def omnisci_array_constructor(context, builder, sig, args):
138-
return omnisci_buffer_constructor(context, builder, sig, args)
138+
return heavydb_buffer_constructor(context, builder, sig, args)
139139

140140

141141
@extending.type_callable(Array)

rbc/heavyai/buffer.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ class ArrayPointerModel(BufferPointerModel):
160160
"""
161161

162162

163-
def omnisci_buffer_constructor(context, builder, sig, args):
163+
def heavydb_buffer_constructor(context, builder, sig, args):
164164
"""
165165
166166
Usage:

rbc/heavyai/text_encoding_dict.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
'''Omnisci TextEncodingDict type that corresponds to Omnisci type TEXT ENCODED DICT.
1+
'''HeavyDB TextEncodingDict type that corresponds to HeavyDB type TEXT ENCODED DICT.
22
'''
33

44
__all__ = ['OmnisciTextEncodingDictType', 'TextEncodingDict']

rbc/heavyai/text_encoding_none.py

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
'''Omnisci TextEncodingNone type that corresponds to Omnisci type TEXT ENCODED NONE.
1+
'''HeavyDB TextEncodingNone type that corresponds to HeavyDB type TEXT ENCODED NONE.
22
'''
33

44
__all__ = ['TextEncodingNonePointer', 'TextEncodingNone', 'HeavyDBTextEncodingNoneType']
@@ -9,14 +9,14 @@
99
from rbc.errors import RequireLiteralValue
1010
from .buffer import (
1111
BufferPointer, Buffer, OmnisciBufferType,
12-
omnisci_buffer_constructor)
12+
heavydb_buffer_constructor)
1313
from numba.core import types, extending, cgutils
1414
from llvmlite import ir
1515
from typing import Union
1616

1717

1818
class HeavyDBTextEncodingNoneType(OmnisciBufferType):
19-
"""Omnisci TextEncodingNone type for RBC typesystem.
19+
"""HeavyDB TextEncodingNone type for RBC typesystem.
2020
"""
2121

2222
@property
@@ -118,20 +118,20 @@ def impl(a, b):
118118

119119

120120
@extending.lower_builtin(TextEncodingNone, types.Integer)
121-
def omnisci_text_encoding_none_constructor(context, builder, sig, args):
122-
return omnisci_buffer_constructor(context, builder, sig, args)
121+
def heavydb_text_encoding_none_constructor(context, builder, sig, args):
122+
return heavydb_buffer_constructor(context, builder, sig, args)
123123

124124

125125
@extending.lower_builtin(TextEncodingNone, types.StringLiteral)
126-
def omnisci_text_encoding_none_constructor_literal(context, builder, sig, args):
126+
def heavydb_text_encoding_none_constructor_literal(context, builder, sig, args):
127127
int64_t = ir.IntType(64)
128128
int8_t_ptr = ir.IntType(8).as_pointer()
129129

130130
literal_value = sig.args[0].literal_value
131131
sz = int64_t(len(literal_value))
132132

133133
# arr = {ptr, size, is_null}*
134-
arr = omnisci_buffer_constructor(context, builder, sig.return_type(types.int64), [sz])
134+
arr = heavydb_buffer_constructor(context, builder, sig.return_type(types.int64), [sz])
135135
ptr = builder.extract_value(builder.load(arr), [0])
136136

137137
msg_bytes = literal_value.encode('utf-8')
@@ -144,7 +144,7 @@ def omnisci_text_encoding_none_constructor_literal(context, builder, sig, args):
144144

145145

146146
@extending.type_callable(TextEncodingNone)
147-
def type_omnisci_text_encoding_none(context):
147+
def type_heavydb_text_encoding_none(context):
148148
def typer(arg):
149149
if isinstance(arg, types.UnicodeType):
150150
raise RequireLiteralValue()

rbc/tests/heavyai/test_text_encoding.py

-1
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,6 @@ def test_text_encoding_column_list2(heavydb, size):
227227
@pytest.mark.usefixtures("create_columns")
228228
@pytest.mark.parametrize("size", (32,))
229229
@pytest.mark.parametrize("num_cols", (1, 2, 3, 4))
230-
@pytest.mark.skip()
231230
def test_text_encoding_column_list3(heavydb, size, num_cols):
232231
heavydb.require_version((5, 7), "Requires heavydb-internal PR 5719")
233232

0 commit comments

Comments
 (0)