trafodion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sure...@apache.org
Subject [2/2] incubator-trafodion git commit: Merge [TRAFODION-2758] PR-1250 Sort operator that uses TopN sort at runtime is not accuratelt determined at compile time
Date Tue, 03 Oct 2017 22:39:12 GMT
Merge [TRAFODION-2758] PR-1250 Sort operator that uses TopN sort at runtime is not accuratelt
determined at compile time


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/1c98a7aa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/1c98a7aa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/1c98a7aa

Branch: refs/heads/master
Commit: 1c98a7aa8e4073625eca5555d447a0a4255f162a
Parents: d3a6b6b ab59ee7
Author: Suresh Subbiah <sureshs@apache.org>
Authored: Tue Oct 3 22:38:32 2017 +0000
Committer: Suresh Subbiah <sureshs@apache.org>
Committed: Tue Oct 3 22:38:32 2017 +0000

----------------------------------------------------------------------
 core/sql/bin/SqlciErrors.txt            |  1 +
 core/sql/comexe/ComTdbSort.cpp          |  4 ++--
 core/sql/comexe/ComTdbSort.h            | 21 ++++++++----------
 core/sql/executor/ex_sort.cpp           | 11 ++++------
 core/sql/generator/GenExplain.cpp       |  3 +++
 core/sql/generator/GenPreCode.cpp       |  7 ------
 core/sql/generator/GenRelMisc.cpp       |  5 -----
 core/sql/generator/GenRelPackedRows.cpp | 16 ++++++++++++++
 core/sql/generator/GenRelScan.cpp       | 32 ++++++++++++++++++----------
 core/sql/optimizer/RelExpr.cpp          | 32 +++++++++++++++++++++++++---
 core/sql/sqlcomp/DefaultConstants.h     |  1 +
 core/sql/sqlcomp/nadefaults.cpp         |  3 +++
 12 files changed, 89 insertions(+), 47 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1c98a7aa/core/sql/comexe/ComTdbSort.cpp
----------------------------------------------------------------------
diff --cc core/sql/comexe/ComTdbSort.cpp
index 966dd06,4c58aac..0e89d35
--- a/core/sql/comexe/ComTdbSort.cpp
+++ b/core/sql/comexe/ComTdbSort.cpp
@@@ -172,11 -176,11 +172,11 @@@ void SortOptions::displayContents(Spac
  {
  	char buf[100];
  
-    str_sprintf(buf, "\nFor SortOptions:\nsortNRows = %d, sortType = %d, internalSort = %d",
-    							sortNRows_,sortType_,internalSort_);
+    str_sprintf(buf, "\nFor SortOptions:\nsortType = %d, internalSort = %d",
+    							sortType_,internalSort_);
     space->allocateAndCopyToAlignedSpace(buf, str_len(buf), sizeof(short));
  
 -   str_sprintf(buf,"Sort Option Flags = %b", flags_);
 +   str_sprintf(buf,"Sort Option Flags = %x", flags_);
     space->allocateAndCopyToAlignedSpace(buf, str_len(buf),sizeof(short));
     
     str_sprintf(buf, "sortMaxHeapSizeMB = %d, scratchFreeSpaceThreshold = %d",

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1c98a7aa/core/sql/executor/ex_sort.cpp
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1c98a7aa/core/sql/generator/GenExplain.cpp
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1c98a7aa/core/sql/generator/GenPreCode.cpp
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1c98a7aa/core/sql/generator/GenRelMisc.cpp
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1c98a7aa/core/sql/generator/GenRelPackedRows.cpp
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1c98a7aa/core/sql/generator/GenRelScan.cpp
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1c98a7aa/core/sql/optimizer/RelExpr.cpp
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1c98a7aa/core/sql/sqlcomp/DefaultConstants.h
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1c98a7aa/core/sql/sqlcomp/nadefaults.cpp
----------------------------------------------------------------------


Mime
View raw message