CCBC-1069: don't hardcode path prefix for analytics

Change-Id: I4fa169d7df8e96c2d35dcbb6cf8d2117a6cbc0bd
Reviewed-on: http://review.couchbase.org/113806
Tested-by: Build Bot <build@couchbase.com>
Reviewed-by: Sergey Avseyev <sergey.avseyev@gmail.com>

src/analytics/analytics.cc

@@ -22,7 +22,6 @@
 #include "http/http.h"
 #include "logging.h"
 #include "contrib/lcb-jsoncpp/lcb-jsoncpp.h"
-#include <map>
 #include <string>
 #include <list>
 #include "docreq/docreq.h"
@@ -679,6 +678,8 @@ lcb_STATUS ANALYTICSREQ::issue_htreq(const std::string &body)
     lcb_cmdhttp_streaming(htcmd, true);
     lcb_cmdhttp_handle(htcmd, &htreq);
     lcb_cmdhttp_timeout(htcmd, timeout);
+    std::string url("/query/service");
+    lcb_cmdhttp_path(htcmd, url.c_str(), url.size());
 
     lcb_STATUS rc = lcb_http(instance, this, htcmd);
     lcb_cmdhttp_destroy(htcmd);

src/vbucket/vbucket.c

@@ -364,7 +364,7 @@ static int build_server_strings(lcbvb_CONFIG *cfg, lcbvb_SERVER *server)
         server->ftspath = strdup("/");
     }
     if (server->cbaspath == NULL && server->svc.cbas) {
-        server->cbaspath = strdup("/query/service");
+        server->cbaspath = strdup("");
     }
     return 1;
 }
@@ -1451,7 +1451,7 @@ const char *lcbvb_get_resturl(lcbvb_CONFIG *cfg, unsigned ix, lcbvb_SVCTYPE svc,
     } else if (svc == LCBVB_SVCTYPE_FTS) {
         path = srv->ftspath;
         strp = &svcs->fts_base_;
-    } else if (svc == LCBVB_SVCTYPE_CBAS) {
+    } else if (svc == LCBVB_SVCTYPE_ANALYTICS) {
         path = srv->cbaspath;
         strp = &svcs->cbas_base_;
     } else {