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/19 22:25:23 UTC
[5/9] incubator-trafodion git commit: code cleanup, commit #1
code cleanup, commit #1
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/b952c0d5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/b952c0d5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/b952c0d5
Branch: refs/heads/master
Commit: b952c0d5f96f773155467249631622a79e0ca68e
Parents: cd54195
Author: Anoop Sharma <an...@esgyn.com>
Authored: Fri Sep 15 00:13:37 2017 +0000
Committer: Anoop Sharma <an...@esgyn.com>
Committed: Fri Sep 15 00:13:37 2017 +0000
----------------------------------------------------------------------
core/sql/arkcmp/CmpStoredProc.h | 1 -
core/sql/bin/SqlciMain.cpp | 1 -
core/sql/cli/CliDll.cpp | 36 -
core/sql/cli/CliExtern.cpp | 1 -
core/sql/cli/CliStubsStaticBuild.cpp | 23 -
core/sql/cli/Globals.cpp | 1 -
core/sql/cli/Globals.h | 3 -
core/sql/cli/Module.cpp | 1 -
core/sql/cli/Statement.cpp | 1 -
core/sql/cli/VicKeyValuePair.h | 22 -
core/sql/cli/cli_stdh.h | 2 +-
core/sql/cli/globalsrlversion.cpp | 40 -
core/sql/cli/globalstubs.cpp | 37 -
core/sql/cli/privsrlversion.cpp | 41 -
core/sql/cli/rtdu.cpp | 37 -
core/sql/cli/rtdu.h | 24 -
core/sql/cli/rtdu2.cpp | 37 -
core/sql/cli/rtdu2.h | 28 -
core/sql/cli/sqlciSRLStubs.cpp | 32 -
core/sql/cli/test.cpp | 21 -
core/sql/comexe/FragmentDir.cpp | 2 +-
core/sql/common/NAHeap.h | 2 +-
core/sql/common/SqlExpDllDefines.h | 23 -
core/sql/common/SqlExportDllDefines.h | 20 -
core/sql/executor/ExAll.cpp | 1 -
core/sql/executor/ExExeUtilMisc.cpp | 1 -
core/sql/executor/ExMeas.cpp | 22 -
core/sql/executor/ExMeas.h | 22 -
core/sql/executor/ExStats.h | 1 -
core/sql/executor/dmeasql.h | 22 -
core/sql/executor/ex_esp_frag_dir.cpp | 2 +-
core/sql/executor/ex_globals.cpp | 1 -
core/sql/executor/ex_stdh.h | 2 +-
core/sql/executor/rcb.h | 20 -
core/sql/executor/stubs.cpp | 38 -
core/sql/executor/stubs2.cpp | 26 -
core/sql/executor/tempfile.cpp | 37 -
core/sql/executor/tempfile.h | 37 -
core/sql/exp/ExpAtp.h | 1 -
core/sql/exp/ExpCriDesc.cpp | 2 +-
core/sql/exp/ExpCriDesc.h | 1 -
core/sql/exp/ExpDll.cpp | 3 -
core/sql/exp/ExpError.h | 1 -
core/sql/exp/ExpLOB.h | 1 -
core/sql/exp/ExpPCodeInstruction.h | 1 -
core/sql/exp/ExpPCodeList.h | 1 -
core/sql/exp/ExpPCodeOptimizations.h | 2 +-
core/sql/exp/ExpSeqGen.h | 1 -
core/sql/exp/ExpSqlTupp.h | 1 -
core/sql/exp/exp_clause.h | 2 +-
core/sql/exp/exp_clause_derived.h | 1 -
core/sql/exp/exp_expr.h | 1 -
core/sql/exp/exp_space.cpp | 358 --------
core/sql/exp/exp_space.h | 22 -
core/sql/exp/exp_stdh.h | 3 +-
core/sql/exp/exp_tuple_desc.h | 1 -
core/sql/exp/srlversion.cpp | 41 -
core/sql/export/stubs.cpp | 53 --
core/sql/generator/GenExpGenerator.h | 2 +-
core/sql/generator/Generator.h | 2 +-
core/sql/nskgmake/executor/Makefile | 4 -
core/sql/nskgmake/sqlcat/Makefile | 4 +-
core/sql/nskgmake/sqlci/Makefile | 3 +-
core/sql/nskgmake/sqlcilib/Makefile | 15 +-
core/sql/nskgmake/tdm_sqlcli/Makefile | 3 +-
core/sql/nskgmake/tdm_sqlshare/Makefile | 3 +-
core/sql/qmscommon/QRQueries.cpp | 4 +-
core/sql/sqlcat/ReadTableDef.cpp | 39 -
core/sql/sqlcat/ReadTableDef.h | 44 -
core/sql/sqlcat/enum.h | 20 -
core/sql/sqlcat/readRealArk.cpp | 34 -
core/sql/sqlcat/readRealArk.h | 23 -
core/sql/sqlci/CSInterface.h | 84 --
core/sql/sqlci/CharSetConstants.cpp | 47 --
core/sql/sqlci/CharSetConstants.h | 30 -
core/sql/sqlci/Define.cpp | 204 -----
core/sql/sqlci/Define.h | 42 -
core/sql/sqlci/Formatter.cpp | 4 -
core/sql/sqlci/InputStmt.cpp | 42 +-
core/sql/sqlci/Log.cpp | 51 --
core/sql/sqlci/MsgCat.cpp | 76 --
core/sql/sqlci/MsgCat.h | 82 --
core/sql/sqlci/MxciEHCallBack.cpp | 53 --
core/sql/sqlci/MxciEHCallBack.h | 56 --
core/sql/sqlci/Obey.cpp | 14 -
core/sql/sqlci/Param.cpp | 8 -
core/sql/sqlci/Prepare.cpp | 11 -
core/sql/sqlci/RWInterface.cpp | 119 ---
core/sql/sqlci/RWInterface.h | 155 ----
core/sql/sqlci/ShellCmd.h | 7 -
core/sql/sqlci/SqlCmd.cpp | 50 --
core/sql/sqlci/Sqlci.h | 3 -
core/sql/sqlci/SqlciCSCmd.cpp | 341 --------
core/sql/sqlci/SqlciCSCmd.h | 158 ----
core/sql/sqlci/SqlciCSSimulator.cpp | 112 ---
core/sql/sqlci/SqlciCmd.cpp | 102 +--
core/sql/sqlci/SqlciCmd.h | 45 +-
core/sql/sqlci/SqlciEnv.cpp | 78 --
core/sql/sqlci/SqlciEnv.h | 54 +-
core/sql/sqlci/SqlciError.cpp | 12 -
core/sql/sqlci/SqlciError.h | 4 -
core/sql/sqlci/SqlciHelp.cpp | 244 ------
core/sql/sqlci/SqlciNode.cpp | 30 -
core/sql/sqlci/SqlciNode.h | 10 -
core/sql/sqlci/SqlciParser.cpp | 64 +-
core/sql/sqlci/SqlciRWCmd.cpp | 1172 --------------------------
core/sql/sqlci/SqlciRWCmd.h | 299 -------
core/sql/sqlci/SqlciRWSimulator.cpp | 375 --------
core/sql/sqlci/SqlciReset.cpp | 45 -
core/sql/sqlci/SqlciShow.cpp | 21 -
core/sql/sqlci/SqlciStmts.cpp | 8 -
core/sql/sqlci/SqlciUsage.cpp | 889 -------------------
core/sql/sqlci/SqlciUtil.cpp | 59 --
core/sql/sqlci/SqlciUtil.h | 77 --
core/sql/sqlci/UtilInt.cpp | 86 --
core/sql/sqlci/UtilInt.h | 44 -
core/sql/sqlci/UtilMsg.cpp | 69 --
core/sql/sqlci/UtilMsg.h | 45 -
core/sql/sqlci/immudefs.cpp | 156 ----
core/sql/sqlci/immudefs.h | 185 ----
core/sql/sqlci/sqlci_lex.ll | 83 +-
core/sql/sqlci/sqlci_yacc.y | 416 +--------
core/sql/sqlci/sqlclicmd.h | 4 -
core/sql/sqlci/sqlcmd.h | 24 -
core/sql/sqlcomp/CmpMain.cpp | 2 +-
core/sql/sqlcomp/parser.cpp | 3 +-
core/sql/sqlmsg/GetErrorMessage.cpp | 6 +-
core/sql/sqlshare/catapirequest.cpp | 1070 -----------------------
core/sql/sqlshare/catapirequest.h | 594 -------------
129 files changed, 49 insertions(+), 9440 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b952c0d5/core/sql/arkcmp/CmpStoredProc.h
----------------------------------------------------------------------
diff --git a/core/sql/arkcmp/CmpStoredProc.h b/core/sql/arkcmp/CmpStoredProc.h
index 90d281a..3ee41cd 100644
--- a/core/sql/arkcmp/CmpStoredProc.h
+++ b/core/sql/arkcmp/CmpStoredProc.h
@@ -46,7 +46,6 @@
#include "CmpISPStd.h"
// for the table descriptions
-#include "enum.h"
#include "CmpCommon.h"
#include "Collections.h" // for NAList
#include "Int64.h"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b952c0d5/core/sql/bin/SqlciMain.cpp
----------------------------------------------------------------------
diff --git a/core/sql/bin/SqlciMain.cpp b/core/sql/bin/SqlciMain.cpp
index f453b8a..081b7f9 100644
--- a/core/sql/bin/SqlciMain.cpp
+++ b/core/sql/bin/SqlciMain.cpp
@@ -87,7 +87,6 @@ DEFINE_DOVERS(sqlci)
#endif
#include "EHException.h"
-#include "MxciEHCallBack.h"
#ifdef _DEBUG_RTS
#include "ComQueue.h"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b952c0d5/core/sql/cli/CliDll.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/CliDll.cpp b/core/sql/cli/CliDll.cpp
deleted file mode 100644
index f98e94c..0000000
--- a/core/sql/cli/CliDll.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-/* -*-C++-*-
- *****************************************************************************
- *
- * File: CliDll.cpp
- * Description: CLI DLL-related code for Windows NT - from Cli.cpp originally
- *
- *
- * Created: 7/19/97
- * Language: C++
- *
- *
-// @@@ START COPYRIGHT @@@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-// @@@ END COPYRIGHT @@@
- *
- *
- *****************************************************************************
- */
-
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b952c0d5/core/sql/cli/CliExtern.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/CliExtern.cpp b/core/sql/cli/CliExtern.cpp
index 4d3ed51..d04602b 100644
--- a/core/sql/cli/CliExtern.cpp
+++ b/core/sql/cli/CliExtern.cpp
@@ -75,7 +75,6 @@
#include "memorymonitor.h"
#include "dfs2rec.h"
-#include "ExMeas.h"
#include "Statement.h"
#include "ComSqlId.h"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b952c0d5/core/sql/cli/CliStubsStaticBuild.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/CliStubsStaticBuild.cpp b/core/sql/cli/CliStubsStaticBuild.cpp
deleted file mode 100644
index c5be5ac..0000000
--- a/core/sql/cli/CliStubsStaticBuild.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-/**********************************************************************
-// @@@ START COPYRIGHT @@@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-// @@@ END COPYRIGHT @@@
-**********************************************************************/
-
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b952c0d5/core/sql/cli/Globals.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/Globals.cpp b/core/sql/cli/Globals.cpp
index cb9c836..c62acfe 100644
--- a/core/sql/cli/Globals.cpp
+++ b/core/sql/cli/Globals.cpp
@@ -48,7 +48,6 @@
#include "ex_stdh.h"
#include "ex_frag_rt.h"
#include "memorymonitor.h"
-#include "ExMeas.h"
#include "ExStats.h"
#include "ExUdrServer.h"
#include "ExSqlComp.h"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b952c0d5/core/sql/cli/Globals.h
----------------------------------------------------------------------
diff --git a/core/sql/cli/Globals.h b/core/sql/cli/Globals.h
index b825fb9..22ca7f7 100644
--- a/core/sql/cli/Globals.h
+++ b/core/sql/cli/Globals.h
@@ -63,9 +63,6 @@
#include <setjmp.h>
#include "NAMemory.h"
-#ifndef BUILD_MUSE
-#include "ExMeas.h"
-#endif
#include "sqlcli.h"
#include "QuasiFileManager.h"
#include "Ipc.h"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b952c0d5/core/sql/cli/Module.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/Module.cpp b/core/sql/cli/Module.cpp
index f4c5781..d8b9e42 100644
--- a/core/sql/cli/Module.cpp
+++ b/core/sql/cli/Module.cpp
@@ -39,7 +39,6 @@
// -----------------------------------------------------------------------
#include "cli_stdh.h"
-#include "ExMeas.h"
Module::Module(const char * module_name, Lng32 len, char * pathName,
Lng32 pathNameLen, NAHeap *heap)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b952c0d5/core/sql/cli/Statement.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/Statement.cpp b/core/sql/cli/Statement.cpp
index 8246d9c..83910dd 100644
--- a/core/sql/cli/Statement.cpp
+++ b/core/sql/cli/Statement.cpp
@@ -45,7 +45,6 @@
#include "ComTdb.h"
#include "ex_tcb.h"
#include "ex_root.h"
-#include "ExMeas.h"
#include "ExStats.h"
#include "ExSqlComp.h"
#include "ex_transaction.h"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b952c0d5/core/sql/cli/VicKeyValuePair.h
----------------------------------------------------------------------
diff --git a/core/sql/cli/VicKeyValuePair.h b/core/sql/cli/VicKeyValuePair.h
deleted file mode 100644
index ade3632..0000000
--- a/core/sql/cli/VicKeyValuePair.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/**********************************************************************
-// @@@ START COPYRIGHT @@@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-// @@@ END COPYRIGHT @@@
-**********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b952c0d5/core/sql/cli/cli_stdh.h
----------------------------------------------------------------------
diff --git a/core/sql/cli/cli_stdh.h b/core/sql/cli/cli_stdh.h
index db5b670..0315c48 100644
--- a/core/sql/cli/cli_stdh.h
+++ b/core/sql/cli/cli_stdh.h
@@ -21,7 +21,7 @@
#include "Platform.h"
#include "SQLCLIdev.h"
#include "ex_god.h"
-#include "exp_space.h"
+#include "ComSpace.h"
#include "NAHeap.h"
#include "NAMemory.h"
#include "str.h"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b952c0d5/core/sql/cli/globalsrlversion.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/globalsrlversion.cpp b/core/sql/cli/globalsrlversion.cpp
deleted file mode 100644
index f519696..0000000
--- a/core/sql/cli/globalsrlversion.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/**********************************************************************
-// @@@ START COPYRIGHT @@@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-// @@@ END COPYRIGHT @@@
-**********************************************************************/
-/* -*-C++-*-
-****************************************************************************
-*
-* File: SRLVersion.cpp
-* RCS:
-* Description:
-*
-* Created: 10/22/98
-* Modified:
-* Language: C++
-* Status: $State: Exp $
-*
-*
-*
-****************************************************************************
-*/
-//#include "platform.h"
-
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b952c0d5/core/sql/cli/globalstubs.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/globalstubs.cpp b/core/sql/cli/globalstubs.cpp
deleted file mode 100644
index e224f47..0000000
--- a/core/sql/cli/globalstubs.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-/**********************************************************************
-// @@@ START COPYRIGHT @@@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-// @@@ END COPYRIGHT @@@
-**********************************************************************/
-
-/* -*-C++-*-
- *****************************************************************************
- *
- * File: Stubs.cpp
- * Description: contains stubs required for the export SRL
- *
- * Created: 10/19/98
- * Language: C++
- * Status: $State: Exp $
- *
- *
- *****************************************************************************
- */
-
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b952c0d5/core/sql/cli/privsrlversion.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/privsrlversion.cpp b/core/sql/cli/privsrlversion.cpp
deleted file mode 100644
index ac1006a..0000000
--- a/core/sql/cli/privsrlversion.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-/**********************************************************************
-// @@@ START COPYRIGHT @@@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-// @@@ END COPYRIGHT @@@
-**********************************************************************/
-/* -*-C++-*-
-****************************************************************************
-*
-* File: SRLVersion.cpp
-* RCS:
-* Description:
-*
-* Created: 10/22/98
-* Modified:
-* Language: C++
-* Status: $State: Exp $
-*
-*
-*
-****************************************************************************
-*/
-
-
-
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b952c0d5/core/sql/cli/rtdu.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/rtdu.cpp b/core/sql/cli/rtdu.cpp
deleted file mode 100644
index da1a5fa..0000000
--- a/core/sql/cli/rtdu.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-/**********************************************************************
-// @@@ START COPYRIGHT @@@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-// @@@ END COPYRIGHT @@@
-**********************************************************************/
-/* -*-C++-*-
- *****************************************************************************
- *
- * File: <file>
- * Description:
- *
- *
- * Created: 7/10/95
- * Language: C++
- *
- *
- *
- *
- *****************************************************************************
- */
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b952c0d5/core/sql/cli/rtdu.h
----------------------------------------------------------------------
diff --git a/core/sql/cli/rtdu.h b/core/sql/cli/rtdu.h
deleted file mode 100644
index 607fc67..0000000
--- a/core/sql/cli/rtdu.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/**********************************************************************
-// @@@ START COPYRIGHT @@@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-// @@@ END COPYRIGHT @@@
-**********************************************************************/
-
-this file is obsolete and has been removed
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b952c0d5/core/sql/cli/rtdu2.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/rtdu2.cpp b/core/sql/cli/rtdu2.cpp
deleted file mode 100644
index da1a5fa..0000000
--- a/core/sql/cli/rtdu2.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-/**********************************************************************
-// @@@ START COPYRIGHT @@@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-// @@@ END COPYRIGHT @@@
-**********************************************************************/
-/* -*-C++-*-
- *****************************************************************************
- *
- * File: <file>
- * Description:
- *
- *
- * Created: 7/10/95
- * Language: C++
- *
- *
- *
- *
- *****************************************************************************
- */
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b952c0d5/core/sql/cli/rtdu2.h
----------------------------------------------------------------------
diff --git a/core/sql/cli/rtdu2.h b/core/sql/cli/rtdu2.h
deleted file mode 100644
index d0197c0..0000000
--- a/core/sql/cli/rtdu2.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/**********************************************************************
-// @@@ START COPYRIGHT @@@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-// @@@ END COPYRIGHT @@@
-**********************************************************************/
-#ifndef RTDU2_H
-#define RTDU2_H
-
-this file is obsolete and has been removed
-
-#endif
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b952c0d5/core/sql/cli/sqlciSRLStubs.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/sqlciSRLStubs.cpp b/core/sql/cli/sqlciSRLStubs.cpp
deleted file mode 100644
index 38ad282..0000000
--- a/core/sql/cli/sqlciSRLStubs.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-/**********************************************************************
-// @@@ START COPYRIGHT @@@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-// @@@ END COPYRIGHT @@@
-**********************************************************************/
-
-/*
-#include "NAStringDef.h"
-
-
-#ifndef RW_NO_LOCALE
-
-
-#endif // RW_NO_LOCALE
-*/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b952c0d5/core/sql/cli/test.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/test.cpp b/core/sql/cli/test.cpp
deleted file mode 100644
index d706a41..0000000
--- a/core/sql/cli/test.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-// @@@ START COPYRIGHT @@@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-// @@@ END COPYRIGHT @@@
-
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b952c0d5/core/sql/comexe/FragmentDir.cpp
----------------------------------------------------------------------
diff --git a/core/sql/comexe/FragmentDir.cpp b/core/sql/comexe/FragmentDir.cpp
index 3d4df19..535546c 100644
--- a/core/sql/comexe/FragmentDir.cpp
+++ b/core/sql/comexe/FragmentDir.cpp
@@ -39,7 +39,7 @@
#include "FragmentDir.h"
//#include "Generator.h"
-#include "exp_space.h"
+#include "ComSpace.h"
// -----------------------------------------------------------------------
// forward declarations
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b952c0d5/core/sql/common/NAHeap.h
----------------------------------------------------------------------
diff --git a/core/sql/common/NAHeap.h b/core/sql/common/NAHeap.h
index 7c00356..6a38511 100644
--- a/core/sql/common/NAHeap.h
+++ b/core/sql/common/NAHeap.h
@@ -52,7 +52,7 @@ class ostream;
// allocateMemory, deallocateMemory methods defined.
//
// -class NASpace: public CollHeap
-// NASpace acts as a Space in exp_space.h
+// NASpace acts as a Space in ComSpace.h
//
// -class NAMFHeap: public CollHeap
// NAMFHeap use malloc/free.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b952c0d5/core/sql/common/SqlExpDllDefines.h
----------------------------------------------------------------------
diff --git a/core/sql/common/SqlExpDllDefines.h b/core/sql/common/SqlExpDllDefines.h
deleted file mode 100644
index c5be5ac..0000000
--- a/core/sql/common/SqlExpDllDefines.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/**********************************************************************
-// @@@ START COPYRIGHT @@@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-// @@@ END COPYRIGHT @@@
-**********************************************************************/
-
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b952c0d5/core/sql/common/SqlExportDllDefines.h
----------------------------------------------------------------------
diff --git a/core/sql/common/SqlExportDllDefines.h b/core/sql/common/SqlExportDllDefines.h
deleted file mode 100644
index 178ea35..0000000
--- a/core/sql/common/SqlExportDllDefines.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// @@@ START COPYRIGHT @@@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-// @@@ END COPYRIGHT @@@
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b952c0d5/core/sql/executor/ExAll.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExAll.cpp b/core/sql/executor/ExAll.cpp
index aae565b..ac34a06 100644
--- a/core/sql/executor/ExAll.cpp
+++ b/core/sql/executor/ExAll.cpp
@@ -72,7 +72,6 @@
#include "ExExplain.cpp"
#include "ExFirstN.cpp"
#include "ExIar.cpp"
-#include "ExMeas.cpp"
#include "ExPack.cpp"
#include "ExPackedRows.cpp"
#include "ExParLabOp.cpp"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b952c0d5/core/sql/executor/ExExeUtilMisc.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExExeUtilMisc.cpp b/core/sql/executor/ExExeUtilMisc.cpp
index dc9808a..7f4ba7a 100644
--- a/core/sql/executor/ExExeUtilMisc.cpp
+++ b/core/sql/executor/ExExeUtilMisc.cpp
@@ -55,7 +55,6 @@
#include "ComSmallDefs.h"
//#include "hdfs.h" //will replace with LOB interface
#include <unistd.h>
-//#include "catapirequest.h"
//////////////////////////////////////////////////////////
// classes defined in this file:
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b952c0d5/core/sql/executor/ExMeas.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExMeas.cpp b/core/sql/executor/ExMeas.cpp
deleted file mode 100644
index ade3632..0000000
--- a/core/sql/executor/ExMeas.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-/**********************************************************************
-// @@@ START COPYRIGHT @@@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-// @@@ END COPYRIGHT @@@
-**********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b952c0d5/core/sql/executor/ExMeas.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExMeas.h b/core/sql/executor/ExMeas.h
deleted file mode 100644
index ade3632..0000000
--- a/core/sql/executor/ExMeas.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/**********************************************************************
-// @@@ START COPYRIGHT @@@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-// @@@ END COPYRIGHT @@@
-**********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b952c0d5/core/sql/executor/ExStats.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExStats.h b/core/sql/executor/ExStats.h
index 6dfee82..8c1dcbb 100644
--- a/core/sql/executor/ExStats.h
+++ b/core/sql/executor/ExStats.h
@@ -51,7 +51,6 @@
#include "ssmpipc.h"
#include "ComCextdecs.h"
#include "ex_tcb.h"
-#include "ExMeas.h"
#include "SQLCLIdev.h"
#include "ExExeUtil.h"
#include "ExpLOBstats.h"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b952c0d5/core/sql/executor/dmeasql.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/dmeasql.h b/core/sql/executor/dmeasql.h
deleted file mode 100644
index ade3632..0000000
--- a/core/sql/executor/dmeasql.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/**********************************************************************
-// @@@ START COPYRIGHT @@@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-// @@@ END COPYRIGHT @@@
-**********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b952c0d5/core/sql/executor/ex_esp_frag_dir.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_esp_frag_dir.cpp b/core/sql/executor/ex_esp_frag_dir.cpp
index 5627fe2..96b6c92 100644
--- a/core/sql/executor/ex_esp_frag_dir.cpp
+++ b/core/sql/executor/ex_esp_frag_dir.cpp
@@ -48,7 +48,7 @@
#include "ex_tcb.h"
#include "ex_split_bottom.h"
#include "ex_send_bottom.h"
-#include "exp_space.h"
+#include "ComSpace.h"
#include "ComDiags.h"
#include "LateBindInfo.h"
#include "NAHeap.h"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b952c0d5/core/sql/executor/ex_globals.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_globals.cpp b/core/sql/executor/ex_globals.cpp
index add53ee..7554a9d 100644
--- a/core/sql/executor/ex_globals.cpp
+++ b/core/sql/executor/ex_globals.cpp
@@ -41,7 +41,6 @@
#include "ComTdb.h"
#include "ex_tcb.h"
#include "ExStats.h"
-#include "ExMeas.h"
#include "ex_globals.h"
#include "Globals.h"
#include "SqlStats.h"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b952c0d5/core/sql/executor/ex_stdh.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_stdh.h b/core/sql/executor/ex_stdh.h
index 72488ea..24389c5 100644
--- a/core/sql/executor/ex_stdh.h
+++ b/core/sql/executor/ex_stdh.h
@@ -59,7 +59,7 @@
#include "ExScheduler.h"
#include "ex_io_control.h"
#include "sql_buffer.h"
-#include "exp_space.h"
+#include "ComSpace.h"
#include "dfs2rec.h"
#endif // EX_STDH_H
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b952c0d5/core/sql/executor/rcb.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/rcb.h b/core/sql/executor/rcb.h
deleted file mode 100644
index 178ea35..0000000
--- a/core/sql/executor/rcb.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// @@@ START COPYRIGHT @@@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-// @@@ END COPYRIGHT @@@
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b952c0d5/core/sql/executor/stubs.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/stubs.cpp b/core/sql/executor/stubs.cpp
deleted file mode 100644
index 0d0386d..0000000
--- a/core/sql/executor/stubs.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-/**********************************************************************
-// @@@ START COPYRIGHT @@@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-// @@@ END COPYRIGHT @@@
-**********************************************************************/
-/* -*-C++-*-
- *****************************************************************************
- *
- * File: <file>
- * Description:
- *
- *
- * Created: 7/10/95
- * Language: C++
- *
- *
- *
- *
- *****************************************************************************
- */
-
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b952c0d5/core/sql/executor/stubs2.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/stubs2.cpp b/core/sql/executor/stubs2.cpp
deleted file mode 100644
index 127422a..0000000
--- a/core/sql/executor/stubs2.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-/**********************************************************************
-// @@@ START COPYRIGHT @@@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-// @@@ END COPYRIGHT @@@
-**********************************************************************/
-
-
-
-
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b952c0d5/core/sql/executor/tempfile.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/tempfile.cpp b/core/sql/executor/tempfile.cpp
deleted file mode 100644
index d868dd3..0000000
--- a/core/sql/executor/tempfile.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-/* -*-C++-*-
-******************************************************************************
-*
-* File: tempfile.C
-* Description: Methods temporary overflow files
-*
-*
-*
-* Created: 08/14/96
-* Language: C++
-*
-*
-// @@@ START COPYRIGHT @@@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-// @@@ END COPYRIGHT @@@
-*
-*
-******************************************************************************
-*/
-
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b952c0d5/core/sql/executor/tempfile.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/tempfile.h b/core/sql/executor/tempfile.h
deleted file mode 100644
index 72fdfae..0000000
--- a/core/sql/executor/tempfile.h
+++ /dev/null
@@ -1,37 +0,0 @@
-#ifndef TEMPFILE_H
-#define TEMPFILE_H
-/* -*-C++-*-
- *****************************************************************************
- *
- * File: <file>
- * Description:
- *
- *
- * Created: 8/14/96
- * Language: C++
- *
- *
-// @@@ START COPYRIGHT @@@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-// @@@ END COPYRIGHT @@@
- *
- *
- *****************************************************************************
- */
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b952c0d5/core/sql/exp/ExpAtp.h
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpAtp.h b/core/sql/exp/ExpAtp.h
index 24ac649..2236dcd 100644
--- a/core/sql/exp/ExpAtp.h
+++ b/core/sql/exp/ExpAtp.h
@@ -38,7 +38,6 @@
#ifndef EXP_ATP_H
#define EXP_ATP_H
-#include "SqlExpDllDefines.h"
// Local defines for assertions
//
//#define ExAtpAssert(a,b) ex_assert(a,b)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b952c0d5/core/sql/exp/ExpCriDesc.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpCriDesc.cpp b/core/sql/exp/ExpCriDesc.cpp
index 795263b..d982efc 100644
--- a/core/sql/exp/ExpCriDesc.cpp
+++ b/core/sql/exp/ExpCriDesc.cpp
@@ -39,7 +39,7 @@
#include "ComPackDefs.h"
#include "ExpCriDesc.h"
-#include "exp_space.h"
+#include "ComSpace.h"
#include "exp_tuple_desc.h"
#include <iostream>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b952c0d5/core/sql/exp/ExpCriDesc.h
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpCriDesc.h b/core/sql/exp/ExpCriDesc.h
index 951e9d7..ffb7859 100644
--- a/core/sql/exp/ExpCriDesc.h
+++ b/core/sql/exp/ExpCriDesc.h
@@ -41,7 +41,6 @@
class ExpTupleDesc;
class ex_cri_desc;
-#include "SqlExpDllDefines.h"
#include "NAVersionedObject.h"
#include "exp_tuple_desc.h"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b952c0d5/core/sql/exp/ExpDll.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpDll.cpp b/core/sql/exp/ExpDll.cpp
index 9e13620..7bca77a 100644
--- a/core/sql/exp/ExpDll.cpp
+++ b/core/sql/exp/ExpDll.cpp
@@ -36,9 +36,6 @@
#include "Platform.h"
-
-#include "SqlExpDllDefines.h"
-
#include <setjmp.h>
THREAD_P jmp_buf ExportJmpBuf;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b952c0d5/core/sql/exp/ExpError.h
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpError.h b/core/sql/exp/ExpError.h
index 7b993de..d1d047b 100644
--- a/core/sql/exp/ExpError.h
+++ b/core/sql/exp/ExpError.h
@@ -37,7 +37,6 @@
#ifndef EXP_ERROR_H
#define EXP_ERROR_H
-#include "SqlExpDllDefines.h"
#include <stdio.h>
class ComDiagsArea;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b952c0d5/core/sql/exp/ExpLOB.h
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpLOB.h b/core/sql/exp/ExpLOB.h
index 850f6bc..58979a8 100644
--- a/core/sql/exp/ExpLOB.h
+++ b/core/sql/exp/ExpLOB.h
@@ -41,7 +41,6 @@
*/
-#include "SqlExpDllDefines.h"
#include "exp_clause.h"
#include "ExpLOBenums.h"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b952c0d5/core/sql/exp/ExpPCodeInstruction.h
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpPCodeInstruction.h b/core/sql/exp/ExpPCodeInstruction.h
index 2cf40e2..59a6153 100644
--- a/core/sql/exp/ExpPCodeInstruction.h
+++ b/core/sql/exp/ExpPCodeInstruction.h
@@ -68,7 +68,6 @@ typedef Int32 PCodeBinary;
// Currently 1 on 32-bit platform and 2 on 64-bit platform
#define PCODEBINARIES_PER_PTR sizeof(char*)/sizeof(PCodeBinary)
-#include "SqlExpDllDefines.h"
// PCIType
//
// The PCIType class encapsulates and provides a uniform name space
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b952c0d5/core/sql/exp/ExpPCodeList.h
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpPCodeList.h b/core/sql/exp/ExpPCodeList.h
index eb93f3f..5be0576 100644
--- a/core/sql/exp/ExpPCodeList.h
+++ b/core/sql/exp/ExpPCodeList.h
@@ -39,7 +39,6 @@
#ifndef ExpPCodeList_h
#define ExpPCodeList_h
-#include "SqlExpDllDefines.h"
#include "ExpPCodeInstruction.h"
// Forward External Declaractions
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b952c0d5/core/sql/exp/ExpPCodeOptimizations.h
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpPCodeOptimizations.h b/core/sql/exp/ExpPCodeOptimizations.h
index 31ed8b9..8df61e9 100644
--- a/core/sql/exp/ExpPCodeOptimizations.h
+++ b/core/sql/exp/ExpPCodeOptimizations.h
@@ -66,7 +66,7 @@
#include "exp_attrs.h"
#include "Collections.h"
-#include "exp_space.h"
+#include "ComSpace.h"
#include "Int64.h"
#include "OperTypeEnum.h"
#include "ExpAtp.h"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b952c0d5/core/sql/exp/ExpSeqGen.h
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpSeqGen.h b/core/sql/exp/ExpSeqGen.h
index cb1c264..3db3ab0 100644
--- a/core/sql/exp/ExpSeqGen.h
+++ b/core/sql/exp/ExpSeqGen.h
@@ -41,7 +41,6 @@
*/
-#include "SqlExpDllDefines.h"
#include "SequenceGeneratorAttributes.h"
#include "ComQueue.h"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b952c0d5/core/sql/exp/ExpSqlTupp.h
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpSqlTupp.h b/core/sql/exp/ExpSqlTupp.h
index ae749de..9fe0dc7 100644
--- a/core/sql/exp/ExpSqlTupp.h
+++ b/core/sql/exp/ExpSqlTupp.h
@@ -37,7 +37,6 @@
#ifndef EXP_SQL_TUPP_H
#define EXP_SQL_TUPP_H
-#include "SqlExpDllDefines.h"
#include "BaseTypes.h"
// Local defines for assertions
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b952c0d5/core/sql/exp/exp_clause.h
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_clause.h b/core/sql/exp/exp_clause.h
index 24fec96..404dcb1 100644
--- a/core/sql/exp/exp_clause.h
+++ b/core/sql/exp/exp_clause.h
@@ -43,7 +43,7 @@
#include "exp_attrs.h"
#include "Collections.h"
-#include "exp_space.h"
+#include "ComSpace.h"
#include "Int64.h"
#include "OperTypeEnum.h"
#include "ExpAtp.h"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b952c0d5/core/sql/exp/exp_clause_derived.h
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_clause_derived.h b/core/sql/exp/exp_clause_derived.h
index adfa2c6..45d577b 100644
--- a/core/sql/exp/exp_clause_derived.h
+++ b/core/sql/exp/exp_clause_derived.h
@@ -41,7 +41,6 @@
#ifndef EXP_CLAUSE_DERIVED_H
#define EXP_CLAUSE_DERIVED_H
-#include "SqlExpDllDefines.h"
#include "exp_clause.h"
#include "exp_like.h"
#include <byteswap.h>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b952c0d5/core/sql/exp/exp_expr.h
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_expr.h b/core/sql/exp/exp_expr.h
index 9779fd5..477e855 100644
--- a/core/sql/exp/exp_expr.h
+++ b/core/sql/exp/exp_expr.h
@@ -41,7 +41,6 @@
// -----------------------------------------------------------------------
-#include "SqlExpDllDefines.h"
#include "NAVersionedObject.h" // for NAVersionedObject
#include "ExpAtp.h"
#include "ExpPCode.h"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b952c0d5/core/sql/exp/exp_space.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_space.cpp b/core/sql/exp/exp_space.cpp
deleted file mode 100644
index a50915e..0000000
--- a/core/sql/exp/exp_space.cpp
+++ /dev/null
@@ -1,358 +0,0 @@
-
-// RETIRED: REFERED TO ComSpace.cpp
-#if 0
-/* -*-C++-*-
- *****************************************************************************
- *
- * File: <file>
- * Description:
- *
- * Created: 7/10/95
- * Language: C++
- *
-// @@@ START COPYRIGHT @@@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-// @@@ END COPYRIGHT @@@
- *
- *****************************************************************************
- */
-
-#include <limits.h>
-
-#include <stdlib.h>
-
-#include "NAAssert.h"
-#include "exp_space.h"
-#include "str.h"
-#include "dp2.h"
-
-
-Space::Space(SpaceType type)
-: type_(type)
-{
- firstBlock_ =
- lastBlock_ = (Block *)0;
-
- totalSize_ = 0;
-};
-
-
-Space::~Space()
-{
- // free up all the blocks attached to this space pointer.
- Block * currBlock = firstBlock_;
- switch (type_)
- {
- case EXECUTOR_SPACE:
- {
- // later change it to deallocate from executor segment. TBD.
- while (currBlock)
- {
- Block * nextBlock = currBlock->getNext();
-
- free(currBlock);
- currBlock = nextBlock;
- }
- }
- break;
-
- case SYSTEM_SPACE:
- {
- while (currBlock)
- {
- Block * nextBlock = currBlock->getNext();
-
- free(currBlock);
- currBlock = nextBlock;
- }
- }
- break;
- }
-}
-
-Lng32 Space::defaultBlockSize(SpaceType type)
-{
- Lng32 block_size;
-
- // use default size
- switch (type)
- {
- case EXECUTOR_SPACE:
- block_size = EXECUTOR_BLOCK_MAX_SIZE;
- break;
-
- case SYSTEM_SPACE:
- block_size = EXECUTOR_BLOCK_MAX_SIZE; //SYSTEM_BLOCK_MAX_SIZE;
- break;
- }
-
- return block_size;
-}
-
-
-
-Block * Space::allocateBlock(SpaceType type, Lng32 in_block_size)
-{
- Block * block;
-
- char * block_ptr;
- Lng32 block_size;
- Lng32 data_size;
- char * data_ptr;
-
- Lng32 needed_size = ((((sizeof(Block) + in_block_size) - 1)/8) + 1) * 8;
- if (needed_size > defaultBlockSize(type))
- block_size = needed_size;
- else
- block_size = defaultBlockSize(type);
-
-
- switch (type)
- {
- case EXECUTOR_SPACE:
- {
- // allocate space from executor extended segment. TBD.
- // For now, get it from system space.
- block_ptr = (char *)malloc(block_size);
- data_ptr = block_ptr + ((((sizeof(Block)-1)/8)+1)*8);
- data_size = block_size - ((((sizeof(Block)-1)/8)+1)*8);
- }
- break;
-
- case SYSTEM_SPACE:
- {
- // allocate space from system heap.
- block_ptr = (char *)malloc(block_size);
- data_ptr = block_ptr + ((((sizeof(Block)-1)/8)+1)*8);
- data_size = block_size - ((((sizeof(Block)-1)/8)+1)*8);
-
- }
- break;
- }
-
- block = (Block *)block_ptr;
-
- if(block) block->init(block_size, data_size, data_ptr);
-
- return block;
-}
-
-
-char *Space::privateAllocateSpace(ULng32 size)
-{
- if (size <= 0)
- return 0;
-
- if (!firstBlock_)
- {
- firstBlock_ = lastBlock_ = allocateBlock(type_, size);
- }
-
- Block * curr_block = firstBlock_;
-
- // see if space is available in any of the existing blocks.
- char * sp = 0;
- while ((curr_block) && (! (sp = curr_block->allocateMemory(size))))
- {
- curr_block = curr_block->getNext();
- }
-
- if (!sp)
- {
- // space not found in any existing block.
- // Allocate a new one and append it to the last block.
- // The minimum space allocated in a block is max size for 'type'.
- curr_block = allocateBlock(type_, size);
-
- lastBlock_->setNext(curr_block);
- lastBlock_ = curr_block;
-
- sp = curr_block->allocateMemory(size);
- }
-
- totalSize_ += size;
-
- return sp;
-}
-
-void * Space::allocateMemory(size_t size)
-{
- return allocateAlignedSpace(size);
-}
-
-
-char *Space::allocateAlignedSpace(ULng32 size)
-{
- if (size <= 0)
- return 0;
-
- // return aligned space on an 8 byte boundary
- return privateAllocateSpace((((size-1)/8)+1)*8);
-}
-
-// If countPrefixSize == 0, make a null-terminated string;
-// else, make a count-prefixed string (no null terminal).
-//
-char *Space::allocateAndCopyToAlignedSpace(const char* dp,
- size_t dlen,
- size_t countPrefixSize)
-{
- size_t alen;
- if (countPrefixSize == 0)
- alen = dlen + 1;
- else
- alen = countPrefixSize + dlen;
- char* rp = allocateAlignedSpace(alen);
-
- switch (countPrefixSize) {
- case 0:
- break;
- case sizeof(char):
- assert(dlen <= UCHAR_MAX); // NT_PORT ( bd 10/30/96 ) added missing semicolon
- *(char *)rp = dlen;
- break;
- case sizeof(short):
- assert(dlen <= USHRT_MAX); // NT_PORT ( bd 10/30/96 ) added missing semicolon
- *(short *)rp = dlen;
- break;
- case sizeof(Int32):
- assert(dlen <= UINT_MAX); // NT_PORT ( bd 10/30/96 ) added missing semicolon
- *(Int32 *)rp = dlen;
- break;
- default:
- assert(0==1);
- }
- char* rdp = rp + countPrefixSize;
- str_cpy_all(rdp, dp, dlen);
- if (countPrefixSize == 0) rdp[dlen] = '\0';
-
- return rp;
-} // allocateAndCopyToAlignedSpace()
-
-
-Lng32 Space::convertToOffset(void * ptr)
-{
- Block * curr_block = firstBlock_;
-
- // find which block this pointer is allocated from.
- short found = 0;
- Lng32 prev_offset = 0;
- while ((curr_block) && (! found))
- {
- if ((Lng32)((char *)ptr) >= (Lng32)(curr_block->getDataPtr()) &&
- (Lng32)((char *)ptr) < ((Lng32)(curr_block->getDataPtr()) +
- curr_block->getAllocatedSize()))
- return -((Lng32)((char *)ptr) - (Lng32)(curr_block->getDataPtr())
- + prev_offset);
-
- prev_offset += curr_block->getAllocatedSize();
-
- curr_block = curr_block->getNext();
- }
-
- // pointer not allocated from any of the existing blocks.
- // Return it as is, it is either an offset already or a
- // garbage pointer. The caller should handle error case.
- return (Lng32)((char *)ptr);
-}
-
-
-Lng32 Space::allocAndCopy(void * from, ULng32 size)
-{
- char * to = allocateAlignedSpace(size);
- str_cpy_all(to, (char *)from, size);
- return (convertToOffset(to));
-}
-
-
-#if 0 /* NOT CURRENTLY USED and does not compile for 64 bits */
-short Space::isOffset(void * ptr)
-{
- if ((Lng32)ptr < 0)
- return -1;
- else
- return 0;
-}
-#endif
-
-// moves all the Blocks into the output contiguous buffer.
-
-char * Space::makeContiguous(char * out_buf, ULng32 out_buflen)
-{
- Block * curr_block = firstBlock_;
- Lng32 curr_offset = 0;
- while (curr_block)
- {
- // NT_PORT (BD 7/11/96) cast to unsigned long
- if (out_buflen - curr_offset < (ULng32)curr_block->getAllocatedSize())
- return 0;
-
- str_cpy_all(&out_buf[curr_offset],
- curr_block->getDataPtr(),
- curr_block->getAllocatedSize());
-
- curr_offset += curr_block->getAllocatedSize();
- curr_block = curr_block->getNext();
- }
-
- return out_buf;
-};
-
-/////////////////////////////////////////////
-//
-// class Block
-//
-/////////////////////////////////////////////
-
-void Block::init(Lng32 block_size, Lng32 data_size, char * data_ptr)
-{
- dataPtr_ = data_ptr;
-
- blockSize_ = block_size;
-
- freeSpaceSize_ =
- maxSize_ = data_size;
-
- allocatedSize_ = 0;
-
- freeSpaceOffset_ = 0;
-
- nextBlock_ = (Block *)0;
-}
-
-
-char *Block::allocateMemory(ULng32 size)
-{
- // NT_PORT (BD 7/11/96) cast to long
- if (freeSpaceSize_ < (Lng32) size)
- return 0;
-
- freeSpaceSize_ -= size;
- allocatedSize_ += size;
-
- char *s = &dataPtr_[freeSpaceOffset_];
-
- freeSpaceOffset_ += size;
-
- return s;
-}
-
-#endif
-
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b952c0d5/core/sql/exp/exp_space.h
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_space.h b/core/sql/exp/exp_space.h
deleted file mode 100644
index 1c24c77..0000000
--- a/core/sql/exp/exp_space.h
+++ /dev/null
@@ -1,22 +0,0 @@
-// @@@ START COPYRIGHT @@@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-// @@@ END COPYRIGHT @@@
-#include "SqlExpDllDefines.h"
-#include "ComSpace.h"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b952c0d5/core/sql/exp/exp_stdh.h
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_stdh.h b/core/sql/exp/exp_stdh.h
index 2c317cb..3ab0113 100644
--- a/core/sql/exp/exp_stdh.h
+++ b/core/sql/exp/exp_stdh.h
@@ -37,7 +37,6 @@
*****************************************************************************
*/
-#include "SqlExpDllDefines.h"
#include "Platform.h"
#ifdef _DEBUG
@@ -48,7 +47,7 @@
#include "ComPackDefs.h"
#include "dfs2rec.h"
-#include "exp_space.h"
+#include "ComSpace.h"
#include "str.h"
#include "exp_expr.h"
#include "exp_clause.h"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b952c0d5/core/sql/exp/exp_tuple_desc.h
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_tuple_desc.h b/core/sql/exp/exp_tuple_desc.h
index b9a75a5..04eacdf 100644
--- a/core/sql/exp/exp_tuple_desc.h
+++ b/core/sql/exp/exp_tuple_desc.h
@@ -38,7 +38,6 @@
*****************************************************************************
*/
-#include "SqlExpDllDefines.h"
#include "ExpAlignedFormat.h"
// Forward external references
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b952c0d5/core/sql/exp/srlversion.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/srlversion.cpp b/core/sql/exp/srlversion.cpp
deleted file mode 100644
index 5225ca4..0000000
--- a/core/sql/exp/srlversion.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-/**********************************************************************
-// @@@ START COPYRIGHT @@@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-// @@@ END COPYRIGHT @@@
-
-**********************************************************************/
-/* -*-C++-*-
-****************************************************************************
-*
-* File: SRLVersion.cpp
-* RCS:
-* Description:
-*
-* Created: 10/22/98
-* Modified:
-* Language: C++
-* Status: $State: Exp $
-*
-*
-*
-****************************************************************************
-*/
-#include "platform.h"
-
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b952c0d5/core/sql/export/stubs.cpp
----------------------------------------------------------------------
diff --git a/core/sql/export/stubs.cpp b/core/sql/export/stubs.cpp
deleted file mode 100644
index f6ef305..0000000
--- a/core/sql/export/stubs.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-/**********************************************************************
-// @@@ START COPYRIGHT @@@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-// @@@ END COPYRIGHT @@@
-**********************************************************************/
-/* -*-C++-*-
- *****************************************************************************
- *
- * File: Stubs.cpp
- * Description: contains stubs required for the export SRL
- *
- * Created: 10/19/98
- * Language: C++
- * Status: $State: Exp $
- *
- *
- *****************************************************************************
- */
-
-
-#include "Platform.h" // 64-BIT
-
-extern "C"
-void SQL_EXEC_IsVolumeUseful_Internal__FCPCc(void){};
-
-extern "C"
-void SQL_EXEC_GetListOfVolumes_Internal__Fv(void){};
-
-void CmpAssertInternal(const char*, const char*, Int32){};
-
-extern "C"
-void contextHeap__9CmpCommonSFv(void){};
-
-extern "C"
-void init(void){};
-
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b952c0d5/core/sql/generator/GenExpGenerator.h
----------------------------------------------------------------------
diff --git a/core/sql/generator/GenExpGenerator.h b/core/sql/generator/GenExpGenerator.h
index 2e7a051..09136ca 100644
--- a/core/sql/generator/GenExpGenerator.h
+++ b/core/sql/generator/GenExpGenerator.h
@@ -42,7 +42,7 @@
#include "Generator.h"
#include "exp_expr.h"
#include "GenMapTable.h"
-#include "exp_space.h"
+#include "ComSpace.h"
#include "exp_tuple_desc.h"
#include "parser.h"
#include "ComKeyRange.h"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b952c0d5/core/sql/generator/Generator.h
----------------------------------------------------------------------
diff --git a/core/sql/generator/Generator.h b/core/sql/generator/Generator.h
index 6764ac5..cc93f74 100644
--- a/core/sql/generator/Generator.h
+++ b/core/sql/generator/Generator.h
@@ -40,7 +40,7 @@
#include "GenMapTable.h"
#include "FragmentDir.h"
-#include "exp_space.h"
+#include "ComSpace.h"
#include "exp_clause.h"
#include "str.h"
#include "Int64.h"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b952c0d5/core/sql/nskgmake/executor/Makefile
----------------------------------------------------------------------
diff --git a/core/sql/nskgmake/executor/Makefile b/core/sql/nskgmake/executor/Makefile
index dd23a6e..1b85950 100755
--- a/core/sql/nskgmake/executor/Makefile
+++ b/core/sql/nskgmake/executor/Makefile
@@ -70,7 +70,6 @@ CPPSRC := Allocator.cpp \
ExHbaseSelect.cpp \
ExHbaseIUD.cpp \
ExHbaseDDL.cpp \
- ExMeas.cpp \
ExPack.cpp \
ExPackedRows.cpp \
ExProbeCache.cpp \
@@ -104,10 +103,7 @@ CPPSRC := Allocator.cpp \
SqlStats.cpp \
rts_msg.cpp \
sql_buffer.cpp \
- stubs.cpp \
- stubs2.cpp \
SwapSpace.cpp \
- tempfile.cpp \
timeout_data.cpp \
TriggerEnable.cpp \
TupleSpace.cpp \
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b952c0d5/core/sql/nskgmake/sqlcat/Makefile
----------------------------------------------------------------------
diff --git a/core/sql/nskgmake/sqlcat/Makefile b/core/sql/nskgmake/sqlcat/Makefile
index 74e4e58..3d3c909 100755
--- a/core/sql/nskgmake/sqlcat/Makefile
+++ b/core/sql/nskgmake/sqlcat/Makefile
@@ -21,8 +21,6 @@
# @@@ END COPYRIGHT @@@
#######################################################################
-CPPSRC := readRealArk.cpp \
- ReadTableDef.cpp \
- TrafDDLdesc.cpp \
+CPPSRC := TrafDDLdesc.cpp \
vers_libsqlcat.cpp
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b952c0d5/core/sql/nskgmake/sqlci/Makefile
----------------------------------------------------------------------
diff --git a/core/sql/nskgmake/sqlci/Makefile b/core/sql/nskgmake/sqlci/Makefile
index 767ebdc..44f2412 100755
--- a/core/sql/nskgmake/sqlci/Makefile
+++ b/core/sql/nskgmake/sqlci/Makefile
@@ -21,8 +21,7 @@
# @@@ END COPYRIGHT @@@
#######################################################################
-CPPSRC := SqlciMain.cpp \
- MxciEHCallBack.cpp
+CPPSRC := SqlciMain.cpp
EARLY_DLLS:= -ljsig
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b952c0d5/core/sql/nskgmake/sqlcilib/Makefile
----------------------------------------------------------------------
diff --git a/core/sql/nskgmake/sqlcilib/Makefile b/core/sql/nskgmake/sqlcilib/Makefile
index 6d9ce0b..3c6cc71 100755
--- a/core/sql/nskgmake/sqlcilib/Makefile
+++ b/core/sql/nskgmake/sqlcilib/Makefile
@@ -21,14 +21,11 @@
# @@@ END COPYRIGHT @@@
#######################################################################
-CPPSRC := CharSetConstants.cpp \
- Define.cpp \
+CPPSRC := Define.cpp \
ExpConvMxcs.cpp \
Formatter.cpp \
- immudefs.cpp \
InputStmt.cpp \
Log.cpp \
- MsgCat.cpp \
Obey.cpp \
Param.cpp \
Prepare.cpp \
@@ -36,28 +33,18 @@ CPPSRC := CharSetConstants.cpp \
SqlciCmd.cpp \
SqlciEnv.cpp \
SqlciError.cpp \
- SqlciHelp.cpp \
SqlciNode.cpp \
SqlciParser.cpp \
SqlciReset.cpp \
- SqlciRWCmd.cpp \
- SqlciCSCmd.cpp \
SqlciShow.cpp \
SqlciStats.cpp \
SqlciStmts.cpp \
- SqlciUsage.cpp \
- SqlciUtil.cpp \
SqlCmd.cpp \
- UtilInt.cpp \
- UtilMsg.cpp \
sqlclicmd.cpp
YINC := tdm_sqlmxmsg_intl
-CPPSRC += SqlciRWSimulator.cpp \
- SqlciCSSimulator.cpp
-
DEFS += -DSQLCLI_LIB -DCLI_DLL -D_UNICODE -DCOPYRIGHT_VERSION_H=\"$(TRAFODION_VER)\" -DCOPYRIGHT_HEADER_H='"$(PRODUCT_COPYRIGHT_HEADER)"' -DPRODVER='"$(TRAFODION_VER_PROD)"'
CPPSRC += vers_libsqlcilib.cpp
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b952c0d5/core/sql/nskgmake/tdm_sqlcli/Makefile
----------------------------------------------------------------------
diff --git a/core/sql/nskgmake/tdm_sqlcli/Makefile b/core/sql/nskgmake/tdm_sqlcli/Makefile
index 251f995..554f840 100755
--- a/core/sql/nskgmake/tdm_sqlcli/Makefile
+++ b/core/sql/nskgmake/tdm_sqlcli/Makefile
@@ -21,8 +21,7 @@
# @@@ END COPYRIGHT @@@
#######################################################################
-CPPSRC := CliDll.cpp \
- StoredProcInterface.cpp \
+CPPSRC := StoredProcInterface.cpp \
vers_libcli.cpp
SRCPATH := cli catman smdio
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b952c0d5/core/sql/nskgmake/tdm_sqlshare/Makefile
----------------------------------------------------------------------
diff --git a/core/sql/nskgmake/tdm_sqlshare/Makefile b/core/sql/nskgmake/tdm_sqlshare/Makefile
index bafb0f8..6d1ea7d 100755
--- a/core/sql/nskgmake/tdm_sqlshare/Makefile
+++ b/core/sql/nskgmake/tdm_sqlshare/Makefile
@@ -21,8 +21,7 @@
# @@@ END COPYRIGHT @@@
#######################################################################
-CPPSRC := catapirequest.cpp \
- CatSQLShare.cpp
+CPPSRC := CatSQLShare.cpp
SRCPATH := sqlshare
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b952c0d5/core/sql/qmscommon/QRQueries.cpp
----------------------------------------------------------------------
diff --git a/core/sql/qmscommon/QRQueries.cpp b/core/sql/qmscommon/QRQueries.cpp
index 1d143ef..760da51 100644
--- a/core/sql/qmscommon/QRQueries.cpp
+++ b/core/sql/qmscommon/QRQueries.cpp
@@ -1974,7 +1974,6 @@ extern SQLMODULE_ID __SQL_mod_199222286715188012;
#include "NAWinNT.h"
#include "wstr.h"
#include "csconvert.h"
-#include "catapirequest.h"
// Disable warning 4390
#pragma warning ( disable : 4390 )
@@ -3265,6 +3264,7 @@ SQL_EXEC_ExecFetch(&__SQL_id0,(long)0,0)) != 0);}
*********************************************************/
Lng32 QRQueries::reDescribeMV(const NAString& mvName, NABoolean rePublish)
{
+#ifdef __ignore
/* EXEC SQL BEGIN DECLARE SECTION; */
/* char */ char catRequestText[MAX_UTF8_CMD_LEN_IN_BYTES_PLUS_1];
/* EXEC SQL END DECLARE SECTION; */
@@ -3300,6 +3300,8 @@ if ((SQLCODE = SQL_EXEC_ClearDiagnostics(&__SQL_id0)) != 0 ||(SQLCODE =
SQL_EXEC_ExecFetch(&__SQL_id0,(long)0,0)) != 0);}
return SQLCODE;
+#endif
+return 0;
}
#pragma warning ( default : 4390 )
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b952c0d5/core/sql/sqlcat/ReadTableDef.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlcat/ReadTableDef.cpp b/core/sql/sqlcat/ReadTableDef.cpp
deleted file mode 100644
index 4107dd2..0000000
--- a/core/sql/sqlcat/ReadTableDef.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-/**********************************************************************
-// @@@ START COPYRIGHT @@@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-// @@@ END COPYRIGHT @@@
-**********************************************************************/
-/* -*-C++-*-
-******************************************************************************
-*
-* File: ReadTableDef.cpp
-* Description:
-* This class and set of functions provide an interface between the
-* compiler and metadata. It gets information from catman cache through
-* the SOL layer and puts it into a desc structure. The desc structure is
-* returned to the compiler to be placed in the NATable structure.
-*
-* Created: 01/18/96
-* Language: C++
-*
-*
-******************************************************************************
-*/
-
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b952c0d5/core/sql/sqlcat/ReadTableDef.h
----------------------------------------------------------------------
diff --git a/core/sql/sqlcat/ReadTableDef.h b/core/sql/sqlcat/ReadTableDef.h
deleted file mode 100644
index 89e0dba..0000000
--- a/core/sql/sqlcat/ReadTableDef.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*-C++-*- */
-/**********************************************************************
-// @@@ START COPYRIGHT @@@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-// @@@ END COPYRIGHT @@@
-**********************************************************************/
-/* -*-C++-*-
-******************************************************************************
-*
-* File: ReadTableDef.h
-* Description:
-* This class and set of functions provide an interface between the
-* compiler and metadata. It gets information from catman cache through
-* the SOL layer and puts it into a desc structure. The desc structure is
-* returned to the compiler to be placed in the NATable structure.
-*
-* Created: 01/18/96
-* Language: C++
-*
-*
-******************************************************************************
-*/
-
-#ifndef __READTABLEDEF_H
-#define __READTABLEDEF_H
-
-#endif // READTABLEDEF_H
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b952c0d5/core/sql/sqlcat/enum.h
----------------------------------------------------------------------
diff --git a/core/sql/sqlcat/enum.h b/core/sql/sqlcat/enum.h
deleted file mode 100644
index 178ea35..0000000
--- a/core/sql/sqlcat/enum.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// @@@ START COPYRIGHT @@@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-// @@@ END COPYRIGHT @@@
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b952c0d5/core/sql/sqlcat/readRealArk.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlcat/readRealArk.cpp b/core/sql/sqlcat/readRealArk.cpp
deleted file mode 100644
index 46e7744..0000000
--- a/core/sql/sqlcat/readRealArk.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -*-C++-*-
-// @@@ START COPYRIGHT @@@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-// @@@ END COPYRIGHT @@@
- *****************************************************************************
- *
- * File: readRealArk.C
- * Description: This module converts SOL based meta-data to TrafDesc
- * based meta-data.
- *
- * Created: 11/20/96
- * Language: C++
- *
- *
- *
- *****************************************************************************
- */
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b952c0d5/core/sql/sqlcat/readRealArk.h
----------------------------------------------------------------------
diff --git a/core/sql/sqlcat/readRealArk.h b/core/sql/sqlcat/readRealArk.h
deleted file mode 100644
index b64a043..0000000
--- a/core/sql/sqlcat/readRealArk.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/**********************************************************************
-// @@@ START COPYRIGHT @@@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-// @@@ END COPYRIGHT @@@
-//
-**********************************************************************/