HPCC-10617 Add support for Cassandra

Minor changes following code review

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>

plugins/cassandra/cassandraembed.cpp

@@ -666,7 +666,7 @@ class CassandraRowBuilder : public CInterfaceOf<IFieldSource>
 {
 public:
     CassandraRowBuilder(const CassandraStatementInfo *_stmtInfo)
-    : stmtInfo(_stmtInfo), colIdx(0),numIteratorFields(0),nextIteratedField(0)
+    : stmtInfo(_stmtInfo), colIdx(0), numIteratorFields(0), nextIteratedField(0)
     {
     }
     virtual bool getBooleanResult(const RtlFieldInfo *field)
@@ -819,7 +819,7 @@ public:
         rtlStrToUtf8X(utf8chars, utfText.refstr(), len, value);
         if (collection)
             checkBind(cass_collection_append_string(*collection,
-                                                 cass_string_init2(utfText.getstr(), rtlUtf8Size(utf8chars, utfText.getstr()))),
+                                                    cass_string_init2(utfText.getstr(), rtlUtf8Size(utf8chars, utfText.getstr()))),
                       field);
         else
             checkBind(cass_statement_bind_string(stmtInfo->queryStatement(),
@@ -899,12 +899,12 @@ public:
         rtlUnicodeToUtf8X(utf8chars, utfText.refstr(), chars, value);
         if (collection)
             checkBind(cass_collection_append_string(*collection,
-                                                        cass_string_init2(utfText.getstr(), rtlUtf8Size(utf8chars, utfText.getstr()))),
+                                                    cass_string_init2(utfText.getstr(), rtlUtf8Size(utf8chars, utfText.getstr()))),
                       field);
         else
             checkBind(cass_statement_bind_string(stmtInfo->queryStatement(),
-                                                     checkNextParam(field),
-                                                     cass_string_init2(utfText.getstr(), rtlUtf8Size(utf8chars, utfText.getstr()))),
+                                                 checkNextParam(field),
+                                                 cass_string_init2(utfText.getstr(), rtlUtf8Size(utf8chars, utfText.getstr()))),
                       field);
     }
     virtual void processQString(unsigned len, const char *value, const RtlFieldInfo * field)

testing/regress/ecl/key/cassandra-simple.xml

@@ -1,9 +1,11 @@
+
+<Result>
 <Dataset name='Result 1'>
  <Row><name>name1</name><value>1</value><boolval>true</boolval><r8>1.2</r8><r4>3.400000095367432</r4><d>6161353561613535</d><ddd>1234567.89</ddd><u1>Straße</u1><u2>Straße</u2><set1><Item>one</Item><Item>three</Item><Item>two</Item></set1><list1><Item>5</Item><Item>4</Item><Item>4</Item><Item>3</Item></list1><map1><Row><fromval>b</fromval><toval>banana</toval></Row><Row><fromval>a</fromval><toval>apple</toval></Row></map1></Row>
- <Row><name>name2</name><value>2</value><boolval>false</boolval><r8>5.6</r8><r4>7.800000190734863</r4><d>3030</d><ddd>-1234567.89</ddd><u1>là</u1><u2>là</u2><set1/><list1/><map1/></Row>
+ <Row><name>name2</name><value>2</value><boolval>false</boolval><r8>5.6</r8><r4>7.800000190734863</r4><d>3030</d><ddd>-1234567.89</ddd><u1>là</u1><u2>là</u2><set1></set1><list1></list1><map1></map1></Row>
  <Row><name>name3</name><value>1</value><boolval>true</boolval><r8>1.2</r8><r4>3.400000095367432</r4><d>6161353561613535</d><ddd>8.76</ddd><u1>Straße</u1><u2>Straße</u2><set1><Item>five</Item><Item>four</Item></set1><list1><Item>2</Item><Item>2</Item><Item>3</Item><Item>1</Item></list1><map1><Row><fromval>f</fromval><toval>fish</toval></Row></map1></Row>
- <Row><name>name4</name><value>3</value><boolval>true</boolval><r8>9.1</r8><r4>11.11999988555908</r4><d>6161353561613535</d><ddd>987.65</ddd><u1>Baße</u1><u2>Baße</u2><set1/><list1/><map1/></Row>
- <Row><name>nulls</name><value>99999</value><boolval>true</boolval><r8>99.98999999999999</r8><r4>999.989990234375</r4><d>393939393939</d><ddd>9.99</ddd><u1>ß</u1><u2>9999 ßßßß</u2><set1/><list1/><map1/></Row>
+ <Row><name>name4</name><value>3</value><boolval>true</boolval><r8>9.1</r8><r4>11.11999988555908</r4><d>6161353561613535</d><ddd>987.65</ddd><u1>Baße</u1><u2>Baße</u2><set1></set1><list1></list1><map1></map1></Row>
+ <Row><name>nulls</name><value>99999</value><boolval>true</boolval><r8>99.98999999999999</r8><r4>999.989990234375</r4><d>393939393939</d><ddd>9.99</ddd><u1>ß</u1><u2>9999 ßßßß</u2><set1></set1><list1></list1><map1></map1></Row>
 </Dataset>
 <Dataset name='Result 2'>
  <Row><Result_2>name1</Result_2></Row>
@@ -47,7 +49,7 @@
 </Dataset>
 <Dataset name='Result 15'>
  <Row><name>name1</name><value>1</value><boolval>true</boolval><r8>1.2</r8><r4>3.400000095367432</r4><d>6161353561613535</d><ddd>1234567.89</ddd><u1>Straße</u1><u2>Straße</u2><set1><Item>one</Item><Item>three</Item><Item>two</Item></set1><list1><Item>5</Item><Item>4</Item><Item>4</Item><Item>3</Item></list1><map1><Row><fromval>b</fromval><toval>banana</toval></Row><Row><fromval>a</fromval><toval>apple</toval></Row></map1></Row>
- <Row><name>name2</name><value>2</value><boolval>false</boolval><r8>5.6</r8><r4>7.800000190734863</r4><d>3030</d><ddd>-1234567.89</ddd><u1>là</u1><u2>là</u2><set1/><list1/><map1/></Row>
+ <Row><name>name2</name><value>2</value><boolval>false</boolval><r8>5.6</r8><r4>7.800000190734863</r4><d>3030</d><ddd>-1234567.89</ddd><u1>là</u1><u2>là</u2><set1></set1><list1></list1><map1></map1></Row>
 </Dataset>
 <Dataset name='Result 16'>
 </Dataset>
@@ -57,3 +59,4 @@
 <Dataset name='Result 18'>
  <Row><Result_18>Done</Result_18></Row>
 </Dataset>
+</Result>