瀏覽代碼

Merge pull request #8158 from richardkchapman/cassandra-latest

HPCC-14827 Update cassandra cpp driver to latest version 2.2.2

Reviewed-by: Gavin Halliday <ghalliday@hpccsystems.com>
Gavin Halliday 9 年之前
父節點
當前提交
39511f0bcf
共有 2 個文件被更改,包括 7 次插入2 次删除
  1. 6 1
      plugins/cassandra/cassandraembed.cpp
  2. 1 1
      plugins/cassandra/cpp-driver

+ 6 - 1
plugins/cassandra/cassandraembed.cpp

@@ -1114,7 +1114,12 @@ public:
     {
         if (isAll)
             UNSUPPORTED("SET(ALL)");
-        collection.setown(new CassandraCollection(cass_collection_new(CASS_COLLECTION_TYPE_SET, numElements)));
+        // We don't know whether the corresponding field in Cassandra is a list or a set. Try binding a dummy list to tell which.
+        CassandraCollection temp(cass_collection_new(CASS_COLLECTION_TYPE_LIST, 0));
+        if (cass_statement_bind_collection(stmtInfo->queryStatement(), thisParam, temp) == CASS_OK)
+            collection.setown(new CassandraCollection(cass_collection_new(CASS_COLLECTION_TYPE_LIST, numElements)));
+        else
+            collection.setown(new CassandraCollection(cass_collection_new(CASS_COLLECTION_TYPE_SET, numElements)));
         return true;
     }
     virtual bool processBeginDataset(const RtlFieldInfo * field, unsigned numRows)

+ 1 - 1
plugins/cassandra/cpp-driver

@@ -1 +1 @@
-Subproject commit d7bbad34db39a51f209c6fadd07c9ec3a0bb86b7
+Subproject commit b4bb435129bab533612fa2caf194555fa943f925