You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@metamodel.apache.org by ka...@apache.org on 2014/05/18 21:00:41 UTC
[5/6] git commit: Minor post-merge issue resolutions.
Minor post-merge issue resolutions.
Project: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/commit/a7b34750
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/tree/a7b34750
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/diff/a7b34750
Branch: refs/heads/master
Commit: a7b347503e7bbc6c030ae5bef25839606b9b68c6
Parents: dc107fc
Author: Kasper Sørensen <i....@gmail.com>
Authored: Sat May 3 19:53:28 2014 +0200
Committer: Kasper Sørensen <i....@gmail.com>
Committed: Sat May 3 19:53:28 2014 +0200
----------------------------------------------------------------------
.../org/apache/metamodel/couchdb/CouchDbDataContext.java | 9 ++++++---
pom.xml | 1 +
2 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/a7b34750/couchdb/src/main/java/org/apache/metamodel/couchdb/CouchDbDataContext.java
----------------------------------------------------------------------
diff --git a/couchdb/src/main/java/org/apache/metamodel/couchdb/CouchDbDataContext.java b/couchdb/src/main/java/org/apache/metamodel/couchdb/CouchDbDataContext.java
index bcd82ed..7e85001 100644
--- a/couchdb/src/main/java/org/apache/metamodel/couchdb/CouchDbDataContext.java
+++ b/couchdb/src/main/java/org/apache/metamodel/couchdb/CouchDbDataContext.java
@@ -45,18 +45,21 @@ import org.apache.metamodel.util.SimpleTableDef;
import org.codehaus.jackson.JsonNode;
import org.ektorp.CouchDbConnector;
import org.ektorp.CouchDbInstance;
+import org.ektorp.DbAccessException;
import org.ektorp.StreamingViewResult;
import org.ektorp.ViewQuery;
import org.ektorp.ViewResult.Row;
import org.ektorp.http.HttpClient;
import org.ektorp.http.StdHttpClient;
import org.ektorp.impl.StdCouchDbInstance;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* DataContext implementation for CouchDB
*/
public class CouchDbDataContext extends QueryPostprocessDataContext implements UpdateableDataContext {
-
+
private static final Logger logger = LoggerFactory.getLogger(CouchDbDataContext.class);
public static final int DEFAULT_PORT = 5984;
@@ -116,8 +119,8 @@ public class CouchDbDataContext extends QueryPostprocessDataContext implements U
public static SimpleTableDef detectTable(CouchDbConnector connector) {
final SortedMap<String, Set<ColumnType>> columnsAndTypes = new TreeMap<String, Set<ColumnType>>();
- final StreamingViewResult streamingView = connector.queryForStreamingView(new ViewQuery().allDocs().includeDocs(true)
- .limit(1000));
+ final StreamingViewResult streamingView = connector.queryForStreamingView(new ViewQuery().allDocs()
+ .includeDocs(true).limit(1000));
try {
final Iterator<Row> rowIterator = streamingView.iterator();
while (safeHasNext(rowIterator)) {
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/a7b34750/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a844217..45cd86f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -335,6 +335,7 @@
<exclude>NOTICE.txt</exclude>
<exclude>LICENSE.txt</exclude>
<exclude>KEYS</exclude>
+ <exclude>*.md</exclude>
<exclude>example-metamodel-integrationtest-configuration.properties</exclude>
<exclude>**/.gitignore/**</exclude>
<exclude>.git/**</exclude>