Преглед изворни кода

Merge branch 'HPCC-9481-feature' of github.com:AttilaVamos/HPCC-Platform into HPCC-9481-feature

Conflicts:
	dali/ft/daftformat.cpp
	dali/ft/daftformat.ipp
	dali/ft/filecopy.cpp

Signed-off-by: Attila Vamos <attila.vamos@gmail.com>
Attila Vamos пре 11 година
родитељ
комит
d6883d90c9
2 измењених фајлова са 3 додато и 0 уклоњено
  1. 2 0
      dali/ft/daftformat.ipp
  2. 1 0
      dali/ft/filecopy.cpp

+ 2 - 0
dali/ft/daftformat.ipp

@@ -229,6 +229,7 @@ public:
     CCsvPartitioner(const FileFormat & _format);
 
     virtual void setTarget(IOutputProcessor * _target);
+
     virtual void getRecordStructure(StringBuffer & _recordStructure) { _recordStructure = recordStructure; }
     virtual void setRecordStructurePresent( bool _isRecordStructurePresent) {isRecordStructurePresent = _isRecordStructurePresent;}
     virtual unsigned getFieldCount(void) { return fieldCount; }
@@ -246,6 +247,7 @@ protected:
     unsigned        maxElementLength;
     FileFormat      format;
     StringMatcher   matcher;
+
     bool            isRecordStructurePresent;
     StringBuffer    recordStructure;
     unsigned        fieldCount;

+ 1 - 0
dali/ft/filecopy.cpp

@@ -1130,6 +1130,7 @@ void FileSprayer::calculateSprayPartition()
         const SocketEndpoint & ep = cur.filename.queryEndpoint();
         IFormatPartitioner * partitioner = createFormatPartitioner(ep, srcFormat, tgtFormat, calcOutput, queryFixedSlave(), wuid);
 
+
         // CSV record structure discovery of every source
         if (srcFormat.type == FFTcsv)
         {