You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by sa...@apache.org on 2017/02/01 02:57:51 UTC
[2/4] incubator-trafodion git commit: fix feedback comments.
fix feedback comments.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/2d86dd62
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/2d86dd62
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/2d86dd62
Branch: refs/heads/master
Commit: 2d86dd62a02ab3f1f3cb51234dc9472da4dcc9ae
Parents: 17959e9
Author: Prashant Vasudev <pr...@esgyn.com>
Authored: Mon Jan 30 23:07:55 2017 +0000
Committer: Prashant Vasudev <pr...@esgyn.com>
Committed: Mon Jan 30 23:07:55 2017 +0000
----------------------------------------------------------------------
core/sql/comexe/ComTdbSort.h | 2 +-
core/sql/generator/GenRelMisc.cpp | 4 ++--
core/sql/sqlcomp/DefaultConstants.h | 1 -
core/sql/sqlcomp/nadefaults.cpp | 1 -
4 files changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/2d86dd62/core/sql/comexe/ComTdbSort.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbSort.h b/core/sql/comexe/ComTdbSort.h
index 1c3b674..ab0fd64 100644
--- a/core/sql/comexe/ComTdbSort.h
+++ b/core/sql/comexe/ComTdbSort.h
@@ -61,7 +61,7 @@ public:
memoryQuotaMB_ = 0;
bmoMaxMemThresholdMB_ =0;
pressureThreshold_ = 10;
- scratchIOBlockSize_ = 0;
+ scratchIOBlockSize_ = 524288; //512kb initial size.
};
// ---------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/2d86dd62/core/sql/generator/GenRelMisc.cpp
----------------------------------------------------------------------
diff --git a/core/sql/generator/GenRelMisc.cpp b/core/sql/generator/GenRelMisc.cpp
index e5e2ac2..a89e0cb 100644
--- a/core/sql/generator/GenRelMisc.cpp
+++ b/core/sql/generator/GenRelMisc.cpp
@@ -3074,8 +3074,8 @@ short Sort::generateTdb(Generator * generator,
sort_options->scratchFreeSpaceThresholdPct() = threshold;
sort_options->sortMaxHeapSize() = (short)getDefault(SORT_MAX_HEAP_SIZE_MB);
sort_options->mergeBufferUnit() = (short)getDefault(SORT_MERGE_BUFFER_UNIT_56KB);
-
- sort_options->scratchIOBlockSize() = (Int32)getDefault(SCRATCH_IO_BLOCKSIZE_SORT);
+
+ //512kb default size initiliazed in sort_options.
if(sortRecLen >= sort_options->scratchIOBlockSize())
{
Int32 maxScratchIOBlockSize = (Int32)getDefault(SCRATCH_IO_BLOCKSIZE_SORT_MAX);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/2d86dd62/core/sql/sqlcomp/DefaultConstants.h
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/DefaultConstants.h b/core/sql/sqlcomp/DefaultConstants.h
index f0ad07c..56aca3a 100644
--- a/core/sql/sqlcomp/DefaultConstants.h
+++ b/core/sql/sqlcomp/DefaultConstants.h
@@ -2584,7 +2584,6 @@ enum DefaultConstants
SCRATCH_DISK_LOGGING,
SCRATCH_MGMT_OPTION,
SCRATCH_PREALLOCATE_EXTENTS,
- SCRATCH_IO_BLOCKSIZE_SORT,
SCRATCH_IO_BLOCKSIZE_SORT_MAX,
SCRATCH_IO_VECTOR_SIZE_HASH,
SCRATCH_IO_VECTOR_SIZE_SORT,
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/2d86dd62/core/sql/sqlcomp/nadefaults.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/nadefaults.cpp b/core/sql/sqlcomp/nadefaults.cpp
index 049f81a..fcba006 100644
--- a/core/sql/sqlcomp/nadefaults.cpp
+++ b/core/sql/sqlcomp/nadefaults.cpp
@@ -3113,7 +3113,6 @@ SDDflt0_(QUERY_CACHE_SELECTIVITY_TOLERANCE, "0"),
DD_____(SCRATCH_DIRS, ""),
DDkwd__(SCRATCH_DISK_LOGGING, "OFF"),
SDDpct__(SCRATCH_FREESPACE_THRESHOLD_PERCENT, "1"),
- DDui___(SCRATCH_IO_BLOCKSIZE_SORT, "524288"),
DDui___(SCRATCH_IO_BLOCKSIZE_SORT_MAX, "5242880"),
//On LINUX, writev and readv calls are used to perform
//scratch file IO. This CQD sets the vector size to use