trafodion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sure...@apache.org
Subject [3/5] incubator-trafodion git commit: Address comments by Hans
Date Sun, 07 Aug 2016 23:48:08 GMT
Address comments by Hans


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

Branch: refs/heads/master
Commit: bfd3cdb02b8057aede24c8f91d43e035e3bd0eed
Parents: 66d03a8
Author: Suresh Subbiah <sureshs@apache.org>
Authored: Wed Aug 3 22:30:51 2016 +0000
Committer: Suresh Subbiah <sureshs@apache.org>
Committed: Wed Aug 3 22:30:51 2016 +0000

----------------------------------------------------------------------
 core/sql/bin/SqlciErrors.txt      | 2 +-
 core/sql/generator/GenRelScan.cpp | 9 ++++++---
 core/sql/regress/hive/EXPECTED002 | 4 ++--
 3 files changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/bfd3cdb0/core/sql/bin/SqlciErrors.txt
----------------------------------------------------------------------
diff --git a/core/sql/bin/SqlciErrors.txt b/core/sql/bin/SqlciErrors.txt
index 10d0a2c..a9f08c2 100644
--- a/core/sql/bin/SqlciErrors.txt
+++ b/core/sql/bin/SqlciErrors.txt
@@ -1282,7 +1282,7 @@ $1~String1 --------------------------------
 4223 42000 99999 BEGINNER MAJOR DBADMIN $0~String0 not supported in this software version.
 4224 42000 99999 BEGINNER MAJOR DBADMIN The directory $0~String0 is not a valid Hive location.
 4225 42000 99999 BEGINNER MAJOR DBADMIN Number of column families cannot exceed 32.
-4226 42000 99999 BEGINNER MAJOR DBADMIN Table $0~TableName has a maximum record length of
$0~Int0 which is greater than HDFS_IO_BUFFERSIZE. Increase buffer size setting, or reduce
HIVE_MAX_STRING_LENGTH.
+4226 42000 99999 BEGINNER MAJOR DBADMIN Table $0~TableName has a maximum record length of
$0~Int0 which is greater than the HDFS_IO_BUFFERSIZE default. Increase buffer size setting,
or reduce the HIVE_MAX_STRING_LENGTH default.
 4240 ZZZZZ 99999 BEGINNER MAJOR DBADMIN Expression $0~string0 in the DIVISION BY clause references
columns other than clustering key columns.
 4241 ZZZZZ 99999 BEGINNER MAJOR DBADMIN The value $0~string0 is not supported at this place
in the DIVISION BY clause, only constants are allowed.
 4242 ZZZZZ 99999 BEGINNER MAJOR DBADMIN The value $0~string0 is not supported at this place
in the DIVISION BY clause, only key columns are allowed.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/bfd3cdb0/core/sql/generator/GenRelScan.cpp
----------------------------------------------------------------------
diff --git a/core/sql/generator/GenRelScan.cpp b/core/sql/generator/GenRelScan.cpp
index b60f756..4cb64fd 100644
--- a/core/sql/generator/GenRelScan.cpp
+++ b/core/sql/generator/GenRelScan.cpp
@@ -1186,10 +1186,13 @@ if (hTabStats->isOrcFile())
     {
       rangeTailIOSize = getTableDesc()->getNATable()->getRecordLength() +
 	(getTableDesc()->getNATable()->getClusteringIndex()->
-	 getAllColumns().entries())*2;
+	 getAllColumns().entries())*2 + 16*1024;
       // for each range we look ahead in the next range upto the maximum
-      // record length to find the end of record delimiter.
-      rangeTailIOSize = MAXOF(rangeTailIOSize, 16*1024);
+      // record length to find the end of record delimiter. The 16KB is 
+      // old default setting which worked fine till we started testing
+      // wide columns. We need to keep the 16 KB as additional fudge factor
+      // as recordlength in compiler is different from what it would be
+      // in a Hive text file
     }
 
   char * tablename = 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/bfd3cdb0/core/sql/regress/hive/EXPECTED002
----------------------------------------------------------------------
diff --git a/core/sql/regress/hive/EXPECTED002 b/core/sql/regress/hive/EXPECTED002
index 907d2f2..d779012 100644
--- a/core/sql/regress/hive/EXPECTED002
+++ b/core/sql/regress/hive/EXPECTED002
@@ -18,7 +18,7 @@
 >>--------------------------------------------------------------------------
 >>
 >>log;
-hdfsBufSize_ = 3072, rangeTailIOSize_ = 16384, hdfsSqlMaxRecLen_ = 8
+hdfsBufSize_ = 3072, rangeTailIOSize_ = 16636, hdfsSqlMaxRecLen_ = 8
 >>select count(*) from customer ;
 
 (EXPR)              
@@ -141,7 +141,7 @@ LC   RC   OP   OPERATOR              OPT       DESCRIPTION           CARD
 >>--------------------------------------------------------------------------
 >>
 >>log;
-hdfsBufSize_ = 32768, rangeTailIOSize_ = 16384, hdfsSqlMaxRecLen_ = 8
+hdfsBufSize_ = 32768, rangeTailIOSize_ = 16636, hdfsSqlMaxRecLen_ = 8
 >>select count(*) from customer ;
 
 (EXPR)              


Mime
View raw message