Various performance improvements.

Author: anthony-tuininga

doc/src/release_notes.rst

@@ -37,6 +37,7 @@ Common Changes
     columns which have the check constraint ``IS JSON FORMAT OSON`` enabled.
 #)  Added boolean property :data:`FetchInfo.is_oson` which is set when a column
     has the check constraint "IS JSON FORMAT OSON" enabled.
+#)  A number of performance improvements were made.
 #)  Error ``DPY-2045: arraysize must be an integer greater than zero`` is now
     raised when an invalid value is specified for the attribute
     :data:`Cursor.arraysize`. Previously a variety of errors (``TypeError``,

src/oracledb/base_impl.pxd

@@ -43,6 +43,9 @@ cdef enum:
     NUM_TYPE_STR = 3
 
 cdef enum:
+    DB_TYPE_NUM_MIN = 2000
+    DB_TYPE_NUM_MAX = 2032
+
     DB_TYPE_NUM_BFILE = 2020
     DB_TYPE_NUM_BINARY_DOUBLE = 2008
     DB_TYPE_NUM_BINARY_FLOAT = 2007
@@ -74,6 +77,21 @@ cdef enum:
     DB_TYPE_NUM_VARCHAR = 2001
     DB_TYPE_NUM_XMLTYPE = 2032
 
+cdef enum:
+    NATIVE_TYPE_NUM_BOOLEAN = 3011
+    NATIVE_TYPE_NUM_BYTES = 3004
+    NATIVE_TYPE_NUM_DOUBLE = 3003
+    NATIVE_TYPE_NUM_FLOAT = 3002
+    NATIVE_TYPE_NUM_INTERVAL_DS = 3006
+    NATIVE_TYPE_NUM_INTERVAL_YM = 3007
+    NATIVE_TYPE_NUM_INT64 = 3000
+    NATIVE_TYPE_NUM_JSON = 3013
+    NATIVE_TYPE_NUM_LOB = 3008
+    NATIVE_TYPE_NUM_OBJECT = 3009
+    NATIVE_TYPE_NUM_ROWID = 3012
+    NATIVE_TYPE_NUM_STMT = 3010
+    NATIVE_TYPE_NUM_TIMESTAMP = 3005
+
 cdef enum:
     CS_FORM_IMPLICIT = 1
     CS_FORM_NCHAR = 2
@@ -100,6 +118,7 @@ cdef class DbType:
         readonly uint32_t num
         readonly str name
         readonly uint32_t default_size
+        uint32_t _native_num
         uint32_t _buffer_size_factor
         str _ora_name
         uint8_t _ora_type_num
@@ -115,6 +134,18 @@ cdef class DbType:
     cdef DbType _from_ora_type_and_csfrm(uint8_t ora_type_num, uint8_t csfrm)
 
 
+cdef class DefaultsImpl:
+    cdef:
+        public uint32_t arraysize
+        public str config_dir
+        public bint fetch_lobs
+        public bint fetch_decimals
+        public uint32_t prefetchrows
+        public uint32_t stmtcachesize
+
+cdef DefaultsImpl C_DEFAULTS
+
+
 cdef class Buffer:
     cdef:
         ssize_t _max_size, _size, _pos
@@ -426,6 +457,7 @@ cdef class BaseConnImpl:
 
     cdef object _check_value(self, DbType dbtype, BaseDbObjectTypeImpl objtype,
                              object value, bint* is_ok)
+    cdef BaseCursorImpl _create_cursor_impl(self)
 
 
 cdef class BasePoolImpl:
@@ -450,6 +482,7 @@ cdef class BaseCursorImpl:
         public object outputtypehandler
         public object rowfactory
         public bint scrollable
+        public bint set_input_sizes
         public list fetch_info_impls
         public list fetch_vars
         public list fetch_var_impls
@@ -474,9 +507,10 @@ cdef class BaseCursorImpl:
                                       uint32_t row_num,
                                       bint defer_type_assignment) except -1
     cdef int _close(self, bint in_del) except -1
-    cdef int _create_fetch_var(self, object conn, object cursor,
-                               object type_handler, bint uses_fetch_info,
-                               ssize_t pos, FetchInfoImpl fetch_info) except -1
+    cdef BaseVarImpl _create_fetch_var(self, object conn, object cursor,
+                                       object type_handler, bint
+                                       uses_fetch_info, ssize_t pos,
+                                       FetchInfoImpl fetch_info)
     cdef object _create_row(self)
     cdef BaseVarImpl _create_var_impl(self, object conn)
     cdef int _fetch_rows(self, object cursor) except -1
@@ -486,8 +520,11 @@ cdef class BaseCursorImpl:
     cdef int _init_fetch_vars(self, uint32_t num_columns) except -1
     cdef bint _is_plsql(self)
     cdef int _perform_binds(self, object conn, uint32_t num_execs) except -1
+    cdef int _prepare(self, str statement, str tag,
+                      bint cache_statement) except -1
     cdef int _reset_bind_vars(self, uint32_t num_rows) except -1
     cdef int _verify_var(self, object var) except -1
+    cdef int bind_one(self, object cursor, object parameters) except -1
 
 
 cdef class FetchInfoImpl:

src/oracledb/base_impl.pyx

@@ -56,7 +56,6 @@ cydatetime.import_datetime()
 include "impl/base/types.pyx"
 
 from . import constants, errors, exceptions, utils
-from .defaults import defaults
 
 cdef type PY_TYPE_ASYNC_CURSOR
 cdef type PY_TYPE_ASYNC_LOB
@@ -86,6 +85,7 @@ cdef int get_preferred_num_type(int16_t precision, int8_t scale):
 
 
 include "impl/base/constants.pxi"
+include "impl/base/defaults.pyx"
 include "impl/base/utils.pyx"
 include "impl/base/buffer.pyx"
 include "impl/base/oson.pyx"

src/oracledb/cursor.py

@@ -34,28 +34,22 @@
 from . import __name__ as MODULE_NAME
 from . import errors
 from . import connection as connection_module
-from .defaults import defaults
 from .fetch_info import FetchInfo
 from .var import Var
 from .base_impl import DbType, DB_TYPE_OBJECT
 from .dbobject import DbObjectType
 
 
 class BaseCursor:
+    _impl = None
+
     def __init__(
         self,
         connection: "connection_module.Connection",
         scrollable: bool = False,
     ) -> None:
-        self._impl = None
         self.connection = connection
-        self.statement = None
-        self._set_input_sizes = False
-        self._impl = connection._impl.create_cursor_impl()
-        self._impl.scrollable = scrollable
-        self._impl.arraysize = defaults.arraysize
-        self._impl.prefetchrows = defaults.prefetchrows
-        self._fetch_infos = None
+        self._impl = connection._impl.create_cursor_impl(scrollable)
 
     def __del__(self):
         if self._impl is not None:
@@ -124,58 +118,16 @@ def _prepare(
         """
         Internal method used for preparing a statement for execution.
         """
-        self._impl.fetch_vars = None
-        if not self._set_input_sizes:
-            self._impl.bind_vars = None
-            self._impl.bind_vars_by_name = None
-            self._impl.bind_style = None
         self._impl.prepare(statement, tag, cache_statement)
-        self.statement = statement
-        self._impl.rowfactory = None
-        self._fetch_infos = None
 
     def _prepare_for_execute(self, statement, parameters, keyword_parameters):
         """
         Internal method for preparing a statement for execution.
         """
-
-        # verify parameters
-        if statement is None and self.statement is None:
-            errors._raise_err(errors.ERR_NO_STATEMENT)
-        if keyword_parameters:
-            if parameters:
-                errors._raise_err(errors.ERR_ARGS_AND_KEYWORD_ARGS)
-            parameters = keyword_parameters
-        elif parameters is not None and not isinstance(
-            parameters, (list, tuple, dict)
-        ):
-            errors._raise_err(errors.ERR_WRONG_EXECUTE_PARAMETERS_TYPE)
         self._verify_open()
-        impl = self._impl
-        bind_vars = impl.bind_vars
-        bind_style = impl.bind_style
-        prepare_needed = statement and statement != self.statement
-        if (
-            not (prepare_needed and not self._set_input_sizes)
-            and bind_vars is not None
-            and parameters is not None
-        ):
-            if (
-                bind_style is dict
-                and not isinstance(parameters, dict)
-                or bind_style is not dict
-                and isinstance(parameters, dict)
-            ):
-                errors._raise_err(errors.ERR_MIXED_POSITIONAL_AND_NAMED_BINDS)
-
-        # prepare statement, if necessary
-        if prepare_needed:
-            self._prepare(statement)
-
-        # perform bind and execute
-        self._set_input_sizes = False
-        if parameters is not None:
-            impl.bind_one(self, parameters)
+        self._impl._prepare_for_execute(
+            self, statement, parameters, keyword_parameters
+        )
 
     def _verify_fetch(self) -> None:
         """
@@ -265,7 +217,7 @@ def bindnames(self) -> list:
         that a statement must have been prepared first.
         """
         self._verify_open()
-        if self.statement is None:
+        if self._impl.statement is None:
             errors._raise_err(errors.ERR_NO_STATEMENT_PREPARED)
         return self._impl.get_bind_names()
 
@@ -300,11 +252,10 @@ def description(self) -> tuple:
         cursor has not had an operation invoked via the execute() method yet.
         """
         self._verify_open()
-        if self._fetch_infos is None and self._impl.is_query(self):
-            self._fetch_infos = [
+        if self._impl.is_query(self):
+            return [
                 FetchInfo._from_impl(i) for i in self._impl.fetch_info_impls
             ]
-        return self._fetch_infos
 
     @property
     def fetchvars(self) -> list:
@@ -314,7 +265,7 @@ def fetchvars(self) -> list:
         attribute. In particular, elements should not be removed or replaced.
         """
         self._verify_open()
-        return self._impl.fetch_vars
+        return self._impl.get_fetch_vars()
 
     def getarraydmlrowcounts(self) -> list:
         """
@@ -491,9 +442,7 @@ def setinputsizes(self, *args: Any, **kwargs: Any) -> Union[list, dict]:
             errors._raise_err(errors.ERR_ARGS_AND_KEYWORD_ARGS)
         elif args or kwargs:
             self._verify_open()
-            self._impl.setinputsizes(self.connection, args, kwargs)
-            self._set_input_sizes = True
-            return self._impl.get_bind_vars()
+            return self._impl.setinputsizes(self.connection, args, kwargs)
         return []
 
     def setoutputsize(self, size: int, column: int = 0) -> None:
@@ -503,6 +452,14 @@ def setoutputsize(self, size: int, column: int = 0) -> None:
         """
         pass
 
+    @property
+    def statement(self) -> Union[str, None]:
+        """
+        Returns the statement associated with the cursor, if one is present.
+        """
+        if self._impl is not None:
+            return self._impl.statement
+
     def var(
         self,
         typ: Union[DbType, DbObjectType, type],
@@ -741,7 +698,6 @@ def execute(
         """
         self._prepare_for_execute(statement, parameters, keyword_parameters)
         impl = self._impl
-        impl.warning = None
         impl.execute(self)
         if impl.fetch_vars is not None:
             return self
@@ -789,18 +745,18 @@ def executemany(
         bound as numbers or dates will raise a TypeError exception.
         """
         # verify parameters
-        if statement is None and self.statement is None:
+        if statement is None and self._impl.statement is None:
             errors._raise_err(errors.ERR_NO_STATEMENT)
         if not isinstance(parameters, (list, int)):
             errors._raise_err(errors.ERR_WRONG_EXECUTEMANY_PARAMETERS_TYPE)
 
         # prepare statement, if necessary
         self._verify_open()
-        if statement and statement != self.statement:
+        if statement and statement != self._impl.statement:
             self._prepare(statement)
 
         # perform bind and execute
-        self._set_input_sizes = False
+        self._impl.set_input_sizes = False
         if isinstance(parameters, int):
             num_execs = parameters
         else:
@@ -1010,7 +966,6 @@ async def execute(
         TypeError exception.
         """
         self._prepare_for_execute(statement, parameters, keyword_parameters)
-        self._impl.warning = None
         await self._impl.execute(self)
 
     async def executemany(
@@ -1056,18 +1011,18 @@ async def executemany(
         bound as numbers or dates will raise a TypeError exception.
         """
         # verify parameters
-        if statement is None and self.statement is None:
+        if statement is None and self._impl.statement is None:
             errors._raise_err(errors.ERR_NO_STATEMENT)
         if not isinstance(parameters, (list, int)):
             errors._raise_err(errors.ERR_WRONG_EXECUTEMANY_PARAMETERS_TYPE)
 
         # prepare statement, if necessary
         self._verify_open()
-        if statement and statement != self.statement:
+        if statement and statement != self._impl.statement:
             self._prepare(statement)
 
         # perform bind and execute
-        self._set_input_sizes = False
+        self._impl.set_input_sizes = False
         if isinstance(parameters, int):
             num_execs = parameters
         else: