You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by an...@apache.org on 2017/09/07 01:55:17 UTC
[23/30] incubator-trafodion git commit: TRAFODION-2731 CodeCleanup:
Remove obsolete, legacy and unused code
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/cli/sqlcli.h
----------------------------------------------------------------------
diff --git a/core/sql/cli/sqlcli.h b/core/sql/cli/sqlcli.h
index 4366de9..a27d942 100644
--- a/core/sql/cli/sqlcli.h
+++ b/core/sql/cli/sqlcli.h
@@ -33,27 +33,17 @@
******************************************************************************
*/
-
-#ifdef __gnu_linux__
-#endif /* __gnu_linux__ */
-
/* Size specific types used here */
typedef int Int32;
typedef unsigned int UInt32;
-#if defined(NA_LINUX) && defined(NA_64BIT)
+#if defined(NA_64BIT)
typedef long Int64;
#else
typedef long long int Int64;
#endif
#undef SQLCLI_LIB_FUNC
-
- #define SQLCLI_LIB_FUNC
-#ifdef NA_64BIT
- /* dg64 - get rid of __declspec */
- #undef SQLCLI_LIB_FUNC
- #define SQLCLI_LIB_FUNC
-#endif
+#define SQLCLI_LIB_FUNC
#ifdef __cplusplus
extern "C"
@@ -882,7 +872,6 @@ enum SQLSTATS_TYPE {
SQLCLI_NO_STATS = 0,
/* SQLCLI_DEFAULT_STATS means the statistics is merged based on the statistics view type */
SQLCLI_DEFAULT_STATS = 0,
- SQLCLI_MEASURE_STATS = 1,
SQLCLI_ACCUMULATED_STATS = 2,
SQLCLI_PERTABLE_STATS = 3,
SQLCLI_ALL_STATS = 4,
@@ -1306,38 +1295,30 @@ typedef struct {
};
} SQL_QIKEY;
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_AddModule (
- /*IN*/ SQLMODULE_ID * module_name);
-
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_ADDMODULE (
- /*IN*/ SQLMODULE_ID * module_name);
-
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_AllocDesc (
+Int32 SQL_EXEC_AllocDesc (
/*INOUT*/ SQLDESC_ID * desc_id,
/*IN OPTIONAL*/ SQLDESC_ID * input_descriptor);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_ALLOCDESC (
+Int32 SQL_EXEC_ALLOCDESC (
/*INOUT*/ SQLDESC_ID * desc_id,
/*IN OPTIONAL*/ SQLDESC_ID * input_descriptor);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_AllocDescBasic (
+Int32 SQL_EXEC_AllocDescBasic (
/*INOUT*/ SQLDESC_ID * desc_id,
/*IN OPTIONAL*/ Int32 max_entries);
-
-
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_AssocFileNumber (
+Int32 SQL_EXEC_AssocFileNumber (
/*IN*/ SQLSTMT_ID * statement_id,
/*IN*/ short file_number);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_ASSOCFILENUMBER (
+Int32 SQL_EXEC_ASSOCFILENUMBER (
/*IN*/ SQLSTMT_ID * statement_id,
/*IN*/ short file_number);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetDiskMaxSize (
+Int32 SQL_EXEC_GetDiskMaxSize (
/*IN*/ char *volname,
/*OUT*/ Int64 *totalCapacity,
/*OUT*/ Int64 *totalFreespace);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetListOfDisks (
+Int32 SQL_EXEC_GetListOfDisks (
/*IN/OUT*/ char *diskBuf,
/* OUT */ Int32 *numTSEs,
/* OUT */ Int32 *maxTSELength,
@@ -1345,146 +1326,136 @@ SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetListOfDisks (
);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_AllocStmt (
+Int32 SQL_EXEC_AllocStmt (
/*INOUT*/ SQLSTMT_ID * new_statement_id,
/*IN OPTIONAL*/ SQLSTMT_ID * cloned_statement);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_ALLOCSTMT (
+Int32 SQL_EXEC_ALLOCSTMT (
/*INOUT*/ SQLSTMT_ID * new_statement_id,
/*IN OPTIONAL*/ SQLSTMT_ID * cloned_statement);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_AllocStmtForRS (
+Int32 SQL_EXEC_AllocStmtForRS (
/*IN*/ SQLSTMT_ID *callStmtId,
/*IN*/ Int32 resultSetIndex,
/*INOUT*/ SQLSTMT_ID *resultSetStmtId);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_ALLOCSTMTFORRS (
+Int32 SQL_EXEC_ALLOCSTMTFORRS (
/*IN*/ SQLSTMT_ID *callStmtId,
/*IN*/ Int32 resultSetIndex,
/*INOUT*/ SQLSTMT_ID *resultSetStmtId);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_ClearDiagnostics (/*IN*/ SQLSTMT_ID *statement_id);
+Int32 SQL_EXEC_ClearDiagnostics (/*IN*/ SQLSTMT_ID *statement_id);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_CLEARDIAGNOSTICS (/*IN*/ SQLSTMT_ID *statement_id);
+Int32 SQL_EXEC_CLEARDIAGNOSTICS (/*IN*/ SQLSTMT_ID *statement_id);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_CLI_VERSION ();
+Int32 SQL_EXEC_CLI_VERSION ();
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_CloseStmt (
+Int32 SQL_EXEC_CloseStmt (
/*IN*/ SQLSTMT_ID * statement_id);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_CLOSESTMT (
+Int32 SQL_EXEC_CLOSESTMT (
/*IN*/ SQLSTMT_ID * statement_id);
-SQLCLI_LIB_FUNC
Int32 SQL_EXEC_CreateContext(/*OUT*/ SQLCTX_HANDLE * context_handle,
/*IN OPTIONAL*/ char* sqlAuthId,
/*IN OPTIONAL*/ Int32 suppressAutoXactStart);
-SQLCLI_LIB_FUNC
Int32 SQL_EXEC_CREATECONTEXT(/*OUT*/ SQLCTX_HANDLE * context_handle,
/*IN OPTIONAL*/ char* sqlAuthId,
/*IN OPTIONAL*/ Int32 suppressAutoXactStart);
-SQLCLI_LIB_FUNC
Int32 SQL_EXEC_CurrentContext(/*OUT*/ SQLCTX_HANDLE * contextHandle);
-SQLCLI_LIB_FUNC
Int32 SQL_EXEC_CURRENTCONTEXT(/*OUT*/ SQLCTX_HANDLE * contextHandle);
-SQLCLI_LIB_FUNC
Int32 SQL_EXEC_DeleteContext(/*IN*/ SQLCTX_HANDLE contextHandle);
-SQLCLI_LIB_FUNC
Int32 SQL_EXEC_DELETECONTEXT(/*IN*/ SQLCTX_HANDLE contextHandle);
-SQLCLI_LIB_FUNC
Int32 SQL_EXEC_ResetContext(/*IN*/ SQLCTX_HANDLE contextHandle, /*IN*/ void *contextMsg);
-SQLCLI_LIB_FUNC
Int32 SQL_EXEC_RESETCONTEXT(/*IN*/ SQLCTX_HANDLE contextHandle, /*IN*/ void *contextMsg);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_DeallocDesc (
+Int32 SQL_EXEC_DeallocDesc (
/*IN*/ SQLDESC_ID * desc_id );
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_DEALLOCDESC (
+Int32 SQL_EXEC_DEALLOCDESC (
/*IN*/ SQLDESC_ID * desc_id );
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_DeallocStmt (
+Int32 SQL_EXEC_DeallocStmt (
/*IN*/ SQLSTMT_ID * statement_id);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_DEALLOCSTMT (
+Int32 SQL_EXEC_DEALLOCSTMT (
/*IN*/ SQLSTMT_ID * statement_id);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_DefineDesc (
+Int32 SQL_EXEC_DefineDesc (
/*IN*/ SQLSTMT_ID * statement_id,
/*IN* (SQLWHAT_DESC) */ Int32 what_descriptor,
/*IN*/ SQLDESC_ID * sql_descriptor);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_DEFINEDESC (
+Int32 SQL_EXEC_DEFINEDESC (
/*IN*/ SQLSTMT_ID * statement_id,
/*IN* (SQLWHAT_DESC) */ Int32 what_descriptor,
/*IN*/ SQLDESC_ID * sql_descriptor);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_DescribeStmt (
+Int32 SQL_EXEC_DescribeStmt (
/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
/*IN OPTIONAL*/ SQLDESC_ID * output_descriptor);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_DESCRIBESTMT (
+Int32 SQL_EXEC_DESCRIBESTMT (
/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
/*IN OPTIONAL*/ SQLDESC_ID * output_descriptor);
-SQLCLI_LIB_FUNC
Int32 SQL_EXEC_DisassocFileNumber(/*IN*/ SQLSTMT_ID * statement_id);
-SQLCLI_LIB_FUNC
Int32 SQL_EXEC_DISASSOCFILENUMBER(/*IN*/ SQLSTMT_ID * statement_id);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_DropContext (
+Int32 SQL_EXEC_DropContext (
/*IN*/ SQLCTX_HANDLE context_handle );
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_DROPCONTEXT (
+Int32 SQL_EXEC_DROPCONTEXT (
/*IN*/ SQLCTX_HANDLE context_handle );
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_Exec (
+Int32 SQL_EXEC_Exec (
/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
/*IN*/ Int32 num_ptr_pairs,
...);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_EXEC (
+Int32 SQL_EXEC_EXEC (
/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
/*IN*/ Int32 num_ptr_pairs,
/*IN*/ struct SQLCLI_PTR_PAIRS ptr_pairs[]);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_ExecClose (
+Int32 SQL_EXEC_ExecClose (
/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
/*IN*/ Int32 num_ptr_pairs,
...);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_EXECCLOSE (
+Int32 SQL_EXEC_EXECCLOSE (
/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
/*IN*/ Int32 num_ptr_pairs,
/*IN*/ struct SQLCLI_PTR_PAIRS ptr_pairs[]);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_ExecDirect(
+Int32 SQL_EXEC_ExecDirect(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN*/ SQLDESC_ID * sql_source,
/*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
/*IN*/ Int32 num_ptr_pairs,
...);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_ExecDirect2(
+Int32 SQL_EXEC_ExecDirect2(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN*/ SQLDESC_ID * sql_source,
/*IN*/ Int32 prepFlags,
@@ -1492,40 +1463,40 @@ SQLCLI_LIB_FUNC Int32 SQL_EXEC_ExecDirect2(
/*IN*/ Int32 num_ptr_pairs,
...
);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_EXECDIRECT (
+Int32 SQL_EXEC_EXECDIRECT (
/*IN*/ SQLSTMT_ID * statement_id,
/*IN*/ SQLDESC_ID * sql_source,
/*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
/*IN*/ Int32 num_ptr_pairs,
/*IN*/ struct SQLCLI_PTR_PAIRS ptr_pairs[]);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_ExecDirectDealloc(
+Int32 SQL_EXEC_ExecDirectDealloc(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN*/ SQLDESC_ID * sql_source,
/*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
/*IN*/ Int32 num_ptr_pairs,
...);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_EXECDIRECTDEALLOC(
+Int32 SQL_EXEC_EXECDIRECTDEALLOC(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN*/ SQLDESC_ID * sql_source,
/*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
/*IN*/ Int32 num_ptr_pairs,
/*IN*/ struct SQLCLI_PTR_PAIRS ptr_pairs[]);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_ExecFetch(
+Int32 SQL_EXEC_ExecFetch(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
/*IN*/ Int32 num_ptr_pairs,
...);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_EXECFETCH(
+Int32 SQL_EXEC_EXECFETCH(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
/*IN*/ Int32 num_ptr_pairs,
/*IN*/ struct SQLCLI_PTR_PAIRS ptr_pairs[]);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_ClearExecFetchClose(
+Int32 SQL_EXEC_ClearExecFetchClose(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
/*IN OPTIONAL*/ SQLDESC_ID * output_descriptor,
@@ -1534,7 +1505,7 @@ SQLCLI_LIB_FUNC Int32 SQL_EXEC_ClearExecFetchClose(
/*IN*/ Int32 num_total_ptr_pairs,
...);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_CLEAREXECFETCHCLOSE(
+Int32 SQL_EXEC_CLEAREXECFETCHCLOSE(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
/*IN OPTIONAL*/ SQLDESC_ID * output_descriptor,
@@ -1544,63 +1515,63 @@ SQLCLI_LIB_FUNC Int32 SQL_EXEC_CLEAREXECFETCHCLOSE(
/*IN*/ struct SQLCLI_PTR_PAIRS input_ptr_pairs[],
/*IN*/ struct SQLCLI_PTR_PAIRS output_ptr_pairs[]);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_Fetch(
+Int32 SQL_EXEC_Fetch(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * output_descriptor,
/*IN*/ Int32 num_ptr_pairs,
...);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_FETCH(
+Int32 SQL_EXEC_FETCH(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * output_descriptor,
/*IN*/ Int32 num_ptr_pairs,
/*IN*/ struct SQLCLI_PTR_PAIRS ptr_pairs[]);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_FetchClose(
+Int32 SQL_EXEC_FetchClose(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * output_descriptor,
/*IN*/ Int32 num_ptr_pairs,
...);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_FETCHCLOSE(
+Int32 SQL_EXEC_FETCHCLOSE(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * output_descriptor,
/*IN*/ Int32 num_ptr_pairs,
/*IN*/ struct SQLCLI_PTR_PAIRS ptr_pairs[]);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_FetchMultiple(/*IN*/ SQLSTMT_ID * statement_id,
+Int32 SQL_EXEC_FetchMultiple(/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * output_descriptor,
/*IN*/ Int32 rowset_size,
/*IN*/ Int32 * rowset_status_ptr,
/*OUT*/ Int32 * rowset_nfetched,
/*IN*/ Int32 num_quadruple_fields,
...);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_FETCHMULTIPLE(/*IN*/ SQLSTMT_ID * statement_id,
+Int32 SQL_EXEC_FETCHMULTIPLE(/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * output_descriptor,
/*IN*/ Int32 rowset_size,
/*IN*/ Int32 * rowset_status_ptr,
/*OUT*/ Int32 * rowset_nfetched,
/*IN*/ Int32 num_quadruple_fields,
/*IN*/ struct SQLCLI_QUAD_FIELDS quad_fields[]);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_Cancel (
+Int32 SQL_EXEC_Cancel (
/*IN OPTIONAL*/ SQLSTMT_ID * statement_id);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_CANCEL (
+Int32 SQL_EXEC_CANCEL (
/*IN OPTIONAL*/ SQLSTMT_ID * statement_id);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetDescEntryCount(
+Int32 SQL_EXEC_GetDescEntryCount(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ SQLDESC_ID * output_descriptor);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GETDESCENTRYCOUNT(
+Int32 SQL_EXEC_GETDESCENTRYCOUNT(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ SQLDESC_ID * output_descriptor);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetDescEntryCountBasic(
+Int32 SQL_EXEC_GetDescEntryCountBasic(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*OUT*/ Int32 * num_entries);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetDescItem(
+Int32 SQL_EXEC_GetDescItem(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ Int32 entry,
/*IN* (SQLDESC_ITEM_ID) */ Int32 what_to_get,
@@ -1610,7 +1581,7 @@ SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetDescItem(
/*OUT OPTIONAL*/ Int32 * len_of_item,
/*IN OPTIONAL*/ Int32 start_from_offset);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GETDESCITEM(
+Int32 SQL_EXEC_GETDESCITEM(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ Int32 entry,
/*IN* (SQLDESC_ITEM_ID) */ Int32 what_to_get,
@@ -1620,37 +1591,37 @@ SQLCLI_LIB_FUNC Int32 SQL_EXEC_GETDESCITEM(
/*OUT OPTIONAL*/ Int32 * len_of_item,
/*IN OPTIONAL*/ Int32 start_from_offset);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetDescItems(
+Int32 SQL_EXEC_GetDescItems(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ SQLDESC_ITEM desc_items[],
/*IN*/ SQLDESC_ID * value_num_descriptor,
/*IN*/ SQLDESC_ID * output_descriptor);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GETDESCITEMS(
+Int32 SQL_EXEC_GETDESCITEMS(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ SQLDESC_ITEM desc_items[],
/*IN*/ SQLDESC_ID * value_num_descriptor,
/*IN*/ SQLDESC_ID * output_descriptor);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetDescItems2(
+Int32 SQL_EXEC_GetDescItems2(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ Int32 no_of_desc_items,
/*IN*/ SQLDESC_ITEM desc_items[]);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GETDESCITEMS2(
+Int32 SQL_EXEC_GETDESCITEMS2(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ Int32 no_of_desc_items,
/*IN*/ SQLDESC_ITEM desc_items[]);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetDiagnosticsStmtInfo(
+Int32 SQL_EXEC_GetDiagnosticsStmtInfo(
/*IN*/ Int32 *stmt_info_items,
/*IN*/ SQLDESC_ID * output_descriptor);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GETDIAGNOSTICSSTMTINFO(
+Int32 SQL_EXEC_GETDIAGNOSTICSSTMTINFO(
/*IN*/ Int32 *stmt_info_items,
/*IN*/ SQLDESC_ID * output_descriptor);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetDiagnosticsStmtInfo2(
+Int32 SQL_EXEC_GetDiagnosticsStmtInfo2(
/*IN OPTIONAL*/ SQLSTMT_ID * statement_id,
/*IN* (SQLDIAG_STMT_INFO_ITEM_ID) */ Int32 what_to_get,
/*OUT OPTIONAL*/ void * numeric_value,
@@ -1658,7 +1629,7 @@ SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetDiagnosticsStmtInfo2(
/*IN OPTIONAL*/ Int32 max_string_len,
/*OUT OPTIONAL*/ Int32 * len_of_item);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GETDIAGNOSTICSSTMTINFO2(
+Int32 SQL_EXEC_GETDIAGNOSTICSSTMTINFO2(
/*IN OPTIONAL*/ SQLSTMT_ID * statement_id,
/*IN* (SQLDIAG_STMT_INFO_ITEM_ID) */ Int32 what_to_get,
/*OUT OPTIONAL*/ void * numeric_value,
@@ -1666,17 +1637,17 @@ SQLCLI_LIB_FUNC Int32 SQL_EXEC_GETDIAGNOSTICSSTMTINFO2(
/*IN OPTIONAL*/ Int32 max_string_len,
/*OUT OPTIONAL*/ Int32 * len_of_item);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetDiagnosticsCondInfo(
+Int32 SQL_EXEC_GetDiagnosticsCondInfo(
/*IN*/ SQLDIAG_COND_INFO_ITEM *cond_info_items,
/*IN*/ SQLDESC_ID * cond_num_descriptor,
/*IN*/ SQLDESC_ID * output_descriptor);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GETDIAGNOSTICSCONDINFO(
+Int32 SQL_EXEC_GETDIAGNOSTICSCONDINFO(
/*IN*/ SQLDIAG_COND_INFO_ITEM *cond_info_items,
/*IN*/ SQLDESC_ID * cond_num_descriptor,
/*IN*/ SQLDESC_ID * output_descriptor);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetDiagnosticsCondInfo2(
+Int32 SQL_EXEC_GetDiagnosticsCondInfo2(
/*IN* (SQLDIAG_COND_INFO_ITEM_ID) */ Int32 what_to_get,
/*IN*/ Int32 conditionNum,
/*OUT OPTIONAL*/ Int32 * numeric_value,
@@ -1684,7 +1655,7 @@ SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetDiagnosticsCondInfo2(
/*IN OPTIONAL */ Int32 max_string_len,
/*OUT OPTIONAL*/ Int32 * len_of_item);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GETDIAGNOSTICSCONDINFO2(
+Int32 SQL_EXEC_GETDIAGNOSTICSCONDINFO2(
/*IN* (SQLDIAG_COND_INFO_ITEM_ID) */ Int32 what_to_get,
/*IN*/ Int32 conditionNum,
/*OUT OPTIONAL*/ Int32 * numeric_value,
@@ -1692,64 +1663,64 @@ SQLCLI_LIB_FUNC Int32 SQL_EXEC_GETDIAGNOSTICSCONDINFO2(
/*IN OPTIONAL */ Int32 max_string_len,
/*OUT OPTIONAL*/ Int32 * len_of_item);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetDiagnosticsCondInfo3 (
+Int32 SQL_EXEC_GetDiagnosticsCondInfo3 (
/*IN*/ Int32 no_of_condition_items,
/*IN*/ SQLDIAG_COND_INFO_ITEM_VALUE
diag_cond_info_item_values[]);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GETDIAGNOSTICSCONDINFO3 (
+Int32 SQL_EXEC_GETDIAGNOSTICSCONDINFO3 (
/*IN*/ Int32 no_of_condition_items,
/*IN*/ SQLDIAG_COND_INFO_ITEM_VALUE
diag_cond_info_item_values[]);
/* This function retrieves the SQLSTATE from the statement diagnostics area
if possible */
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetMainSQLSTATE(
+Int32 SQL_EXEC_GetMainSQLSTATE(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN*/ Int32 sqlcode,
/*OUT*/ char * sqlstate /* assumed to be char[6] */);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GETMAINSQLSTATE(
+Int32 SQL_EXEC_GETMAINSQLSTATE(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN*/ Int32 sqlcode,
/*OUT*/ char * sqlstate /* assumed to be char[6] */);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetCSQLSTATE(
+Int32 SQL_EXEC_GetCSQLSTATE(
/*OUT*/ char * sqlstate /* assumed to be char[6] */,
/*IN*/ Int32 sqlcode);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GETCSQLSTATE(
+Int32 SQL_EXEC_GETCSQLSTATE(
/*OUT*/ char * sqlstate /* assumed to be char[6] */,
/*IN*/ Int32 sqlcode);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetCobolSQLSTATE(
+Int32 SQL_EXEC_GetCobolSQLSTATE(
/*OUT*/ char * sqlstate /* assumed to be char[5] */,
/*IN*/ Int32 sqlcode);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GETCOBOLSQLSTATE(
+Int32 SQL_EXEC_GETCOBOLSQLSTATE(
/*OUT*/ char * sqlstate /* assumed to be char[5] */,
/*IN*/ Int32 sqlcode);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetSQLSTATE(
+Int32 SQL_EXEC_GetSQLSTATE(
/*OUT*/ char * sqlstate /* assumed to be char[6] */);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GETSQLSTATE(
+Int32 SQL_EXEC_GETSQLSTATE(
/*OUT*/ char * sqlstate /* assumed to be char[6] */);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetSessionAttr(
+Int32 SQL_EXEC_GetSessionAttr(
/*IN* (SESSIONATTR_TYPE) */ Int32 attrName,
/*OUT OPTIONAL*/ Int32 * numeric_value,
/*OUT OPTIONAL*/ char * string_value,
/*IN OPTIONAL*/ Int32 max_string_len,
/*OUT OPTIONAL*/ Int32 * len_of_item);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetUniqueQueryIdAttrs (
+Int32 SQL_EXEC_GetUniqueQueryIdAttrs (
/*IN*/ char * uniqueQueryId,
/*IN*/ Int32 uniqueQueryIdLen,
/*IN*/ Int32 no_of_attrs,
/*INOUT*/ UNIQUEQUERYID_ATTR unique_queryid_attrs[]);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetStmtAttr(
+Int32 SQL_EXEC_GetStmtAttr(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN* (SQLATTR_TYPE) */ Int32 attrName,
/*OUT OPTIONAL*/ Int32 * numeric_value,
@@ -1757,7 +1728,7 @@ SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetStmtAttr(
/*IN OPTIONAL*/ Int32 max_string_len,
/*OUT OPTIONAL*/ Int32 * len_of_item);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GETSTMTATTR(
+Int32 SQL_EXEC_GETSTMTATTR(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN* (SQLATTR_TYPE) */ Int32 attrName,
/*OUT OPTIONAL*/ Int32 * numeric_value,
@@ -1765,55 +1736,39 @@ SQLCLI_LIB_FUNC Int32 SQL_EXEC_GETSTMTATTR(
/*IN OPTIONAL*/ Int32 max_string_len,
/*OUT OPTIONAL*/ Int32 * len_of_item);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetStmtAttrs(
+Int32 SQL_EXEC_GetStmtAttrs(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN*/ Int32 number_of_attrs,
/*INOUT*/ SQLSTMT_ATTR attrs[],
/*OUT OPTIONAL*/ Int32 * num_returned);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GETSTMTATTRS(
+Int32 SQL_EXEC_GETSTMTATTRS(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN*/ Int32 number_of_attrs,
/*INOUT*/ SQLSTMT_ATTR attrs[],
/*OUT OPTIONAL*/ Int32 * num_returned);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GETMPCATALOG(
- /*IN*/ char * AnsiObjName,
- /*INOUT*/ char * MPObjName,
- /*IN*/ Int32 MPObjNameMaxLen,
- /*INOUT*/ Int32 * MPObjNameLen,
- /*OUT*/ char * MPCatalogName,
- /*IN*/ Int32 MPCatalogNameMaxLen,
- /*OUT*/ Int32 * MPCatalogNameLen);
-
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetPfsSize(
- /*OUT*/ Int32 *pfsSize,
- /*OUT*/ Int32 *pfsCurUse,
- /*OUT*/ Int32 *pfsMaxUse);
-
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetExplainData(
+Int32 SQL_EXEC_GetExplainData(
/*IN*/ SQLSTMT_ID * statement_id,
/*INOUT*/ char * explain_ptr,
/*IN*/ Int32 explain_len,
/*INOUT*/ Int32 * ret_explain_len);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_StoreExplainData(
+Int32 SQL_EXEC_StoreExplainData(
/*IN*/ Int64 * exec_start_utc_ts,
/*IN*/ char * query_id,
/*INOUT*/ char * explain_ptr,
/*IN*/ Int32 explain_len);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_CleanUpPfsResources();
-
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_Prepare(
+Int32 SQL_EXEC_Prepare(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN*/ SQLDESC_ID * sql_source);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_PREPARE(
+Int32 SQL_EXEC_PREPARE(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN*/ SQLDESC_ID * sql_source);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_Prepare2(
+Int32 SQL_EXEC_Prepare2(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN*/ SQLDESC_ID * sql_source,
/*INOUT*/ char * gencode_ptr,
@@ -1825,131 +1780,131 @@ SQLCLI_LIB_FUNC Int32 SQL_EXEC_Prepare2(
/*INOUT*/ Int32 * uniqueQueryIdLen,
/*IN*/ UInt32 flags);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_ResDescName(
+Int32 SQL_EXEC_ResDescName(
/*INOUT*/ SQLDESC_ID * statement_id,
/*IN OPTIONAL*/ SQLSTMT_ID * from_statement,
/*IN OPTIONAL (SQLWHAT_DESC) */ Int32 what_desc);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_RESDESCNAME(
+Int32 SQL_EXEC_RESDESCNAME(
/*INOUT*/ SQLDESC_ID * statement_id,
/*IN OPTIONAL*/ SQLSTMT_ID * from_statement,
/*IN OPTIONAL (SQLWHAT_DESC) */ Int32 what_desc);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_ResStmtName(
+Int32 SQL_EXEC_ResStmtName(
/*INOUT*/ SQLSTMT_ID * statement_id);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_RESSTMTNAME(
+Int32 SQL_EXEC_RESSTMTNAME(
/*INOUT*/ SQLSTMT_ID * statement_id);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_SetCursorName(
+Int32 SQL_EXEC_SetCursorName(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN*/ SQLSTMT_ID * cursor_name);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_SETCURSORNAME(
+Int32 SQL_EXEC_SETCURSORNAME(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN*/ SQLSTMT_ID * cursor_name);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_SetDescEntryCount(
+Int32 SQL_EXEC_SetDescEntryCount(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ SQLDESC_ID * input_descriptor);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_SETDESCENTRYCOUNT(
+Int32 SQL_EXEC_SETDESCENTRYCOUNT(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ SQLDESC_ID * input_descriptor);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_SetDescEntryCountBasic(
+Int32 SQL_EXEC_SetDescEntryCountBasic(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ Int32 num_entries);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_SetDescItem(
+Int32 SQL_EXEC_SetDescItem(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ Int32 entry,
/*IN* (SQLDESC_ITEM_ID) */ Int32 what_to_set,
/*IN OPTIONAL*/ long numeric_value,
/*IN OPTIONAL*/ char * string_value);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_SETDESCITEM(
+Int32 SQL_EXEC_SETDESCITEM(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ Int32 entry,
/*IN* (SQLDESC_ITEM_ID) */ Int32 what_to_set,
/*IN OPTIONAL*/ long numeric_value,
/*IN OPTIONAL*/ char * string_value);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_SetDescItems(
+Int32 SQL_EXEC_SetDescItems(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ SQLDESC_ITEM desc_items[],
/*IN*/ SQLDESC_ID * value_num_descriptor,
/*IN*/ SQLDESC_ID * input_descriptor);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_SETDESCITEMS(
+Int32 SQL_EXEC_SETDESCITEMS(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ SQLDESC_ITEM desc_items[],
/*IN*/ SQLDESC_ID * value_num_descriptor,
/*IN*/ SQLDESC_ID * input_descriptor);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_SetDescItems2(
+Int32 SQL_EXEC_SetDescItems2(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ Int32 no_of_desc_items,
/*IN*/ SQLDESC_ITEM desc_items[]);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_SETDESCITEMS2(
+Int32 SQL_EXEC_SETDESCITEMS2(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ Int32 no_of_desc_items,
/*IN*/ SQLDESC_ITEM desc_items[]);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_SetDescPointers(
+Int32 SQL_EXEC_SetDescPointers(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ Int32 starting_entry,
/*IN*/ Int32 num_ptr_pairs,
...);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_SETDESCPOINTERS(
+Int32 SQL_EXEC_SETDESCPOINTERS(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ Int32 starting_entry,
/*IN*/ Int32 num_ptr_pairs,
/*IN*/ struct SQLCLI_PTR_PAIRS ptr_pairs[]);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_SetRowsetDescPointers(SQLDESC_ID * desc_id,
+Int32 SQL_EXEC_SetRowsetDescPointers(SQLDESC_ID * desc_id,
Int32 rowset_size,
Int32 *rowset_status_ptr,
Int32 starting_entry,
Int32 num_quadruple_fields,
...);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_SETROWSETDESCPOINTERS(SQLDESC_ID * desc_id,
+Int32 SQL_EXEC_SETROWSETDESCPOINTERS(SQLDESC_ID * desc_id,
Int32 rowset_size,
Int32 *rowset_status_ptr,
Int32 starting_entry,
Int32 num_quadruple_fields,
struct SQLCLI_QUAD_FIELDS quad_fields[]);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_SetStmtAttr(
+Int32 SQL_EXEC_SetStmtAttr(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN* (SQLATTR_TYPE) */ Int32 attrName,
/*IN OPTIONAL*/ Int32 numeric_value,
/*IN OPTIONAL*/ char * string_value);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_SETSTMTATTR(
+Int32 SQL_EXEC_SETSTMTATTR(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN* (SQLATTR_TYPE) */ Int32 attrName,
/*IN OPTIONAL*/ Int32 numeric_value,
/*IN OPTIONAL*/ char * string_value);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_SwitchContext(
+Int32 SQL_EXEC_SwitchContext(
/*IN*/ SQLCTX_HANDLE context_handle,
/*OUT OPTIONAL*/ SQLCTX_HANDLE * prev_context_handle);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_SWITCHCONTEXT(
+Int32 SQL_EXEC_SWITCHCONTEXT(
/*IN*/ SQLCTX_HANDLE context_handle,
/*OUT OPTIONAL*/ SQLCTX_HANDLE * prev_context_handle);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_Xact(
+Int32 SQL_EXEC_Xact(
/*IN* (SQLTRANS_COMMAND) */ Int32 command,
/*OUT OPTIONAL*/ SQLDESC_ID * transid_descriptor);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_XACT(
+Int32 SQL_EXEC_XACT(
/*IN* (SQLTRANS_COMMAND) */ Int32 command,
/*OUT OPTIONAL*/ SQLDESC_ID * transid_descriptor);
@@ -1961,36 +1916,20 @@ Int32 SQL_EXEC_SetAuthID(
Int32 effectiveUserID, /*IN*/
Int32 sessionUserID); /*IN*/
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_SETAUTHID(
+Int32 SQL_EXEC_SETAUTHID(
/*IN*/ char * authID,
/*IN SQLAUTHID_TYPE */ Int32 authIDType,
/* OUT OPTIONAL primaryRole*/ char *primaryRole,
/* OUT OPTIONAL role len*/ short *primaryRoleLen,
- /* OUT OPTIONAL userRedefTime*/ Int64 *redefTime); // NA_64BIT
+ /* OUT OPTIONAL userRedefTime*/ Int64 *redefTime);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetAuthState(
+Int32 SQL_EXEC_GetAuthState(
/*OUT*/ bool & authenticationEnabled,
/*OUT*/ bool & authorizationEnabled,
/*OUT*/ bool & authorizationReady,
/*OUT*/ bool & auditingEnabled);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_DecodeAndFormatKey(
- /*IN*/void * RCB_Pointer_Addr,
- /*IN*/void * KeyAddr,
- /*IN*/Int32 KeyLength,
- /*INOUT*/void * DecodedKeyBufAddr,
- /*INOUT*/void * FormattedKeyBufAddr,
- /*IN*/Int32 FormattedKeyBufLen,
- /*OUT*/Int32 * NeededKeyBufLen );
-
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetPartitionKeyFromRow(
- /*IN*/void * RCB_Pointer_Addr,
- /*IN*/void * Row_Addr,
- /*IN*/Int32 Row_Length,
- /*INOUT*/void * KeyAddr,
- /*IN*/Int32 KeyLength);
-
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_LocaleToUTF8 (
+Int32 SQL_EXEC_LocaleToUTF8 (
/*IN*/Int32 conv_charset,
/*IN*/void * Input_Buffer_Addr,
/*IN*/Int32 Input_Buffer_Length,
@@ -2002,7 +1941,7 @@ SQLCLI_LIB_FUNC Int32 SQL_EXEC_LocaleToUTF8 (
/*OUT*/Int32 * num_translated_char
);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_UTF8ToLocale(
+Int32 SQL_EXEC_UTF8ToLocale(
/*IN*/Int32 conv_charset,
/*IN*/void * Input_Buffer_Addr,
/*IN*/Int32 Input_Buffer_Length,
@@ -2016,7 +1955,7 @@ SQLCLI_LIB_FUNC Int32 SQL_EXEC_UTF8ToLocale(
/*IN*/void * substitution_char_addr
);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_LocaleToUTF16 (
+Int32 SQL_EXEC_LocaleToUTF16 (
/*IN*/Int32 conv_charset,
/*IN*/void * Input_Buffer_Addr,
/*IN*/Int32 Input_Buffer_Length,
@@ -2029,7 +1968,7 @@ SQLCLI_LIB_FUNC Int32 SQL_EXEC_LocaleToUTF16 (
/*OUT*/Int32 * num_translated_char
);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_UTF16ToLocale(
+Int32 SQL_EXEC_UTF16ToLocale(
/*IN*/Int32 conv_charset,
/*IN*/void * Input_Buffer_Addr,
/*IN*/Int32 Input_Buffer_Length,
@@ -2043,11 +1982,12 @@ SQLCLI_LIB_FUNC Int32 SQL_EXEC_UTF16ToLocale(
/*OUT*/Int32 * num_translated_char,
/*IN*/void * substitution_char_addr
);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_SetSecInvalidKeys(
+
+Int32 SQL_EXEC_SetSecInvalidKeys(
/* IN */ Int32 numSiKeys,
/* IN */ SQL_QIKEY siKeys[]);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetSecInvalidKeys(
+Int32 SQL_EXEC_GetSecInvalidKeys(
/* IN */ Int64 prevTimestamp,
/* IN/OUT */ SQL_QIKEY siKeys[],
/* IN */ Int32 maxNumSiKeys,
@@ -2055,7 +1995,7 @@ SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetSecInvalidKeys(
/* IN/OUT */ Int64 *maxTimestamp);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetStatistics2(
+Int32 SQL_EXEC_GetStatistics2(
/* IN */ short statsReqType,
/* IN */ char *statsReqStr,
/* IN */ Int32 statsReqStrLen,
@@ -2066,14 +2006,14 @@ SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetStatistics2(
/* IN */ Int32 max_stats_desc,
/* OUT */ Int32 *no_returned_stats_desc);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetStatisticsItems(
+Int32 SQL_EXEC_GetStatisticsItems(
/* IN */ short statsReqType,
/* IN */ char *queryId,
/* IN */ Int32 queryIdLen,
/* IN */ Int32 no_of_stats_items,
/* IN/OUT */ SQLSTATS_ITEM sqlstats_items[]);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetChildQueryInfo(
+Int32 SQL_EXEC_GetChildQueryInfo(
/*IN*/ SQLSTMT_ID * statement_id,
/*INOUT*/ char * uniqueQueryId,
/*IN */ Int32 uniqueQueryIdMaxLen,
@@ -2086,19 +2026,19 @@ SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetChildQueryInfo(
/* temporary functions -- for use by sqlcat simulator only */
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_AllocDesc (
+Int32 SQL_EXEC_AllocDesc (
/*INOUT*/ SQLDESC_ID * desc_id,
/*IN OPTIONAL*/ Int32 max_entries);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetDescEntryCount(
+Int32 SQL_EXEC_GetDescEntryCount(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*OUT*/ Int32 * num_entries);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_SetDescEntryCount(
+Int32 SQL_EXEC_SetDescEntryCount(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ Int32 num_entries);
-SQLCLI_LIB_FUNC short sqInit();
+short sqInit();
#endif /*__cplusplus*/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/cli/test.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/test.cpp b/core/sql/cli/test.cpp
index 285d32a..d706a41 100644
--- a/core/sql/cli/test.cpp
+++ b/core/sql/cli/test.cpp
@@ -18,103 +18,4 @@
// under the License.
//
// @@@ END COPYRIGHT @@@
-#include <limits.h>
-#include <stdlib.h>
-#include <iostream>
-
-class A
-{
-
-public:
- void * operator new(size_t size, Int32 a);
- void * operator new(size_t size);
- void operator delete(void * ptr);
-private:
- Int32 a;
-};
-
-class C
-{
- friend class B;
-
- Int32 a;
-public:
- C()
- {
- a = 10;
- };
-
-};
-
-
-class B : public A
-{
-public:
- B();
- ~B();
-
- Int32 b;
-
- C c;
-};
-
-void C()
-{
- cout << "C\n";
-
-}
-
-void D()
-{
- cout << "D \n";
-
-}
-
-void E()
-{
- cout << "E \n";
-}
-
-void * A::operator new(size_t size, Int32 a)
-{
- C();
-
- return ::operator new(size);
-}
-
-void * A::operator new(size_t size)
-{
- D();
-
- return ::operator new(size);
-}
-
-void A::operator delete(void * ptr)
-{
- E();
-
- ::operator delete(ptr);
-}
-
-B::B()
-{
- b = 10;
-
- cout << c.a << endl;
-}
-
-B::~B()
-{
- b = -1;
-}
-
-Int32 main()
-{
- B * b = new(1) B();
-
- delete b;
-
- return 0;
-}
-
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/CmpMessage.cpp
----------------------------------------------------------------------
diff --git a/core/sql/comexe/CmpMessage.cpp b/core/sql/comexe/CmpMessage.cpp
index 38d7a19..55bcf42 100644
--- a/core/sql/comexe/CmpMessage.cpp
+++ b/core/sql/comexe/CmpMessage.cpp
@@ -262,13 +262,11 @@ void CmpMessageReplyBasic::unpackMyself(IpcMessageObjType objType,
CmpCompileInfo::CmpCompileInfo(char * sourceStr, Lng32 sourceStrLen,
Lng32 sourceStrCharSet,
char * schemaName, Lng32 schemaNameLen,
- char * recompControlInfo, Lng32 recompControlInfoLen,
ULng32 inputArrayMaxsize, short atomicity)
: flags_(0),
sqltext_(sourceStr), sqlTextLen_(sourceStrLen),
sqlTextCharSet_(sourceStrCharSet),
schemaName_(schemaName), schemaNameLen_(schemaNameLen),
- recompControlInfo_(recompControlInfo), recompControlInfoLen_(recompControlInfoLen),
inputArrayMaxsize_(inputArrayMaxsize)
{
if (atomicity == 1) {
@@ -291,8 +289,6 @@ CmpCompileInfo::CmpCompileInfo()
sqlTextCharSet_(0),
schemaName_(NULL),
schemaNameLen_(0),
- recompControlInfo_(NULL),
- recompControlInfoLen_(0),
inputArrayMaxsize_(0)
{
str_pad(fillerBytes_, FILLERSIZE, '\0');
@@ -306,8 +302,6 @@ void CmpCompileInfo::init()
sqlTextCharSet_ = 0;
schemaName_ = NULL;
schemaNameLen_ = 0;
- recompControlInfo_ = NULL;
- recompControlInfoLen_ = 0;
inputArrayMaxsize_ = 0;
}
@@ -321,8 +315,7 @@ Lng32 CmpCompileInfo::getLength()
Lng32 CmpCompileInfo::getVarLength()
{
return ROUND8(sqlTextLen_) +
- ROUND8(schemaNameLen_)
- + ROUND8(recompControlInfoLen_);
+ ROUND8(schemaNameLen_);
}
void CmpCompileInfo::packVars(char * buffer, CmpCompileInfo *ci,
@@ -341,13 +334,6 @@ void CmpCompileInfo::packVars(char * buffer, CmpCompileInfo *ci,
ci->schemaName_ = (char *)nextOffset;
nextOffset += ROUND8(schemaNameLen_);
}
-
- if (recompControlInfo_ && (recompControlInfoLen_ > 0))
- {
- str_cpy_all(&buffer[nextOffset], (char *)recompControlInfo_, recompControlInfoLen_);
- ci->recompControlInfo_ = (char *)nextOffset;
- nextOffset += ROUND8(recompControlInfoLen_);
- }
}
void CmpCompileInfo::pack(char * buffer)
@@ -375,15 +361,10 @@ void CmpCompileInfo::unpack(char * base)
schemaName_ = base + (Lng32)(Long)schemaName_;
}
- if (recompControlInfo_)
- {
- recompControlInfo_ = base + (Lng32)(Long)recompControlInfo_;
- }
}
void CmpCompileInfo::getUnpackedFields(char* &sqltext,
- char* &schemaName,
- char* &recompControlInfo)
+ char* &schemaName)
{
char * base = (char *)this;
@@ -397,11 +378,6 @@ void CmpCompileInfo::getUnpackedFields(char* &sqltext,
schemaName = base + (Lng32)(Long)schemaName_;
}
- recompControlInfo = NULL;
- if (recompControlInfo_)
- {
- recompControlInfo = base + (Lng32)(Long)recompControlInfo_;
- }
}
const short CmpCompileInfo::getRowsetAtomicity()
@@ -446,11 +422,9 @@ CmpDDLwithStatusInfo::CmpDDLwithStatusInfo()
CmpDDLwithStatusInfo::CmpDDLwithStatusInfo(char * sourceStr, Lng32 sourceStrLen,
Lng32 sourceStrCharSet,
- char * schemaName, Lng32 schemaNameLen,
- char * recompControlInfo, Lng32 recompControlInfoLen)
+ char * schemaName, Lng32 schemaNameLen)
: CmpCompileInfo(sourceStr, sourceStrLen, sourceStrCharSet,
schemaName, schemaNameLen,
- recompControlInfo, recompControlInfoLen,
0, 0)
{
statusFlags_ = 0;
@@ -649,7 +623,6 @@ IpcMessageObjSize CmpMessageReplyCode::packMyself(IpcMessageBufferPtr& buffer)
return size;
}
-#ifdef NA_CMPDLL
IpcMessageObjSize
CmpMessageReplyCode::copyFragsToBuffer(IpcMessageBufferPtr& buffer)
{
@@ -673,7 +646,6 @@ CmpMessageReplyCode::copyFragsToBuffer(IpcMessageBufferPtr& buffer)
return size;
}
-#endif // NA_CMPDLL
// -----------------------------------------------------------------------
// methods for CmpMessageRequest
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/CmpMessage.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/CmpMessage.h b/core/sql/comexe/CmpMessage.h
index fde5f53..5c306f5 100644
--- a/core/sql/comexe/CmpMessage.h
+++ b/core/sql/comexe/CmpMessage.h
@@ -90,7 +90,6 @@ public:
INTERNALSP_REQUEST,
INTERNALSP_GETNEXT,
ENVS_REFRESH,
- READTABLEDEF_REQUEST,
SQLTEXT_RECOMPILE, // tells mxcmp to decache & recompile query
SQLTEXT_STATIC_RECOMPILE,
END_SESSION,
@@ -185,7 +184,7 @@ protected:
char* strPtr, ULng32 maxSize,
ULng32& sizeMoved);
- NA_EIDPROC void advanceSize(IpcMessageObjSize &size,
+ void advanceSize(IpcMessageObjSize &size,
const void * const buffPtr, Lng32 sz=0)
{
const Int32 lenSize = sizeof(CmpMsgBufLenType);
@@ -196,7 +195,7 @@ protected:
ID id_;
- NA_EIDPROC void advanceSize(IpcMessageObjSize &size, Int64 i64)
+ void advanceSize(IpcMessageObjSize &size, Int64 i64)
{ size += sizeof(i64); }
IpcMessageObjSize packIntoBuffer(char* &buffer, Int64 i64)
@@ -310,7 +309,6 @@ public:
CmpCompileInfo(char * sourceStr, Lng32 sourceStrLen,
Lng32 sourceStrCharSet,
char * schemaName, Lng32 schemaNameLen,
- char * recompControlInfo, Lng32 recompControlInfoLen,
ULng32 inputArrayMaxsize,
short rowsetAtomicity);
CmpCompileInfo();
@@ -326,17 +324,12 @@ public:
void unpack(char * base);
void getUnpackedFields(char* &sqltext,
- char* &schemaName,
- char* &recompControlInfo);
+ char* &schemaName);
const ULng32 getInputArrayMaxsize() {return inputArrayMaxsize_ ;}
const short getRowsetAtomicity();
- NABoolean nametypeNsk() { return (flags_ & NAMETYPE_NSK) != 0; }
- void setNametypeNsk(NABoolean v)
- { (v ? flags_ |= NAMETYPE_NSK : flags_ &= ~NAMETYPE_NSK); }
-
NABoolean odbcProcess() { return (flags_ & ODBC_PROCESS) != 0; }
void setOdbcProcess(NABoolean v)
{ (v ? flags_ |= ODBC_PROCESS : flags_ &= ~ODBC_PROCESS); }
@@ -382,7 +375,7 @@ public:
void setDoNotCachePlan(NABoolean v)
{ (v ? flags_ |= DO_NOT_CACHE_PLAN : flags_ &= ~DO_NOT_CACHE_PLAN); }
- enum { FILLERSIZE = 56 /* used to be 60 - took 4 bytes for sqlTextCharSet_ */ } ; // of original 72
+ enum { FILLERSIZE = 60 };
protected:
enum Flags
@@ -430,10 +423,8 @@ protected:
ULng32 inputArrayMaxsize_; // 32-35
ULng32 flags_; // 36-39
- char * recompControlInfo_; // 40-43
- Lng32 recompControlInfoLen_; // 44-47
- Lng32 sqlTextCharSet_; // 48-51
- char fillerBytes_[FILLERSIZE]; // 52-107
+ Lng32 sqlTextCharSet_; // 40-43
+ char fillerBytes_[FILLERSIZE]; // 44-103
};
#pragma warn(1506) // warning elimination
@@ -854,8 +845,7 @@ class CmpDDLwithStatusInfo : public CmpCompileInfo
CmpDDLwithStatusInfo(char * sourceStr, Lng32 sourceStrLen,
Lng32 sourceStrCharSet,
- char * schemaName, Lng32 schemaNameLen,
- char * recompControlInfo, Lng32 recompControlInfoLen);
+ char * schemaName, Lng32 schemaNameLen);
short getClassSize() { return (short)sizeof(CmpDDLwithStatusInfo); }
Lng32 getLength();
@@ -1096,9 +1086,7 @@ public:
IpcMessageObjSize mypackedLength();
IpcMessageObjSize packMyself(IpcMessageBufferPtr& buffer);
-#ifdef NA_CMPDLL
IpcMessageObjSize copyFragsToBuffer(IpcMessageBufferPtr& buffer);
-#endif // NA_CMPDLL
private:
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/ComKeyMDAM.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComKeyMDAM.h b/core/sql/comexe/ComKeyMDAM.h
index 123c6ea..ca51fa8 100644
--- a/core/sql/comexe/ComKeyMDAM.h
+++ b/core/sql/comexe/ComKeyMDAM.h
@@ -98,17 +98,17 @@ private:
Int16 reverseEndpoints_; // 38-39
// private method used by public methods getValue() and getValue2()
- NA_EIDPROC ex_expr::exp_return_type getValue_(ExExprPtr value,
+ ex_expr::exp_return_type getValue_(ExExprPtr value,
atp_struct * atp0,
atp_struct * atp1);
public:
- NA_EIDPROC MdamPred() // for use by unpack only
+ MdamPred() // for use by unpack only
: NAVersionedObject(-1)
{ }
- NA_EIDPROC MdamPred(Lng32 disjunctNumber,
+ MdamPred(Lng32 disjunctNumber,
MdamPredType pred_type,
ex_expr *value,
ex_expr *value2 = NULL,
@@ -130,45 +130,45 @@ public:
// ---------------------------------------------------------------------
// Redefine virtual functions required for Versioning.
//----------------------------------------------------------------------
- NA_EIDPROC virtual unsigned char getClassVersionID()
+ virtual unsigned char getClassVersionID()
{
return 1;
}
- NA_EIDPROC virtual void populateImageVersionIDArray()
+ virtual void populateImageVersionIDArray()
{
setImageVersionID(0,getClassVersionID());
}
- NA_EIDPROC virtual short getClassSize() { return (short)sizeof(MdamPred); }
+ virtual short getClassSize() { return (short)sizeof(MdamPred); }
- NA_EIDPROC ~MdamPred() { };
+ ~MdamPred() { };
// methods used during Generation only
void setOr()
{ firstInOrGroup_ = FALSE; };
- NA_EIDPROC Long pack(void *);
- NA_EIDPROC Lng32 unpack(void *,void * reallocator);
+ Long pack(void *);
+ Lng32 unpack(void *,void * reallocator);
- NA_EIDPROC ex_expr::exp_return_type fixup(Lng32 base, unsigned short,
+ ex_expr::exp_return_type fixup(Lng32 base, unsigned short,
const ex_tcb *tcb,
Space * space,
CollHeap *heap);
- NA_EIDPROC void setNext(MdamPred *next) { next_ = next; };
- NA_EIDPROC MdamPred *getNext() { return next_; };
- NA_EIDPROC NABoolean firstInOrGroup() { return firstInOrGroup_; };
- NA_EIDPROC Lng32 getDisjunctNumber() { return disjunctNumber_; };
+ void setNext(MdamPred *next) { next_ = next; };
+ MdamPred *getNext() { return next_; };
+ NABoolean firstInOrGroup() { return firstInOrGroup_; };
+ Lng32 getDisjunctNumber() { return disjunctNumber_; };
- NA_EIDPROC MdamPredType getPredType()
+ MdamPredType getPredType()
{ return (enum MdamPredType)predType_; };
- NA_EIDPROC NABoolean reverseEndpoints()
+ NABoolean reverseEndpoints()
{ return (NABoolean)reverseEndpoints_; }
// Indicates whether the start of an MDAM_BETWEEN interval is inclusive.
- NA_EIDPROC MdamEnums::MdamInclusion getStartInclusion()
+ MdamEnums::MdamInclusion getStartInclusion()
{
return val1Inclusive_
? MdamEnums::MDAM_INCLUDED
@@ -176,7 +176,7 @@ public:
}
// Indicates whether the end of an MDAM_BETWEEN interval is inclusive.
- NA_EIDPROC MdamEnums::MdamInclusion getEndInclusion()
+ MdamEnums::MdamInclusion getEndInclusion()
{
return val2Inclusive_
? MdamEnums::MDAM_INCLUDED
@@ -185,7 +185,7 @@ public:
// This function computes a transformed predicate type based on
// predType_ and dataConvErrorFlag.
- NA_EIDPROC MdamPredType getTransformedPredType
+ MdamPredType getTransformedPredType
(Lng32 dataConvErrorFlag,
Lng32 dataConvErrorFlag2,
MdamEnums::MdamInclusion& startInclusion,
@@ -193,11 +193,11 @@ public:
// Get the value used in this predicate. For MDAM_BETWEEN, which has two values,
// this is the start value.
- NA_EIDPROC ex_expr::exp_return_type getValue(atp_struct* atp0, atp_struct* atp1)
+ ex_expr::exp_return_type getValue(atp_struct* atp0, atp_struct* atp1)
{ return getValue_(value_, atp0, atp1); }
// Used only for MDAM_BETWEEN, this gets the end value.
- NA_EIDPROC ex_expr::exp_return_type getValue2(atp_struct* atp0, atp_struct* atp1)
+ ex_expr::exp_return_type getValue2(atp_struct* atp0, atp_struct* atp1)
{ return getValue_(value2_, atp0, atp1); }
};
#pragma warn(1506) // warning elimination
@@ -256,11 +256,11 @@ private:
public:
- NA_EIDPROC MdamColumnGen() // for use by unpack only
+ MdamColumnGen() // for use by unpack only
: NAVersionedObject(-1)
{ preds_ = NULL; };
- NA_EIDPROC MdamColumnGen(MdamColumnGen *previous,
+ MdamColumnGen(MdamColumnGen *previous,
ULng32 columnLength,
ULng32 keyBufferOffset,
NABoolean useSparseProbes,
@@ -287,36 +287,36 @@ public:
}
};
- NA_EIDPROC ~MdamColumnGen();
+ ~MdamColumnGen();
// ---------------------------------------------------------------------
// Redefine virtual functions required for Versioning.
//----------------------------------------------------------------------
- NA_EIDPROC virtual unsigned char getClassVersionID()
+ virtual unsigned char getClassVersionID()
{
return 1;
}
- NA_EIDPROC virtual void populateImageVersionIDArray()
+ virtual void populateImageVersionIDArray()
{
setImageVersionID(0,getClassVersionID());
}
- NA_EIDPROC virtual short getClassSize()
+ virtual short getClassSize()
{ return (short)sizeof(MdamColumnGen); }
- NA_EIDPROC ex_expr::exp_return_type fixup(Lng32 base, unsigned short mode,
+ ex_expr::exp_return_type fixup(Lng32 base, unsigned short mode,
Space * space,
CollHeap *heap, const ex_tcb *tcb);
- NA_EIDPROC MdamColumnGen *getNext()
+ MdamColumnGen *getNext()
{ return next_; };
- NA_EIDPROC void setNext(MdamColumnGen *next)
+ void setNext(MdamColumnGen *next)
{ next_ = next; };
// the following function is used in the Generator to obtain the
// maximum disjunct number
- NA_EIDPROC Lng32 getLastDisjunctNumber()
+ Lng32 getLastDisjunctNumber()
{
Lng32 rc = -1;
@@ -341,32 +341,32 @@ public:
{ useSparseProbes_ = FALSE; };
// the following functions are used at MdamColumn constructor time
- NA_EIDPROC ex_expr *getHiExpr()
+ ex_expr *getHiExpr()
{ return hiExpr_; };
- NA_EIDPROC ex_expr *getLoExpr()
+ ex_expr *getLoExpr()
{ return loExpr_; };
- NA_EIDPROC ex_expr *getNonNullHiExpr()
+ ex_expr *getNonNullHiExpr()
{ return nonNullHiExpr_; };
- NA_EIDPROC ex_expr *getNonNullLoExpr()
+ ex_expr *getNonNullLoExpr()
{ return nonNullLoExpr_; };
// the following function is used at MdamColumn constructor time
// and during tree traversal
- NA_EIDPROC ULng32 getLength()
+ ULng32 getLength()
{ return columnLength_; };
// the following function is used during tree traversal
- NA_EIDPROC ULng32 getOffset()
+ ULng32 getOffset()
{ return keyBufferOffset_; };
- NA_EIDPROC NABoolean useSparseProbes()
+ NABoolean useSparseProbes()
{ return useSparseProbes_; };
// the following function used when building an Mdam network
- NA_EIDPROC MdamPred *getFirstPred()
+ MdamPred *getFirstPred()
{ return preds_; };
- NA_EIDPROC Long pack(void *);
- NA_EIDPROC Lng32 unpack(void *, void * reallocator);
+ Long pack(void *);
+ Lng32 unpack(void *, void * reallocator);
};
@@ -411,10 +411,10 @@ class keyMdamGen : public keyRangeGen
public:
- NA_EIDPROC keyMdamGen() // default constructor needed for UNPACK
+ keyMdamGen() // default constructor needed for UNPACK
{ first_ = 0; last_ = 0; };
- NA_EIDPROC keyMdamGen(ULng32 keyLen,
+ keyMdamGen(ULng32 keyLen,
ex_cri_desc * workCriDesc,
unsigned short keyValuesAtpIndex,
unsigned short excludeFlagAtpIndex,
@@ -428,50 +428,50 @@ public:
// ---------------------------------------------------------------------
// Redefine virtual functions required for Versioning.
//----------------------------------------------------------------------
- NA_EIDPROC virtual unsigned char getClassVersionID()
+ virtual unsigned char getClassVersionID()
{
return 1;
}
- NA_EIDPROC virtual void populateImageVersionIDArray()
+ virtual void populateImageVersionIDArray()
{
setImageVersionID(1,getClassVersionID());
keyRangeGen::populateImageVersionIDArray();
}
- NA_EIDPROC virtual short getClassSize() { return (short)sizeof(keyMdamGen); }
+ virtual short getClassSize() { return (short)sizeof(keyMdamGen); }
- NA_EIDPROC ~keyMdamGen();
+ ~keyMdamGen();
- NA_EIDPROC MdamColumnGen *getFirst() const
+ MdamColumnGen *getFirst() const
{ return first_; };
- NA_EIDPROC unsigned short getValueAtpIndex() const
+ unsigned short getValueAtpIndex() const
{ return valueAtpIndex_; };
- NA_EIDPROC Lng32 getMaxDisjunctNumber() const
+ Lng32 getMaxDisjunctNumber() const
{ return maxDisjunctNumber_; };
- NA_EIDPROC Lng32 getMaxMdamIntervals() const
+ Lng32 getMaxMdamIntervals() const
{ return maxMdamIntervals_; };
- NA_EIDPROC Lng32 getMaxMdamRefs() const
+ Lng32 getMaxMdamRefs() const
{ return maxMdamRefs_; };
- NA_EIDPROC Lng32 getMaxMdamRefsForStopLists() const
+ Lng32 getMaxMdamRefsForStopLists() const
{ return maxMdamRefsForStopLists_; };
- NA_EIDPROC NABoolean complementKeysBeforeReturning() const
+ NABoolean complementKeysBeforeReturning() const
{ return complementKeysBeforeReturning_; };
- NA_EIDPROC virtual Long pack(void * space);
- NA_EIDPROC virtual Lng32 unpack(void * base, void * reallocator);
- NA_EIDPROC virtual ex_expr* getExpressionNode(Int32 pos);
+ virtual Long pack(void * space);
+ virtual Lng32 unpack(void * base, void * reallocator);
+ virtual ex_expr* getExpressionNode(Int32 pos);
virtual keyMdamGen * castToKeyMdamGen() { return this; }
private:
- NA_EIDPROC NABoolean isBlank(char *text);
+ NABoolean isBlank(char *text);
};
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/ComKeyRange.cpp
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComKeyRange.cpp b/core/sql/comexe/ComKeyRange.cpp
index b46bc7a..2352925 100644
--- a/core/sql/comexe/ComKeyRange.cpp
+++ b/core/sql/comexe/ComKeyRange.cpp
@@ -68,7 +68,7 @@ keyRangeGen::keyRangeGen(key_type keyType,
// This method returns the virtual function table pointer for an object
// with the given class ID; used by NAVersionedObject::driveUnpack().
// -----------------------------------------------------------------------
-NA_EIDPROC char *keyRangeGen::findVTblPtr(short classID)
+char *keyRangeGen::findVTblPtr(short classID)
{
char *vtblPtr;
switch (classID)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/ComKeyRange.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComKeyRange.h b/core/sql/comexe/ComKeyRange.h
index 5e1984a..ce80757 100644
--- a/core/sql/comexe/ComKeyRange.h
+++ b/core/sql/comexe/ComKeyRange.h
@@ -95,66 +95,66 @@ private:
public:
// default constructor needed by UNPACK
- NA_EIDPROC keyRangeGen()
+ keyRangeGen()
: NAVersionedObject(-1)
{}
- NA_EIDPROC keyRangeGen(key_type keyType,
+ keyRangeGen(key_type keyType,
ULng32 keyLen,
ex_cri_desc * workCriDesc,
unsigned short keyValuesAtpIndex,
unsigned short excludeFlagAtpIndex,
unsigned short dataConvErrorFlagAtpIndex);
- NA_EIDPROC virtual ~keyRangeGen() { };
+ virtual ~keyRangeGen() { };
// ---------------------------------------------------------------------
// Redefine virtual functions required for Versioning.
//----------------------------------------------------------------------
- NA_EIDPROC virtual char *findVTblPtr(short classID);
+ virtual char *findVTblPtr(short classID);
- NA_EIDPROC virtual unsigned char getClassVersionID()
+ virtual unsigned char getClassVersionID()
{
return 1;
}
- NA_EIDPROC virtual void populateImageVersionIDArray()
+ virtual void populateImageVersionIDArray()
{
setImageVersionID(0,getClassVersionID());
}
- NA_EIDPROC virtual short getClassSize()
+ virtual short getClassSize()
{ return (short)sizeof(keyRangeGen); }
virtual keySingleSubsetGen * castToKeySingleSubsetGen() { return NULL; }
virtual keyMdamGen * castToKeyMdamGen() { return NULL; }
// for UNPACK
- NA_EIDPROC void fixupVTblPtr();
+ void fixupVTblPtr();
// accessor functions
- NA_EIDPROC key_type getType() { return (key_type) keyType_; };
+ key_type getType() { return (key_type) keyType_; };
- NA_EIDPROC ULng32 getKeyLength() const
+ ULng32 getKeyLength() const
{ return keyLength_; };
- NA_EIDPROC ex_cri_desc * getWorkCriDesc() const
+ ex_cri_desc * getWorkCriDesc() const
{ return workCriDesc_; };
- NA_EIDPROC unsigned short getKeyValuesAtpIndex() const
+ unsigned short getKeyValuesAtpIndex() const
{ return keyValuesAtpIndex_; };
- NA_EIDPROC unsigned short getExcludeFlagAtpIndex() const
+ unsigned short getExcludeFlagAtpIndex() const
{ return excludeFlagAtpIndex_; };
- NA_EIDPROC unsigned short getDataConvErrorFlagAtpIndex() const
+ unsigned short getDataConvErrorFlagAtpIndex() const
{ return dataConvErrorFlagAtpIndex_; };
- NA_EIDPROC UInt16 getKeytag() const
+ UInt16 getKeytag() const
{ return keytag_; };
- NA_EIDPROC void setKeytag(UInt16 kt)
+ void setKeytag(UInt16 kt)
{ keytag_ = kt; };
- NA_EIDPROC virtual Long pack(void *);
- NA_EIDPROC virtual Lng32 unpack(void *, void * reallocator);
+ virtual Long pack(void *);
+ virtual Lng32 unpack(void *, void * reallocator);
- NA_EIDPROC virtual ex_expr* getExpressionNode(Int32 pos) { return NULL; }
+ virtual ex_expr* getExpressionNode(Int32 pos) { return NULL; }
};
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/ComKeySingleSubset.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComKeySingleSubset.h b/core/sql/comexe/ComKeySingleSubset.h
index 3401f9e..8b7df07 100644
--- a/core/sql/comexe/ComKeySingleSubset.h
+++ b/core/sql/comexe/ComKeySingleSubset.h
@@ -79,9 +79,9 @@ private:
public:
- NA_EIDPROC keySingleSubsetGen() {}; // default constructor used by UNPACK
+ keySingleSubsetGen() {}; // default constructor used by UNPACK
- NA_EIDPROC keySingleSubsetGen(ULng32 keyLen,
+ keySingleSubsetGen(ULng32 keyLen,
ex_cri_desc * workCriDesc,
unsigned short keyValuesAtpIndex,
unsigned short excludeFlagAtpIndex,
@@ -96,46 +96,46 @@ public:
// ---------------------------------------------------------------------
// Redefine virtual functions required for Versioning.
//----------------------------------------------------------------------
- NA_EIDPROC virtual unsigned char getClassVersionID()
+ virtual unsigned char getClassVersionID()
{
return 1;
}
- NA_EIDPROC virtual void populateImageVersionIDArray()
+ virtual void populateImageVersionIDArray()
{
setImageVersionID(1,getClassVersionID());
keyRangeGen::populateImageVersionIDArray();
}
- NA_EIDPROC virtual short getClassSize()
+ virtual short getClassSize()
{ return (short)sizeof(keySingleSubsetGen); }
- NA_EIDPROC virtual ~keySingleSubsetGen();
+ virtual ~keySingleSubsetGen();
- NA_EIDPROC virtual Long pack(void * space);
- NA_EIDPROC virtual Lng32 unpack(void * base, void * reallocator);
+ virtual Long pack(void * space);
+ virtual Lng32 unpack(void * base, void * reallocator);
- NA_EIDPROC virtual ex_expr* getExpressionNode(Int32 pos);
+ virtual ex_expr* getExpressionNode(Int32 pos);
virtual keySingleSubsetGen * castToKeySingleSubsetGen() { return this; }
// accessor functions
- NA_EIDPROC inline ex_expr * bkPred() const
+ inline ex_expr * bkPred() const
{ return bkPred_; };
- NA_EIDPROC inline ex_expr * ekPred() const
+ inline ex_expr * ekPred() const
{ return ekPred_; };
- NA_EIDPROC inline ex_expr * bkExcludedExpr() const
+ inline ex_expr * bkExcludedExpr() const
{ return lowKeyExcludedExpr_; }
- NA_EIDPROC inline ex_expr * ekExcludedExpr() const
+ inline ex_expr * ekExcludedExpr() const
{ return highKeyExcludedExpr_; }
- NA_EIDPROC inline short isBkeyExcluded() const
+ inline short isBkeyExcluded() const
{ return lowKeyExcluded_;}
- NA_EIDPROC inline short isEkeyExcluded() const
+ inline short isEkeyExcluded() const
{ return highKeyExcluded_;}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/ComQueue.cpp
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComQueue.cpp b/core/sql/comexe/ComQueue.cpp
index ba09683..7fec9d1 100644
--- a/core/sql/comexe/ComQueue.cpp
+++ b/core/sql/comexe/ComQueue.cpp
@@ -144,11 +144,7 @@ void Queue::insert(const void * entry_, ULng32 packedLength)
if (heap_)
tail->next = new(heap_) Q_Entry(0, 0, 0);
else
-#ifdef __EID
- assert(heap_);
-#else
tail->next = new Q_Entry(0, 0, 0);
-#endif // __EID
tail->next->prev = tail;
tail = tail->next;
numEntries_++;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/ComQueue.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComQueue.h b/core/sql/comexe/ComQueue.h
index b42c472..e110b49 100644
--- a/core/sql/comexe/ComQueue.h
+++ b/core/sql/comexe/ComQueue.h
@@ -117,18 +117,13 @@ class Q_Entry
char fillersQ_Entry_[20]; // 28-47
public:
-NA_EIDPROC
Q_Entry(void * entry_, Q_Entry * prev_, Q_Entry * next_);
-NA_EIDPROC
~Q_Entry();
-NA_EIDPROC
Long pack(void *space);
-NA_EIDPROC
Lng32 unpack(void *base);
-NA_EIDPROC
ULng32 packedLength() { return packedLength_; }
};
@@ -139,9 +134,6 @@ class Queue : public NAVersionedObject
Q_EntryPtr curr; // 16-23
CollHeap *heap_;
-#ifndef NA_64BIT
- char fillersQueue1_[4];
-#endif // 24-31
Int32 numEntries_; // 32-35
@@ -162,125 +154,97 @@ class Queue : public NAVersionedObject
};
public:
-NA_EIDPROC
Queue();
// ---------------------------------------------------------------------
// Redefine virtual functions required for Versioning.
//----------------------------------------------------------------------
-NA_EIDPROC
virtual unsigned char getClassVersionID()
{
return 1;
}
-NA_EIDPROC
virtual void populateImageVersionIDArray()
{
setImageVersionID(0,getClassVersionID());
}
-NA_EIDPROC
virtual short getClassSize() { return (short)sizeof(Queue); }
-NA_EIDPROC
Queue(CollHeap * heap);
-NA_EIDPROC
~Queue();
// inserts at tail
-NA_EIDPROC
void insert(const void * entry_, ULng32 entryPackedLength = 0);
// inserts at tail, returns addr of Queue entry inserted
-NA_EIDPROC
void insert(const void * entry_, ULng32 entryPackedLength,
void ** queueEntry);
// returns the head entry
-NA_EIDPROC
void * get();
// returns the i'th entry. 0 based. First entry is i = 0
-NA_EIDPROC
void * get(ULng32 i);
// returns the head entry
-NA_EIDPROC
void * getHead();
// returns the tail(last) entry
-NA_EIDPROC
void * getTail();
// positions on the head entry
-NA_EIDPROC
void position();
// positions on a specified Queue entry
-NA_EIDPROC
void position(void * queueEntry);
// returns the current entry
-NA_EIDPROC
void * getCurr();
// advances the current entry
-NA_EIDPROC
void advance();
// returns the current entry and advances curr
-NA_EIDPROC
void * getNext();
// returns -1, if all entries have been returned.
-NA_EIDPROC
short atEnd();
// removes the head entry
-NA_EIDPROC
void remove();
// removes the head entry
-NA_EIDPROC
void removeHead() { remove(); };
// removes the tail entry
-NA_EIDPROC
void removeTail();
-NA_EIDPROC
void removeWithSpaceOpt();
// removes the 'entry' entry
-NA_EIDPROC
NABoolean remove(void * entry);
-NA_EIDPROC
virtual Long pack(void * space);
-NA_EIDPROC
virtual Lng32 unpack(void * base, void * reallocator);
// returns -1, if queue is empty. Otherwise, returns 0.
-NA_EIDPROC
Int32 isEmpty()
{
return ((numEntries() == 0) ? -1 : 0);
}
-NA_EIDPROC
Lng32 numEntries() { return numEntries_;}
Lng32 entries() { return numEntries();}
-NA_EIDPROC
ULng32 packedLength() { return packedLength_; }
- NA_EIDPROC
+
void setDoSpaceOpt(short v) {(v ? flags_ |= DO_SPACE_OPT : flags_ &= ~DO_SPACE_OPT); };
NABoolean doSpaceOpt() { return (flags_ & DO_SPACE_OPT) != 0; };
@@ -308,7 +272,6 @@ class HashQueueEntry {
friend class HashQueue;
public:
-NA_EIDPROC
HashQueueEntry(void * entry,
HashQueueEntry * prev,
HashQueueEntry * next,
@@ -319,7 +282,6 @@ NA_EIDPROC
hashValue_(hashValue) {
};
-NA_EIDPROC
~HashQueueEntry() {
};
@@ -333,66 +295,48 @@ private:
class HashQueue : public NABasicObject {
public:
-NA_EIDPROC
HashQueue(CollHeap * heap, ULng32 hashTableSize = 513);
-NA_EIDPROC
HashQueue(const NABoolean shadowCopy,
const HashQueue &other);
-NA_EIDPROC
~HashQueue();
-NA_EIDPROC
ULng32 entries() { return entries_; }
-NA_EIDPROC
ULng32 size() { return hashTableSize_; }
-NA_EIDPROC
void insert(const char * data, ULng32 dataLength, void * entry);
// position by hashing
-NA_EIDPROC
void position(const char * data, ULng32 dataLength);
// position globally
-NA_EIDPROC
void position();
-NA_EIDPROC
void * getNext();
// returns the current entry
-NA_EIDPROC
void * getCurr();
// advances the current entry
-NA_EIDPROC
void advance();
-NA_EIDPROC
void remove(void * entry);
// To remove the last rrturned entry via getNext() in case of global scan
// of hash queue
-NA_EIDPROC
void remove();
// To remove the entry by passing in the hashing fields and the corresponding entry
-NA_EIDPROC
void remove(const char *data, ULng32 dataLength, void *entry);
-NA_EIDPROC
Lng32 numEntries() { return (Lng32)entries_;}
-NA_EIDPROC
NABoolean sequentialAdd() { return (flags_ & SEQUENTIAL_ADD) != 0; }
-NA_EIDPROC
void setSequentialAdd(NABoolean v)
{ (v ? flags_ |= SEQUENTIAL_ADD : flags_ &= ~SEQUENTIAL_ADD); }
-NA_EIDPROC
Int32 isEmpty() { return ((entries_ == 0) ? -1 : 0); }
private:
@@ -416,10 +360,8 @@ private:
ULng32 flags_;
-NA_EIDPROC
void getHashValue(const char * data, ULng32 dataLength);
-NA_EIDPROC
void removeLastReturned();
};
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/ComTdb.cpp
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdb.cpp b/core/sql/comexe/ComTdb.cpp
index 2c2ddcb..5007e01 100644
--- a/core/sql/comexe/ComTdb.cpp
+++ b/core/sql/comexe/ComTdb.cpp
@@ -57,7 +57,6 @@
// -----------------------------------------------------------------------
// Used in constructor to retrieve PCODE environment variables.
// -----------------------------------------------------------------------
-#ifndef __EID
/*static char *GetEnv(char *eye, char *prefix)
{
char buffer[32];
@@ -71,9 +70,7 @@
return getenv(buffer);
}*/
-#endif
-// LCOV_EXCL_START
// This method is called only if params parameter is sent to ComTdb constructor
// and no where in the code the ComTdb constructor is being called with
// params paramter. It was tested by removing the the param parameter
@@ -83,18 +80,8 @@ void ComTdbParams::getValues(Cardinality &estimatedRowCount,
ExCriDescPtr &criUp,
queue_index &sizeDown,
queue_index &sizeUp,
-#ifdef NA_64BIT
- // dg64 - match signature
Int32 &numBuffers,
-#else
- Lng32 &numBuffers,
-#endif
-#ifdef NA_64BIT
- // dg64 - match signature
UInt32 &bufferSize,
-#else
- ULng32 &bufferSize,
-#endif
Int32 &firstNRows)
{
estimatedRowCount = estimatedRowCount_;
@@ -105,12 +92,11 @@ void ComTdbParams::getValues(Cardinality &estimatedRowCount,
numBuffers = numBuffers_;
firstNRows = firstNRows_;
}
-// LCOV_EXCL_STOP
// -----------------------------------------------------------------------
// TDB constructor & Destructor
// -----------------------------------------------------------------------
-NA_EIDPROC ComTdb::ComTdb(
+ComTdb::ComTdb(
ex_node_type type,
const char *eye,
Cardinality estRowsUsed,
@@ -118,18 +104,8 @@ NA_EIDPROC ComTdb::ComTdb(
ex_cri_desc *criUp,
queue_index sizeDown,
queue_index sizeUp,
-#ifdef NA_64BIT
- // dg64 - match signature
Int32 numBuffers,
-#else
- Lng32 numBuffers,
-#endif
-#ifdef NA_64BIT
- // dg64 - match signature
UInt32 bufferSize,
-#else
- ULng32 bufferSize,
-#endif
Lng32 uniqueId,
ULng32 initialQueueSizeDown,
ULng32 initialQueueSizeUp,
@@ -178,14 +154,14 @@ NA_EIDPROC ComTdb::ComTdb(
}
-NA_EIDPROC ComTdb::ComTdb()
+ComTdb::ComTdb()
: NAVersionedObject(-1),
overflowMode_(OFM_DISK)
{
}
-NA_EIDPROC ComTdb::~ComTdb()
+ComTdb::~ComTdb()
{
// ---------------------------------------------------------------------
// Change the eye catcher
@@ -194,7 +170,7 @@ NA_EIDPROC ComTdb::~ComTdb()
}
-NA_EIDPROC Long ComTdb::pack(void *space)
+Long ComTdb::pack(void *space)
{
criDescDown_.pack(space);
criDescUp_.pack(space);
@@ -203,7 +179,7 @@ NA_EIDPROC Long ComTdb::pack(void *space)
return NAVersionedObject::pack(space);
}
-NA_EIDPROC Lng32 ComTdb::unpack(void * base, void * reallocator)
+Lng32 ComTdb::unpack(void * base, void * reallocator)
{
if(criDescDown_.unpack(base, reallocator)) return -1;
if(criDescUp_.unpack(base, reallocator)) return -1;
@@ -215,10 +191,9 @@ NA_EIDPROC Lng32 ComTdb::unpack(void * base, void * reallocator)
// Used by the internal SHOWPLAN command to get attributes of a TDB in a
// string.
// -----------------------------------------------------------------------
-NA_EIDPROC void ComTdb::displayContents(Space * space,ULng32 flag)
+void ComTdb::displayContents(Space * space,ULng32 flag)
{
-#ifndef __EID
char buf[100];
str_sprintf(buf, "Contents of %s [%d]:", getNodeName(),getExplainNodeId());
Int32 j = str_len(buf);
@@ -262,7 +237,6 @@ NA_EIDPROC void ComTdb::displayContents(Space * space,ULng32 flag)
space->allocateAndCopyToAlignedSpace(buf, str_len(buf), sizeof(short));
}
}
- #endif
if(flag & 0x00000001)
{
@@ -271,7 +245,7 @@ NA_EIDPROC void ComTdb::displayContents(Space * space,ULng32 flag)
}
}
-NA_EIDPROC void ComTdb::displayExpression(Space *space,ULng32 flag)
+void ComTdb::displayExpression(Space *space,ULng32 flag)
{
char buf[100];
@@ -289,10 +263,8 @@ NA_EIDPROC void ComTdb::displayExpression(Space *space,ULng32 flag)
(char *)getExpressionName(i),flag);
else
{
-#ifndef __EID
str_sprintf(buf, "Expression: %s is NULL\n", (char *)getExpressionName(i));
space->allocateAndCopyToAlignedSpace(buf, str_len(buf), sizeof(short));
-#endif
}
}
}
@@ -314,7 +286,7 @@ NA_EIDPROC void ComTdb::displayExpression(Space *space,ULng32 flag)
}
}
-NA_EIDPROC void ComTdb::displayChildren(Space *space,ULng32 flag)
+void ComTdb::displayChildren(Space *space,ULng32 flag)
{
for (Int32 i = 0; i < numChildren(); i++)
{
@@ -331,7 +303,7 @@ NA_EIDPROC void ComTdb::displayChildren(Space *space,ULng32 flag)
// Executor version of the TDB.
// -----------------------------------------------------------------------
// LCOV_EXCL_START
-NA_EIDPROC void ComTdb::fixupVTblPtrCom()
+void ComTdb::fixupVTblPtrCom()
{
}
// LCOV_EXCL_STOP
@@ -343,7 +315,7 @@ NA_EIDPROC void ComTdb::fixupVTblPtrCom()
// implemented in the executor project (in ExComTdb.cpp) which returns
// the pointer for an "executor TDB".
// -----------------------------------------------------------------------
-NA_EIDPROC char *ComTdb::findVTblPtrCom(short classID)
+char *ComTdb::findVTblPtrCom(short classID)
{
char *vtblptr = NULL;
switch (classID)
@@ -429,8 +401,6 @@ NA_EIDPROC char *ComTdb::findVTblPtrCom(short classID)
break;
}
-#ifndef __EID
-
case ex_TUPLE:
{
#pragma nowarn(1506) // warning elimination
@@ -866,7 +836,6 @@ NA_EIDPROC char *ComTdb::findVTblPtrCom(short classID)
break;
}
-#endif
default:
break;
// LCOV_EXCL_STOP