浏览代码

HPCC-10674 Update based on review

Signed-off-by: Anthony Fishbeck <anthony.fishbeck@lexisnexis.com>
Anthony Fishbeck 10 年之前
父节点
当前提交
c40de84a02
共有 5 个文件被更改,包括 10 次插入8 次删除
  1. 7 0
      common/thorhelper/thorxmlwrite.hpp
  2. 1 1
      ecl/hthor/hthor.cpp
  3. 1 0
      plugins/CMakeLists.txt
  4. 1 1
      roxie/ccd/ccdserver.cpp
  5. 0 6
      rtl/include/eclhelper.hpp

+ 7 - 0
common/thorhelper/thorxmlwrite.hpp

@@ -37,6 +37,13 @@ interface IXmlStreamFlusher
     virtual void flushXML(StringBuffer &current, bool isClose) = 0;
 };
 
+interface IXmlWriterExt : extends IXmlWriter
+{
+    virtual IXmlWriterExt & clear() = 0;
+    virtual size32_t length() const = 0;
+    virtual const char *str() const = 0;
+};
+
 class thorhelper_decl CommonXmlWriter : public CInterface, implements IXmlWriterExt
 {
 public:

+ 1 - 1
ecl/hthor/hthor.cpp

@@ -945,7 +945,7 @@ void CHThorXmlWriteActivity::execute()
     if (kind==TAKjsonwrite)
     {
         buildJsonFooter(footer.newline(), suppliedFooter, rowTag);
-        footerLength=footer.length()-1;
+        footerLength=footer.length();
     }
     else if (suppliedFooter)
         footer.append(suppliedFooter);

+ 1 - 0
plugins/CMakeLists.txt

@@ -28,3 +28,4 @@ add_subdirectory (v8embed)
 add_subdirectory (pyembed)
 add_subdirectory (javaembed)
 add_subdirectory (Rembed)
+add_subdirectory (cassandra)

+ 1 - 1
roxie/ccd/ccdserver.cpp

@@ -11170,7 +11170,7 @@ public:
         if (kind==TAKjsonwrite)
         {
             buildJsonFooter(footer.newline(), suppliedFooter, rowTag);
-            footerLength=footer.length()-1;
+            footerLength=footer.length();
         }
         else if (suppliedFooter)
             footer.append(suppliedFooter);

+ 0 - 6
rtl/include/eclhelper.hpp

@@ -181,12 +181,6 @@ public:
     inline void outputCString(const char *field, const char *fieldname) { outputString((size32_t)strlen(field), field, fieldname); }
 };
 
-interface IXmlWriterExt : extends IXmlWriter
-{
-    virtual IXmlWriterExt & clear() = 0;
-    virtual unsigned length() const = 0;
-    virtual const char *str() const = 0;
-};
 
 interface IFieldProcessor : public IInterface
 {