Store constants in cdef'ed globals in order to avoid the overhead of

getting the Python values from the module each and every time!

Author: anthony-tuininga

src/oracledb/impl/thin/constants.pxi

@@ -652,7 +652,6 @@ cdef enum:
  TNS_AUTH_MODE_CHANGE_PASSWORD = 0x00000002
  TNS_AUTH_MODE_SYSDBA = 0x00000020
  TNS_AUTH_MODE_SYSOPER = 0x00000040
- TNS_AUTH_MODE_PRELIM = 0x00000080
  TNS_AUTH_MODE_WITH_PASSWORD = 0x00000100
  TNS_AUTH_MODE_SYSASM = 0x00400000
  TNS_AUTH_MODE_SYSBKP = 0x01000000
@@ -794,12 +793,6 @@ cdef bytearray TNS_BASE64_ALPHABET_ARRAY = \
  bytearray(TNS_BASE64_ALPHABET)
 cdef bytes TNS_EXTENT_OID = bytes.fromhex('00000000000000000000000000010001')
 
-# purity types
-cdef enum:
- PURITY_DEFAULT = 0
- PURITY_NEW = 1
- PURITY_SELF = 2
-
 # timezone offsets
 cdef enum:
  TZ_HOUR_OFFSET = 20

src/oracledb/impl/thin/messages.pyx

@@ -1533,19 +1533,19 @@ cdef class AuthMessage(Message):
  # set authentication mode
  if params._new_password is None:
  self.auth_mode = TNS_AUTH_MODE_LOGON
- if params.mode & constants.AUTH_MODE_SYSDBA:
+ if params.mode & AUTH_MODE_SYSDBA:
  self.auth_mode |= TNS_AUTH_MODE_SYSDBA
- if params.mode & constants.AUTH_MODE_SYSOPER:
+ if params.mode & AUTH_MODE_SYSOPER:
  self.auth_mode |= TNS_AUTH_MODE_SYSOPER
- if params.mode & constants.AUTH_MODE_SYSASM:
+ if params.mode & AUTH_MODE_SYSASM:
  self.auth_mode |= TNS_AUTH_MODE_SYSASM
- if params.mode & constants.AUTH_MODE_SYSBKP:
+ if params.mode & AUTH_MODE_SYSBKP:
  self.auth_mode |= TNS_AUTH_MODE_SYSBKP
- if params.mode & constants.AUTH_MODE_SYSDGD:
+ if params.mode & AUTH_MODE_SYSDGD:
  self.auth_mode |= TNS_AUTH_MODE_SYSDGD
- if params.mode & constants.AUTH_MODE_SYSKMT:
+ if params.mode & AUTH_MODE_SYSKMT:
  self.auth_mode |= TNS_AUTH_MODE_SYSKMT
- if params.mode & constants.AUTH_MODE_SYSRAC:
+ if params.mode & AUTH_MODE_SYSRAC:
  self.auth_mode |= TNS_AUTH_MODE_SYSRAC
  if self.private_key is not None:
  self.auth_mode |= TNS_AUTH_MODE_IAM_TOKEN

src/oracledb/impl/thin/pool.pyx

@@ -75,7 +75,7 @@ cdef class ThinPoolImpl(BasePoolImpl):
  self._busy_conn_impls = []
  self._conn_impls_to_drop = []
  self._extra_conn_impls = []
- self._auth_mode = constants.AUTH_MODE_DEFAULT
+ self._auth_mode = AUTH_MODE_DEFAULT
  self._open = True
  self._condition = threading.Condition()
  self._bg_thread_condition = threading.Condition()
@@ -537,7 +537,7 @@ cdef class ThinPoolImpl(BasePoolImpl):
  """
  Internal method for getting the wait timeout for acquiring sessions.
  """
- if self._getmode == constants.POOL_GETMODE_TIMEDWAIT:
+ if self._getmode == POOL_GETMODE_TIMEDWAIT:
  return self._wait_timeout
  return 0
 
@@ -548,10 +548,9 @@ cdef class ThinPoolImpl(BasePoolImpl):
  """
  if self._getmode != value:
  self._getmode = value
- self._force_get = \
- (self._getmode == constants.POOL_GETMODE_FORCEGET)
- if self._getmode == constants.POOL_GETMODE_TIMEDWAIT \
- or self._getmode == constants.POOL_GETMODE_NOWAIT:
+ self._force_get = (self._getmode == POOL_GETMODE_FORCEGET)
+ if self._getmode == POOL_GETMODE_TIMEDWAIT \
+ or self._getmode == POOL_GETMODE_NOWAIT:
  self._wait_timeout = 0
  else:
  self._wait_timeout = None
@@ -584,9 +583,9 @@ cdef class ThinPoolImpl(BasePoolImpl):
  """
  Internal method for setting the wait timeout for acquiring sessions.
  """
- if self._getmode == constants.POOL_GETMODE_TIMEDWAIT:
+ if self._getmode == POOL_GETMODE_TIMEDWAIT:
  self._wait_timeout = value / 1000
- elif self._getmode == constants.POOL_GETMODE_NOWAIT:
+ elif self._getmode == POOL_GETMODE_NOWAIT:
  self._wait_timeout = 0
  else:
  self._wait_timeout = None

src/oracledb/thin_impl.pyx

@@ -86,13 +86,36 @@ from .base_impl import DB_TYPE_BINARY_INTEGER, DB_TYPE_CURSOR, DB_TYPE_OBJECT
 
 ctypedef unsigned char char_type
 
+# Python types
 cdef type PY_TYPE_DATE = datetime.date
 cdef type PY_TYPE_DATETIME = datetime.datetime
 cdef type PY_TYPE_DECIMAL = decimal.Decimal
 cdef type PY_TYPE_DB_OBJECT
 cdef type PY_TYPE_LOB
 cdef type PY_TYPE_TIMEDELTA = datetime.timedelta
 
+# authorization modes
+cdef uint32_t AUTH_MODE_DEFAULT = constants.AUTH_MODE_DEFAULT
+cdef uint32_t AUTH_MODE_SYSASM = constants.AUTH_MODE_SYSASM
+cdef uint32_t AUTH_MODE_SYSBKP = constants.AUTH_MODE_SYSBKP
+cdef uint32_t AUTH_MODE_SYSDBA = constants.AUTH_MODE_SYSDBA
+cdef uint32_t AUTH_MODE_SYSDGD = constants.AUTH_MODE_SYSDGD
+cdef uint32_t AUTH_MODE_SYSKMT = constants.AUTH_MODE_SYSKMT
+cdef uint32_t AUTH_MODE_SYSOPER = constants.AUTH_MODE_SYSOPER
+cdef uint32_t AUTH_MODE_SYSRAC = constants.AUTH_MODE_SYSRAC
+
+# purity values
+cdef uint8_t PURITY_DEFAULT = constants.PURITY_DEFAULT
+cdef uint8_t PURITY_NEW = constants.PURITY_NEW
+cdef uint8_t PURITY_SELF = constants.PURITY_SELF
+
+# pool get modes
+cdef uint32_t POOL_GETMODE_FORCEGET = constants.POOL_GETMODE_FORCEGET
+cdef uint32_t POOL_GETMODE_NOWAIT = constants.POOL_GETMODE_NOWAIT
+cdef uint32_t POOL_GETMODE_WAIT = constants.POOL_GETMODE_WAIT
+cdef uint32_t POOL_GETMODE_TIMEDWAIT = constants.POOL_GETMODE_TIMEDWAIT
+
+# flag whether the cryptography package exists
 cdef bint HAS_CRYPTOGRAPHY = True
 
 include "impl/thin/constants.pxi"