trafodion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ansha...@apache.org
Subject [3/4] incubator-trafodion git commit: removed obsolete code that used libhdfs to write to hive/text files
Date Wed, 12 Jul 2017 18:20:21 GMT
removed obsolete code that used libhdfs to write to hive/text files

Traf had code to write to hive/text files using direct libhdfs
interface from C or through java interface. hive/sequence files
were added later and they are written using java interface.
libhdfs code was made obsolete a while back and is no longer used.
That code has now been removed.
Traf now uses common java interface to write to hive/text and
hive/sequence files.


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

Branch: refs/heads/master
Commit: b21f2a946dc00ffade5d7f7e7452f3a5cdf6fd24
Parents: 2a520b5
Author: Anoop Sharma <anoop.sharma@esgyn.com>
Authored: Wed Jul 12 00:32:17 2017 +0000
Committer: Anoop Sharma <anoop.sharma@esgyn.com>
Committed: Wed Jul 12 00:32:17 2017 +0000

----------------------------------------------------------------------
 core/sql/comexe/ComTdbFastTransport.h   |  28 +----
 core/sql/executor/ExExeUtilExplain.cpp  |   3 +
 core/sql/executor/ExExeUtilLoad.cpp     |  10 --
 core/sql/executor/ExFastTransport.cpp   | 167 ++++-----------------------
 core/sql/executor/ExFastTransport.h     |   3 -
 core/sql/generator/GenFastTransport.cpp |   3 -
 core/sql/generator/GenRelExeUtil.cpp    |   1 -
 core/sql/regress/hive/EXPECTED018       |  31 -----
 core/sql/regress/hive/TEST018           |  13 ---
 core/sql/sqlcomp/DefaultConstants.h     |   2 -
 core/sql/sqlcomp/nadefaults.cpp         |   2 -
 11 files changed, 24 insertions(+), 239 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b21f2a94/core/sql/comexe/ComTdbFastTransport.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbFastTransport.h b/core/sql/comexe/ComTdbFastTransport.h
index 4b4146c..a63290b 100644
--- a/core/sql/comexe/ComTdbFastTransport.h
+++ b/core/sql/comexe/ComTdbFastTransport.h
@@ -71,9 +71,7 @@ public:
     SEQUENCE_FILE               = 0x0080,
     PRINT_DIAGS                 = 0x0100,
     HDFS_COMPRESSED             = 0x0200,
-    SKIP_WRITING_TO_FILES       = 0x0400,
-    BYPASS_LIBHDFS              = 0x0800,
-    CONTINUE_ON_ERROR           = 0x1000
+    CONTINUE_ON_ERROR           = 0x0400
   };
 
   ComTdbFastExtract ()
@@ -342,30 +340,6 @@ public:
     return ((flags_ & HDFS_COMPRESSED) != 0);
   }
   ;
-  void setSkipWritingToFiles(UInt32 value)
-  {
-    if (value)
-      flags_ |= SKIP_WRITING_TO_FILES;
-    else
-      flags_ &= ~SKIP_WRITING_TO_FILES;
-  }
-  NABoolean getSkipWritingToFiles() const
-  {
-    return ((flags_ & SKIP_WRITING_TO_FILES) != 0);
-  }
-  ;
-  void setBypassLibhdfs(UInt32 value)
-  {
-    if (value)
-      flags_ |= BYPASS_LIBHDFS;
-    else
-      flags_ &= ~BYPASS_LIBHDFS;
-  }
-  NABoolean getBypassLibhdfs() const
-  {
-    return ((flags_ & BYPASS_LIBHDFS) != 0);
-  }
-
   void setContinueOnError(NABoolean value)
   { value ? flags_ |= CONTINUE_ON_ERROR : flags_ &= ~CONTINUE_ON_ERROR; }
   NABoolean getContinueOnError() const

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b21f2a94/core/sql/executor/ExExeUtilExplain.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExExeUtilExplain.cpp b/core/sql/executor/ExExeUtilExplain.cpp
index 537f58e..2880435 100644
--- a/core/sql/executor/ExExeUtilExplain.cpp
+++ b/core/sql/executor/ExExeUtilExplain.cpp
@@ -2205,10 +2205,13 @@ const FilterKeyValueStruct filterKeyValue[] =
     {"max_card_est", "###"},
     {"max_max_cardinality", "###"},
     {"total_overflow_size", "###"},
+    {"est_memory_per_node", "###"},
     {"est_memory_per_cpu", "###"},
+    {"est_memory_per_instance", "###"},
     {"buffer_size", "###"},
     {"memory_quota", "###"},
     {"memory_quota_per_esp", "###"},
+    {"memory_quota_per_instance", "###"},
     {"memory_limit_per_cpu", "###"},
     {"cache_size", "###"},
     {"probes", "###"},

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b21f2a94/core/sql/executor/ExExeUtilLoad.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExExeUtilLoad.cpp b/core/sql/executor/ExExeUtilLoad.cpp
index c7129a9..dfbbac4 100644
--- a/core/sql/executor/ExExeUtilLoad.cpp
+++ b/core/sql/executor/ExExeUtilLoad.cpp
@@ -2242,11 +2242,6 @@ short ExExeUtilHBaseBulkUnLoadTcb::work()
         step_ = UNLOAD_END_ERROR_;
         break;
       }
-      if (holdAndSetCQD("TRAF_UNLOAD_BYPASS_LIBHDFS", "ON") < 0)
-      {
-        step_ = UNLOAD_END_ERROR_;
-        break;
-      }
       if (hblTdb().getSkipWriteToFiles())
       {
         setEmptyTarget(FALSE);
@@ -2495,11 +2490,6 @@ short ExExeUtilHBaseBulkUnLoadTcb::work()
         step_ = UNLOAD_ERROR_;
         break;
       }
-      if (restoreCQD("TRAF_UNLOAD_BYPASS_LIBHDFS") < 0)
-      {
-        step_ = UNLOAD_ERROR_;
-        break;
-      }
       if ( restoreCQD("TRAF_UNLOAD_HDFS_COMPRESS") < 0)
       {
         step_ = UNLOAD_ERROR_;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b21f2a94/core/sql/executor/ExFastTransport.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExFastTransport.cpp b/core/sql/executor/ExFastTransport.cpp
index 12ff6ee..5d3b9ec 100644
--- a/core/sql/executor/ExFastTransport.cpp
+++ b/core/sql/executor/ExFastTransport.cpp
@@ -433,54 +433,6 @@ ExOperStats * ExFastExtractTcb::doAllocateStatsEntry(
                                          tdb);
   }
 }
-///////////////////////////////////
-///////////////////////////////////
-
-Lng32 ExHdfsFastExtractTcb::lobInterfaceInsert(ssize_t bytesToWrite)
-{
-  Int64 requestTag = 0;
-  Int64 descSyskey = 0;
-  return ExpLOBInterfaceInsert(lobGlob_,
-      fileName_,
-      targetLocation_,
-      (Lng32)Lob_External_HDFS_File,
-      hdfsHost_,
-      hdfsPort_,
-      0,
-      NULL,  //lobHandle == NULL -->simpleInsert
-      NULL,
-      NULL,
-      0,
-      NULL,
-      requestTag,
-      0,
-      descSyskey,
-      Lob_InsertDataSimple,
-      NULL,
-      Lob_None,//LobsSubOper so
-      1,  //waitedOp
-      currBuffer_->data_,
-      bytesToWrite,
-      0,     //bufferSize
-      myTdb().getHdfsReplication(),     //replication
-      0      //blockSize
-      );
-}
-
-Lng32 ExHdfsFastExtractTcb::lobInterfaceCreate()
-{
-  return   ExpLOBinterfaceCreate(lobGlob_,
-      fileName_,
-      targetLocation_,
-      (Lng32)Lob_External_HDFS_File,
-      hdfsHost_,
-      hdfsPort_,
-      0, //bufferSize -- 0 --> use default
-      myTdb().getHdfsReplication(), //replication
-      0 //bloclSize --0 -->use default
-      );
-
-}
 
 Lng32 ExHdfsFastExtractTcb::lobInterfaceDataModCheck
 (Int64 &failedModTS,
@@ -498,19 +450,6 @@ Lng32 ExHdfsFastExtractTcb::lobInterfaceDataModCheck
 }
 
 
-Lng32 ExHdfsFastExtractTcb::lobInterfaceClose()
-{
-  return
-      ExpLOBinterfaceCloseFile
-      (lobGlob_,
-       fileName_,
-       NULL, //(char*)"",
-       (Lng32)Lob_External_HDFS_File,
-       hdfsHost_,
-       hdfsPort_);
-
-}
-
 ExHdfsFastExtractTcb::ExHdfsFastExtractTcb(
     const ExFastExtractTdb &fteTdb,
     const ex_tcb & childTcb,
@@ -545,14 +484,11 @@ Int32 ExHdfsFastExtractTcb::fixup()
 
   ex_tcb::fixup();
 
-  if(!myTdb().getSkipWritingToFiles() &&
-     !myTdb().getBypassLibhdfs())
-    memset (hdfsHost_, '\0', sizeof(hdfsHost_));
-      strncpy(hdfsHost_, myTdb().getHdfsHostName(), sizeof(hdfsHost_));
-      hdfsPort_ = myTdb().getHdfsPortNum();
-    ExpLOBinterfaceInit
-      (lobGlob_, getGlobals()->getDefaultHeap(),getGlobals()->castToExExeStmtGlobals()->getContext(),TRUE,hdfsHost_,hdfsPort_);
-
+  strncpy(hdfsHost_, myTdb().getHdfsHostName(), sizeof(hdfsHost_));
+  hdfsPort_ = myTdb().getHdfsPortNum();
+  ExpLOBinterfaceInit
+    (lobGlob_, getGlobals()->getDefaultHeap(),getGlobals()->castToExExeStmtGlobals()->getContext(),TRUE,hdfsHost_,hdfsPort_);
+  
   modTS_ = myTdb().getModTSforDir();
 
   return 0;
@@ -811,8 +747,7 @@ ExWorkProcRetcode ExHdfsFastExtractTcb::work()
 
       ComDiagsArea *da = NULL;
 
-      if (!myTdb().getSkipWritingToFiles())
-        if (myTdb().getTargetFile() )
+      if (myTdb().getTargetFile() )
         {
           Lng32 fileNum = getGlobals()->castToExExeStmtGlobals()->getMyInstanceNumber();
           memset (hdfsHost_, '\0', sizeof(hdfsHost_));
@@ -834,8 +769,7 @@ ExWorkProcRetcode ExHdfsFastExtractTcb::work()
           else
             snprintf(fileName_,999, "%s%d-%s-%d", "file", fileNum, pt,rand() % 1000);
 
-          if ((isSequenceFile() || myTdb().getBypassLibhdfs()) &&
-              !sequenceFileWriter_)
+          if (!sequenceFileWriter_)
           {
             sequenceFileWriter_ = new(getHeap())
                                      SequenceFileWriter((NAHeap *)getHeap());
@@ -848,47 +782,25 @@ ExWorkProcRetcode ExHdfsFastExtractTcb::work()
             }
           }
 
-          if (isSequenceFile()  ||  myTdb().getBypassLibhdfs())
-          {
-            strcat(targetLocation_, "//");
-            strcat(targetLocation_, fileName_);
-            if (isSequenceFile())
-              sfwRetCode = sequenceFileWriter_->open(targetLocation_, SFW_COMP_NONE);
-            else
-              sfwRetCode = sequenceFileWriter_->hdfsCreate(targetLocation_, isHdfsCompressed());
-            if (sfwRetCode != SFW_OK)
-            {
-              createSequenceFileError(sfwRetCode);
-              pstate.step_ = EXTRACT_ERROR;
-              break;
-            }
-          }
+          strcat(targetLocation_, "//");
+          strcat(targetLocation_, fileName_);
+          if (isSequenceFile())
+            sfwRetCode = sequenceFileWriter_->open(targetLocation_, SFW_COMP_NONE);
           else
-          {
-            retcode = 0;
-            retcode = lobInterfaceCreate();
-            if (retcode < 0)
+            sfwRetCode = sequenceFileWriter_->hdfsCreate(targetLocation_, isHdfsCompressed());
+          if (sfwRetCode != SFW_OK)
             {
-              Lng32 cliError = 0;
-
-              Lng32 intParam1 = -retcode;
-              ComDiagsArea * diagsArea = NULL;
-              ExRaiseSqlError(getHeap(), &diagsArea,
-                  (ExeErrorCode)(8442), NULL, &intParam1,
-                  &cliError, NULL, (char*)"ExpLOBinterfaceCreate",
-                  getLobErrStr(intParam1));
-              pentry_down->setDiagsArea(diagsArea);
+              createSequenceFileError(sfwRetCode);
               pstate.step_ = EXTRACT_ERROR;
               break;
             }
-          }
             
           if (feStats)
           {
             feStats->setPartitionNumber(fileNum);
           }
         }
-        else
+      else
         {
           updateWorkATPDiagsArea(__FILE__,__LINE__,"sockets are not supported");
           pstate.step_ = EXTRACT_ERROR;
@@ -1083,8 +995,7 @@ ExWorkProcRetcode ExHdfsFastExtractTcb::work()
     {
       ssize_t bytesToWrite = currBuffer_->bufSize_ - currBuffer_->bytesLeft_;
 
-      if (!myTdb().getSkipWritingToFiles())
-        if (isSequenceFile())
+      if (isSequenceFile())
         {
           sfwRetCode = sequenceFileWriter_->writeBuffer(currBuffer_->data_, bytesToWrite,
myTdb().getRecordSeparator());
           if (sfwRetCode != SFW_OK)
@@ -1094,7 +1005,7 @@ ExWorkProcRetcode ExHdfsFastExtractTcb::work()
             break;
           }
         }
-        else  if (myTdb().getBypassLibhdfs())
+      else
         {
           sfwRetCode = sequenceFileWriter_->hdfsWrite(currBuffer_->data_, bytesToWrite);
           if (sfwRetCode != SFW_OK)
@@ -1104,25 +1015,7 @@ ExWorkProcRetcode ExHdfsFastExtractTcb::work()
             break;
           }
         }
-        else
-        {
-          retcode = 0;
-          retcode = lobInterfaceInsert(bytesToWrite);
-          if (retcode < 0)
-          {
-            Lng32 cliError = 0;
-
-            Lng32 intParam1 = -retcode;
-            ComDiagsArea * diagsArea = NULL;
-            ExRaiseSqlError(getHeap(), &diagsArea,
-                (ExeErrorCode)(8442), NULL, &intParam1,
-                &cliError, NULL, (char*)"ExpLOBInterfaceInsert",
-                getLobErrStr(intParam1));
-            pentry_down->setDiagsArea(diagsArea);
-            pstate.step_ = EXTRACT_ERROR;
-            break;
-          }
-        }
+
       if (feStats)
       {
         feStats->incReadyToSendBuffersCount();
@@ -1204,8 +1097,7 @@ ExWorkProcRetcode ExHdfsFastExtractTcb::work()
       if (qParent_.up->isFull())
         return WORK_OK;
 
-      if (!myTdb().getSkipWritingToFiles())
-        if (isSequenceFile())
+      if (isSequenceFile())
         {
           sfwRetCode = sequenceFileWriter_->close();
           if (!errorOccurred_ && sfwRetCode != SFW_OK )
@@ -1215,7 +1107,7 @@ ExWorkProcRetcode ExHdfsFastExtractTcb::work()
             break;
           }
         }
-        else  if (myTdb().getBypassLibhdfs())
+      else
         {
           if (sequenceFileWriter_)
             {
@@ -1228,26 +1120,7 @@ ExWorkProcRetcode ExHdfsFastExtractTcb::work()
                 }
             }
         }
-        else
-        {
-          retcode = lobInterfaceClose();
-          if (! errorOccurred_ && retcode < 0)
-          {
-            Lng32 cliError = 0;
-
-            Lng32 intParam1 = -retcode;
-            ComDiagsArea * diagsArea = NULL;
-            ExRaiseSqlError(getHeap(), &diagsArea,
-                (ExeErrorCode)(8442), NULL, &intParam1,
-                &cliError, NULL,
-                (char*)"ExpLOBinterfaceCloseFile",
-                getLobErrStr(intParam1));
-            pentry_down->setDiagsArea(diagsArea);
 
-            pstate.step_ = EXTRACT_ERROR;
-            break;
-          }
-        }
       //insertUpQueueEntry will insert Q_NO_DATA into the up queue and
       //remove the head of the down queue
       insertUpQueueEntry(ex_queue::Q_NO_DATA, NULL, TRUE);

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b21f2a94/core/sql/executor/ExFastTransport.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExFastTransport.h b/core/sql/executor/ExFastTransport.h
index d0875f5..4f57a9f 100644
--- a/core/sql/executor/ExFastTransport.h
+++ b/core/sql/executor/ExFastTransport.h
@@ -402,9 +402,6 @@ public:
 protected:
 
 
-  Lng32 lobInterfaceInsert(ssize_t bytesToWrite);
-  Lng32 lobInterfaceCreate();
-  Lng32 lobInterfaceClose();
   Lng32 lobInterfaceDataModCheck(Int64 &failedModTS,
                                  char * failedLocBuf,
                                  Int32 &failedLocBufLen);

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b21f2a94/core/sql/generator/GenFastTransport.cpp
----------------------------------------------------------------------
diff --git a/core/sql/generator/GenFastTransport.cpp b/core/sql/generator/GenFastTransport.cpp
index 0c88a28..eec0b7d 100644
--- a/core/sql/generator/GenFastTransport.cpp
+++ b/core/sql/generator/GenFastTransport.cpp
@@ -481,9 +481,6 @@ static short ft_codegen(Generator *generator,
   tdb->setSequenceFile(isSequenceFile);
   tdb->setHdfsCompressed(CmpCommon::getDefaultNumeric(TRAF_UNLOAD_HDFS_COMPRESS)!=0);
 
-  tdb->setSkipWritingToFiles(CmpCommon::getDefault(TRAF_UNLOAD_SKIP_WRITING_TO_FILES)
== DF_ON);
-  tdb->setBypassLibhdfs(CmpCommon::getDefault(TRAF_UNLOAD_BYPASS_LIBHDFS) == DF_ON);
-
   if ((hiveNAColArray) &&
       (hiveInsertErrMode == 2))
     {

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b21f2a94/core/sql/generator/GenRelExeUtil.cpp
----------------------------------------------------------------------
diff --git a/core/sql/generator/GenRelExeUtil.cpp b/core/sql/generator/GenRelExeUtil.cpp
index 21eb027..e6fb5a5 100644
--- a/core/sql/generator/GenRelExeUtil.cpp
+++ b/core/sql/generator/GenRelExeUtil.cpp
@@ -5703,7 +5703,6 @@ short ExeUtilHBaseBulkUnLoad::codeGen(Generator * generator)
   exe_util_tdb->setCompressType(compressType_);
   exe_util_tdb->setOneFile(oneFile_);
   exe_util_tdb->setMergePath(mergePathStr);
-  exe_util_tdb->setSkipWriteToFiles(CmpCommon::getDefault(TRAF_UNLOAD_SKIP_WRITING_TO_FILES)
== DF_ON);
   exe_util_tdb->setOverwriteMergeFile(overwriteMergeFile_);
   exe_util_tdb->setScanType(scanType_);
   exe_util_tdb->setSnapshotSuffix(snapSuffixStr);

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b21f2a94/core/sql/regress/hive/EXPECTED018
----------------------------------------------------------------------
diff --git a/core/sql/regress/hive/EXPECTED018 b/core/sql/regress/hive/EXPECTED018
index b2ba64c..79aa4bc 100644
--- a/core/sql/regress/hive/EXPECTED018
+++ b/core/sql/regress/hive/EXPECTED018
@@ -2471,35 +2471,4 @@ ss order by ca_address_id;
 >>log;
 regrhadoop.ksh fs -rm /user/trafodion/hive/exttables/unload_customer_demographics/*
 >>
->>CQD TRAF_UNLOAD_SKIP_WRITING_TO_FILES 'ON';
-
---- SQL operation complete.
->>UNLOAD  
-+>WITH PURGEDATA FROM TARGET
-+>INTO '/user/trafodion/hive/exttables/unload_customer_demographics'
-+>(select * from trafodion.hbase.customer_demographics_salt) ;
-Task: UNLOAD           Status: Started
-Task:  EXTRACT         Status: Started    Time: 2017-05-01 18:53:36.154
-       Rows Processed but NOT Written to Disk: 20000 
-Task:  EXTRACT         Status: Ended      Time: 2017-05-01 18:53:36.660
-Task:  EXTRACT         Status: Ended      Elapsed Time:    00:00:00.506
-
---- 20000 row(s) unloaded.
->>--sh sleep 10;
->>select count(*) from hive.hive.unload_customer_demographics;
-
-(EXPR)              
---------------------
-
-                   0
-
---- 1 row(s) selected.
->>
->>CQD TRAF_UNLOAD_SKIP_WRITING_TO_FILES reset;
-
---- SQL operation complete.
->>
->>
->>
->>
 >>log;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b21f2a94/core/sql/regress/hive/TEST018
----------------------------------------------------------------------
diff --git a/core/sql/regress/hive/TEST018 b/core/sql/regress/hive/TEST018
index 7759805..a5544c1 100644
--- a/core/sql/regress/hive/TEST018
+++ b/core/sql/regress/hive/TEST018
@@ -751,17 +751,4 @@ sh echo "regrhadoop.ksh fs -rm /user/trafodion/hive/exttables/unload_customer_de
 sh regrhadoop.ksh fs -rm /user/trafodion/hive/exttables/unload_customer_demographics/* ;
 log LOG018;
 
-CQD TRAF_UNLOAD_SKIP_WRITING_TO_FILES 'ON';
-UNLOAD  
-WITH PURGEDATA FROM TARGET
-INTO '/user/trafodion/hive/exttables/unload_customer_demographics'
-(select * from trafodion.hbase.customer_demographics_salt) ;
---sh sleep 10;
-select count(*) from hive.hive.unload_customer_demographics;
-
-CQD TRAF_UNLOAD_SKIP_WRITING_TO_FILES reset;
-
-
-
-
 log;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b21f2a94/core/sql/sqlcomp/DefaultConstants.h
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/DefaultConstants.h b/core/sql/sqlcomp/DefaultConstants.h
index 4cf1842..d128356 100644
--- a/core/sql/sqlcomp/DefaultConstants.h
+++ b/core/sql/sqlcomp/DefaultConstants.h
@@ -3609,12 +3609,10 @@ enum DefaultConstants
   ASG_FEATURE,
 
   TRAF_UNLOAD_HDFS_COMPRESS,
-  TRAF_UNLOAD_SKIP_WRITING_TO_FILES,
 
   NCM_IND_JOIN_COST_ADJ_FACTOR,
   NCM_IND_SCAN_COST_ADJ_FACTOR,
   GROUP_BY_PARTIAL_ROOT_THRESHOLD,
-  TRAF_UNLOAD_BYPASS_LIBHDFS,
   TRAF_UNLOAD_DEF_DELIMITER,
   TRAF_UNLOAD_DEF_RECORD_SEPARATOR,
   TRAF_LOAD_FORCE_CIF,

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b21f2a94/core/sql/sqlcomp/nadefaults.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/nadefaults.cpp b/core/sql/sqlcomp/nadefaults.cpp
index bd90ca0..fc342ba 100644
--- a/core/sql/sqlcomp/nadefaults.cpp
+++ b/core/sql/sqlcomp/nadefaults.cpp
@@ -3435,11 +3435,9 @@ XDDkwd__(SUBQUERY_UNNESTING,			"ON"),
   // DTM Transaction Type: MVCC, SSCC
   XDDkwd__(TRAF_TRANS_TYPE,                            "MVCC"),
 
-  DDkwd__(TRAF_UNLOAD_BYPASS_LIBHDFS,                  "ON"),
   DD_____(TRAF_UNLOAD_DEF_DELIMITER,                   "|" ),
   DD_____(TRAF_UNLOAD_DEF_RECORD_SEPARATOR,            "\n" ),
   DDint__(TRAF_UNLOAD_HDFS_COMPRESS,                   "0"),
-  DDkwd__(TRAF_UNLOAD_SKIP_WRITING_TO_FILES,           "OFF"),
   DDkwd__(TRAF_UPSERT_ADJUST_PARAMS,                   "OFF"),
   DDkwd__(TRAF_UPSERT_MODE,                            "MERGE"),
   DDkwd__(TRAF_UPSERT_TO_EFF_TREE,                     "ON"),


Mime
View raw message