Skip to content

Commit 87908fe

Browse files
Refactor: rename method to be more accurate.
1 parent d4c1017 commit 87908fe

File tree

3 files changed

+27
-27
lines changed

3 files changed

+27
-27
lines changed

src/oracledb/base_impl.pxd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -448,8 +448,8 @@ cdef class OracleMetadata:
448448
ArrowSchemaImpl _schema_impl
449449
uint8_t _py_type_num
450450

451+
cdef int _create_arrow_schema(self) except -1
451452
cdef int _finalize_init(self) except -1
452-
cdef int _set_arrow_schema(self) except -1
453453
cdef OracleMetadata copy(self)
454454
@staticmethod
455455
cdef OracleMetadata from_arrow_schema(ArrowSchemaImpl schema_impl)

src/oracledb/impl/base/metadata.pyx

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -31,32 +31,9 @@
3131
@cython.freelist(30)
3232
cdef class OracleMetadata:
3333

34-
cdef int _finalize_init(self) except -1:
35-
"""
36-
Internal method that finalizes the initialization of metadata by
37-
setting the buffer size, max size and default Python type (if they have
38-
not already been set).
39-
"""
40-
if self.dbtype.default_size == 0:
41-
self.max_size = 0
42-
self.buffer_size = self.dbtype._buffer_size_factor
43-
else:
44-
if self.max_size == 0:
45-
self.max_size = self.dbtype.default_size
46-
self.buffer_size = self.max_size * self.dbtype._buffer_size_factor
47-
if self._py_type_num == 0:
48-
if self.dbtype._ora_type_num != ORA_TYPE_NUM_NUMBER:
49-
self._py_type_num = self.dbtype._default_py_type_num
50-
else:
51-
if self.scale == 0 or \
52-
(self.scale == -127 and self.precision == 0):
53-
self._py_type_num = PY_TYPE_NUM_INT
54-
else:
55-
self._py_type_num = PY_TYPE_NUM_FLOAT
56-
57-
cdef int _set_arrow_schema(self) except -1:
34+
cdef int _create_arrow_schema(self) except -1:
5835
"""
59-
Sets the Arrow schema given the metadata.
36+
Creates an Arrow schema for the metadata.
6037
"""
6138
cdef:
6239
ArrowType arrow_type, child_arrow_type = NANOARROW_TYPE_NA
@@ -131,6 +108,29 @@ cdef class OracleMetadata:
131108
child_arrow_type,
132109
)
133110

111+
cdef int _finalize_init(self) except -1:
112+
"""
113+
Internal method that finalizes the initialization of metadata by
114+
setting the buffer size, max size and default Python type (if they have
115+
not already been set).
116+
"""
117+
if self.dbtype.default_size == 0:
118+
self.max_size = 0
119+
self.buffer_size = self.dbtype._buffer_size_factor
120+
else:
121+
if self.max_size == 0:
122+
self.max_size = self.dbtype.default_size
123+
self.buffer_size = self.max_size * self.dbtype._buffer_size_factor
124+
if self._py_type_num == 0:
125+
if self.dbtype._ora_type_num != ORA_TYPE_NUM_NUMBER:
126+
self._py_type_num = self.dbtype._default_py_type_num
127+
else:
128+
if self.scale == 0 or \
129+
(self.scale == -127 and self.precision == 0):
130+
self._py_type_num = PY_TYPE_NUM_INT
131+
else:
132+
self._py_type_num = PY_TYPE_NUM_FLOAT
133+
134134
cdef OracleMetadata copy(self):
135135
"""
136136
Create a copy of the metadata and return it.

src/oracledb/impl/base/var.pyx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ cdef class BaseVarImpl:
253253
user.
254254
"""
255255
if self.metadata._schema_impl is None:
256-
self.metadata._set_arrow_schema()
256+
self.metadata._create_arrow_schema()
257257
self._arrow_array = ArrowArrayImpl.__new__(ArrowArrayImpl)
258258
self._arrow_array.populate_from_schema(self.metadata._schema_impl)
259259

0 commit comments

Comments
 (0)