libcouchbase 1.3.0 → 1.3.2

data/ext/libcouchbase/cmake/Modules/DownloadLcbDep.cmake

@@ -1,18 +1,16 @@
 # DownloadLcbDeb(url location)
-FIND_PROGRAM(WGET wget)
-FIND_PROGRAM(CURL curl)
 MACRO(DOWNLOAD_LCB_DEP url dest)
-    IF(WIN32)
-        EXECUTE_PROCESS(COMMAND powershell -Command
-            "(New-Object Net.WebClient).DownloadFile('${url}', '${dest}')" RESULT_VARIABLE DLRC)
-    ELSEIF(CURL)
-        EXECUTE_PROCESS(COMMAND "${CURL}" "${url}" -o "${dest}" RESULT_VARIABLE DLRC)
+    FIND_PROGRAM(WGET wget)
+    FIND_PROGRAM(CURL curl)
+    IF(CURL)
+        EXECUTE_PROCESS(COMMAND "${CURL}" "${url}" -L -o "${dest}" RESULT_VARIABLE DLRC)
     ELSEIF(WGET)
         EXECUTE_PROCESS(COMMAND "${WGET}" "${url}" -O "${dest}" RESULT_VARIABLE DLRC)
-    ELSE()
-        MESSAGE(WARNING "Using buggy built-in CMake downloader")
-        FILE(DOWNLOAD ${url} ${dest} INACTIVITY_TIMEOUT 30 SHOW_PROGRESS)
-        SET(DLRC 0)
+    ENDIF()
+    IF(NOT DLRC EQUAL 0)
+      MESSAGE(WARNING "Using buggy built-in CMake downloader")
+      FILE(DOWNLOAD ${url} ${dest} INACTIVITY_TIMEOUT 30 SHOW_PROGRESS STATUS RET)
+      LIST(GET RET 0 DLRC)
     ENDIF()
     IF(NOT DLRC EQUAL 0)
         MESSAGE(FATAL_ERROR "Failed to download ${url}")

data/ext/libcouchbase/cmake/Modules/FindProfiler.cmake

@@ -0,0 +1,16 @@
+FIND_LIBRARY(LIBPROFILER
+             NAMES profiler
+             HINTS
+                 ENV LIBPROFILER_DIR
+             PATHS
+                 ${DEPS_LIB_DIR}
+                 ~/Library/Frameworks
+                 /Library/Frameworks
+                 /opt/local
+                 /opt)
+
+IF(LIBPROFILER)
+  MESSAGE(STATUS "Found libprofiler: ${LIBPROFILER}")
+ELSE()
+  MESSAGE(FATAL_ERROR "Unable to find gperftools libprofiler, Try disabling LCB_USE_PROFILER option of CMake.")
+ENDIF()

data/ext/libcouchbase/cmake/Modules/GetVersionInfo.cmake

@@ -16,9 +16,9 @@ MACRO(RUNGIT outvar)
         OUTPUT_STRIP_TRAILING_WHITESPACE)
 ENDMACRO()
 
-if (GIT_EXECUTABLE)
-    RUNGIT(LCB_REVDESCRIBE describe --long)
-    RUNGIT(LCB_VERSION describe)
+if (GIT_EXECUTABLE AND NOT LCB_SKIP_GIT_VERSION)
+    RUNGIT(LCB_REVDESCRIBE describe --long --abbrev=10)
+    RUNGIT(LCB_VERSION describe --abbrev=10)
     STRING(REPLACE "-" "_" LCB_VERSION "${LCB_VERSION}")
     MESSAGE(STATUS "Sanitized VERSION=${LCB_VERSION}")
     RUNGIT(LCB_VERSION_CHANGESET rev-parse HEAD)
@@ -42,13 +42,13 @@ ENDIF()
 
 IF (NOT LCB_VERSION)
     SET(LCB_NOGITVERSION ON)
-    SET(LCB_VERSION "2.8.7")
+    SET(LCB_VERSION "2.9.5")
 ENDIF()
 IF (NOT LCB_VERSION_CHANGESET)
     SET(LCB_VERSION_CHANGESET "0xdeadbeef")
 ENDIF()
 IF (NOT LCB_VERSION_HEX)
-    SET(LCB_VERSION_HEX 0x020807)
+    SET(LCB_VERSION_HEX 0x020905)
 ENDIF()
 
 # Now parse the version string
@@ -63,7 +63,7 @@ IF(APPLE)
 ELSE()
     SET(LCB_SONAME_MAJOR "2")
 ENDIF()
-SET(LCB_SONAME_FULL "${LCB_SONAME_MAJOR}.0.55")
+SET(LCB_SONAME_FULL "${LCB_SONAME_MAJOR}.0.61")
 
 MESSAGE(STATUS
     "libcouchbase ${LCB_VERSION_MAJOR},${LCB_VERSION_MINOR},${LCB_VERSION_PATCH}")

data/ext/libcouchbase/cmake/config-cmake.h.in

@@ -72,7 +72,9 @@
 #define LCB_CXX_FLAGS "${CMAKE_CXX_FLAGS}"
 #define LCB_C_COMPILER "${CMAKE_C_COMPILER_ID} ${CMAKE_C_COMPILER_VERSION}"
 #define LCB_C_FLAGS "${CMAKE_C_FLAGS}"
+#define LCB_BUILD_TIMESTAMP "${LCB_BUILD_TIMESTAMP}"
 
 #define LCB_CLIENT_ID "libcouchbase/" LCB_VERSION_STRING " (" LCB_SYSTEM "; " LCB_SYSTEM_PROCESSOR "; " LCB_C_COMPILER ")"
 
 #cmakedefine HAVE_PKCS5_PBKDF2_HMAC
+#cmakedefine LCB_DUMP_PACKETS

data/ext/libcouchbase/cmake/configure

@@ -24,6 +24,10 @@ my @HELP_DESCRIPTIONS = (
         "Create a debug build",
         "%d", \(my $DEBUG = 0) ],
 
+    [ "enable-profiler", "",
+        "Build with profiler support (gperftools)",
+        "%d", \(my $USE_PROFILER = 0) ],
+
     [ "disable-tracing", "",
         "Disable builtin tracing",
         "%d", \(my $NO_TRACING = 0) ],
@@ -118,6 +122,10 @@ my @HELP_DESCRIPTIONS = (
     [ "build-dir", "s",
         "Directory to build in",
         "%s", \(my $BUILD_DIR = "build") ],
+    [ "skip-git-version", "",
+        "Skip version detection using git",
+        "%d", \(my $SKIP_GIT_VERSION = 0) ],
+
     [ "help", "",
         "This message", "%s", \(my $WANT_HELP = 0) ]
 );
@@ -223,6 +231,10 @@ if ($DEBUG) {
     push @CM_OPTIONS, "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
 }
 
+if ($USE_PROFILER) {
+    push @CM_OPTIONS, "-DLCB_USE_PROFILER=1";
+}
+
 if ($PREFIX) {
     push @CM_OPTIONS, "-DCMAKE_INSTALL_PREFIX=$PREFIX";
 }
@@ -237,6 +249,10 @@ if ($NO_TRACING) {
     push @CM_OPTIONS, "-DLCB_TRACING=0"
 }
 
+if ($SKIP_GIT_VERSION) {
+    push @CM_OPTIONS, "-DLCB_SKIP_GIT_VERSION=1"
+}
+
 if ($NO_PLUGINS) {
     push @CM_OPTIONS, "-DLCB_NO_PLUGINS=1";
 }

data/ext/libcouchbase/example/CMakeLists.txt

@@ -19,15 +19,30 @@ TARGET_LINK_LIBRARIES(db couchbase)
 TARGET_LINK_LIBRARIES(vb couchbase)
 
 ADD_EXAMPLE(mcc mcc "" "")
-ADD_EXAMPLE(minimal minimal "" "")
-ADD_EXAMPLE(observe observe "" "")
 ADD_EXAMPLE(views-example views "" "")
 ADD_EXAMPLE(tick tick "" "")
+ADD_EXAMPLE(users users "" "")
+ADD_EXAMPLE(fts fts "" "")
+ADD_EXAMPLE(analytics analytics "" "")
 
 ADD_EXECUTABLE(subdoc-simple subdoc/subdoc-simple.cc)
 ADD_EXECUTABLE(subdoc-multi subdoc/subdoc-multi.cc)
+ADD_EXECUTABLE(subdoc-xattrs subdoc/subdoc-xattrs.c)
 TARGET_LINK_LIBRARIES(subdoc-simple couchbase)
 TARGET_LINK_LIBRARIES(subdoc-multi couchbase)
+TARGET_LINK_LIBRARIES(subdoc-xattrs couchbase)
+
+ADD_EXECUTABLE(minimal minimal/minimal.c)
+TARGET_LINK_LIBRARIES(minimal couchbase)
+
+ADD_EXECUTABLE(query minimal/query.c)
+TARGET_LINK_LIBRARIES(query couchbase)
+
+ADD_EXECUTABLE(observe observe/observe.c)
+TARGET_LINK_LIBRARIES(observe couchbase)
+
+ADD_EXECUTABLE(durability observe/durability.c)
+TARGET_LINK_LIBRARIES(durability couchbase)
 
 IF(NOT WIN32)
     ADD_EXAMPLE(instancepool instancepool pthread "")

data/ext/libcouchbase/example/analytics/.gitignore

@@ -0,0 +1 @@
+analytics

data/ext/libcouchbase/example/analytics/analytics.c

@@ -0,0 +1,158 @@
+/* -*- Mode: C; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/*
+ *     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.
+ */
+
+/**
+
+   CFLAGS="-I$(realpath ../../include) -I$(realpath ../../build/generated)"
+   LDFLAGS="-L$(realpath ../../build/lib) -lcouchbase -Wl,-rpath=$(realpath ../../build/lib)"
+   make analytics
+
+ */
+
+#include <unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <libcouchbase/couchbase.h>
+#include <libcouchbase/n1ql.h>
+
+#include "queries.h"
+#include "cJSON.h"
+
+static void fail(const char *msg)
+{
+    printf("[\x1b[31mERROR\x1b[0m] %s\n", msg);
+    exit(EXIT_FAILURE);
+}
+
+static void check(lcb_error_t err, const char *msg)
+{
+    if (err != LCB_SUCCESS) {
+        char buf[1024] = {0};
+        snprintf(buf, sizeof(buf), "%s: %s\n", msg, lcb_strerror_short(err));
+        fail(buf);
+    }
+}
+
+static int err2color(lcb_error_t err)
+{
+    switch (err) {
+        case LCB_SUCCESS:
+            return 49;
+        default:
+            return 31;
+    }
+}
+
+static void row_callback(lcb_t instance, int type, const lcb_RESPN1QL *resp)
+{
+    int *idx = (int *)resp->cookie;
+    if (resp->rc != LCB_SUCCESS) {
+        printf("\x1b[31m%s\x1b[0m", lcb_strerror_short(resp->rc));
+        if (resp->htresp) {
+            printf(", HTTP status: %d", resp->htresp->htstatus);
+        }
+        printf("\n");
+        if (resp->nrow) {
+            cJSON *json;
+            char *data = calloc(resp->nrow + 1, sizeof(char));
+            memcpy(data, resp->row, resp->nrow);
+            json = cJSON_Parse(data);
+            if (json && json->type == cJSON_Object) {
+                cJSON *errors = cJSON_GetObjectItem(json, "errors");
+                if (errors && errors->type == cJSON_Array) {
+                    int ii, nerrors = cJSON_GetArraySize(errors);
+                    for (ii = 0; ii < nerrors; ii++) {
+                        cJSON *err = cJSON_GetArrayItem(errors, ii);
+                        if (err && err->type == cJSON_Object) {
+                            cJSON *code, *msg;
+                            code = cJSON_GetObjectItem(err, "code");
+                            msg = cJSON_GetObjectItem(err, "msg");
+                            if (code && code->type == cJSON_Number && msg && msg->type == cJSON_String) {
+                                printf(
+                                    "\x1b[1mcode\x1b[0m: \x1b[31m%d\x1b[0m, \x1b[1mmessage\x1b[0m: \x1b[31m%s\x1b[0m\n",
+                                    code->valueint, msg->valuestring);
+                            }
+                        }
+                    }
+                }
+            }
+            free(data);
+        }
+    }
+    if (resp->rflags & LCB_RESP_F_FINAL) {
+        printf("\x1b[1mMETA:\x1b[0m ");
+    } else {
+        printf("\x1b[1mR%d:\x1b[0m ", (*idx)++);
+    }
+    printf("%.*s\n", (int)resp->nrow, (char *)resp->row);
+    if (resp->rflags & LCB_RESP_F_FINAL) {
+        printf("\n");
+    }
+}
+
+int main(int argc, char *argv[])
+{
+    lcb_error_t err;
+    lcb_t instance;
+    char *bucket = NULL;
+    size_t ii;
+
+    if (argc < 2) {
+        printf("Usage: %s couchbase://host/beer-sample [ password [ username ] ]\n", argv[0]);
+        exit(EXIT_FAILURE);
+    }
+
+    {
+        struct lcb_create_st create_options = {0};
+        create_options.version = 3;
+        create_options.v.v3.connstr = argv[1];
+        if (argc > 2) {
+            create_options.v.v3.passwd = argv[2];
+        }
+        if (argc > 3) {
+            create_options.v.v3.username = argv[3];
+        }
+        check(lcb_create(&instance, &create_options), "create couchbase handle");
+        check(lcb_connect(instance), "schedule connection");
+        lcb_wait(instance);
+        check(lcb_get_bootstrap_status(instance), "bootstrap from cluster");
+        check(lcb_cntl(instance, LCB_CNTL_GET, LCB_CNTL_BUCKETNAME, &bucket), "get bucket name");
+        if (strcmp(bucket, "beer-sample") != 0) {
+            fail("expected bucket to be \"beer-sample\"");
+        }
+    }
+
+    for (ii = 0; ii < num_queries; ii++) {
+        lcb_CMDN1QL cmd = {0};
+        int idx = 0;
+        /* NOTE: with this flag, the request will be issued to Analytics service */
+        cmd.cmdflags = LCB_CMDN1QL_F_ANALYTICSQUERY;
+        cmd.callback = row_callback;
+        cmd.query = queries[ii].query;
+        cmd.nquery = queries[ii].query_len;
+        check(lcb_n1ql_query(instance, &idx, &cmd), "schedule analytics query");
+        printf("----> \x1b[1m%s\x1b[0m\n", queries[ii].comment);
+        printf("----> \x1b[36m%.*s\x1b[0m\n", (int)queries[ii].query_len, queries[ii].query);
+        lcb_wait(instance);
+    }
+
+    /* Now that we're all done, close down the connection handle */
+    lcb_destroy(instance);
+    return 0;
+}

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

@@ -0,0 +1,34 @@
+#!/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 analytics_query_str { const char *comment; size_t query_len; const char *query; } analytics_query_str;")
+  out.puts("size_t num_queries = #{paths.size};")
+  out.puts("analytics_query_str queries[#{paths.size + 1}] = {")
+  paths.each do |path|
+    lines = File.readlines(path)
+    lines.delete_at(0)
+    comment, query = lines.partition { |line| line.start_with?('//') }
+    comment_str = comment.map { |line| line.sub(%r(^//\s*), '').strip }.join(' ')
+    query_str = JSON.generate(JSON.parse(query.join.strip))
+    out.puts("{#{comment_str.inspect},\n #{query_str.size},\n #{query_str.inspect}},\n\n")
+  end
+  out.puts("{NULL, 0, NULL}};")
+end

data/ext/libcouchbase/example/analytics/cJSON.c

@@ -0,0 +1 @@
+../../contrib/cJSON/cJSON.c

data/ext/libcouchbase/example/analytics/cJSON.h

@@ -0,0 +1 @@
+../../contrib/cJSON/cJSON.h

data/ext/libcouchbase/example/analytics/queries.h

@@ -0,0 +1,113 @@
+// This file was generated by queries.rb
+typedef struct analytics_query_str { const char *comment; size_t query_len; const char *query; } analytics_query_str;
+size_t num_queries = 27;
+analytics_query_str queries[28] = {
+{"Display dataverses defined by Analytics service",
+ 50,
+ "{\"statement\":\"SELECT * FROM Metadata.`Dataverse`\"}"},
+
+{"Tell analytics service to shadow the data from beer-sample bucket using breweries dataset.",
+ 84,
+ "{\"statement\":\"CREATE DATASET breweries ON `beer-sample` WHERE `type` = \\\"brewery\\\"\"}"},
+
+{"Tell analytics service to shadow the data from beer-sample bucket using beers dataset.",
+ 77,
+ "{\"statement\":\"CREATE DATASET beers ON `beer-sample` WHERE `type` = \\\"beer\\\"\"}"},
+
+{"Initiate the shadowing relationship of datasets to the data in Couchbase Server",
+ 34,
+ "{\"statement\":\"CONNECT LINK Local\"}"},
+
+{"List populated datasets",
+ 129,
+ "{\"statement\":\"SELECT ds.BucketName, ds.DatasetName, ds.`Filter` FROM Metadata.`Dataset` ds WHERE ds.DataverseName = \\\"Default\\\"\"}"},
+
+{"Ask Analytics the number of breweries",
+ 52,
+ "{\"statement\":\"SELECT VALUE COUNT(*) FROM breweries\"}"},
+
+{"Retrieve first brewery, ordered by name",
+ 75,
+ "{\"statement\":\"SELECT * FROM breweries ORDER BY name LIMIT 1\",\"pretty\":true}"},
+
+{"Find a particular brewery based on its Couchbase Server key",
+ 118,
+ "{\"statement\":\"SELECT meta(bw) AS meta, bw AS data FROM breweries bw WHERE meta(bw).id = 'kona_brewing'\",\"pretty\":true}"},
+
+{"Find the same brewery information but in a slightly simpler or cleaner way based only on the data",
+ 94,
+ "{\"statement\":\"SELECT VALUE bw FROM breweries bw WHERE bw.name = 'Kona Brewing'\",\"pretty\":true}"},
+
+{"Find brewery by name, but return objects instead of values",
+ 88,
+ "{\"statement\":\"SELECT bw FROM breweries bw WHERE bw.name = 'Kona Brewing'\",\"pretty\":true}"},
+
+{"Apply a range condition together with a string condition to select breweries",
+ 133,
+ "{\"statement\":\"SELECT VALUE bw FROM breweries bw WHERE bw.geo.lat > 60.0 AND bw.name LIKE '%Brewing%' ORDER BY bw.name\",\"pretty\":true}"},
+
+{"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.",
+ 153,
+ "{\"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\"}"},
+
+{"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.",
+ 134,
+ "{\"statement\":\"SELECT * FROM breweries bw, beers br WHERE br.brewery_id = meta(bw).id ORDER BY bw.name, br.name LIMIT 3\",\"pretty\":true}"},
+
+{"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!",
+ 135,
+ "{\"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}"},
+
+{"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.",
+ 163,
+ "{\"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}"},
+
+{"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",
+ 197,
+ "{\"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}"},
+
+{"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",
+ 319,
+ "{\"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}"},
+
+{"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.",
+ 336,
+ "{\"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}"},
+
+{"Find those breweries that only have seriously strong beers",
+ 359,
+ "{\"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}"},
+
+{"Compute the total number of beers in a SQL-like way",
+ 55,
+ "{\"statement\":\"SELECT COUNT(*) AS num_beers FROM beers\"}"},
+
+{"Compute the total number of beers and return unwrapped value",
+ 50,
+ "{\"statement\":\"SELECT VALUE COUNT(b) FROM beers b\"}"},
+
+{"Compute the total number of beers with explicit aggregate function",
+ 65,
+ "{\"statement\":\"SELECT VALUE ARRAY_COUNT((SELECT b FROM beers b))\"}"},
+
+{"For each brewery that offers more than 30 beers, the following group-by or aggregate query reports the number of beers that it offers",
+ 140,
+ "{\"statement\":\"SELECT br.brewery_id, COUNT(*) AS num_beers FROM beers br GROUP BY br.brewery_id HAVING COUNT(*) > 30 ORDER BY COUNT(*) DESC\"}"},
+
+{"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.",
+ 152,
+ "{\"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\"}"},
+
+{"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",
+ 236,
+ "{\"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\"}"},
+
+{"Find the same brewery information but specify name as parameter",
+ 108,
+ "{\"statement\":\"SELECT VALUE bw FROM breweries bw WHERE bw.name = $name\",\"$name\":\"Kona Brewing\",\"pretty\":true}"},
+
+{"Find the same brewery information but specify name as parameter",
+ 105,
+ "{\"statement\":\"SELECT VALUE bw FROM breweries bw WHERE bw.name = ?\",\"args\":[\"Kona Brewing\"],\"pretty\":true}"},
+
+{NULL, 0, NULL}};