libcouchbase 1.3.0 → 1.3.2

data/ext/libcouchbase/example/analytics/queries/00-show-dataverse.json

@@ -0,0 +1,5 @@
+// vim: ft=javascript
+// Display dataverses defined by Analytics service
+{
+  "statement": "SELECT * FROM Metadata.`Dataverse`"
+}

data/ext/libcouchbase/example/analytics/queries/01-setup-dataset-breweries.json

@@ -0,0 +1,6 @@
+// vim: ft=javascript
+// Tell analytics service to shadow the data from beer-sample bucket using
+// breweries dataset.
+{
+  "statement": "CREATE DATASET breweries ON `beer-sample` WHERE `type` = \"brewery\""
+}

data/ext/libcouchbase/example/analytics/queries/02-setup-dataset-beers.json

@@ -0,0 +1,6 @@
+// vim: ft=javascript
+// Tell analytics service to shadow the data from beer-sample bucket using
+// beers dataset.
+{
+  "statement": "CREATE DATASET beers ON `beer-sample` WHERE `type` = \"beer\""
+}

data/ext/libcouchbase/example/analytics/queries/03-initiate-shadow.json

@@ -0,0 +1,6 @@
+// vim: ft=javascript
+// Initiate the shadowing relationship of datasets to the data in Couchbase
+// Server
+{
+  "statement": "CONNECT LINK Local"
+}

data/ext/libcouchbase/example/analytics/queries/04-list-datasets.json

@@ -0,0 +1,7 @@
+// vim: ft=javascript
+// List populated datasets
+{
+  "statement": "SELECT ds.BucketName, ds.DatasetName, ds.`Filter` FROM Metadata.`Dataset` ds WHERE ds.DataverseName = \"Default\""
+}
+
+

data/ext/libcouchbase/example/analytics/queries/05-count-breweries.json

@@ -0,0 +1,5 @@
+// vim: ft=javascript
+// Ask Analytics the number of breweries
+{
+  "statement": "SELECT VALUE COUNT(*) FROM breweries"
+}

data/ext/libcouchbase/example/analytics/queries/06-first-brewery.json

@@ -0,0 +1,6 @@
+// vim: ft=javascript
+// Retrieve first brewery, ordered by name
+{
+  "statement": "SELECT * FROM breweries ORDER BY name LIMIT 1",
+  "pretty": true
+}

data/ext/libcouchbase/example/analytics/queries/07-key-based-lookup.json

@@ -0,0 +1,6 @@
+// vim: ft=javascript
+// Find a particular brewery based on its Couchbase Server key
+{
+  "statement": "SELECT meta(bw) AS meta, bw AS data FROM breweries bw WHERE meta(bw).id = 'kona_brewing'",
+  "pretty": true
+}

data/ext/libcouchbase/example/analytics/queries/08-exact-match-lookup.json

@@ -0,0 +1,7 @@
+// vim: ft=javascript
+// Find the same brewery information but in a slightly simpler or cleaner way
+// based only on the data
+{
+  "statement": "SELECT VALUE bw FROM breweries bw WHERE bw.name = 'Kona Brewing'",
+  "pretty": true
+}

data/ext/libcouchbase/example/analytics/queries/09-exact-match-lookup-different-shape.json

@@ -0,0 +1,6 @@
+// vim: ft=javascript
+// Find brewery by name, but return objects instead of values
+{
+  "statement": "SELECT bw FROM breweries bw WHERE bw.name = 'Kona Brewing'",
+  "pretty": true
+}

data/ext/libcouchbase/example/analytics/queries/10-other-query-filters.json

@@ -0,0 +1,6 @@
+// vim: ft=javascript
+// Apply a range condition together with a string condition to select breweries
+{
+  "statement": "SELECT VALUE bw FROM breweries bw WHERE bw.geo.lat > 60.0 AND bw.name LIKE '%Brewing%' ORDER BY bw.name",
+  "pretty": true
+}

data/ext/libcouchbase/example/analytics/queries/11-equijoin.json

@@ -0,0 +1,9 @@
+// vim: ft=javascript
+// Fetch  list of all breweries paired with their associated beers, with the
+// list enumerating the brewery name and the beer name for each such pair,
+// while also limiting the answer set size to at most 3 results.
+{
+  "statement": "SELECT bw.name AS brewer, br.name AS beer FROM breweries bw, beers br WHERE br.brewery_id = meta(bw).id ORDER BY bw.name, br.name LIMIT 3"
+}
+
+

data/ext/libcouchbase/example/analytics/queries/12-equijoin-select-star.json

@@ -0,0 +1,10 @@
+// vim: ft=javascript
+// Fetch  list of all breweries paired with their associated beers, including
+// all attributes, while also limiting the answer set size to at most 3
+// results.
+{
+  "statement": "SELECT * FROM breweries bw, beers br WHERE br.brewery_id = meta(bw).id ORDER BY bw.name, br.name LIMIT 3",
+  "pretty": true
+}
+
+

data/ext/libcouchbase/example/analytics/queries/13-ansi-join.json

@@ -0,0 +1,8 @@
+// vim: ft=javascript
+// Fetch  list of all breweries paired with their associated beers, including
+// all attributes, while also limiting the answer set size to at most 3
+// results. With ANSI JOINS!
+{
+  "statement": "SELECT * FROM breweries bw JOIN beers br ON br.brewery_id = meta(bw).id ORDER BY bw.name, br.name LIMIT 3",
+  "pretty": true
+}

data/ext/libcouchbase/example/analytics/queries/14-join-select-values.json

@@ -0,0 +1,8 @@
+// vim: ft=javascript
+// Fetch  list of all breweries paired with their associated beers, including
+// all attributes, while also limiting the answer set size to at most 3
+// results. Select values explicitly.
+{
+  "statement": "SELECT VALUE {\"bw\": bw, \"br\": br} FROM breweries bw, beers br WHERE br.brewery_id = meta(bw).id ORDER BY bw.name, br.name LIMIT 3",
+  "pretty": true
+}

data/ext/libcouchbase/example/analytics/queries/15-nested-outer-join.json

@@ -0,0 +1,7 @@
+// vim: ft=javascript
+// For each brewery produce an object that contains the brewery name along with
+// a list of all of the brewery’s offered beer names and alcohol percentages
+{
+  "statement": "SELECT bw.name AS brewer, (SELECT br.name, br.abv FROM beers br WHERE br.brewery_id = meta(bw).id ORDER BY br.name) AS beers FROM breweries bw ORDER BY bw.name LIMIT 2",
+  "pretty": true
+}

data/ext/libcouchbase/example/analytics/queries/16-theta-join.json

@@ -0,0 +1,8 @@
+// vim: ft=javascript
+// For each Arizona brewery get the brewery's name, location, and a list of
+// competitors' names -- where competitors are other breweries that are
+// geographically close to their location
+{
+  "statement": "SELECT bw1.name AS brewer, bw1.geo AS location, (SELECT VALUE bw2.name FROM breweries bw2 WHERE bw2.name != bw1.name AND abs(bw1.geo.lat - bw2.geo.lat) <= 0.1 AND abs(bw2.geo.lon - bw1.geo.lon) <= 0.1) AS competitors FROM breweries bw1 WHERE bw1.state = 'Arizona' ORDER BY bw1.name LIMIT 3",
+  "pretty": true
+}

data/ext/libcouchbase/example/analytics/queries/17-existential-quantification.json

@@ -0,0 +1,9 @@
+// vim: ft=javascript
+// Find those breweries whose beers include at least one IPA and return the
+// brewery’s name, phone number, and complete list of beer names and associated
+// alcohol levels.
+{
+  "statement": "WITH nested_breweries AS ( SELECT bw.name AS brewer, bw.phone, ( SELECT br.name, br.abv FROM beers br WHERE br.brewery_id = meta(bw).id ORDER BY br.name) AS beers FROM breweries bw) SELECT VALUE nb FROM nested_breweries nb WHERE (SOME b IN nb.beers SATISFIES b.name LIKE '%IPA%') ORDER BY nb.brewer LIMIT 2",
+  "pretty": true
+}
+

data/ext/libcouchbase/example/analytics/queries/18-universal-quantification.json

@@ -0,0 +1,7 @@
+// vim: ft=javascript
+// Find those breweries that only have seriously strong beers
+{
+  "statement": "WITH nested_breweries AS ( SELECT bw.name AS brewer, bw.phone, ( SELECT br.name, br.abv FROM beers br WHERE br.brewery_id = meta(bw).id ORDER BY br.name) AS beers FROM breweries bw) SELECT VALUE nb FROM nested_breweries nb WHERE (EVERY b IN nb.beers SATISFIES b.abv >= 10) AND ARRAY_COUNT(nb.beers) > 0 ORDER BY nb.brewer LIMIT 5",
+  "pretty": true
+}
+

data/ext/libcouchbase/example/analytics/queries/19-simple-aggregation.json

@@ -0,0 +1,6 @@
+// vim: ft=javascript
+// Compute the total number of beers in a SQL-like way
+{
+  "statement": "SELECT COUNT(*) AS num_beers FROM beers"
+}
+

data/ext/libcouchbase/example/analytics/queries/20-simple-aggregation-unwrapped-value.json

@@ -0,0 +1,6 @@
+// vim: ft=javascript
+// Compute the total number of beers and return unwrapped value
+{
+  "statement": "SELECT VALUE COUNT(b) FROM beers b"
+}
+

data/ext/libcouchbase/example/analytics/queries/21-simple-aggregation-explicit.json

@@ -0,0 +1,6 @@
+// vim: ft=javascript
+// Compute the total number of beers with explicit aggregate function
+{
+  "statement": "SELECT VALUE ARRAY_COUNT((SELECT b FROM beers b))"
+}
+

data/ext/libcouchbase/example/analytics/queries/22-grouping-and-aggregation.json

@@ -0,0 +1,6 @@
+// vim: ft=javascript
+// For each brewery that offers more than 30 beers, the following group-by or
+// aggregate query reports the number of beers that it offers
+{
+  "statement": "SELECT br.brewery_id, COUNT(*) AS num_beers FROM beers br GROUP BY br.brewery_id HAVING COUNT(*) > 30 ORDER BY COUNT(*) DESC"
+}

data/ext/libcouchbase/example/analytics/queries/23-grouping-and-aggregation-with-hint.json

@@ -0,0 +1,7 @@
+// vim: ft=javascript
+// For each brewery that offers more than 30 beers, the following group-by or
+// aggregate query reports the number of beers that it offers. With a
+// hash-based aggregation hint.
+{
+  "statement": "SELECT br.brewery_id, COUNT(*) AS num_beers FROM beers br /*+ hash */ GROUP BY br.brewery_id HAVING COUNT(*) > 30 ORDER BY COUNT(*) DESC"
+}

data/ext/libcouchbase/example/analytics/queries/24-grouping-and-limits.json

@@ -0,0 +1,7 @@
+// vim: ft=javascript
+// Return the top three breweries based on their numbers of offered beers. Also
+// illustrate the use of multiple aggregate functions to compute various
+// alcohol content statistics for their beers
+{
+  "statement": "SELECT bw.name, COUNT(*) AS num_beers, AVG(br.abv) AS abv_avg, MIN(br.abv) AS abv_min, MAX(br.abv) AS abv_max FROM breweries bw, beers br WHERE br.brewery_id = meta(bw).id GROUP BY bw.name ORDER BY num_beers DESC LIMIT 3"
+}

data/ext/libcouchbase/example/analytics/queries/25-named-parameters.json

@@ -0,0 +1,7 @@
+// vim: ft=javascript
+// Find the same brewery information but specify name as parameter
+{
+  "statement": "SELECT VALUE bw FROM breweries bw WHERE bw.name = $name",
+  "$name": "Kona Brewing",
+  "pretty": true
+}

data/ext/libcouchbase/example/analytics/queries/26-positional-parameters.json

@@ -0,0 +1,7 @@
+// vim: ft=javascript
+// Find the same brewery information but specify name as parameter
+{
+  "statement": "SELECT VALUE bw FROM breweries bw WHERE bw.name = ?",
+  "args": ["Kona Brewing"],
+  "pretty": true
+}

data/ext/libcouchbase/example/crypto/common_provider.c

@@ -17,6 +17,8 @@
 
 #include "common_provider.h"
 
+char * common_aes256_key_id = "mykeyid";
+
 uint8_t *common_hmac_sha256_key = "myauthpassword";
 
 uint8_t common_aes256_key[AES256_KEY_SIZE] = "!mysecretkey#9^5usdk39d&dlf)03sL";

data/ext/libcouchbase/example/crypto/common_provider.h

@@ -20,6 +20,8 @@
 
 #include <libcouchbase/couchbase.h>
 
+extern char * common_aes256_key_id;
+
 #define AES256_KEY_SIZE 32
 #define AES256_IV_SIZE 16
 

data/ext/libcouchbase/example/crypto/openssl_symmetric_decrypt.c

@@ -39,6 +39,7 @@ static void op_callback(lcb_t instance, int cbtype, const lcb_RESPBASE *rb)
     if (rb->rc == LCB_SUCCESS) {
         const lcb_RESPGET *rg = (const lcb_RESPGET *)rb;
         lcbcrypto_CMDDECRYPT dcmd = {};
+        lcbcrypto_FIELDSPEC field = {};
         lcb_error_t err;
 
         printf("VALUE:  %.*s\n", (int)rg->nvalue, rg->value);
@@ -48,6 +49,10 @@ static void op_callback(lcb_t instance, int cbtype, const lcb_RESPBASE *rb)
         dcmd.ndoc = rg->nvalue;
         dcmd.out = NULL;
         dcmd.nout = 0;
+        dcmd.nfields = 1;
+        dcmd.fields = &field;
+        field.name = "message";
+        field.alg = "AES-256-HMAC-SHA256";
         err = lcbcrypto_decrypt_fields(instance, &dcmd);
         if (err != LCB_SUCCESS) {
             die(instance, "Couldn't decrypt field 'message'", err);

data/ext/libcouchbase/example/crypto/openssl_symmetric_encrypt.c

@@ -63,7 +63,6 @@ static void store_encrypted(lcb_t instance, const char *key, const char *val)
     ecmd.fields = &field;
     field.name = "message";
     field.alg = "AES-256-HMAC-SHA256";
-    field.kid = "mypublickey";
 
     err = lcbcrypto_encrypt_fields(instance, &ecmd);
     if (err != LCB_SUCCESS) {

data/ext/libcouchbase/example/crypto/openssl_symmetric_provider.c

@@ -41,17 +41,9 @@ static void osp_release_bytes(lcbcrypto_PROVIDER *provider, void *bytes)
     (void)provider;
 }
 
-static lcb_error_t osp_load_key(struct lcbcrypto_PROVIDER *provider, lcbcrypto_KEYTYPE type, const char *keyid,
-                                uint8_t **key, size_t *key_len)
+static const char *osp_get_key_id(lcbcrypto_PROVIDER *provider)
 {
-    *key_len = AES256_KEY_SIZE;
-    *key = malloc(*key_len);
-    memcpy(*key, common_aes256_key, *key_len);
-
-    (void)type;
-    (void)keyid;
-    (void)provider;
-    return LCB_SUCCESS;
+    return common_aes256_key_id;
 }
 
 static lcb_error_t osp_generate_iv(struct lcbcrypto_PROVIDER *provider, uint8_t **iv, size_t *iv_len)
@@ -170,15 +162,14 @@ static lcb_error_t osp_verify_signature(struct lcbcrypto_PROVIDER *provider, con
 }
 
 static lcb_error_t osp_encrypt(struct lcbcrypto_PROVIDER *provider, const uint8_t *input, size_t input_len,
-                               const uint8_t *key, size_t key_len, const uint8_t *iv, size_t iv_len, uint8_t **output,
-                               size_t *output_len)
+                               const uint8_t *iv, size_t iv_len, uint8_t **output, size_t *output_len)
 {
     EVP_CIPHER_CTX *ctx;
     const EVP_CIPHER *cipher;
     int rc, len, block_len, out_len;
     uint8_t *out;
 
-    if (iv_len != 16 || key_len != 32) {
+    if (iv_len != 16) {
         return LCB_EINVAL;
     }
 
@@ -187,7 +178,7 @@ static lcb_error_t osp_encrypt(struct lcbcrypto_PROVIDER *provider, const uint8_
         return LCB_EINVAL;
     }
     cipher = EVP_aes_256_cbc();
-    rc = EVP_EncryptInit_ex(ctx, cipher, NULL, key, iv);
+    rc = EVP_EncryptInit_ex(ctx, cipher, NULL, common_aes256_key, iv);
     if (rc != 1) {
         EVP_CIPHER_CTX_free(ctx);
         return LCB_EINVAL;
@@ -215,15 +206,14 @@ static lcb_error_t osp_encrypt(struct lcbcrypto_PROVIDER *provider, const uint8_
 }
 
 static lcb_error_t osp_decrypt(struct lcbcrypto_PROVIDER *provider, const uint8_t *input, size_t input_len,
-                               const uint8_t *key, size_t key_len, const uint8_t *iv, size_t iv_len, uint8_t **output,
-                               size_t *output_len)
+                               const uint8_t *iv, size_t iv_len, uint8_t **output, size_t *output_len)
 {
     EVP_CIPHER_CTX *ctx;
     const EVP_CIPHER *cipher;
     int rc, len, out_len;
     uint8_t *out;
 
-    if (iv_len != 16 || key_len != 32) {
+    if (iv_len != 16) {
         return LCB_EINVAL;
     }
 
@@ -232,7 +222,7 @@ static lcb_error_t osp_decrypt(struct lcbcrypto_PROVIDER *provider, const uint8_
         return LCB_EINVAL;
     }
     cipher = EVP_aes_256_cbc();
-    rc = EVP_DecryptInit_ex(ctx, cipher, NULL, key, iv);
+    rc = EVP_DecryptInit_ex(ctx, cipher, NULL, common_aes256_key, iv);
     if (rc != 1) {
         EVP_CIPHER_CTX_free(ctx);
         return LCB_EINVAL;
@@ -261,15 +251,15 @@ static lcb_error_t osp_decrypt(struct lcbcrypto_PROVIDER *provider, const uint8_
 lcbcrypto_PROVIDER *osp_create()
 {
     lcbcrypto_PROVIDER *provider = calloc(1, sizeof(lcbcrypto_PROVIDER));
-    provider->version = 0;
+    provider->version = 1;
     provider->destructor = osp_free;
-    provider->v.v0.release_bytes = osp_release_bytes;
-    provider->v.v0.load_key = osp_load_key;
-    provider->v.v0.generate_iv = osp_generate_iv;
-    provider->v.v0.sign = osp_sign;
-    provider->v.v0.verify_signature = osp_verify_signature;
-    provider->v.v0.encrypt = osp_encrypt;
-    provider->v.v0.decrypt = osp_decrypt;
+    provider->v.v1.release_bytes = osp_release_bytes;
+    provider->v.v1.generate_iv = osp_generate_iv;
+    provider->v.v1.sign = osp_sign;
+    provider->v.v1.verify_signature = osp_verify_signature;
+    provider->v.v1.encrypt = osp_encrypt;
+    provider->v.v1.decrypt = osp_decrypt;
+    provider->v.v1.get_key_id = osp_get_key_id;
     return provider;
 }
 

data/ext/libcouchbase/example/db/db.c

@@ -26,8 +26,8 @@
  * RUN:
  *
  *      valgrind -v --tool=memcheck  --leak-check=full --show-reachable=yes ./db
- *      ./db key size <host:port> <bucket> <passwd>
- *      db.exe key size <host:port> <bucket> <passwd>
+ *      ./db key size <host:port> <bucket> <passwd> <username>
+ *      db.exe key size <host:port> <bucket> <passwd> <username>
  */
 #include <stdio.h>
 #include <libcouchbase/couchbase.h>
@@ -106,6 +106,9 @@ int main(int argc, char *argv[])
     if (argc > 4) {
         create_options.v.v3.passwd = argv[4];
     }
+    if (argc > 5) {
+        create_options.v.v3.username = argv[5];
+    }
 
     INSTALL_SIGINT_HANDLER();
 
@@ -151,16 +154,17 @@ int main(int argc, char *argv[])
     }
     lcb_wait3(instance, LCB_WAIT_NOCHECK);
     fprintf(stderr, "Benchmarking... CTRL-C to stop\n");
-    {
-        lcb_CMDGET cmd = { 0 };
+    while (1) {
+        lcb_CMDGET cmd = {0};
         LCB_CMD_SET_KEY(&cmd, key, nkey);
         err = lcb_get3(instance, NULL, &cmd);
         if (err != LCB_SUCCESS) {
-            fprintf(stderr, "Failed to get: %s\n", lcb_strerror(NULL, err));
+            fprintf(stderr, "Failed to schedule get operation: %s\n", lcb_strerror(NULL, err));
             exit(EXIT_FAILURE);
         }
+        lcb_wait3(instance, LCB_WAIT_NOCHECK);
+        fprintf(stderr, "retry\n");
     }
-    lcb_wait3(instance, LCB_WAIT_NOCHECK);
     lcb_destroy(instance);
 
     exit(EXIT_SUCCESS);

data/ext/libcouchbase/example/fts/.gitignore

@@ -0,0 +1 @@
+fts

data/ext/libcouchbase/example/fts/build-queries.rb

@@ -0,0 +1,33 @@
+#!/usr/bin/ruby
+
+#    Copyright 2018 Couchbase, Inc.
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+require 'json'
+
+paths = Dir[File.join(__dir__, 'queries', '*.json')].sort
+File.open(File.join(__dir__, 'queries.h'), 'w+') do |out|
+  out.puts("// This file was generated by queries.rb")
+  out.puts("typedef struct fts_query_str { const char *comment; size_t query_len; const char *query; } fts_query_str;")
+  out.puts("size_t num_queries = #{paths.size};")
+  out.puts("fts_query_str queries[#{paths.size + 1}] = {")
+  paths.each do |path|
+    lines = File.readlines(path)
+    comment = lines[1].gsub(%r{^//\s*}, '').strip
+    query = lines.reject { |line| line.start_with?('//') }.join
+    query_str = JSON.generate(JSON.parse(query))
+    out.puts("{#{comment.inspect},\n #{query_str.size},\n #{query_str.inspect}},\n\n")
+  end
+  out.puts("{NULL, 0, NULL}};")
+end