Author: sseifert
Date: Tue Sep 29 21:55:12 2015
New Revision: 1705931
URL: http://svn.apache.org/viewvc?rev=1705931&view=rev
Log:
SLING-5077 NoSQL Couchbase Resource Provider: Make index creation compatible
with Couchbase 4.0 RC0
Modified:
sling/trunk/contrib/nosql/couchbase-resourceprovider/src/main/java/org/apache/sling/nosql/couchbase/resourceprovider/impl/CouchbaseNoSqlAdapter.java
sling/trunk/contrib/nosql/launchpad/pom.xml
Modified:
sling/trunk/contrib/nosql/couchbase-resourceprovider/src/main/java/org/apache/sling/nosql/couchbase/resourceprovider/impl/CouchbaseNoSqlAdapter.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/nosql/couchbase-resourceprovider/src/main/java/org/apache/sling/nosql/couchbase/resourceprovider/impl/CouchbaseNoSqlAdapter.java?rev=1705931&r1=1705930&r2=1705931&view=diff
==============================================================================
---
sling/trunk/contrib/nosql/couchbase-resourceprovider/src/main/java/org/apache/sling/nosql/couchbase/resourceprovider/impl/CouchbaseNoSqlAdapter.java
(original)
+++
sling/trunk/contrib/nosql/couchbase-resourceprovider/src/main/java/org/apache/sling/nosql/couchbase/resourceprovider/impl/CouchbaseNoSqlAdapter.java
Tue Sep 29 21:55:12 2015
@@ -37,7 +37,6 @@ import com.couchbase.client.java.Bucket;
import com.couchbase.client.java.document.JsonDocument;
import com.couchbase.client.java.document.json.JsonObject;
import com.couchbase.client.java.error.DocumentAlreadyExistsException;
-import com.couchbase.client.java.query.Index;
import com.couchbase.client.java.query.N1qlParams;
import com.couchbase.client.java.query.N1qlQuery;
import com.couchbase.client.java.query.N1qlQueryResult;
@@ -63,8 +62,9 @@ public final class CouchbaseNoSqlAdapter
this.cacheKeyPrefix = cacheKeyPrefix;
// make sure primary index and index on parentPath is present - ignore
error if it is already present
- Index.createPrimaryIndex().on(couchbaseClient.getBucketName());
- Index.createIndex(PN_PARENT_PATH).on(couchbaseClient.getBucketName(),
x(PN_PARENT_PATH));
+ Bucket bucket = couchbaseClient.getBucket();
+ bucket.query(N1qlQuery.simple("CREATE PRIMARY INDEX ON `" +
couchbaseClient.getBucketName() + "`"));
+ bucket.query(N1qlQuery.simple("CREATE INDEX " + PN_PARENT_PATH + " ON
`" + couchbaseClient.getBucketName() + "`(" + PN_PARENT_PATH + ")"));
}
@Override
Modified: sling/trunk/contrib/nosql/launchpad/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/nosql/launchpad/pom.xml?rev=1705931&r1=1705930&r2=1705931&view=diff
==============================================================================
--- sling/trunk/contrib/nosql/launchpad/pom.xml (original)
+++ sling/trunk/contrib/nosql/launchpad/pom.xml Tue Sep 29 21:55:12 2015
@@ -86,7 +86,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.nosql.couchbase-resourceprovider</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
