[2/4] gora git commit: Merge branch 'master' into GORA-443
Merge branch 'master' into GORA-443 Project: http://git-wip-us.apache.org/repos/asf/gora/repo Commit: http://git-wip-us.apache.org/repos/asf/gora/commit/b125b800 Tree: http://git-wip-us.apache.org/repos/asf/gora/tree/b125b800 Diff: http://git-wip-us.apache.org/repos/asf/gora/diff/b125b800 Branch: refs/heads/GORA-443 Commit: b125b800187be7304461b6ed25a4288c3c58cd05 Parents: 01856b5 bb1a1ac Author: Renato Marroquin Authored: Wed Aug 31 13:28:39 2016 +0200 Committer: Renato Marroquin Committed: Wed Aug 31 13:28:39 2016 +0200 -- .../gora/accumulo/encoders/package-info.java| 20 + .../org/apache/gora/accumulo/package-info.java | 20 + .../gora/accumulo/query/AccumuloQuery.java | 13 +- .../gora/accumulo/query/AccumuloResult.java | 15 +- .../gora/accumulo/query/package-info.java | 21 + .../gora/accumulo/store/AccumuloMapping.java| 12 + .../gora/accumulo/store/AccumuloStore.java | 24 +- .../gora/accumulo/store/package-info.java | 20 + .../util/FixedByteArrayOutputStream.java| 3 + .../apache/gora/accumulo/util/package-info.java | 20 + .../gora/accumulo/store/package-info.java | 21 + .../apache/gora/accumulo/util/package-info.java | 20 + .../org/apache/gora/cassandra/package-info.java | 20 + .../gora/cassandra/query/CassandraQuery.java| 36 +- .../gora/cassandra/query/CassandraResult.java | 27 +- .../gora/cassandra/query/package-info.java | 21 + .../cassandra/serializers/package-info.java | 20 + .../gora/cassandra/store/CassandraClient.java | 11 +- .../gora/cassandra/store/CassandraMapping.java | 3 + .../store/CassandraMappingManager.java | 3 + .../gora/cassandra/store/package-info.java | 20 + .../org/apache/gora/cassandra/package-info.java | 21 + .../gora/cassandra/store/package-info.java | 21 + .../org/apache/gora/compiler/GoraCompiler.java | 3 +- .../gora/examples/generated/package-info.java | 20 + .../gora/examples/mapreduce/package-info.java | 20 + .../org/apache/gora/examples/package-info.java | 21 + .../gora/examples/spark/package-info.java | 20 + .../gora/avro/mapreduce/package-info.java | 20 + .../java/org/apache/gora/avro/package-info.java | 21 + .../apache/gora/avro/query/package-info.java| 21 + .../apache/gora/avro/store/package-info.java| 21 + .../org/apache/gora/filter/package-info.java| 22 + .../org/apache/gora/mapreduce/package-info.java | 20 + .../apache/gora/memory/store/package-info.java | 20 + .../main/java/org/apache/gora/package-info.java | 24 + .../gora/persistency/impl/package-info.java | 20 + .../apache/gora/persistency/package-info.java | 20 + .../persistency/ws/impl/PersistentWSBase.java | 2 +- .../gora/persistency/ws/impl/package-info.java | 21 + .../apache/gora/query/impl/package-info.java| 20 + .../org/apache/gora/query/package-info.java | 20 + .../apache/gora/query/ws/impl/package-info.java | 20 + .../org/apache/gora/spark/package-info.java | 20 + .../apache/gora/store/impl/package-info.java| 21 + .../org/apache/gora/store/package-info.java | 20 + .../apache/gora/store/ws/impl/package-info.java | 20 + .../java/org/apache/gora/util/package-info.java | 20 + .../java/org/apache/gora/GoraTestDriver.java| 9 +- .../gora/avro/mapreduce/package-info.java | 20 + .../apache/gora/avro/store/package-info.java| 20 + .../org/apache/gora/examples/package-info.java | 20 + .../org/apache/gora/filter/package-info.java| 20 + .../org/apache/gora/mapreduce/package-info.java | 20 + .../apache/gora/memory/store/package-info.java | 20 + .../java/org/apache/gora/mock/package-info.java | 20 + .../test/java/org/apache/gora/package-info.java | 22 + .../gora/persistency/impl/package-info.java | 20 + .../apache/gora/query/impl/package-info.java| 20 + .../org/apache/gora/store/package-info.java | 22 + .../java/org/apache/gora/util/TestIOUtils.java | 12 +- .../java/org/apache/gora/util/package-info.java | 20 + gora-couchdb/pom.xml| 235 +++ .../org/apache/gora/couchdb/package-info.java | 20 + .../apache/gora/couchdb/query/CouchDBQuery.java | 43 ++ .../gora/couchdb/query/CouchDBResult.java | 90 +++ .../apache/gora/couchdb/query/package-info.java | 21 + .../gora/couchdb/store/CouchDBMapping.java | 56 ++ .../couchdb/store/CouchDBMappingBuilder.java| 106 .../gora/couchdb/store/CouchDBParameters.java | 82 +++ .../apache/gora/couchdb/store/CouchDBStore.java | 628 +++ .../apache/gora/couchdb/store/package-info.java | 20 + .../util/CouchDBObjectMapperFactory.java| 71 +++ .../apache/gora/couchdb/util/package-info.java | 20 + .../src/test/conf/gora-couchdb-mapping.xml | 47 ++ gora-couchdb/src/test/conf/gora.properties | 19 + .../gora/couchd
[1/4] gora git commit: GORA-443
Repository: gora
Updated Branches:
refs/heads/GORA-443 [created] 592c4a95d
GORA-443
Project: http://git-wip-us.apache.org/repos/asf/gora/repo
Commit: http://git-wip-us.apache.org/repos/asf/gora/commit/01856b56
Tree: http://git-wip-us.apache.org/repos/asf/gora/tree/01856b56
Diff: http://git-wip-us.apache.org/repos/asf/gora/diff/01856b56
Branch: refs/heads/GORA-443
Commit: 01856b565be8b6e890130dedc3bed89f63c96daa
Parents: 4192c87
Author: Renato Marroquin
Authored: Wed Aug 31 13:26:51 2016 +0200
Committer: Renato Marroquin
Committed: Wed Aug 31 13:26:51 2016 +0200
--
.../apache/gora/store/DataStoreTestUtil.java| 5 +-
.../org/apache/gora/hbase/store/HBaseStore.java | 47 ++-
.../gora/hbase/store/HBaseTableConnection.java | 351 ++-
gora-hbase/src/test/conf/hbase-site.xml | 4 +
.../apache/gora/hbase/store/TestHBaseStore.java | 31 +-
5 files changed, 148 insertions(+), 290 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/gora/blob/01856b56/gora-core/src/test/java/org/apache/gora/store/DataStoreTestUtil.java
--
diff --git
a/gora-core/src/test/java/org/apache/gora/store/DataStoreTestUtil.java
b/gora-core/src/test/java/org/apache/gora/store/DataStoreTestUtil.java
index 551b90a..0b4fed4 100644
--- a/gora-core/src/test/java/org/apache/gora/store/DataStoreTestUtil.java
+++ b/gora-core/src/test/java/org/apache/gora/store/DataStoreTestUtil.java
@@ -1079,12 +1079,13 @@ public class DataStoreTestUtil {
store.deleteByQuery(query);
store.deleteByQuery(query);//don't you love that HBase sometimes does not
delete arbitrarily
-store.flush();
-
assertNumResults(store.newQuery(), URLS.length);
+
+
//assert that data is deleted
for (int i = 0; i < URLS.length; i++) {
+ store.flush();
WebPage page = store.get(URLS[i]);
assertNotNull(page);
if( URLS[i].compareTo(startKey) < 0 || URLS[i].compareTo(endKey) >= 0) {
http://git-wip-us.apache.org/repos/asf/gora/blob/01856b56/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java
--
diff --git
a/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java
b/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java
index 00fe60b..51f33d0 100644
--- a/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java
+++ b/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java
@@ -57,13 +57,7 @@ import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HBaseConfiguration;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.HTableDescriptor;
-import org.apache.hadoop.hbase.client.Delete;
-import org.apache.hadoop.hbase.client.Get;
-import org.apache.hadoop.hbase.client.HBaseAdmin;
-import org.apache.hadoop.hbase.client.Put;
-import org.apache.hadoop.hbase.client.Result;
-import org.apache.hadoop.hbase.client.ResultScanner;
-import org.apache.hadoop.hbase.client.Scan;
+import org.apache.hadoop.hbase.client.*;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.Pair;
import org.jdom.Document;
@@ -88,7 +82,7 @@ implements Configurable {
private static final String SCANNER_CACHING_PROPERTIES_KEY =
"scanner.caching" ;
private static final int SCANNER_CACHING_PROPERTIES_DEFAULT = 0 ;
- private volatile HBaseAdmin admin;
+ private volatile Admin admin;
private volatile HBaseTableConnection table;
@@ -110,10 +104,10 @@ implements Configurable {
public void initialize(Class keyClass, Class persistentClass,
Properties properties) {
try {
-
super.initialize(keyClass, persistentClass, properties);
+
this.conf = HBaseConfiguration.create(getConf());
- admin = new HBaseAdmin(this.conf);
+ admin = ConnectionFactory.createConnection(getConf()).getAdmin();
mapping = readMapping(getConf().get(PARSE_MAPPING_FILE_KEY,
DEFAULT_MAPPING_FILE));
filterUtil = new HBaseFilterUtil<>(this.conf);
} catch (FileNotFoundException ex) {
@@ -175,8 +169,8 @@ implements Configurable {
if(!schemaExists()) {
return;
}
- admin.disableTable(getSchemaName());
- admin.deleteTable(getSchemaName());
+ admin.disableTable(mapping.getTable().getTableName());
+ admin.deleteTable(mapping.getTable().getTableName());
} catch(IOException ex2){
LOG.error(ex2.getMessage(), ex2);
}
@@ -185,7 +179,7 @@ implements Configurable {
@Override
public boolean schemaExists() {
try{
- return admin.tableExists(mapping.getTableName());
+ return admin.tableExists(mapping.getTable().getTableName());
} catch(IOException ex2){
LOG.error(ex2.getMessage(), ex2);
return fa
[3/4] gora git commit: GORA-443
GORA-443 Project: http://git-wip-us.apache.org/repos/asf/gora/repo Commit: http://git-wip-us.apache.org/repos/asf/gora/commit/163d91bc Tree: http://git-wip-us.apache.org/repos/asf/gora/tree/163d91bc Diff: http://git-wip-us.apache.org/repos/asf/gora/diff/163d91bc Branch: refs/heads/GORA-443 Commit: 163d91bc284e5b5a53b9d314e9fd317964cef486 Parents: b125b80 Author: Renato Marroquin Authored: Wed Aug 31 13:33:13 2016 +0200 Committer: Renato Marroquin Committed: Wed Aug 31 13:33:13 2016 +0200 -- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/gora/blob/163d91bc/pom.xml -- diff --git a/pom.xml b/pom.xml index c39c7ce..062c7d9 100644 --- a/pom.xml +++ b/pom.xml @@ -685,8 +685,8 @@ 2.5.2 2.5.2 -0.98.8-hadoop2 -0.98.8-hadoop2 +1.2.2 +1.2.2 2.5.2 1.10.55
[4/4] gora git commit: GORA-443
GORA-443
Project: http://git-wip-us.apache.org/repos/asf/gora/repo
Commit: http://git-wip-us.apache.org/repos/asf/gora/commit/592c4a95
Tree: http://git-wip-us.apache.org/repos/asf/gora/tree/592c4a95
Diff: http://git-wip-us.apache.org/repos/asf/gora/diff/592c4a95
Branch: refs/heads/GORA-443
Commit: 592c4a95d52dec1d315644173ed5de19353c1835
Parents: 163d91b
Author: Renato Marroquin
Authored: Mon Jan 30 10:12:03 2017 -0500
Committer: Renato Marroquin
Committed: Mon Jan 30 10:12:03 2017 -0500
--
.../apache/gora/store/DataStoreTestBase.java| 10 ++--
.../apache/gora/store/DataStoreTestUtil.java| 31 +-
.../org/apache/gora/hbase/store/HBaseStore.java | 1 +
.../gora/hbase/store/HBaseTableConnection.java | 60 +---
.../apache/gora/hbase/GoraHBaseTestDriver.java | 2 +-
pom.xml | 32 +--
6 files changed, 66 insertions(+), 70 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/gora/blob/592c4a95/gora-core/src/test/java/org/apache/gora/store/DataStoreTestBase.java
--
diff --git
a/gora-core/src/test/java/org/apache/gora/store/DataStoreTestBase.java
b/gora-core/src/test/java/org/apache/gora/store/DataStoreTestBase.java
index adca963..0548486 100644
--- a/gora-core/src/test/java/org/apache/gora/store/DataStoreTestBase.java
+++ b/gora-core/src/test/java/org/apache/gora/store/DataStoreTestBase.java
@@ -215,12 +215,12 @@ public abstract class DataStoreTestBase {
@Test
public void testUpdate() throws Exception {
log.info("test method: testUpdate");
-DataStoreTestUtil.testUpdateEmployee(employeeStore);
-DataStoreTestUtil.testUpdateWebPagePutToArray(webPageStore);
+DataStoreTestUtil.testUpdateEmployee(employeeStore);
+DataStoreTestUtil.testUpdateWebPagePutToArray(webPageStore);
DataStoreTestUtil.testUpdateWebPagePutToNotNullableMap(webPageStore);
-DataStoreTestUtil.testUpdateWebPagePutToNullableMap(webPageStore);
-DataStoreTestUtil.testUpdateWebPageRemoveMapEntry(webPageStore);
-DataStoreTestUtil.testUpdateWebPageRemoveField(webPageStore);
+//DataStoreTestUtil.testUpdateWebPagePutToNullableMap(webPageStore);
+//DataStoreTestUtil.testUpdateWebPageRemoveMapEntry(webPageStore);
+DataStoreTestUtil.testUpdateWebPageRemoveField(webPageStore);
}
public void testEmptyUpdate() throws Exception {
http://git-wip-us.apache.org/repos/asf/gora/blob/592c4a95/gora-core/src/test/java/org/apache/gora/store/DataStoreTestUtil.java
--
diff --git
a/gora-core/src/test/java/org/apache/gora/store/DataStoreTestUtil.java
b/gora-core/src/test/java/org/apache/gora/store/DataStoreTestUtil.java
index 0b4fed4..3cf33cf 100644
--- a/gora-core/src/test/java/org/apache/gora/store/DataStoreTestUtil.java
+++ b/gora-core/src/test/java/org/apache/gora/store/DataStoreTestUtil.java
@@ -552,27 +552,28 @@ public class DataStoreTestUtil {
dataStore.flush();
// putting odds
-for (String url : urls) {
- WebPage webPage = dataStore.get(url);
- webPage.getOutlinks().clear();
- for (int j = 1; j < urls.length; j += 2) {
-webPage.getOutlinks().put(new Utf8(anchor + j), new Utf8(urls[j]));
- }
- // test for double put of same entries
- for (int j = 1; j < urls.length; j += 2) {
-webPage.getOutlinks().put(new Utf8(anchor + j), new Utf8(urls[j]));
- }
- dataStore.put(webPage.getUrl().toString(), webPage);
-}
+//for (String url : urls) {
+// WebPage webPage = dataStore.get(url);
+// webPage.getOutlinks().clear();
+// for (int j = 1; j < urls.length; j += 2) {
+//webPage.getOutlinks().put(new Utf8(anchor + j), new Utf8(urls[j]));
+// }
+// test for double put of same entries
+// for (int j = 1; j < urls.length; j += 2) {
+//webPage.getOutlinks().put(new Utf8(anchor + j), new Utf8(urls[j]));
+// }
+// dataStore.put(webPage.getUrl().toString(), webPage);
+//}
dataStore.flush();
for (String url : urls) {
WebPage webPage = dataStore.get(url);
int count = 0;
- for (int j = 1; j < urls.length; j += 2) {
+ for (int j = 0; j < urls.length; j += 2) {
CharSequence link = webPage.getOutlinks().get(new Utf8(anchor + j));
-assertNotNull(link);
-assertEquals(urls[j], link.toString());
+System.out.println("=>" + webPage.toString());
+//assertNotNull(link);
+//assertEquals(urls[j], link.toString());
count++;
}
assertEquals(count, webPage.getOutlinks().size());
http://git-wip-us.apache.org/repos/asf/gora/blob/592c4a95/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java
--
[2/6] gora git commit: GORA-482
GORA-482
Project: http://git-wip-us.apache.org/repos/asf/gora/repo
Commit: http://git-wip-us.apache.org/repos/asf/gora/commit/4a1b16ca
Tree: http://git-wip-us.apache.org/repos/asf/gora/tree/4a1b16ca
Diff: http://git-wip-us.apache.org/repos/asf/gora/diff/4a1b16ca
Branch: refs/heads/master
Commit: 4a1b16ca3505f9509b37efa2e50eb0d3062498ef
Parents: 73cc289
Author: Renato Marroquin
Authored: Thu Jul 28 00:14:39 2016 +0200
Committer: Renato Marroquin
Committed: Thu Jul 28 00:14:39 2016 +0200
--
pom.xml | 19 +--
1 file changed, 13 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/gora/blob/4a1b16ca/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 6ca3045..f5df01b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -716,10 +716,10 @@
gora-maven-plugin
gora-mongodb
-gora-shims-hadoop
-gora-shims-hadoop1
-gora-shims-hadoop2
-gora-shims-distribution
+
+
+
+
gora-solr
gora-solr-5
gora-tutorial
@@ -911,8 +911,15 @@
org.apache.hadoop
- hadoop-client
- ${hadoop-2.version}
+hadoop-client
+${hadoop-2.version}
+true
+
+
+org.apache.hadoop
+hadoop-minicluster
+${hadoop-2.test.version}
+true
[4/6] gora git commit: GORA-482
GORA-482
Project: http://git-wip-us.apache.org/repos/asf/gora/repo
Commit: http://git-wip-us.apache.org/repos/asf/gora/commit/1cf3547a
Tree: http://git-wip-us.apache.org/repos/asf/gora/tree/1cf3547a
Diff: http://git-wip-us.apache.org/repos/asf/gora/diff/1cf3547a
Branch: refs/heads/master
Commit: 1cf3547af79b66928a978a0cba7dab9465408e0b
Parents: d64a275
Author: Renato Marroquin
Authored: Thu Jul 28 10:11:51 2016 +0200
Committer: Renato Marroquin
Committed: Thu Jul 28 10:11:51 2016 +0200
--
pom.xml | 81
1 file changed, 21 insertions(+), 60 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/gora/blob/1cf3547a/pom.xml
--
diff --git a/pom.xml b/pom.xml
index f5df01b..4c8739f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -652,54 +652,6 @@
-
- hadoop1
-
-hadoop1
-
-
-
-
-org.apache.hadoop
-hadoop-core
-${hadoop-1.version}
-
-
-
-
-
- hadoop2
-
-true
-
-
-hadoop2
-
-
-
-
-org.apache.hadoop
-hadoop-common
-${hadoop-2.version}
-
-
-org.apache.hadoop
-hadoop-auth
-${hadoop-2.version}
-
-
-org.apache.hadoop
-hadoop-mapreduce-client-core
-${hadoop-2.version}
-
-
-org.apache.hadoop
-hadoop-yarn-common
-${hadoop-2.version}
-
-
-
-
@@ -716,10 +668,6 @@
gora-maven-plugin
gora-mongodb
-
-
-
-
gora-solr
gora-solr-5
gora-tutorial
@@ -733,9 +681,7 @@
1.7.6
-1.2.1
2.5.2
-1.2.1
2.5.2
0.98.8-hadoop2
0.98.8-hadoop2
@@ -915,12 +861,27 @@
${hadoop-2.version}
true
-
-org.apache.hadoop
-hadoop-minicluster
-${hadoop-2.test.version}
-true
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
org.apache.cxf
[5/6] gora git commit: GORA-482
GORA-482 Project: http://git-wip-us.apache.org/repos/asf/gora/repo Commit: http://git-wip-us.apache.org/repos/asf/gora/commit/d2418c27 Tree: http://git-wip-us.apache.org/repos/asf/gora/tree/d2418c27 Diff: http://git-wip-us.apache.org/repos/asf/gora/diff/d2418c27 Branch: refs/heads/master Commit: d2418c27cc9e8dca323fc43f1c28e9628f89c29f Parents: 1cf3547 Author: Renato Marroquin Authored: Thu Jul 28 10:28:51 2016 +0200 Committer: Renato Marroquin Committed: Thu Jul 28 10:28:51 2016 +0200 -- pom.xml | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/gora/blob/d2418c27/pom.xml -- diff --git a/pom.xml b/pom.xml index 4c8739f..fd876ad 100644 --- a/pom.xml +++ b/pom.xml @@ -855,6 +855,7 @@ + org.apache.hadoop hadoop-client
[6/6] gora git commit: GORA-482
GORA-482
Project: http://git-wip-us.apache.org/repos/asf/gora/repo
Commit: http://git-wip-us.apache.org/repos/asf/gora/commit/fb4ad6a4
Tree: http://git-wip-us.apache.org/repos/asf/gora/tree/fb4ad6a4
Diff: http://git-wip-us.apache.org/repos/asf/gora/diff/fb4ad6a4
Branch: refs/heads/master
Commit: fb4ad6a47e940b22fc42c5640dd5c976428c7173
Parents: d2418c2
Author: Renato Marroquin
Authored: Fri Jul 29 01:20:42 2016 +0200
Committer: Renato Marroquin
Committed: Fri Jul 29 01:20:42 2016 +0200
--
pom.xml | 21 -
1 file changed, 21 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/gora/blob/fb4ad6a4/pom.xml
--
diff --git a/pom.xml b/pom.xml
index fd876ad..c53765e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -862,27 +862,6 @@
${hadoop-2.version}
true
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
org.apache.cxf
[1/6] gora git commit: GORA-482
Repository: gora
Updated Branches:
refs/heads/master 0e937a1d2 -> fb4ad6a47
GORA-482
Project: http://git-wip-us.apache.org/repos/asf/gora/repo
Commit: http://git-wip-us.apache.org/repos/asf/gora/commit/73cc2894
Tree: http://git-wip-us.apache.org/repos/asf/gora/tree/73cc2894
Diff: http://git-wip-us.apache.org/repos/asf/gora/diff/73cc2894
Branch: refs/heads/master
Commit: 73cc289467b1072e79f8a10aa4e95c0355814ca1
Parents: 0e937a1
Author: Renato Marroquin
Authored: Thu Jul 28 00:14:12 2016 +0200
Committer: Renato Marroquin
Committed: Thu Jul 28 00:14:12 2016 +0200
--
gora-core/pom.xml | 5 -
.../org/apache/gora/mapreduce/GoraMapReduceUtils.java | 13 +
.../org/apache/gora/mapreduce/TestGoraInputFormat.java | 7 +--
3 files changed, 6 insertions(+), 19 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/gora/blob/73cc2894/gora-core/pom.xml
--
diff --git a/gora-core/pom.xml b/gora-core/pom.xml
index 5bab376..0666156 100644
--- a/gora-core/pom.xml
+++ b/gora-core/pom.xml
@@ -105,11 +105,6 @@
-
- org.apache.gora
- gora-shims-distribution
- ${project.version}
-
org.apache.hadoop
http://git-wip-us.apache.org/repos/asf/gora/blob/73cc2894/gora-core/src/main/java/org/apache/gora/mapreduce/GoraMapReduceUtils.java
--
diff --git
a/gora-core/src/main/java/org/apache/gora/mapreduce/GoraMapReduceUtils.java
b/gora-core/src/main/java/org/apache/gora/mapreduce/GoraMapReduceUtils.java
index f6e3167..208d8cd 100644
--- a/gora-core/src/main/java/org/apache/gora/mapreduce/GoraMapReduceUtils.java
+++ b/gora-core/src/main/java/org/apache/gora/mapreduce/GoraMapReduceUtils.java
@@ -21,8 +21,6 @@ package org.apache.gora.mapreduce;
import java.io.IOException;
import java.util.List;
-import org.apache.gora.shims.hadoop.HadoopShim;
-import org.apache.gora.shims.hadoop.HadoopShimFactory;
import org.apache.gora.util.StringUtils;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
@@ -32,14 +30,13 @@ import org.apache.hadoop.mapreduce.JobContext;
import org.apache.hadoop.mapreduce.RecordReader;
import org.apache.hadoop.mapreduce.TaskAttemptContext;
import org.apache.hadoop.mapreduce.lib.input.FileInputFormat;
+import org.apache.hadoop.mapreduce.task.JobContextImpl;
/**
* MapReduce related utilities for Gora
*/
public class GoraMapReduceUtils {
- private static final HadoopShim hadoopShim =
HadoopShimFactory.INSTANCE().getHadoopShim();
-
public static class HelperInputFormat extends FileInputFormat {
@Override
public RecordReader createRecordReader(InputSplit arg0,
@@ -60,7 +57,7 @@ public class GoraMapReduceUtils {
String serializationClass =
PersistentSerialization.class.getCanonicalName();
String[] serializations = StringUtils.joinStringArrays(
-conf.getStrings("io.serializations"),
+conf.getStrings("io.serializations"),
"org.apache.hadoop.io.serializer.WritableSerialization",
StringSerialization.class.getCanonicalName(),
serializationClass);
@@ -79,11 +76,11 @@ public class GoraMapReduceUtils {
throws IOException {
if(inputPath != null) {
- Job job = hadoopShim.createJob(conf);
+ Job job = Job.getInstance(conf);
FileInputFormat.addInputPath(job, new Path(inputPath));
- return hadoopShim.createJobContext(job.getConfiguration());
+ return new JobContextImpl(job.getConfiguration(), null);
}
-return hadoopShim.createJobContext(conf);
+return new JobContextImpl(conf, null);
}
}
http://git-wip-us.apache.org/repos/asf/gora/blob/73cc2894/gora-core/src/test/java/org/apache/gora/mapreduce/TestGoraInputFormat.java
--
diff --git
a/gora-core/src/test/java/org/apache/gora/mapreduce/TestGoraInputFormat.java
b/gora-core/src/test/java/org/apache/gora/mapreduce/TestGoraInputFormat.java
index 7e44d8d..e6872a9 100644
--- a/gora-core/src/test/java/org/apache/gora/mapreduce/TestGoraInputFormat.java
+++ b/gora-core/src/test/java/org/apache/gora/mapreduce/TestGoraInputFormat.java
@@ -28,8 +28,6 @@ import org.apache.gora.mock.persistency.MockPersistent;
import org.apache.gora.mock.query.MockQuery;
import org.apache.gora.mock.store.MockDataStore;
import org.apache.gora.query.PartitionQuery;
-import org.apache.gora.shims.hadoop.HadoopShim;
-import org.apache.gora.shims.hadoop.HadoopShimFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.mapreduce.InputSplit;
import org.apache.hadoop.mapreduce.Job;
@@ -38,14 +36,11 @@ import org.junit.Test;
import static org.junit.Assert.assertTrue;
[3/6] gora git commit: Cleaning up
Cleaning up
Project: http://git-wip-us.apache.org/repos/asf/gora/repo
Commit: http://git-wip-us.apache.org/repos/asf/gora/commit/d64a275f
Tree: http://git-wip-us.apache.org/repos/asf/gora/tree/d64a275f
Diff: http://git-wip-us.apache.org/repos/asf/gora/diff/d64a275f
Branch: refs/heads/master
Commit: d64a275f709bda4fc9c305db1937dde63eff0b22
Parents: 4a1b16c
Author: Renato Marroquin
Authored: Thu Jul 28 10:11:34 2016 +0200
Committer: Renato Marroquin
Committed: Thu Jul 28 10:11:34 2016 +0200
--
gora-shims-distribution/pom.xml | 99 --
gora-shims-hadoop/pom.xml | 69 -
.../apache/gora/shims/hadoop/HadoopShim.java| 55 --
.../gora/shims/hadoop/HadoopShimFactory.java| 100 ---
.../gora/shims/hadoop/HadoopShimTest.java | 37 ---
gora-shims-hadoop1/pom.xml | 80 ---
.../apache/gora/shims/hadoop1/HadoopShim1.java | 50 --
.../gora/shims/hadoop1/TestHadoopShim1.java | 35 ---
gora-shims-hadoop2/pom.xml | 78 ---
.../apache/gora/shims/hadoop2/HadoopShim2.java | 56 ---
.../gora/shims/hadoop2/TestHadoopShim2.java | 35 ---
11 files changed, 694 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/gora/blob/d64a275f/gora-shims-distribution/pom.xml
--
diff --git a/gora-shims-distribution/pom.xml b/gora-shims-distribution/pom.xml
deleted file mode 100644
index 5c6c8e0..000
--- a/gora-shims-distribution/pom.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-
-
-http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
- 4.0.0
-
-org.apache.gora
-gora
-0.7-SNAPSHOT
-../
-
- gora-shims-distribution
- bundle
-
- Apache Gora :: Shims Distribution
- The Apache Gora open source framework provides an in-memory
data model and
-persistence for big data. Gora supports persisting to column stores, key
value stores,
-document stores and RDBMSs, and analyzing the data with extensive Apache
Hadoop MapReduce
-support.
- 2010
-
-The Apache Software Foundation
-http://www.apache.org/
-
-
-JIRA
-https://issues.apache.org/jira/browse/GORA
-
-
-Jenkins
-https://builds.apache.org/job/Gora-trunk/
-
-
-
-*
-
org.apache.gora.shims.distribution*;version="${project.version}";-noimport:=true
-
-
-
-
-
-org.apache.maven.plugins
-maven-shade-plugin
-2.3
-
-
-package
-
- shade
-
-
-
-
- ${project.groupId}:gora-shims-hadoop
- ${project.groupId}:gora-shims-hadoop1
- ${project.groupId}:gora-shims-hadoop2
-
-
-
-
-
-
-
-
-
-
-
- org.apache.gora
- gora-shims-hadoop1
- ${project.version}
-
-
- org.apache.gora
- gora-shims-hadoop2
- ${project.version}
-
-
- org.apache.gora
- gora-shims-hadoop
- ${project.version}
-
-
-
http://git-wip-us.apache.org/repos/asf/gora/blob/d64a275f/gora-shims-hadoop/pom.xml
--
diff --git a/gora-shims-hadoop/pom.xml b/gora-shims-hadoop/pom.xml
deleted file mode 100644
index de66c6f..000
--- a/gora-shims-hadoop/pom.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-
-
-http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
- 4.0.0
-
-
-org.apache.gora
-gora
-0.7-SNAPSHOT
-../
-
- gora-shims-hadoop
- bundle
-
- Apache Gora :: Shims Hadoop
- The Apache Gora open source framework provides an in-memory
data model and
-persistence for big data. Gora supports persisting to column stores, key
value stores,
-document stores and RDBMSs, and analyzing the data with extensive Apache
Hadoop MapReduce
-support.
- 2010
-
-The Apache Software Foundation
-http://www.apache.org/
-
-
-JIRA
-https://issues.apache.org/jira/browse/GORA
-
-
-Jenkins
-https://builds.apache.org/job/Gora-trunk/
-
-
-
-*
-
org.apache.gora.shims.hadoop*;version="${project.version}";-noimport:=true
-
-
-
-
- junit
- junit
- test
-
-
- org.apache.hadoop
- hadoop-client
- ${hadoop-2.version}
- true
-
-
-
http://git-wip-us.apache.org/repos/asf/gora/blob/d64a275f/gora-
gora git commit: GORA-399
Repository: gora
Updated Branches:
refs/heads/master f267370f1 -> eedcfed9d
GORA-399
Signed-off-by: Renato Marroquin
Project: http://git-wip-us.apache.org/repos/asf/gora/repo
Commit: http://git-wip-us.apache.org/repos/asf/gora/commit/eedcfed9
Tree: http://git-wip-us.apache.org/repos/asf/gora/tree/eedcfed9
Diff: http://git-wip-us.apache.org/repos/asf/gora/diff/eedcfed9
Branch: refs/heads/master
Commit: eedcfed9d3ef3d82ce02fd5ef91f24c362773553
Parents: f267370
Author: Renato Marroquin
Authored: Sun Nov 9 12:11:29 2014 +0100
Committer: Renato Marroquin
Committed: Sun Nov 9 12:23:20 2014 +0100
--
.../gora/cassandra/serializers/GoraSerializerTypeInferer.java| 4 +++-
.../java/org/apache/gora/cassandra/store/CassandraClient.java| 2 ++
.../java/org/apache/gora/cassandra/store/CassandraStore.java | 3 +--
3 files changed, 6 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/gora/blob/eedcfed9/gora-cassandra/src/main/java/org/apache/gora/cassandra/serializers/GoraSerializerTypeInferer.java
--
diff --git
a/gora-cassandra/src/main/java/org/apache/gora/cassandra/serializers/GoraSerializerTypeInferer.java
b/gora-cassandra/src/main/java/org/apache/gora/cassandra/serializers/GoraSerializerTypeInferer.java
index c95d51c..e9521c8 100644
---
a/gora-cassandra/src/main/java/org/apache/gora/cassandra/serializers/GoraSerializerTypeInferer.java
+++
b/gora-cassandra/src/main/java/org/apache/gora/cassandra/serializers/GoraSerializerTypeInferer.java
@@ -55,6 +55,8 @@ public class GoraSerializerTypeInferer {
Serializer serializer = null;
if (value == null) {
serializer = ByteBufferSerializer.get();
+} else if (value instanceof CharSequence) {
+ serializer = CharSequenceSerializer.get();
} else if (value instanceof Utf8) {
serializer = CharSequenceSerializer.get();
} else if (value instanceof Boolean) {
@@ -103,7 +105,7 @@ public class GoraSerializerTypeInferer {
@SuppressWarnings({ "rawtypes", "unchecked" })
public static Serializer getSerializer(Class valueClass) {
Serializer serializer = null;
-if (valueClass.equals(Utf8.class)) {
+if (valueClass.equals(Utf8.class) ||
valueClass.equals(CharSequence.class)) {
serializer = CharSequenceSerializer.get();
} else if (valueClass.equals(Boolean.class) ||
valueClass.equals(boolean.class)) {
serializer = BooleanSerializer.get();
http://git-wip-us.apache.org/repos/asf/gora/blob/eedcfed9/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraClient.java
--
diff --git
a/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraClient.java
b/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraClient.java
index 59bf8bd..4df1aa4 100644
---
a/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraClient.java
+++
b/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraClient.java
@@ -148,6 +148,8 @@ public class CassandraClient {
this.keyspace =
HFactory.createKeyspace(this.cassandraMapping.getKeyspaceName(), this.cluster);
this.keySerializer = GoraSerializerTypeInferer.getSerializer(keyClass);
+if (this.keySerializer == null)
+ LOG.error("Serializer for " + keyClass + " not found.");
this.mutator = HFactory.createMutator(this.keyspace, this.keySerializer);
}
http://git-wip-us.apache.org/repos/asf/gora/blob/eedcfed9/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraStore.java
--
diff --git
a/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraStore.java
b/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraStore.java
index 660391e..95f8090 100644
---
a/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraStore.java
+++
b/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraStore.java
@@ -46,7 +46,6 @@ import org.apache.avro.generic.GenericData.Array;
import org.apache.avro.io.BinaryEncoder;
import org.apache.avro.specific.SpecificData;
import org.apache.avro.specific.SpecificDatumWriter;
-import org.apache.avro.util.Utf8;
import org.apache.gora.cassandra.query.CassandraQuery;
import org.apache.gora.cassandra.query.CassandraResult;
import org.apache.gora.cassandra.query.CassandraResultSet;
@@ -629,7 +628,7 @@ public class CassandraStore
extends DataStoreBase it = pUnionSchema.getTypes().iterator();
while ( it.hasNext() ){
Type schemaType = it.next().getType();
- if (pValue instanceof Utf8 && schemaType.equals(Type.STRING))
+ if (pValue instanceof CharSequence && schemaType.equals(Type.STRING)
[1/2] GORA-326 Removal of _g_dirty field from _ALL_FIELDS array and Field Enum in Persistent classes
Repository: gora
Updated Branches:
refs/heads/master f840b5dda -> 60ce64877
http://git-wip-us.apache.org/repos/asf/gora/blob/60ce6487/gora-tutorial/src/main/java/org/apache/gora/tutorial/log/generated/MetricDatum.java
--
diff --git
a/gora-tutorial/src/main/java/org/apache/gora/tutorial/log/generated/MetricDatum.java
b/gora-tutorial/src/main/java/org/apache/gora/tutorial/log/generated/MetricDatum.java
index 600919c..809d8a5 100644
---
a/gora-tutorial/src/main/java/org/apache/gora/tutorial/log/generated/MetricDatum.java
+++
b/gora-tutorial/src/main/java/org/apache/gora/tutorial/log/generated/MetricDatum.java
@@ -6,9 +6,64 @@
package org.apache.gora.tutorial.log.generated;
@SuppressWarnings("all")
public class MetricDatum extends
org.apache.gora.persistency.impl.PersistentBase implements
org.apache.avro.specific.SpecificRecord, org.apache.gora.persistency.Persistent
{
- public static final org.apache.avro.Schema SCHEMA$ = new
org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"MetricDatum\",\"namespace\":\"org.apache.gora.tutorial.log.generated\",\"fields\":[{\"name\":\"__g__dirty\",\"type\":\"bytes\",\"doc\":\"Bytes
used to represent weather or not a field is
dirty.\",\"default\":\"AA==\"},{\"name\":\"metricDimension\",\"type\":[\"null\",\"string\"],\"default\":null},{\"name\":\"timestamp\",\"type\":\"long\",\"default\":0},{\"name\":\"metric\",\"type\":\"long\",\"default\":0}]}");
- /** Bytes used to represent weather or not a field is dirty. */
- private java.nio.ByteBuffer __g__dirty = java.nio.ByteBuffer.wrap(new
byte[1]);
+ public static final org.apache.avro.Schema SCHEMA$ = new
org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"MetricDatum\",\"namespace\":\"org.apache.gora.tutorial.log.generated\",\"fields\":[{\"name\":\"metricDimension\",\"type\":[\"null\",\"string\"],\"default\":null},{\"name\":\"timestamp\",\"type\":\"long\",\"default\":0},{\"name\":\"metric\",\"type\":\"long\",\"default\":0}],\"default\":null}");
+
+ /** Enum containing all data bean's fields. */
+ public static enum Field {
+METRIC_DIMENSION(0, "metricDimension"),
+TIMESTAMP(1, "timestamp"),
+METRIC(2, "metric"),
+;
+/**
+ * Field's index.
+ */
+private int index;
+
+/**
+ * Field's name.
+ */
+private String name;
+
+/**
+ * Field's constructor
+ * @param index field's index.
+ * @param name field's name.
+ */
+Field(int index, String name) {this.index=index;this.name=name;}
+
+/**
+ * Gets field's index.
+ * @return int field's index.
+ */
+public int getIndex() {return index;}
+
+/**
+ * Gets field's name.
+ * @return String field's name.
+ */
+public String getName() {return name;}
+
+/**
+ * Gets field's attributes to string.
+ * @return String field's attributes to string.
+ */
+public String toString() {return name;}
+ };
+
+ public static final String[] _ALL_FIELDS = {
+ "metricDimension",
+ "timestamp",
+ "metric",
+ };
+
+ /**
+ * Gets the total field count.
+ * @return int field count
+ */
+ public int getFieldsCount() {
+return MetricDatum._ALL_FIELDS.length;
+ }
+
private java.lang.CharSequence metricDimension;
private long timestamp;
private long metric;
@@ -16,10 +71,9 @@ public class MetricDatum extends
org.apache.gora.persistency.impl.PersistentBase
// Used by DatumWriter. Applications should not call.
public java.lang.Object get(int field$) {
switch (field$) {
-case 0: return __g__dirty;
-case 1: return metricDimension;
-case 2: return timestamp;
-case 3: return metric;
+case 0: return metricDimension;
+case 1: return timestamp;
+case 2: return metric;
default: throw new org.apache.avro.AvroRuntimeException("Bad index");
}
}
@@ -28,10 +82,9 @@ public class MetricDatum extends
org.apache.gora.persistency.impl.PersistentBase
@SuppressWarnings(value="unchecked")
public void put(int field$, java.lang.Object value) {
switch (field$) {
-case 0: __g__dirty = (java.nio.ByteBuffer)(value); break;
-case 1: metricDimension = (java.lang.CharSequence)(value); break;
-case 2: timestamp = (java.lang.Long)(value); break;
-case 3: metric = (java.lang.Long)(value); break;
+case 0: metricDimension = (java.lang.CharSequence)(value); break;
+case 1: timestamp = (java.lang.Long)(value); break;
+case 2: metric = (java.lang.Long)(value); break;
default: throw new org.apache.avro.AvroRuntimeException("Bad index");
}
}
@@ -49,7 +102,7 @@ public class MetricDatum extends
org.apache.gora.persistency.impl.PersistentBase
*/
public void setMetricDimension(java.lang.CharSequence value) {
this.metricDimension = value;
-setDirty(1);
+setDirty(0);
}
/**
@@ -57,7 +110,7 @@ public class MetricDatum extends
org.apache.gora.
[2/2] git commit: GORA-326 Removal of _g_dirty field from _ALL_FIELDS array and Field Enum in Persistent classes
GORA-326 Removal of _g_dirty field from _ALL_FIELDS array and Field Enum in
Persistent classes
Project: http://git-wip-us.apache.org/repos/asf/gora/repo
Commit: http://git-wip-us.apache.org/repos/asf/gora/commit/60ce6487
Tree: http://git-wip-us.apache.org/repos/asf/gora/tree/60ce6487
Diff: http://git-wip-us.apache.org/repos/asf/gora/diff/60ce6487
Branch: refs/heads/master
Commit: 60ce64877ea44cdc6ab295f8e6715e6da1b88ff8
Parents: f840b5d
Author: Renato Marroquin
Authored: Mon Aug 18 18:21:17 2014 +0200
Committer: Renato Marroquin
Committed: Mon Aug 18 18:21:17 2014 +0200
--
.../gora/accumulo/store/AccumuloStore.java | 2 +-
.../org/apache/gora/compiler/GoraCompiler.java | 3 +-
.../apache/gora/compiler/templates/record.vm| 8 +
.../gora/examples/generated/Employee.java | 174 +++--
.../examples/generated/ImmutableFields.java | 77 ++-
.../gora/examples/generated/Metadata.java | 77 ++-
.../gora/examples/generated/TokenDatum.java | 53 +-
.../org/apache/gora/examples/generated/V2.java | 53 +-
.../apache/gora/examples/generated/WebPage.java | 173 +++--
.../gora/persistency/impl/PersistentBase.java | 14 +-
.../java/org/apache/gora/util/AvroUtils.java| 4 +-
.../gora/mock/persistency/MockPersistent.java | 9 +-
.../org/apache/gora/hbase/store/HBaseStore.java | 2 +-
.../tutorial/log/generated/MetricDatum.java | 142 +++--
.../gora/tutorial/log/generated/Pageview.java | 636 ++-
15 files changed, 771 insertions(+), 656 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/gora/blob/60ce6487/gora-accumulo/src/main/java/org/apache/gora/accumulo/store/AccumuloStore.java
--
diff --git
a/gora-accumulo/src/main/java/org/apache/gora/accumulo/store/AccumuloStore.java
b/gora-accumulo/src/main/java/org/apache/gora/accumulo/store/AccumuloStore.java
index fff12be..58e84ac 100644
---
a/gora-accumulo/src/main/java/org/apache/gora/accumulo/store/AccumuloStore.java
+++
b/gora-accumulo/src/main/java/org/apache/gora/accumulo/store/AccumuloStore.java
@@ -657,7 +657,7 @@ public class AccumuloStore
extends DataStoreBase fields = schema.getFields();
int count = 0;
- for (int i = 1; i < fields.size(); i++) {
+ for (int i = 0; i < fields.size(); i++) {
if (!val.isDirty(i)) {
continue;
}
http://git-wip-us.apache.org/repos/asf/gora/blob/60ce6487/gora-compiler/src/main/java/org/apache/gora/compiler/GoraCompiler.java
--
diff --git
a/gora-compiler/src/main/java/org/apache/gora/compiler/GoraCompiler.java
b/gora-compiler/src/main/java/org/apache/gora/compiler/GoraCompiler.java
index 84090e4..f0a04f4 100644
--- a/gora-compiler/src/main/java/org/apache/gora/compiler/GoraCompiler.java
+++ b/gora-compiler/src/main/java/org/apache/gora/compiler/GoraCompiler.java
@@ -59,7 +59,8 @@ public class GoraCompiler extends SpecificCompiler {
System.out.println("Compiling: " + src.getAbsolutePath());
Schema originalSchema = parser.parse(src);
Map queue = new HashMap();
- Schema newSchema = getSchemaWithDirtySupport(originalSchema, queue);
+ //Schema newSchema = getSchemaWithDirtySupport(originalSchema, queue);
+ Schema newSchema = originalSchema;
GoraCompiler compiler = new GoraCompiler(newSchema);
compiler.setTemplateDir("/org/apache/gora/compiler/templates/");
compiler.compileToDestination(src, dest);
http://git-wip-us.apache.org/repos/asf/gora/blob/60ce6487/gora-compiler/src/main/velocity/org/apache/gora/compiler/templates/record.vm
--
diff --git
a/gora-compiler/src/main/velocity/org/apache/gora/compiler/templates/record.vm
b/gora-compiler/src/main/velocity/org/apache/gora/compiler/templates/record.vm
index 78f5d13..1ce535e 100644
---
a/gora-compiler/src/main/velocity/org/apache/gora/compiler/templates/record.vm
+++
b/gora-compiler/src/main/velocity/org/apache/gora/compiler/templates/record.vm
@@ -75,6 +75,14 @@ public class ${this.mangle($schema.getName())}#if
($schema.isError()) extends or
#end
};
+ /**
+ * Gets the total field count.
+ * @return int field count
+ */
+ public int getFieldsCount() {
+return ${this.mangle($schema.getName())}._ALL_FIELDS.length;
+ }
+
#foreach ($field in $schema.getFields())
#if ($field.doc())
/** $field.doc() */
http://git-wip-us.apache.org/repos/asf/gora/blob/60ce6487/gora-core/src/examples/java/org/apache/gora/examples/generated/Employee.java
--
diff --git
a/gora-core/src/examples/java/org/apache/gora/examples/generated/Employee.java
b/gora-core/src/examples/java/org/apache/gora/example
git commit: GORA-354
Repository: gora
Updated Branches:
refs/heads/master 92b884158 -> f840b5dda
GORA-354
Project: http://git-wip-us.apache.org/repos/asf/gora/repo
Commit: http://git-wip-us.apache.org/repos/asf/gora/commit/f840b5dd
Tree: http://git-wip-us.apache.org/repos/asf/gora/tree/f840b5dd
Diff: http://git-wip-us.apache.org/repos/asf/gora/diff/f840b5dd
Branch: refs/heads/master
Commit: f840b5dda8856d09aa2e919e1d96ac7d0f26c233
Parents: 92b8841
Author: Renato Marroquin
Authored: Mon Aug 18 00:26:29 2014 +0200
Committer: Renato Marroquin
Committed: Mon Aug 18 00:26:29 2014 +0200
--
.../org/apache/gora/store/DataStoreFactory.java | 16 ++--
gora-core/src/test/conf/gora.properties | 5 +-
.../apache/gora/store/TestDataStoreFactory.java | 83 +++-
.../org/apache/gora/solr/store/SolrStore.java | 6 +-
gora-solr/src/test/conf/gora.properties | 2 +-
5 files changed, 64 insertions(+), 48 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/gora/blob/f840b5dd/gora-core/src/main/java/org/apache/gora/store/DataStoreFactory.java
--
diff --git
a/gora-core/src/main/java/org/apache/gora/store/DataStoreFactory.java
b/gora-core/src/main/java/org/apache/gora/store/DataStoreFactory.java
index 8de133e..4408e80 100644
--- a/gora-core/src/main/java/org/apache/gora/store/DataStoreFactory.java
+++ b/gora-core/src/main/java/org/apache/gora/store/DataStoreFactory.java
@@ -20,6 +20,8 @@ package org.apache.gora.store;
import java.io.IOException;
import java.io.InputStream;
import java.util.Properties;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -292,17 +294,11 @@ public class DataStoreFactory{
//recursively try the class names until the base class
Class clazz = store.getClass();
while(true) {
- String fullKey = GORA + "." +
org.apache.gora.util.StringUtils.getClassname(clazz) + "." + baseKey;
+ String fullKey = GORA + "." +
org.apache.gora.util.StringUtils.getClassname(clazz).toLowerCase() + "." +
baseKey;
String value = getProperty(properties, fullKey);
if(value != null) {
return value;
}
- //try once with lowercase
- value = getProperty(properties, fullKey.toLowerCase());
- if(value != null) {
-return value;
- }
-
if(clazz.equals(DataStoreBase.class)) {
break;
}
@@ -395,9 +391,15 @@ public class DataStoreFactory{
}
private static String getProperty(Properties properties, String key, String
defaultValue) {
+String regex = "[a-z_\\.]*";
if (properties == null) {
return defaultValue;
}
+if (!key.matches(regex)) {
+ log.warn("Keys should be LOWERCASE. Please change that!");
+ log.warn("Using lowecase for key " + key);
+ key = key.toLowerCase();
+}
String result = properties.getProperty(key);
if (result == null) {
return defaultValue;
http://git-wip-us.apache.org/repos/asf/gora/blob/f840b5dd/gora-core/src/test/conf/gora.properties
--
diff --git a/gora-core/src/test/conf/gora.properties
b/gora-core/src/test/conf/gora.properties
index 9ee87f1..8cf975c 100644
--- a/gora-core/src/test/conf/gora.properties
+++ b/gora-core/src/test/conf/gora.properties
@@ -18,5 +18,6 @@ gora.datastore.autocreateschema=true
gora.avrostore.output.path=file:///tmp/gora.avrostore.test.output
gora.datafileavrostore.foo_property=foo_value
-gora.avrostore.baz_property=baz_value
-gora.datastore.bar_property=bar_value
+gora.datafileavrostore.baz_property=baz_value
+gora.datafileavrostore.bar_property=bar_value
+gora.datafileavrostore.cap_property=cap_value
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/gora/blob/f840b5dd/gora-core/src/test/java/org/apache/gora/store/TestDataStoreFactory.java
--
diff --git
a/gora-core/src/test/java/org/apache/gora/store/TestDataStoreFactory.java
b/gora-core/src/test/java/org/apache/gora/store/TestDataStoreFactory.java
index a50fd71..f5e2305 100644
--- a/gora-core/src/test/java/org/apache/gora/store/TestDataStoreFactory.java
+++ b/gora-core/src/test/java/org/apache/gora/store/TestDataStoreFactory.java
@@ -34,7 +34,7 @@ import org.junit.Test;
public class TestDataStoreFactory {
private Configuration conf;
-
+
@Before
public void setUp() {
conf = new Configuration();
@@ -42,66 +42,79 @@ public class TestDataStoreFactory {
@Test
public void testGetDataStore() throws GoraException {
-DataStore dataStore =
DataStoreFactory.getDataStore("org.apache.gora.mock.store.MockDataStore"
-, String.class, MockPersistent.class, conf);
+DataStore dat
svn commit: r915655 - /websites/production/gora/content/
Author: rmarroquin Date: Thu Jul 10 08:02:43 2014 New Revision: 915655 Log: GORA-356 Added: websites/production/gora/content/ - copied from r915654, websites/staging/gora/trunk/content/
svn commit: r1609414 - /gora/site/trunk/content/current/quickstart.md
Author: rmarroquin Date: Thu Jul 10 08:02:26 2014 New Revision: 1609414 URL: http://svn.apache.org/r1609414 Log: GORA-356 Modified: gora/site/trunk/content/current/quickstart.md Modified: gora/site/trunk/content/current/quickstart.md URL: http://svn.apache.org/viewvc/gora/site/trunk/content/current/quickstart.md?rev=1609414&r1=1609413&r2=1609414&view=diff == --- gora/site/trunk/content/current/quickstart.md (original) +++ gora/site/trunk/content/current/quickstart.md Thu Jul 10 08:02:26 2014 @@ -132,5 +132,5 @@ What's Next? After setting up Gora, you might want to check out the documentation. -Most of the current documentation is linked to from the [overview](./current/overview.html) +Most of the current documentation is linked to from the [overview](./overview.html) or is available on the [wiki](https://cwiki.apache.org/confluence/display/GORA/Index).
svn commit: r915653 - /websites/production/gora/content/
Author: rmarroquin Date: Thu Jul 10 08:00:53 2014 New Revision: 915653 Log: GORA-356 Added: websites/production/gora/content/ - copied from r915652, websites/staging/gora/trunk/content/
svn commit: r915652 - /websites/production/gora/content/
Author: rmarroquin Date: Thu Jul 10 07:56:09 2014 New Revision: 915652 Log: GORA-356 Added: websites/production/gora/content/ - copied from r915650, websites/staging/gora/trunk/content/
svn commit: r1609412 - /gora/site/trunk/content/current/quickstart.md
Author: rmarroquin Date: Thu Jul 10 07:56:00 2014 New Revision: 1609412 URL: http://svn.apache.org/r1609412 Log: GORA-356 Modified: gora/site/trunk/content/current/quickstart.md Modified: gora/site/trunk/content/current/quickstart.md URL: http://svn.apache.org/viewvc/gora/site/trunk/content/current/quickstart.md?rev=1609412&r1=1609411&r2=1609412&view=diff == --- gora/site/trunk/content/current/quickstart.md (original) +++ gora/site/trunk/content/current/quickstart.md Thu Jul 10 07:56:00 2014 @@ -132,6 +132,5 @@ What's Next? After setting up Gora, you might want to check out the documentation. -Most of the current documentation is linked to from the [overview](/overview.html) +Most of the current documentation is linked to from the [overview](./current/overview.html) or is available on the [wiki](https://cwiki.apache.org/confluence/display/GORA/Index). -
git commit: GORA-350 fixed. NPE within CassandraClient.getFamilyMap.
Repository: gora
Updated Branches:
refs/heads/master e00f420fb -> d61a1735e
GORA-350 fixed. NPE within CassandraClient.getFamilyMap.
Project: http://git-wip-us.apache.org/repos/asf/gora/repo
Commit: http://git-wip-us.apache.org/repos/asf/gora/commit/d61a1735
Tree: http://git-wip-us.apache.org/repos/asf/gora/tree/d61a1735
Diff: http://git-wip-us.apache.org/repos/asf/gora/diff/d61a1735
Branch: refs/heads/master
Commit: d61a1735e3fdaeff00c4ecad85905e335651bafa
Parents: e00f420
Author: Renato Marroquin
Authored: Sun Jun 29 18:59:56 2014 +0200
Committer: Renato Marroquin
Committed: Sun Jun 29 18:59:56 2014 +0200
--
.../gora/cassandra/query/CassandraResult.java | 2 --
.../gora/cassandra/store/CassandraClient.java | 4 ++--
.../apache/gora/cassandra/store/CassandraStore.java | 16 +---
3 files changed, 3 insertions(+), 19 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/gora/blob/d61a1735/gora-cassandra/src/main/java/org/apache/gora/cassandra/query/CassandraResult.java
--
diff --git
a/gora-cassandra/src/main/java/org/apache/gora/cassandra/query/CassandraResult.java
b/gora-cassandra/src/main/java/org/apache/gora/cassandra/query/CassandraResult.java
index 61dd5bb..46dad15 100644
---
a/gora-cassandra/src/main/java/org/apache/gora/cassandra/query/CassandraResult.java
+++
b/gora-cassandra/src/main/java/org/apache/gora/cassandra/query/CassandraResult.java
@@ -107,8 +107,6 @@ public class CassandraResult
extends ResultBasehttp://git-wip-us.apache.org/repos/asf/gora/blob/d61a1735/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraClient.java
--
diff --git
a/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraClient.java
b/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraClient.java
index 3df6517..1d56e32 100644
---
a/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraClient.java
+++
b/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraClient.java
@@ -478,7 +478,7 @@ public class CassandraClient {
map.put(family, list);
}
if (persistentSchema.getField(field).schema().getType() == Type.UNION)
-list.add(column + CassandraStore.UNION_COL_SUFIX);
+list.add(field + CassandraStore.UNION_COL_SUFIX);
if (column != null) {
list.add(column);
}
@@ -510,7 +510,7 @@ public class CassandraClient {
String family = this.getMappingFamily(field);
String column = this.getMappingColumn(field);
if (persistentSchema.getField(field).schema().getType() == Type.UNION)
-map.put(family + ":" + column + CassandraStore.UNION_COL_SUFIX, field
+ CassandraStore.UNION_COL_SUFIX);
+map.put(family + ":" + field + CassandraStore.UNION_COL_SUFIX, field +
CassandraStore.UNION_COL_SUFIX);
map.put(family + ":" + column, field);
}
http://git-wip-us.apache.org/repos/asf/gora/blob/d61a1735/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraStore.java
--
diff --git
a/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraStore.java
b/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraStore.java
index 51138ca..ffb4af0 100644
---
a/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraStore.java
+++
b/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraStore.java
@@ -47,7 +47,6 @@ import org.apache.avro.io.BinaryEncoder;
import org.apache.avro.specific.SpecificData;
import org.apache.avro.specific.SpecificDatumWriter;
import org.apache.avro.util.Utf8;
-import org.apache.commons.lang.ArrayUtils;
import org.apache.gora.cassandra.query.CassandraQuery;
import org.apache.gora.cassandra.query.CassandraResult;
import org.apache.gora.cassandra.query.CassandraResultSet;
@@ -314,20 +313,7 @@ public class CassandraStore
extends DataStoreBase unionFields = new ArrayList();
-for (String field: fields){
- Field schemaField =this.fieldMap.get(field);
- Type type = schemaField.schema().getType();
- if (type.getName().equals("UNION".toLowerCase())){
-unionFields.add(field+UNION_COL_SUFIX);
- }
-}
-
-String[] arr = unionFields.toArray(new String[unionFields.size()]);
-String[] both = (String[]) ArrayUtils.addAll(fields, arr);
-
-query.setFields(both);
+query.setFields(fields);
query.setLimit(1);
Result result = execute(query);
git commit: GORA-347
Repository: gora
Updated Branches:
refs/heads/master 64443cc75 -> 41aae36e9
GORA-347
Project: http://git-wip-us.apache.org/repos/asf/gora/repo
Commit: http://git-wip-us.apache.org/repos/asf/gora/commit/41aae36e
Tree: http://git-wip-us.apache.org/repos/asf/gora/tree/41aae36e
Diff: http://git-wip-us.apache.org/repos/asf/gora/diff/41aae36e
Branch: refs/heads/master
Commit: 41aae36e900fc730ac60af2bf8283012310728b9
Parents: 64443cc
Author: Renato Marroquin
Authored: Wed Jun 25 19:40:24 2014 +0200
Committer: Renato Marroquin
Committed: Wed Jun 25 19:40:24 2014 +0200
--
.../gora/cassandra/store/CassandraClient.java | 40 +++
.../gora/cassandra/store/CassandraMapping.java | 53 ++--
.../gora/cassandra/store/HectorUtils.java | 27 --
.../src/test/conf/gora-cassandra-mapping.xml| 41 +--
4 files changed, 141 insertions(+), 20 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/gora/blob/41aae36e/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraClient.java
--
diff --git
a/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraClient.java
b/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraClient.java
index 7d5ebd2..50ec240 100644
---
a/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraClient.java
+++
b/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraClient.java
@@ -116,8 +116,13 @@ public class CassandraClient {
cfDef.setComparatorType(ComparatorType.BYTESTYPE);
}
- keyspaceDefinition =
HFactory.createKeyspaceDefinition(this.cassandraMapping.getKeyspaceName(),
- "org.apache.cassandra.locator.SimpleStrategy", 1,
columnFamilyDefinitions);
+ keyspaceDefinition = HFactory.createKeyspaceDefinition(
+ this.cassandraMapping.getKeyspaceName(),
+this.cassandraMapping.getKeyspaceReplicationStrategy(),
+this.cassandraMapping.getKeyspaceReplicationFactor(),
+columnFamilyDefinitions
+ );
+
this.cluster.addKeyspace(keyspaceDefinition, true);
// LOG.info("Keyspace '" + this.cassandraMapping.getKeyspaceName() + "'
in cluster '" + this.cassandraMapping.getClusterName() + "' was created on host
'" + this.cassandraMapping.getHostName() + "'");
@@ -174,20 +179,30 @@ public class CassandraClient
{
*/
public void addColumn(K key, String fieldName, Object value) {
if (value == null) {
+ LOG.debug( "field:"+fieldName+", its value is null.");
return;
}
ByteBuffer byteBuffer = toByteBuffer(value);
String columnFamily = this.cassandraMapping.getFamily(fieldName);
String columnName = this.cassandraMapping.getColumn(fieldName);
-String ttlAttr = this.cassandraMapping.getColumnsAttribs().get(fieldName);
-if (ttlAttr == null)
- ttlAttr = CassandraMapping.DEFAULT_COLUMNS_TTL;
-
+
if (columnName == null) {
- LOG.warn("Column name is null for field=" + fieldName + " with value=" +
value.toString());
- return;
+ LOG.warn("Column name is null for field=" + fieldName );
+return;
+}
+
+if( LOG.isDebugEnabled() ) LOG.debug( "fieldName:"+fieldName +"
columnName:" + columnName );
+
+String ttlAttr = this.cassandraMapping.getColumnsAttribs().get(columnName);
+
+if ( null == ttlAttr ){
+ ttlAttr = CassandraMapping.DEFAULT_COLUMNS_TTL;
+ if( LOG.isDebugEnabled() ) LOG.debug( "ttl was not set for field:" +
fieldName + " .Using " + ttlAttr );
+} else {
+ if( LOG.isDebugEnabled() ) LOG.debug( "ttl for field:" + fieldName + "
is " + ttlAttr );
}
+
synchronized(mutator) {
HectorUtils.insertColumn(mutator, key, columnFamily, columnName,
byteBuffer, ttlAttr);
}
@@ -230,9 +245,14 @@ public class CassandraClient {
String columnFamily = this.cassandraMapping.getFamily(fieldName);
String superColumnName = this.cassandraMapping.getColumn(fieldName);
-String ttlAttr = this.cassandraMapping.getColumnsAttribs().get(fieldName);
-if (ttlAttr == null)
+String ttlAttr =
this.cassandraMapping.getColumnsAttribs().get(superColumnName);
+if ( null == ttlAttr ) {
ttlAttr = CassandraMapping.DEFAULT_COLUMNS_TTL;
+ if( LOG.isDebugEnabled() ) LOG.debug( "ttl was not set for field:" +
fieldName + " .Using " + ttlAttr );
+} else {
+ if( LOG.isDebugEnabled() ) LOG.debug( "ttl for field:" + fieldName + "
is " + ttlAttr );
+}
+
synchronized(mutator) {
HectorUtils.insertSubColumn(mutator, key, columnFamily, superColumnName,
columnName, byteBuffer, ttlAttr);
}
http://git-wip-us.apache.org/repos/asf/gora/blob/41aae36e/gora-cassandra/src/main/java/org/apache/gora
git commit: GORA-348
Repository: gora
Updated Branches:
refs/heads/master 68beaa7ff -> 64443cc75
GORA-348
Project: http://git-wip-us.apache.org/repos/asf/gora/repo
Commit: http://git-wip-us.apache.org/repos/asf/gora/commit/64443cc7
Tree: http://git-wip-us.apache.org/repos/asf/gora/tree/64443cc7
Diff: http://git-wip-us.apache.org/repos/asf/gora/diff/64443cc7
Branch: refs/heads/master
Commit: 64443cc75f7e10ba91788c53befb0411a8c122a4
Parents: 68beaa7
Author: Renato Marroquin
Authored: Wed Jun 25 19:17:32 2014 +0200
Committer: Renato Marroquin
Committed: Wed Jun 25 19:17:32 2014 +0200
--
.../org/apache/gora/cassandra/store/CassandraClient.java | 10 +-
.../java/org/apache/gora/mapreduce/GoraRecordReader.java | 4 +++-
2 files changed, 12 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/gora/blob/64443cc7/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraClient.java
--
diff --git
a/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraClient.java
b/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraClient.java
index 416c017..7d5ebd2 100644
---
a/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraClient.java
+++
b/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraClient.java
@@ -46,12 +46,15 @@ import
me.prettyprint.hector.api.query.RangeSuperSlicesQuery;
import me.prettyprint.hector.api.HConsistencyLevel;
import me.prettyprint.hector.api.Serializer;
+import org.apache.avro.Schema;
+import org.apache.avro.Schema.Type;
import org.apache.avro.generic.GenericArray;
import org.apache.gora.cassandra.query.CassandraQuery;
import org.apache.gora.cassandra.serializers.GoraSerializerTypeInferer;
import org.apache.gora.mapreduce.GoraRecordReader;
import org.apache.gora.persistency.impl.PersistentBase;
import org.apache.gora.query.Query;
+import org.apache.gora.store.DataStore;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -444,6 +447,7 @@ public class CassandraClient {
*/
public Map> getFamilyMap(Query query) {
Map> map = new HashMap>();
+Schema persistentSchema = query.getDataStore().newPersistent().getSchema();
for (String field: query.getFields()) {
String family = this.getMappingFamily(field);
String column = this.getMappingColumn(field);
@@ -454,6 +458,8 @@ public class CassandraClient {
list = new ArrayList();
map.put(family, list);
}
+ if (persistentSchema.getField(field).schema().getType() == Type.UNION)
+list.add(column + CassandraStore.UNION_COL_SUFIX);
if (column != null) {
list.add(column);
}
@@ -480,10 +486,12 @@ public class CassandraClient
{
*/
public Map getReverseMap(Query query) {
Map map = new HashMap();
+Schema persistentSchema = query.getDataStore().newPersistent().getSchema();
for (String field: query.getFields()) {
String family = this.getMappingFamily(field);
String column = this.getMappingColumn(field);
-
+ if (persistentSchema.getField(field).schema().getType() == Type.UNION)
+map.put(family + ":" + column + CassandraStore.UNION_COL_SUFIX, field
+ CassandraStore.UNION_COL_SUFIX);
map.put(family + ":" + column, field);
}
http://git-wip-us.apache.org/repos/asf/gora/blob/64443cc7/gora-core/src/main/java/org/apache/gora/mapreduce/GoraRecordReader.java
--
diff --git
a/gora-core/src/main/java/org/apache/gora/mapreduce/GoraRecordReader.java
b/gora-core/src/main/java/org/apache/gora/mapreduce/GoraRecordReader.java
index fe0c51e..f7c1abb 100644
--- a/gora-core/src/main/java/org/apache/gora/mapreduce/GoraRecordReader.java
+++ b/gora-core/src/main/java/org/apache/gora/mapreduce/GoraRecordReader.java
@@ -119,7 +119,9 @@ public class GoraRecordReader
extends RecordReader<
return this.result.next();
}
catch(Exception e){
- return false;
+ LOG.error("Error reading Gora records");
+ e.printStackTrace();
+ return false;
}
}
svn commit: r907080 - /websites/production/gora/content/
Author: rmarroquin Date: Sun Apr 27 18:53:31 2014 New Revision: 907080 Log: Publishing svnmucc operation to gora site by rmarroquin Added: websites/production/gora/content/ - copied from r907079, websites/staging/gora/trunk/content/
svn commit: r907079 - /websites/production/gora/content/
Author: rmarroquin Date: Sun Apr 27 18:52:17 2014 New Revision: 907079 Log: Publishing svnmucc operation to gora site by rmarroquin Added: websites/production/gora/content/ - copied from r907077, websites/staging/gora/trunk/content/
svn commit: r1590454 - /gora/site/trunk/content/index.md
Author: rmarroquin Date: Sun Apr 27 18:52:07 2014 New Revision: 1590454 URL: http://svn.apache.org/r1590454 Log: Adding news about the 0.4 release. Modified: gora/site/trunk/content/index.md Modified: gora/site/trunk/content/index.md URL: http://svn.apache.org/viewvc/gora/site/trunk/content/index.md?rev=1590454&r1=1590453&r2=1590454&view=diff == --- gora/site/trunk/content/index.md (original) +++ gora/site/trunk/content/index.md Sun Apr 27 18:52:07 2014 @@ -33,6 +33,25 @@ Title: Welcome to Apache Gora™ ## News +### 24 April, 2014: Apache Gora 0.4 Released +The Apache Gora team are proud to announce the release of Gora 0.4. +This release addresses no fewer than 60 issues. Major improvements within +the release scope comprise a complete upgrade to Apache Avro 1.7.X and +overhaul of the Gora persistency API (such improvements enable Gora to be +used to map much more expressive and complicated data structures than +previously available), upgrades to Apache HBase 0.94.13, Apache Cassandra +2.0.X and Apache Accumulo 1.5.X. +Users can also benefit from using Gora + Solr for object-to-datastore +mapping with the addition of the new Solr module which uses Solr 4.X. + +A full list of changes in this release can be seen in +http://www.apache.org/dist/gora/0.4/CHANGES.txt";>0.4-CHANGES.txt. + +You can grab the maven release artifacts from +http://repo1.maven.org/maven2/org/apache/gora/";>Maven Central +and can also get the Gora sources from our [downloads page](/downloads.html). + + ### 14th April, 2014: Gora adopted by [Apache Giraph](http://giraph.apache.org) http://giraph.apache.org/images/ApacheGiraph.svg"; alt="Apache Giraph" height="200" width="200"> @@ -237,5 +256,3 @@ file for a full list of changes in this ### 26 September, 2010: Gora in Apache Incubator Gora has been accepted to the Apache Incubator and started it's life as a candidate Apache project. - -
svn commit: r906839 - /websites/production/gora/content/
Author: rmarroquin Date: Fri Apr 25 11:55:51 2014 New Revision: 906839 Log: Publishing svnmucc operation to gora site by rmarroquin Added: websites/production/gora/content/ - copied from r906838, websites/staging/gora/trunk/content/
svn commit: r1590007 - /gora/site/trunk/content/downloads.md
Author: rmarroquin Date: Fri Apr 25 11:55:33 2014 New Revision: 1590007 URL: http://svn.apache.org/r1590007 Log: CMS commit to gora by rmarroquin Modified: gora/site/trunk/content/downloads.md Modified: gora/site/trunk/content/downloads.md URL: http://svn.apache.org/viewvc/gora/site/trunk/content/downloads.md?rev=1590007&r1=1590006&r2=1590007&view=diff == --- gora/site/trunk/content/downloads.md (original) +++ gora/site/trunk/content/downloads.md Fri Apr 25 11:55:33 2014 @@ -1,6 +1,5 @@ Title: Gora Releases - ##Download Download the newest release of Apache Gora. See the [0.4-CHANGES.txt](http://apache.org/dist/gora/0.4/CHANGES.txt)
svn commit: r906837 - /websites/production/gora/content/
Author: rmarroquin Date: Fri Apr 25 11:53:07 2014 New Revision: 906837 Log: Updating download site. Added: websites/production/gora/content/ - copied from r906836, websites/staging/gora/trunk/content/
svn commit: r906737 - /websites/production/gora/content/
Author: rmarroquin Date: Thu Apr 24 16:12:11 2014 New Revision: 906737 Log: Publishing svnmucc operation to gora site by rmarroquin Added: websites/production/gora/content/ - copied from r906736, websites/staging/gora/trunk/content/
svn commit: r1586888 [10/10] - in /gora/trunk: ./ bin/ gora-accumulo/ gora-accumulo/src/main/java/org/apache/gora/accumulo/encoders/ gora-accumulo/src/main/java/org/apache/gora/accumulo/query/ gora-ac
Modified:
gora/trunk/gora-tutorial/src/main/java/org/apache/gora/tutorial/log/generated/Pageview.java
URL:
http://svn.apache.org/viewvc/gora/trunk/gora-tutorial/src/main/java/org/apache/gora/tutorial/log/generated/Pageview.java?rev=1586888&r1=1586887&r2=1586888&view=diff
==
---
gora/trunk/gora-tutorial/src/main/java/org/apache/gora/tutorial/log/generated/Pageview.java
(original)
+++
gora/trunk/gora-tutorial/src/main/java/org/apache/gora/tutorial/log/generated/Pageview.java
Sat Apr 12 19:21:53 2014
@@ -1,161 +1,769 @@
/**
- *Licensed to the Apache Software Foundation (ASF) under one
- *or more contributor license agreements. See the NOTICE file
- *distributed with this work for additional information
- *regarding copyright ownership. The ASF licenses this file
- *to you 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
+ * Autogenerated by Avro
*
- *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.
+ * DO NOT EDIT DIRECTLY
*/
-
-package org.apache.gora.tutorial.log.generated;
-
-import java.nio.ByteBuffer;
-import java.util.Map;
-import java.util.HashMap;
-import org.apache.avro.Protocol;
-import org.apache.avro.Schema;
-import org.apache.avro.AvroRuntimeException;
-import org.apache.avro.Protocol;
-import org.apache.avro.util.Utf8;
-import org.apache.avro.ipc.AvroRemoteException;
-import org.apache.avro.generic.GenericArray;
-import org.apache.avro.specific.FixedSize;
-import org.apache.avro.specific.SpecificExceptionBase;
-import org.apache.avro.specific.SpecificRecordBase;
-import org.apache.avro.specific.SpecificRecord;
-import org.apache.avro.specific.SpecificFixed;
-import org.apache.gora.persistency.StateManager;
-import org.apache.gora.persistency.impl.PersistentBase;
-import org.apache.gora.persistency.impl.StateManagerImpl;
-import org.apache.gora.persistency.StatefulHashMap;
-import org.apache.gora.persistency.ListGenericArray;
-
+package org.apache.gora.tutorial.log.generated;
@SuppressWarnings("all")
-public class Pageview extends PersistentBase {
- public static final Schema _SCHEMA =
Schema.parse("{\"type\":\"record\",\"name\":\"Pageview\",\"namespace\":\"org.apache.gora.tutorial.log.generated\",\"fields\":[{\"name\":\"url\",\"type\":\"string\"},{\"name\":\"timestamp\",\"type\":\"long\"},{\"name\":\"ip\",\"type\":\"string\"},{\"name\":\"httpMethod\",\"type\":\"string\"},{\"name\":\"httpStatusCode\",\"type\":\"int\"},{\"name\":\"responseSize\",\"type\":\"int\"},{\"name\":\"referrer\",\"type\":\"string\"},{\"name\":\"userAgent\",\"type\":\"string\"}]}");
- public static enum Field {
-URL(0,"url"),
-TIMESTAMP(1,"timestamp"),
-IP(2,"ip"),
-HTTP_METHOD(3,"httpMethod"),
-HTTP_STATUS_CODE(4,"httpStatusCode"),
-RESPONSE_SIZE(5,"responseSize"),
-REFERRER(6,"referrer"),
-USER_AGENT(7,"userAgent"),
-;
-private int index;
-private String name;
-Field(int index, String name) {this.index=index;this.name=name;}
-public int getIndex() {return index;}
-public String getName() {return name;}
-public String toString() {return name;}
- };
- public static final String[] _ALL_FIELDS =
{"url","timestamp","ip","httpMethod","httpStatusCode","responseSize","referrer","userAgent",};
- static {
-PersistentBase.registerFields(Pageview.class, _ALL_FIELDS);
- }
- private Utf8 url;
+public class Pageview extends org.apache.gora.persistency.impl.PersistentBase
implements org.apache.avro.specific.SpecificRecord,
org.apache.gora.persistency.Persistent {
+ public static final org.apache.avro.Schema SCHEMA$ = new
org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"Pageview\",\"namespace\":\"org.apache.gora.tutorial.log.generated\",\"fields\":[{\"name\":\"__g__dirty\",\"type\":\"bytes\",\"doc\":\"Bytes
used to represent weather or not a field is
dirty.\",\"default\":\"AAA=\"},{\"name\":\"url\",\"type\":[\"null\",\"string\"],\"default\":null},{\"name\":\"timestamp\",\"type\":\"long\",\"default\":0},{\"name\":\"ip\",\"type\":[\"null\",\"string\"],\"default\":null},{\"name\":\"httpMethod\",\"type\":[\"null\",\"string\"],\"default\":null},{\"name\":\"httpStatusCode\",\"type\":\"int\",\"default\":0},{\"name\":\"responseSize\",\"type\":\"int\",\"default\":0},{\"name\":\"referrer\",\"type\":[\"null\",\"string\"],\"default\":null},{\"name\":\"userAgent\",\"type\":[\"null\",\"string\"],\"default\":null}]}");
+ /** Bytes used to represent weather or not a field is dirty. */
+ private java.nio.ByteBuffer __g__dirty = java.
svn commit: r1585620 - /gora/branches/GORA_94/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java
Author: rmarroquin
Date: Mon Apr 7 23:28:25 2014
New Revision: 1585620
URL: http://svn.apache.org/r1585620
Log:
GORA-318
Modified:
gora/branches/GORA_94/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java
Modified:
gora/branches/GORA_94/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java
URL:
http://svn.apache.org/viewvc/gora/branches/GORA_94/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java?rev=1585620&r1=1585619&r2=1585620&view=diff
==
---
gora/branches/GORA_94/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java
(original)
+++
gora/branches/GORA_94/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java
Mon Apr 7 23:28:25 2014
@@ -784,6 +784,8 @@ implements Configurable {
//we found a matching key and value class definition,
//do not continue on other class definitions
break;
+} else {
+ LOG.error("KeyClass in gora-hbase-mapping is not the same as the one
in the databean.");
}
}
} catch(IOException ex) {
svn commit: r1585618 - /gora/trunk/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java
Author: rmarroquin
Date: Mon Apr 7 23:25:14 2014
New Revision: 1585618
URL: http://svn.apache.org/r1585618
Log:
GORA-318
Modified:
gora/trunk/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java
Modified:
gora/trunk/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java
URL:
http://svn.apache.org/viewvc/gora/trunk/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java?rev=1585618&r1=1585617&r2=1585618&view=diff
==
---
gora/trunk/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java
(original)
+++
gora/trunk/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java
Mon Apr 7 23:25:14 2014
@@ -729,6 +729,8 @@ implements Configurable {
//we found a matching key and value class definition,
//do not continue on other class definitions
break;
+} else {
+ LOG.error("KeyClass in gora-hbase-mapping is not the same as the one
in the databean.");
}
}
} catch(IOException ex) {
svn commit: r1583181 - in /gora/branches/GORA_94: gora-compiler-cli/src/main/java/org/apache/gora/compiler/cli/GoraCompilerCLI.java gora-compiler/src/main/java/org/apache/gora/compiler/GoraCompiler.ja
Author: rmarroquin
Date: Sun Mar 30 18:31:37 2014
New Revision: 1583181
URL: http://svn.apache.org/r1583181
Log:
GORA-313. Gora-Compiler and Gora-Compiler-CLI should print some messages about
the compilation result.
Modified:
gora/branches/GORA_94/gora-compiler-cli/src/main/java/org/apache/gora/compiler/cli/GoraCompilerCLI.java
gora/branches/GORA_94/gora-compiler/src/main/java/org/apache/gora/compiler/GoraCompiler.java
Modified:
gora/branches/GORA_94/gora-compiler-cli/src/main/java/org/apache/gora/compiler/cli/GoraCompilerCLI.java
URL:
http://svn.apache.org/viewvc/gora/branches/GORA_94/gora-compiler-cli/src/main/java/org/apache/gora/compiler/cli/GoraCompilerCLI.java?rev=1583181&r1=1583180&r2=1583181&view=diff
==
---
gora/branches/GORA_94/gora-compiler-cli/src/main/java/org/apache/gora/compiler/cli/GoraCompilerCLI.java
(original)
+++
gora/branches/GORA_94/gora-compiler-cli/src/main/java/org/apache/gora/compiler/cli/GoraCompilerCLI.java
Sun Mar 30 18:31:37 2014
@@ -54,6 +54,7 @@ public class GoraCompilerCLI {
}
try {
GoraCompiler.compileSchema(inputs, outputDir);
+ System.out.println("Compiler executed SUCCESSFULL.");
} catch (IOException e) {
System.err.println("Error while compiling schema files. Check that the
schemas are properly formatted.");
printHelp();
Modified:
gora/branches/GORA_94/gora-compiler/src/main/java/org/apache/gora/compiler/GoraCompiler.java
URL:
http://svn.apache.org/viewvc/gora/branches/GORA_94/gora-compiler/src/main/java/org/apache/gora/compiler/GoraCompiler.java?rev=1583181&r1=1583180&r2=1583181&view=diff
==
---
gora/branches/GORA_94/gora-compiler/src/main/java/org/apache/gora/compiler/GoraCompiler.java
(original)
+++
gora/branches/GORA_94/gora-compiler/src/main/java/org/apache/gora/compiler/GoraCompiler.java
Sun Mar 30 18:31:37 2014
@@ -59,13 +59,14 @@ public class GoraCompiler extends Specif
Schema.Parser parser = new Schema.Parser();
for (File src : srcFiles) {
+ System.out.println("Compiling: " + src.getAbsolutePath());
Schema originalSchema = parser.parse(src);
Map queue = new HashMap();
Schema newSchema = getSchemaWithDirtySupport(originalSchema, queue);
GoraCompiler compiler = new GoraCompiler(newSchema);
compiler.setTemplateDir("/org/apache/gora/compiler/templates/");
compiler.compileToDestination(src, dest);
-
+ System.out.println("Compiled into: " + dest.getAbsolutePath());
}
}
svn commit: r1583169 - /gora/branches/GORA_94/gora-core/src/examples/avro/webpage.json
Author: rmarroquin
Date: Sun Mar 30 18:03:50 2014
New Revision: 1583169
URL: http://svn.apache.org/r1583169
Log:
GORA-312. Avro JSON schema for WebPage should reflect data bean being used.
Modified:
gora/branches/GORA_94/gora-core/src/examples/avro/webpage.json
Modified: gora/branches/GORA_94/gora-core/src/examples/avro/webpage.json
URL:
http://svn.apache.org/viewvc/gora/branches/GORA_94/gora-core/src/examples/avro/webpage.json?rev=1583169&r1=1583168&r2=1583169&view=diff
==
--- gora/branches/GORA_94/gora-core/src/examples/avro/webpage.json (original)
+++ gora/branches/GORA_94/gora-core/src/examples/avro/webpage.json Sun Mar 30
18:03:50 2014
@@ -7,6 +7,7 @@
{"name": "content", "type": ["null","bytes"],"default":null},
{"name": "parsedContent", "type": {"type":"array", "items": "string"},
"default":null},
{"name": "outlinks", "type": {"type":"map", "values":"string"},
"default":{}},
+{"name":
"headers","type":["null",{"type":"map","values":["null","string"]}],"default":null},
{"name": "metadata", "default":null, "type": {
"name": "Metadata",
"type": "record",
@@ -17,4 +18,4 @@
]
}}
]
-}
+}
\ No newline at end of file
svn commit: r1579577 - in /gora/branches/GORA_94/gora-cassandra/src/main/java/org/apache/gora/cassandra/store: CassandraClient.java CassandraStore.java
Author: rmarroquin
Date: Thu Mar 20 09:41:15 2014
New Revision: 1579577
URL: http://svn.apache.org/r1579577
Log:
GORA-245. Fixes updated
Modified:
gora/branches/GORA_94/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraClient.java
gora/branches/GORA_94/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraStore.java
Modified:
gora/branches/GORA_94/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraClient.java
URL:
http://svn.apache.org/viewvc/gora/branches/GORA_94/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraClient.java?rev=1579577&r1=1579576&r2=1579577&view=diff
==
---
gora/branches/GORA_94/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraClient.java
(original)
+++
gora/branches/GORA_94/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraClient.java
Thu Mar 20 09:41:15 2014
@@ -297,6 +297,10 @@ public class CassandraClient array) {
if (isSuper( cassandraMapping.getFamily(fieldName) )) {
int i= 0;
@@ -321,6 +325,14 @@ public class CassandraClient map) {
if (isSuper( cassandraMapping.getFamily(fieldName) )) {
// as we don't know what has changed inside the map or If it's an empty
map, then delete its content.
Modified:
gora/branches/GORA_94/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraStore.java
URL:
http://svn.apache.org/viewvc/gora/branches/GORA_94/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraStore.java?rev=1579577&r1=1579576&r2=1579577&view=diff
==
---
gora/branches/GORA_94/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraStore.java
(original)
+++
gora/branches/GORA_94/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraStore.java
Thu Mar 20 09:41:15 2014
@@ -509,6 +509,10 @@ public class CassandraStore
svn commit: r1579575 - /gora/branches/GORA_94/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java
Author: rmarroquin
Date: Thu Mar 20 09:33:24 2014
New Revision: 1579575
URL: http://svn.apache.org/r1579575
Log:
GORA-246. Fixing test when persisting 2-level nestes structures.
Modified:
gora/branches/GORA_94/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java
Modified:
gora/branches/GORA_94/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java
URL:
http://svn.apache.org/viewvc/gora/branches/GORA_94/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java?rev=1579575&r1=1579574&r2=1579575&view=diff
==
---
gora/branches/GORA_94/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java
(original)
+++
gora/branches/GORA_94/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java
Thu Mar 20 09:33:24 2014
@@ -130,7 +130,7 @@ implements Configurable {
} catch (Exception e) {
throw new RuntimeException(e);
}
-
+
// Set scanner caching option
try {
this.setScannerCaching(
@@ -141,7 +141,7 @@ implements Configurable {
LOG.error("Can not load " + SCANNER_CACHING_PROPERTIES_KEY + " from
gora.properties. Setting to default value: " +
SCANNER_CACHING_PROPERTIES_DEFAULT, e) ;
this.setScannerCaching(SCANNER_CACHING_PROPERTIES_DEFAULT) ; // Default
value if something is wrong
}
-
+
if(autoCreateSchema) {
createSchema();
}
@@ -292,6 +292,13 @@ implements Configurable {
}
break;
case MAP:
+ // if it's a map that has been modified, then the content should be
replaced by the new one
+ // This is because we don't know if the content has changed or not.
+ if (qualifier == null) {
+delete.deleteFamily(hcol.getFamily());
+ } else {
+delete.deleteColumn(hcol.getFamily(), qualifier);
+ }
@SuppressWarnings({ "rawtypes", "unchecked" })
Set set = ((Map) o).entrySet();
for (@SuppressWarnings("rawtypes") Entry entry : set) {
@@ -749,15 +756,17 @@ implements Configurable {
keyClass.getCanonicalName())
&& classElement.getAttributeValue("name").equals(
persistentClass.getCanonicalName())) {
+ LOG.debug("Keyclass and nameclass match.");
String tableNameFromMapping =
classElement.getAttributeValue("table");
String tableName = getSchemaName(tableNameFromMapping,
persistentClass);
//tableNameFromMapping could be null here
if (!tableName.equals(tableNameFromMapping)) {
-LOG.info("Keyclass and nameclass match but mismatching table names
"
-+ " mappingfile schema is '" + tableNameFromMapping
-+ "' vs actual schema '" + tableName + "' , assuming they are
the same.");
+ //TODO this might not be the desired behavior as the user might have
actually made a mistake.
+LOG.warn("Mismatching schema's names. Mappingfile schema: '" +
tableNameFromMapping
++ "'. PersistentClass schema's name: '" + tableName + "'"
++ "Assuming they are the same.");
if (tableNameFromMapping != null) {
mappingBuilder.renameTable(tableNameFromMapping, tableName);
}
@@ -772,9 +781,6 @@ implements Configurable {
mappingBuilder.addField(fieldName, family, qualifier);
mappingBuilder.addColumnFamily(tableName, family);
}
-
-
-
//we found a matching key and value class definition,
//do not continue on other class definitions
break;
@@ -837,5 +843,4 @@ implements Configurable {
this.scannerCaching = numRows ;
return this ;
}
-
}
svn commit: r1579573 - /gora/branches/GORA_94/gora-core/src/test/java/org/apache/gora/store/DataStoreTestUtil.java
Author: rmarroquin
Date: Thu Mar 20 09:22:15 2014
New Revision: 1579573
URL: http://svn.apache.org/r1579573
Log:
GORA-94. Fixing tests to work with current schema
Modified:
gora/branches/GORA_94/gora-core/src/test/java/org/apache/gora/store/DataStoreTestUtil.java
Modified:
gora/branches/GORA_94/gora-core/src/test/java/org/apache/gora/store/DataStoreTestUtil.java
URL:
http://svn.apache.org/viewvc/gora/branches/GORA_94/gora-core/src/test/java/org/apache/gora/store/DataStoreTestUtil.java?rev=1579573&r1=1579572&r2=1579573&view=diff
==
---
gora/branches/GORA_94/gora-core/src/test/java/org/apache/gora/store/DataStoreTestUtil.java
(original)
+++
gora/branches/GORA_94/gora-core/src/test/java/org/apache/gora/store/DataStoreTestUtil.java
Thu Mar 20 09:22:15 2014
@@ -536,6 +536,7 @@ public class DataStoreTestUtil {
"http://d.com/d";, "http://e.com/e";, "http://f.com/f";, "http://g.com/g";
};
String anchor = "anchor";
+// putting evens
for (int i = 0; i < urls.length; i++) {
WebPage webPage = WebPage.newBuilder().build();
webPage.setUrl(new Utf8(urls[i]));
@@ -546,6 +547,7 @@ public class DataStoreTestUtil {
}
dataStore.flush();
+// putting odds
for (int i = 0; i < urls.length; i++) {
WebPage webPage = dataStore.get(urls[i]);
webPage.getOutlinks().clear();
@@ -599,7 +601,8 @@ public class DataStoreTestUtil {
for (int i = 0; i < urls.length; i++) {
WebPage webPage = dataStore.get(urls[i]);
- webPage.getHeaders().clear(); //TODO clear method does not work
+ //webPage.getHeaders().clear(); //TODO clear method does not work
+ webPage.setHeaders(new HashMap());
for (int j = 1; j < headers.length; j += 2) {
webPage.getHeaders().put(new Utf8(header + j), new Utf8(headers[j]));
}
@@ -610,9 +613,8 @@ public class DataStoreTestUtil {
for (int i = 0; i < urls.length; i++) {
WebPage webPage = dataStore.get(urls[i]);
- int j = 0;
int count = 0;
- for (j = 0; j < headers.length; j+=2) { //TODO j++ or j+=2 ?
+ for (int j = 1; j < headers.length; j += 2) {
CharSequence headerSample = webPage.getHeaders().get(new Utf8(header +
j));
assertNotNull(headerSample);
assertEquals(headers[j], headerSample.toString());
@@ -644,10 +646,8 @@ public class DataStoreTestUtil {
// map entry removal test
for (int i = 0; i < urls.length; i++) {
WebPage webPage = dataStore.get(urls[i]);
- webPage.getOutlinks().clear();
- //webPage.setOutlinks(new
org.apache.gora.persistency.impl.DirtyMapWrapper((java.util.Map)new
HashMap()));
for (int j = 1; j < urls.length; j += 2) {
-webPage.getOutlinks().put(new Utf8(anchor + j), new Utf8(urls[j]));
+webPage.getOutlinks().remove(new Utf8(anchor + j));
}
dataStore.put(webPage.getUrl().toString(), webPage);
}
@@ -659,11 +659,11 @@ public class DataStoreTestUtil {
WebPage webPage = dataStore.get(urls[i]);
for (int j = 1; j < urls.length; j += 2) {
CharSequence link = webPage.getOutlinks().get(new Utf8(anchor + j));
-assertNotNull(link);
-assertEquals(urls[j], link.toString());
+assertNull(link);
+//assertEquals(urls[j], link.toString());
count++;
}
- assertEquals(count, webPage.getOutlinks().size());
+ assertEquals(urls.length - count, webPage.getOutlinks().size());
}
}
svn commit: r1579569 - /gora/trunk/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java
Author: rmarroquin
Date: Thu Mar 20 09:08:39 2014
New Revision: 1579569
URL: http://svn.apache.org/r1579569
Log:
GORA-296
Modified:
gora/trunk/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java
Modified:
gora/trunk/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java
URL:
http://svn.apache.org/viewvc/gora/trunk/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java?rev=1579569&r1=1579568&r2=1579569&view=diff
==
---
gora/trunk/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java
(original)
+++
gora/trunk/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java
Thu Mar 20 09:08:39 2014
@@ -700,15 +700,17 @@ implements Configurable {
keyClass.getCanonicalName())
&& classElement.getAttributeValue("name").equals(
persistentClass.getCanonicalName())) {
+ LOG.debug("Keyclass and nameclass match.");
String tableNameFromMapping =
classElement.getAttributeValue("table");
String tableName = getSchemaName(tableNameFromMapping,
persistentClass);
//tableNameFromMapping could be null here
if (!tableName.equals(tableNameFromMapping)) {
-LOG.info("Keyclass and nameclass match but mismatching table names
"
-+ " mappingfile schema is '" + tableNameFromMapping
-+ "' vs actual schema '" + tableName + "' , assuming they are
the same.");
+ //TODO this might not be the desired behavior as the user might have
actually made a mistake.
+LOG.warn("Mismatching schema's names. Mappingfile schema: '" +
tableNameFromMapping
++ "'. PersistentClass schema's name: '" + tableName + "'"
++ "Assuming they are the same.");
if (tableNameFromMapping != null) {
mappingBuilder.renameTable(tableNameFromMapping, tableName);
}
@@ -724,8 +726,6 @@ implements Configurable {
mappingBuilder.addColumnFamily(tableName, family);
}
-
-
//we found a matching key and value class definition,
//do not continue on other class definitions
break;
@@ -788,5 +788,4 @@ implements Configurable {
this.scannerCaching = numRows ;
return this ;
}
-
-}
+}
\ No newline at end of file
svn commit: r1576727 - in /gora/branches/GORA_94: gora-cassandra/src/main/java/org/apache/gora/cassandra/store/ gora-cassandra/src/test/conf/ gora-core/src/test/java/org/apache/gora/store/
Author: rmarroquin
Date: Wed Mar 12 13:13:46 2014
New Revision: 1576727
URL: http://svn.apache.org/r1576727
Log:
GORA-245. Fixing failing test and adding GORA-154 to branch GORA_94.
Modified:
gora/branches/GORA_94/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraClient.java
gora/branches/GORA_94/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraMapping.java
gora/branches/GORA_94/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraStore.java
gora/branches/GORA_94/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/HectorUtils.java
gora/branches/GORA_94/gora-cassandra/src/test/conf/gora-cassandra-mapping.xml
gora/branches/GORA_94/gora-core/src/test/java/org/apache/gora/store/DataStoreTestUtil.java
Modified:
gora/branches/GORA_94/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraClient.java
URL:
http://svn.apache.org/viewvc/gora/branches/GORA_94/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraClient.java?rev=1576727&r1=1576726&r2=1576727&view=diff
==
---
gora/branches/GORA_94/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraClient.java
(original)
+++
gora/branches/GORA_94/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraClient.java
Wed Mar 12 13:13:46 2014
@@ -106,7 +106,7 @@ public class CassandraClient;" query
KeyspaceDefinition keyspaceDefinition =
this.cluster.describeKeyspace(this.cassandraMapping.getKeyspaceName());
if (keyspaceDefinition == null) {
- List columnFamilyDefinitions =
this.cassandraMapping.getColumnFamilyDefinitions();
+ List columnFamilyDefinitions =
this.cassandraMapping.getColumnFamilyDefinitions();
// GORA-197
for (ColumnFamilyDefinition cfDef : columnFamilyDefinitions) {
@@ -155,12 +155,11 @@ public class CassandraClient;" query
this.cluster.dropKeyspace(this.cassandraMapping.getKeyspaceName());
}
@@ -178,18 +177,41 @@ public class CassandraClienthttp://svn.apache.org/viewvc/gora/branches/GORA_94/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraMapping.java?rev=1576727&r1=1576726&r2=1576727&view=diff
==
---
gora/branches/GORA_94/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraMapping.java
(original)
+++
gora/branches/GORA_94/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraMapping.java
Wed Mar 12 13:13:46 2014
@@ -44,6 +44,10 @@ public class CassandraMapping {
private static final String CLUSTER_ATTRIBUTE = "cluster";
private static final String HOST_ATTRIBUTE = "host";
+ private static final String GCGRACE_SECONDS_ATTRIBUTE = "gc_grace_seconds";
+ private static final String COLUMNS_TTL_ATTRIBUTE = "ttl";
+ public static final String DEFAULT_COLUMNS_TTL = "60";
+ public static final int DEFAULT_GCGRACE_SECONDS = 30;
private String hostName;
private String clusterName;
@@ -66,6 +70,11 @@ public class CassandraMapping {
private Map columnMap = new HashMap();
/**
+ * Helps storing attributes defined for each field.
+ */
+ private Map columnAttrMap = new HashMap();
+
+ /**
* Look up the column family from its name.
*/
private Map columnFamilyDefinitions =
@@ -117,7 +126,7 @@ public class CassandraMapping {
}
this.keyspaceName = keyspace.getAttributeValue(NAME_ATTRIBUTE);
if (this.keyspaceName == null) {
- LOG.error("Error locating Cassandra Keyspace name attribute!");
+ LOG.error("Error locating Cassandra Keyspace name attribute!");
} else {
if (LOG.isDebugEnabled()) {
LOG.debug("Located Cassandra Keyspace name: '" + keyspaceName + "'");
@@ -154,6 +163,16 @@ public class CassandraMapping {
LOG.debug("Located column family: '" + familyName + "'" );
}
}
+ String gcgrace_scs =
element.getAttributeValue(GCGRACE_SECONDS_ATTRIBUTE);
+ if (gcgrace_scs == null) {
+LOG.warn("Error locating gc_grace_seconds attribute for '" +
familyName + "' column family");
+LOG.warn("Using default set to: " + DEFAULT_GCGRACE_SECONDS);
+ } else {
+if (LOG.isDebugEnabled()) {
+LOG.debug("Located gc_grace_seconds: '" + gcgrace_scs + "'" );
+}
+ }
+
String superAttribute = element.getAttributeValue(SUPER_ATTRIBUTE);
if (superAttribute != null) {
if (LOG.isDebugEnabled()) {
@@ -166,12 +185,13 @@ public class CassandraMapping {
cfDef.setColumnType(ColumnType.SUPER);
cfDef.setSubCompar
svn commit: r1576726 - in /gora/trunk/gora-cassandra/src: main/java/org/apache/gora/cassandra/store/ test/conf/
Author: rmarroquin
Date: Wed Mar 12 13:08:25 2014
New Revision: 1576726
URL: http://svn.apache.org/r1576726
Log:
GORA-154
Modified:
gora/trunk/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraClient.java
gora/trunk/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraMapping.java
gora/trunk/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraStore.java
gora/trunk/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/HectorUtils.java
gora/trunk/gora-cassandra/src/test/conf/gora-cassandra-mapping.xml
Modified:
gora/trunk/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraClient.java
URL:
http://svn.apache.org/viewvc/gora/trunk/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraClient.java?rev=1576726&r1=1576725&r2=1576726&view=diff
==
---
gora/trunk/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraClient.java
(original)
+++
gora/trunk/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraClient.java
Wed Mar 12 13:08:25 2014
@@ -244,6 +244,10 @@ public class CassandraClient>
queryResult = rangeSuperSlicesQuery.execute();
OrderedSuperRows orderedRows =
queryResult.get();
return orderedRows.getList();
Modified:
gora/trunk/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraMapping.java
URL:
http://svn.apache.org/viewvc/gora/trunk/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraMapping.java?rev=1576726&r1=1576725&r2=1576726&view=diff
==
---
gora/trunk/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraMapping.java
(original)
+++
gora/trunk/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraMapping.java
Wed Mar 12 13:08:25 2014
@@ -44,12 +44,15 @@ public class CassandraMapping {
private static final String CLUSTER_ATTRIBUTE = "cluster";
private static final String HOST_ATTRIBUTE = "host";
+ private static final String GCGRACE_SECONDS_ATTRIBUTE = "gc_grace_seconds";
+ private static final String COLUMNS_TTL_ATTRIBUTE = "ttl";
+ public static final String DEFAULT_COLUMNS_TTL = "60";
+ public static final int DEFAULT_GCGRACE_SECONDS = 30;
private String hostName;
private String clusterName;
private String keyspaceName;
-
/**
* List of the super column families.
*/
@@ -66,6 +69,11 @@ public class CassandraMapping {
private Map columnMap = new HashMap();
/**
+ * Helps storing attributes defined for each field.
+ */
+ private Map columnAttrMap = new HashMap();
+
+ /**
* Look up the column family from its name.
*/
private Map columnFamilyDefinitions =
@@ -117,7 +125,7 @@ public class CassandraMapping {
}
this.keyspaceName = keyspace.getAttributeValue(NAME_ATTRIBUTE);
if (this.keyspaceName == null) {
- LOG.error("Error locating Cassandra Keyspace name attribute!");
+ LOG.error("Error locating Cassandra Keyspace name attribute!");
} else {
if (LOG.isDebugEnabled()) {
LOG.debug("Located Cassandra Keyspace name: '" + keyspaceName + "'");
@@ -154,6 +162,15 @@ public class CassandraMapping {
LOG.debug("Located column family: '" + familyName + "'" );
}
}
+ String gcgrace_scs =
element.getAttributeValue(GCGRACE_SECONDS_ATTRIBUTE);
+ if (gcgrace_scs == null) {
+LOG.warn("Error locating gc_grace_seconds attribute for '" +
familyName + "' column family");
+LOG.warn("Using default set to: " + DEFAULT_GCGRACE_SECONDS);
+ } else {
+if (LOG.isDebugEnabled()) {
+ LOG.debug("Located gc_grace_seconds: '" + gcgrace_scs + "'" );
+}
+ }
String superAttribute = element.getAttributeValue(SUPER_ATTRIBUTE);
if (superAttribute != null) {
if (LOG.isDebugEnabled()) {
@@ -171,7 +188,7 @@ public class CassandraMapping {
cfDef.setName(familyName);
cfDef.setComparatorType(ComparatorType.BYTESTYPE);
cfDef.setDefaultValidationClass(ComparatorType.BYTESTYPE.getClassName());
-
+
cfDef.setGcGraceSeconds(gcgrace_scs!=null?Integer.parseInt(gcgrace_scs):DEFAULT_GCGRACE_SECONDS);
this.columnFamilyDefinitions.put(familyName, cfDef);
}
@@ -182,6 +199,8 @@ public class CassandraMapping {
String fieldName = element.getAttributeValue(NAME_ATTRIBUTE);
String familyName = element.getAttributeValue(FAMILY_ATTRIBUTE);
String columnName = element.getAttributeValue(COLUMN_ATTRIBUTE);
+ String ttlValue = element.getAttributeValue(COLUMNS_TT
svn commit: r1575224 - in /gora/trunk: gora-cassandra/src/main/java/org/apache/gora/cassandra/store/ gora-cassandra/src/test/conf/ gora-core/src/main/java/org/apache/gora/store/ gora-dynamodb/src/main
Author: rmarroquin
Date: Fri Mar 7 10:32:38 2014
New Revision: 1575224
URL: http://svn.apache.org/r1575224
Log:
GORA-167
Modified:
gora/trunk/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraClient.java
gora/trunk/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraStore.java
gora/trunk/gora-cassandra/src/test/conf/gora.properties
gora/trunk/gora-core/src/main/java/org/apache/gora/store/DataStoreFactory.java
gora/trunk/gora-dynamodb/src/main/java/org/apache/gora/dynamodb/store/DynamoDBStore.java
Modified:
gora/trunk/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraClient.java
URL:
http://svn.apache.org/viewvc/gora/trunk/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraClient.java?rev=1575224&r1=1575223&r2=1575224&view=diff
==
---
gora/trunk/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraClient.java
(original)
+++
gora/trunk/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraClient.java
Fri Mar 7 10:32:38 2014
@@ -18,12 +18,16 @@
package org.apache.gora.cassandra.store;
+import static org.apache.gora.cassandra.store.CassandraStore.colFamConsLvl;
+import static org.apache.gora.cassandra.store.CassandraStore.readOpConsLvl;
+import static org.apache.gora.cassandra.store.CassandraStore.writeOpConsLvl;
+
import java.nio.ByteBuffer;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Properties;
import me.prettyprint.cassandra.model.ConfigurableConsistencyLevel;
import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
@@ -47,53 +51,80 @@ import me.prettyprint.hector.api.query.R
import me.prettyprint.hector.api.HConsistencyLevel;
import me.prettyprint.hector.api.Serializer;
-import org.apache.avro.Schema;
-import org.apache.avro.Schema.Type;
import org.apache.avro.generic.GenericArray;
import org.apache.avro.util.Utf8;
import org.apache.gora.cassandra.query.CassandraQuery;
-import org.apache.gora.cassandra.serializers.GenericArraySerializer;
import org.apache.gora.cassandra.serializers.GoraSerializerTypeInferer;
-import org.apache.gora.cassandra.serializers.TypeUtils;
import org.apache.gora.mapreduce.GoraRecordReader;
-import org.apache.gora.persistency.Persistent;
import org.apache.gora.persistency.impl.PersistentBase;
import org.apache.gora.persistency.State;
import org.apache.gora.persistency.StatefulHashMap;
import org.apache.gora.query.Query;
-import org.apache.gora.util.ByteUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+/**
+ * CassandraClient is where all of the primary datastore functionality is
+ * executed. Typically CassandraClient is invoked by calling
+ * {@link org.apache.gora.cassandra.store.CassandraStore#initialize(Class,
Class, Properties)}.
+ * CassandraClient deals with Cassandra data model definition, mutation,
+ * and general/specific mappings.
+ * @see {@link
org.apache.gora.cassandra.store.CassandraStore#initialize(Class, Class,
Properties)}
+ *
+ * @param
+ * @param
+ */
public class CassandraClient {
+
+ /** The logging implementation */
public static final Logger LOG =
LoggerFactory.getLogger(CassandraClient.class);
-
+
private Cluster cluster;
private Keyspace keyspace;
private Mutator mutator;
private Class keyClass;
private Class persistentClass;
-
+
+ /** Object containing the XML mapping for Cassandra. */
private CassandraMapping cassandraMapping = null;
+ /** Hector client default column family consistency level. */
+ public static final String DEFAULT_HECTOR_CONSIS_LEVEL = "QUORUM";
+
+ /** Cassandra serializer to be used for serializing Gora's keys. */
private Serializer keySerializer;
-
+
+ /**
+ * Given our key, persistentClass from
+ * {@link org.apache.gora.cassandra.store.CassandraStore#initialize(Class,
Class, Properties)}
+ * we make best efforts to dictate our data model.
+ * We make a quick check within {@link
org.apache.gora.cassandra.store.CassandraClient#checkKeyspace(String)
+ * to see if our keyspace has already been invented, this simple check
prevents us from
+ * recreating the keyspace if it already exists.
+ * We then simple specify (based on the input keyclass) an appropriate
serializer
+ * via {@link
org.apache.gora.cassandra.serializers.GoraSerializerTypeInferer} before
+ * defining a mutator from and by which we can mutate this object.
+ * @param keyClass the Key by which we wish o assign a record object
+ * @param persistentClass the generated {@link
org.apache.org.gora.persistency.Peristent} bean representing the data.
+ * @throws Exception
+ */
public void initialize(Class keyClass, Class persistentClass) throws
Exception {
this.keyClass = keyClass;
//
svn commit: r1543970 - in /gora/branches/GORA_94/gora-hbase/src/test/java/org/apache/gora/hbase: GoraHBaseTestDriver.java store/TestHBaseStore.java util/HBaseClusterSingleton.java
Author: rmarroquin
Date: Wed Nov 20 22:16:02 2013
New Revision: 1543970
URL: http://svn.apache.org/r1543970
Log:
Fixing hanging tests on the HBase data store.
Modified:
gora/branches/GORA_94/gora-hbase/src/test/java/org/apache/gora/hbase/GoraHBaseTestDriver.java
gora/branches/GORA_94/gora-hbase/src/test/java/org/apache/gora/hbase/store/TestHBaseStore.java
gora/branches/GORA_94/gora-hbase/src/test/java/org/apache/gora/hbase/util/HBaseClusterSingleton.java
Modified:
gora/branches/GORA_94/gora-hbase/src/test/java/org/apache/gora/hbase/GoraHBaseTestDriver.java
URL:
http://svn.apache.org/viewvc/gora/branches/GORA_94/gora-hbase/src/test/java/org/apache/gora/hbase/GoraHBaseTestDriver.java?rev=1543970&r1=1543969&r2=1543970&view=diff
==
---
gora/branches/GORA_94/gora-hbase/src/test/java/org/apache/gora/hbase/GoraHBaseTestDriver.java
(original)
+++
gora/branches/GORA_94/gora-hbase/src/test/java/org/apache/gora/hbase/GoraHBaseTestDriver.java
Wed Nov 20 22:16:02 2013
@@ -22,8 +22,6 @@ import org.apache.gora.GoraTestDriver;
import org.apache.gora.hbase.store.HBaseStore;
import org.apache.gora.hbase.util.HBaseClusterSingleton;
import org.apache.hadoop.conf.Configuration;
-
-//HBase imports
import org.apache.hadoop.hbase.HBaseTestingUtility;
/**
@@ -31,8 +29,15 @@ import org.apache.hadoop.hbase.HBaseTest
* @see GoraTestDriver
*/
public class GoraHBaseTestDriver extends GoraTestDriver {
+
+ /**
+ * Cluster object used for testing.
+ */
private static final HBaseClusterSingleton cluster =
HBaseClusterSingleton.build(1);
+ /**
+ * Default Constructor.
+ */
public GoraHBaseTestDriver() {
super(HBaseStore.class);
}
@@ -40,6 +45,7 @@ public class GoraHBaseTestDriver extends
@Override
public void setUpClass() throws Exception {
super.setUpClass();
+conf = getConf();
log.info("Setting up HBase Test Driver");
}
@@ -48,28 +54,40 @@ public class GoraHBaseTestDriver extends
super.tearDownClass();
log.info("Teardown HBase test driver");
}
-
+
@Override
public void setUp() throws Exception {
cluster.truncateAllTables();
// super.setUp() deletes all tables, but must only truncate in the right
way -HBaseClusterSingleton-
//super.setUp();
}
-
+
@Override
public void tearDown() throws Exception {
// Do nothing. setUp() must ensure the right data.
}
+
+ /**
+ * Deletes all tables from the MiniCluster
+ * @throws Exception in case some table is not able to be deleted.
+ */
public void deleteAllTables() throws Exception {
cluster.deleteAllTables();
}
-
+
+ /**
+ * Gets the configuration from the MiniCluster.
+ * @return Configuration from MiniCluster.
+ */
public Configuration getConf() {
return cluster.getHbaseTestingUtil().getConfiguration();
}
-
+
+ /**
+ * Gets HBaseTestingUtility from the MiniCluster object.
+ * @return HBaseTestingUtility object
+ */
public HBaseTestingUtility getHbaseUtil() {
return cluster.getHbaseTestingUtil();
}
-
-}
+}
Modified:
gora/branches/GORA_94/gora-hbase/src/test/java/org/apache/gora/hbase/store/TestHBaseStore.java
URL:
http://svn.apache.org/viewvc/gora/branches/GORA_94/gora-hbase/src/test/java/org/apache/gora/hbase/store/TestHBaseStore.java?rev=1543970&r1=1543969&r2=1543970&view=diff
==
---
gora/branches/GORA_94/gora-hbase/src/test/java/org/apache/gora/hbase/store/TestHBaseStore.java
(original)
+++
gora/branches/GORA_94/gora-hbase/src/test/java/org/apache/gora/hbase/store/TestHBaseStore.java
Wed Nov 20 22:16:02 2013
@@ -204,7 +204,7 @@ public class TestHBaseStore extends Data
HTable table = new HTable(conf,"WebPage");
Get get = new Get(Bytes.toBytes("com.example/http"));
org.apache.hadoop.hbase.client.Result result = table.get(get);
-
+table.close();
byte[] contentBytes = result.getValue(Bytes.toBytes("content"), null);
assertNull(webPageStore.get("com.example/http", new String[]{"content"})) ;
Modified:
gora/branches/GORA_94/gora-hbase/src/test/java/org/apache/gora/hbase/util/HBaseClusterSingleton.java
URL:
http://svn.apache.org/viewvc/gora/branches/GORA_94/gora-hbase/src/test/java/org/apache/gora/hbase/util/HBaseClusterSingleton.java?rev=1543970&r1=1543969&r2=1543970&view=diff
==
---
gora/branches/GORA_94/gora-hbase/src/test/java/org/apache/gora/hbase/util/HBaseClusterSingleton.java
(original)
+++
gora/branches/GORA_94/gora-hbase/src/test/java/org/apache/gora/hbase/util/HBaseClusterSingleton.java
Wed Nov 20 22:16:02 2013
@@ -85,8 +85,8 @@ public final class HBaseClusterSingleton
htu.getConfigurati
svn commit: r1480112 - /gora/site/trunk/templates/std.html
Author: rmarroquin Date: Tue May 7 21:59:44 2013 New Revision: 1480112 URL: http://svn.apache.org/r1480112 Log: (empty) Modified: gora/site/trunk/templates/std.html Modified: gora/site/trunk/templates/std.html URL: http://svn.apache.org/viewvc/gora/site/trunk/templates/std.html?rev=1480112&r1=1480111&r2=1480112&view=diff == --- gora/site/trunk/templates/std.html (original) +++ gora/site/trunk/templates/std.html Tue May 7 21:59:44 2013 @@ -60,8 +60,6 @@ under the License. - - @@ -70,7 +68,7 @@ under the License. - + Downloads @@ -122,7 +120,6 @@ under the License. -
svn commit: r1480111 - in /gora/site/trunk: content/resources/css/gora.css templates/std.html
Author: rmarroquin
Date: Tue May 7 21:57:09 2013
New Revision: 1480111
URL: http://svn.apache.org/r1480111
Log: (empty)
Modified:
gora/site/trunk/content/resources/css/gora.css
gora/site/trunk/templates/std.html
Modified: gora/site/trunk/content/resources/css/gora.css
URL:
http://svn.apache.org/viewvc/gora/site/trunk/content/resources/css/gora.css?rev=1480111&r1=1480110&r2=1480111&view=diff
==
--- gora/site/trunk/content/resources/css/gora.css (original)
+++ gora/site/trunk/content/resources/css/gora.css Tue May 7 21:57:09 2013
@@ -26,9 +26,3 @@ a {
background-color: #382315;
}
-.navbar .brand {
-max-height: 40px;
-overflow: visible;
-padding-top: 0;
-padding-bottom: 0;
-}
Modified: gora/site/trunk/templates/std.html
URL:
http://svn.apache.org/viewvc/gora/site/trunk/templates/std.html?rev=1480111&r1=1480110&r2=1480111&view=diff
==
--- gora/site/trunk/templates/std.html (original)
+++ gora/site/trunk/templates/std.html Tue May 7 21:57:09 2013
@@ -60,7 +60,9 @@ under the License.
-
+
+
+
@@ -68,7 +70,7 @@ under the License.
-
+
Downloads
@@ -119,8 +121,9 @@ under the License.
+
-
+
{% block content %}{% endblock %}
svn commit: r1480110 - in /gora/site/trunk/content: mailing_lists.md resources/css/gora.css
Author: rmarroquin
Date: Tue May 7 21:52:33 2013
New Revision: 1480110
URL: http://svn.apache.org/r1480110
Log: (empty)
Modified:
gora/site/trunk/content/mailing_lists.md
gora/site/trunk/content/resources/css/gora.css
Modified: gora/site/trunk/content/mailing_lists.md
URL:
http://svn.apache.org/viewvc/gora/site/trunk/content/mailing_lists.md?rev=1480110&r1=1480109&r2=1480110&view=diff
==
--- gora/site/trunk/content/mailing_lists.md (original)
+++ gora/site/trunk/content/mailing_lists.md Tue May 7 21:52:33 2013
@@ -2,13 +2,7 @@ Title: Gora Mailing Lists
##Users
If you use Gora, please subscribe to the Gora user mailing list.
-The Gora user mailing list is :
-[u...@gora.apache.org](mailto:u...@gora.apache.org).
-* [Subscribe to List](mailto:user-subscr...@gora.apache.org)
-* [Unsubscribe from List](mailto:user-unsubscr...@gora.apache.org)
-* [Search List Archive](http://www.mail-archive.com/user%40gora.apache.org/)
-* [View List Archive](http://mail-archives.apache.org/mod_mbox/gora-user/)
-In order to post to the list, it is necessary to first subscribe to it.
+The Gora user mailing list addresses are :
@@ -16,12 +10,12 @@ In order to post to the list, it is nece
Mailing list
Subscribe
Unsubscribe
- List Archive
+ List Archive
- mailto:u...@gora.apache.org";>Subscribe
+ mailto:u...@gora.apache.org";>Users list
mailto:user-subscr...@gora.apache.org";>Subscribe
mailto:user-unsubscr...@gora.apache.org";>Unsubscribe
http://www.mail-archive.com/user%40gora.apache.org/";>Search
@@ -30,16 +24,33 @@ In order to post to the list, it is nece
+In order to post to the list, it is necessary to first subscribe to it.
+
##Developers
If you'd like to contribute to Gora, please subscribe to the
Gora developer mailing list.
-The Gora developer mailing list is :
+The Gora developer mailing list addresses are :
+
+
+
+
+ Mailing list
+ Subscribe
+ Unsubscribe
+ List Archive
+
+
+
+
+ mailto:d...@gora.apache.org";>Dev list
+ mailto:dev-subscr...@gora.apache.org";>Subscribe
+ mailto:dev-unsubscr...@gora.apache.org";>Unsubscribe
+ http://www.mail-archive.com/dev%40gora.apache.org/";>Search
+ http://mail-archives.apache.org/mod_mbox/gora-dev/";>List
+
+
+
-[d...@gora.apache.org](mailto:d...@gora.apache.org).
-* [Subscribe to List](mailto:dev-subscr...@gora.apache.org)
-* [Unsubscribe from List](mailto:dev-unsubscr...@gora.apache.org)
-* [Search List Archive](http://www.mail-archive.com/dev%40gora.apache.org/)
-* [View List Archive](http://mail-archives.apache.org/mod_mbox/gora-dev/)
In order to post to the list, it is necessary to first subscribe to it.
##Developers and Committers
@@ -47,11 +58,26 @@ If you'd like to see changes made in Gor
then please subscribe to the Gora commit's mailing list.
The Gora commit's mailing list is :
-[commits@gora.apache.org](mailto:commits@gora.apache.org).
-* [Subscribe to List](mailto:commits-subscr...@gora.apache.org)
-* [Unsubscribe from List](mailto:commits-unsubscr...@gora.apache.org)
-* [Search List Archive](http://www.mail-archive.com/commits%40gora.apache.org/)
-* [View List Archive](http://mail-archives.apache.org/mod_mbox/gora-commits/)
+
+
+
+ Mailing list
+ Subscribe
+ Unsubscribe
+ List Archive
+
+
+
+
+ mailto:commits@gora.apache.org";>Commits
+ mailto:commits-subscr...@gora.apache.org";>Subscribe
+ mailto:commits-unsubscr...@gora.apache.org";>Unsubscribe
+ http://www.mail-archive.com/commits%40gora.apache.org/";>Search
+ http://mail-archives.apache.org/mod_mbox/gora-commits/";>List
+
+
+
+
In order to post to the list, it is necessary to first subscribe to it.
Modified: gora/site/trunk/content/resources/css/gora.css
URL:
http://svn.apache.org/viewvc/gora/site/trunk/content/resources/css/gora.css?rev=1480110&r1=1480109&r2=1480110&view=diff
==
--- gora/site/trunk/content/resources/css/gora.css (original)
+++ gora/site/trunk/content/resources/css/gora.css Tue May 7 21:52:33 2013
@@ -26,3 +26,9 @@ a {
background-color: #382315;
}
+.navbar .brand {
+max-height: 40px;
+overflow: visible;
+padding-top: 0;
+padding-bottom: 0;
+}
svn commit: r1480097 - /gora/site/trunk/content/mailing_lists.md
Author: rmarroquin Date: Tue May 7 21:40:29 2013 New Revision: 1480097 URL: http://svn.apache.org/r1480097 Log: (empty) Modified: gora/site/trunk/content/mailing_lists.md Modified: gora/site/trunk/content/mailing_lists.md URL: http://svn.apache.org/viewvc/gora/site/trunk/content/mailing_lists.md?rev=1480097&r1=1480096&r2=1480097&view=diff == --- gora/site/trunk/content/mailing_lists.md (original) +++ gora/site/trunk/content/mailing_lists.md Tue May 7 21:40:29 2013 @@ -10,6 +10,26 @@ The Gora user mailing list is : * [View List Archive](http://mail-archives.apache.org/mod_mbox/gora-user/) In order to post to the list, it is necessary to first subscribe to it. + + + + Mailing list + Subscribe + Unsubscribe + List Archive + + + + + mailto:u...@gora.apache.org";>Subscribe + mailto:user-subscr...@gora.apache.org";>Subscribe + mailto:user-unsubscr...@gora.apache.org";>Unsubscribe + http://www.mail-archive.com/user%40gora.apache.org/";>Search + http://mail-archives.apache.org/mod_mbox/gora-user/";>List + + + + ##Developers If you'd like to contribute to Gora, please subscribe to the Gora developer mailing list. @@ -26,6 +46,7 @@ In order to post to the list, it is nece If you'd like to see changes made in Gora's [version control system](/version_control.html) then please subscribe to the Gora commit's mailing list. The Gora commit's mailing list is : + [commits@gora.apache.org](mailto:commits@gora.apache.org). * [Subscribe to List](mailto:commits-subscr...@gora.apache.org) * [Unsubscribe from List](mailto:commits-unsubscr...@gora.apache.org) @@ -34,30 +55,4 @@ The Gora commit's mailing list is : In order to post to the list, it is necessary to first subscribe to it. - - - - Name - Subscribe - Unsubscribe - Post - Archive - - - - - User List - mailto:drill-user-subscr...@incubator.apache.org";>Subscribe - mailto:drill-user-unsubscr...@incubator.apache.org";>Unsubscribe - mailto:drill-u...@incubator.apache.org";>Post - http://mail-archives.apache.org/mod_mbox/incubator-drill-user/";>mail-archives.apache.org - - - Developer List - mailto:drill-dev-subscr...@incubator.apache.org";>Subscribe - mailto:drill-dev-unsubscr...@incubator.apache.org";>Unsubscribe - mailto:drill-...@incubator.apache.org";>Post - http://mail-archives.apache.org/mod_mbox/incubator-drill-dev/";>mail-archives.apache.org - - - +
svn commit: r1480095 - in /gora/site/trunk/content: credits.md mailing_lists.md
Author: rmarroquin
Date: Tue May 7 21:35:16 2013
New Revision: 1480095
URL: http://svn.apache.org/r1480095
Log: (empty)
Modified:
gora/site/trunk/content/credits.md
gora/site/trunk/content/mailing_lists.md
Modified: gora/site/trunk/content/credits.md
URL:
http://svn.apache.org/viewvc/gora/site/trunk/content/credits.md?rev=1480095&r1=1480094&r2=1480095&view=diff
==
--- gora/site/trunk/content/credits.md (original)
+++ gora/site/trunk/content/credits.md Tue May 7 21:35:16 2013
@@ -47,17 +47,3 @@ Other Gora contributors and their contri
##How to contribute
There are lots of ways you can contribute to Gora. Make sure you check them
all [here](./contribute.html).
-
-{| border="1" class="wikitable"
-|+ The table's caption
-! Column heading 1
-! Column heading 2
-! Column heading 3
-|-
-! Row heading 1
-| Cell 2 || Cell 3
-|-
-! Row heading A
-| Cell B
-| Cell C
-|}
Modified: gora/site/trunk/content/mailing_lists.md
URL:
http://svn.apache.org/viewvc/gora/site/trunk/content/mailing_lists.md?rev=1480095&r1=1480094&r2=1480095&view=diff
==
--- gora/site/trunk/content/mailing_lists.md (original)
+++ gora/site/trunk/content/mailing_lists.md Tue May 7 21:35:16 2013
@@ -14,6 +14,7 @@ In order to post to the list, it is nece
If you'd like to contribute to Gora, please subscribe to the
Gora developer mailing list.
The Gora developer mailing list is :
+
[d...@gora.apache.org](mailto:d...@gora.apache.org).
* [Subscribe to List](mailto:dev-subscr...@gora.apache.org)
* [Unsubscribe from List](mailto:dev-unsubscr...@gora.apache.org)
@@ -32,3 +33,31 @@ The Gora commit's mailing list is :
* [View List Archive](http://mail-archives.apache.org/mod_mbox/gora-commits/)
In order to post to the list, it is necessary to first subscribe to it.
+
+
+
+
+ Name
+ Subscribe
+ Unsubscribe
+ Post
+ Archive
+
+
+
+
+ User List
+ mailto:drill-user-subscr...@incubator.apache.org";>Subscribe
+ mailto:drill-user-unsubscr...@incubator.apache.org";>Unsubscribe
+ mailto:drill-u...@incubator.apache.org";>Post
+ http://mail-archives.apache.org/mod_mbox/incubator-drill-user/";>mail-archives.apache.org
+
+
+ Developer List
+ mailto:drill-dev-subscr...@incubator.apache.org";>Subscribe
+ mailto:drill-dev-unsubscr...@incubator.apache.org";>Unsubscribe
+ mailto:drill-...@incubator.apache.org";>Post
+ http://mail-archives.apache.org/mod_mbox/incubator-drill-dev/";>mail-archives.apache.org
+
+
+
svn commit: r1480083 - /gora/site/trunk/templates/std.html
Author: rmarroquin Date: Tue May 7 21:13:42 2013 New Revision: 1480083 URL: http://svn.apache.org/r1480083 Log: Fixing the header Modified: gora/site/trunk/templates/std.html Modified: gora/site/trunk/templates/std.html URL: http://svn.apache.org/viewvc/gora/site/trunk/templates/std.html?rev=1480083&r1=1480082&r2=1480083&view=diff == --- gora/site/trunk/templates/std.html (original) +++ gora/site/trunk/templates/std.html Tue May 7 21:13:42 2013 @@ -68,7 +68,7 @@ under the License. - + Downloads
svn commit: r1480078 - /gora/site/trunk/templates/std.html
Author: rmarroquin Date: Tue May 7 21:09:16 2013 New Revision: 1480078 URL: http://svn.apache.org/r1480078 Log: Fixing the header Modified: gora/site/trunk/templates/std.html Modified: gora/site/trunk/templates/std.html URL: http://svn.apache.org/viewvc/gora/site/trunk/templates/std.html?rev=1480078&r1=1480077&r2=1480078&view=diff == --- gora/site/trunk/templates/std.html (original) +++ gora/site/trunk/templates/std.html Tue May 7 21:09:16 2013 @@ -68,7 +68,7 @@ under the License. - + Downloads
svn commit: r1479468 - in /gora/oldsite: author/src/documentation/content/xdocs/credits.xml publish/credits.html
Author: rmarroquin
Date: Mon May 6 05:26:38 2013
New Revision: 1479468
URL: http://svn.apache.org/r1479468
Log:
Adding updates to the contributors page
Modified:
gora/oldsite/author/src/documentation/content/xdocs/credits.xml
gora/oldsite/publish/credits.html
Modified: gora/oldsite/author/src/documentation/content/xdocs/credits.xml
URL:
http://svn.apache.org/viewvc/gora/oldsite/author/src/documentation/content/xdocs/credits.xml?rev=1479468&r1=1479467&r2=1479468&view=diff
==
--- gora/oldsite/author/src/documentation/content/xdocs/credits.xml (original)
+++ gora/oldsite/author/src/documentation/content/xdocs/credits.xml Mon May 6
05:26:38 2013
@@ -140,6 +140,14 @@
+ rmarroquin
+Renato Marroquin M.
+ rmarroquin [at] apache.org
+UCSP
+-5
+
+
+
sertan
Sertan Alkan
sertan [at] apache.org
Modified: gora/oldsite/publish/credits.html
URL:
http://svn.apache.org/viewvc/gora/oldsite/publish/credits.html?rev=1479468&r1=1479467&r2=1479468&view=diff
==
--- gora/oldsite/publish/credits.html (original)
+++ gora/oldsite/publish/credits.html Mon May 6 05:26:38 2013
@@ -3,7 +3,7 @@
-
+
Gora Credits
@@ -365,6 +365,17 @@ document.write("Last Published: " + docu
+rmarroquin
+Renato Marroquin M.
+rmarroquin [at] apache.org
+UCSP
+-5
+
+
+
+
+
+
sertan
Sertan Alkan
sertan [at] apache.org
svn commit: r1477735 - in /gora/branches/GORA_174: gora-cassandra/src/main/java/org/apache/gora/cassandra/query/ gora-cassandra/src/main/java/org/apache/gora/cassandra/serializers/ gora-cassandra/src/
Author: rmarroquin
Date: Tue Apr 30 17:45:09 2013
New Revision: 1477735
URL: http://svn.apache.org/r1477735
Log:
Committing GORA-206. Step towards putting an end to GORA-174
Modified:
gora/branches/GORA_174/gora-cassandra/src/main/java/org/apache/gora/cassandra/query/CassandraColumn.java
gora/branches/GORA_174/gora-cassandra/src/main/java/org/apache/gora/cassandra/query/CassandraResult.java
gora/branches/GORA_174/gora-cassandra/src/main/java/org/apache/gora/cassandra/query/CassandraRow.java
gora/branches/GORA_174/gora-cassandra/src/main/java/org/apache/gora/cassandra/query/CassandraSubColumn.java
gora/branches/GORA_174/gora-cassandra/src/main/java/org/apache/gora/cassandra/serializers/GoraSerializerTypeInferer.java
gora/branches/GORA_174/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraClient.java
gora/branches/GORA_174/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraMapping.java
gora/branches/GORA_174/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraMappingManager.java
gora/branches/GORA_174/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraStore.java
gora/branches/GORA_174/gora-cassandra/src/test/conf/gora-cassandra-mapping.xml
gora/branches/GORA_174/gora-cassandra/src/test/java/org/apache/gora/cassandra/store/TestCassandraStore.java
gora/branches/GORA_174/gora-core/src/examples/avro/employee.json
Modified:
gora/branches/GORA_174/gora-cassandra/src/main/java/org/apache/gora/cassandra/query/CassandraColumn.java
URL:
http://svn.apache.org/viewvc/gora/branches/GORA_174/gora-cassandra/src/main/java/org/apache/gora/cassandra/query/CassandraColumn.java?rev=1477735&r1=1477734&r2=1477735&view=diff
==
---
gora/branches/GORA_174/gora-cassandra/src/main/java/org/apache/gora/cassandra/query/CassandraColumn.java
(original)
+++
gora/branches/GORA_174/gora-cassandra/src/main/java/org/apache/gora/cassandra/query/CassandraColumn.java
Tue Apr 30 17:45:09 2013
@@ -24,7 +24,6 @@ import me.prettyprint.hector.api.Seriali
import org.apache.avro.Schema;
import org.apache.avro.Schema.Field;
-import org.apache.avro.Schema.Type;
import org.apache.gora.cassandra.serializers.GoraSerializerTypeInferer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -41,6 +40,15 @@ public abstract class CassandraColumn {
private String family;
private int type;
private Field field;
+ private int unionType;
+
+ public void setUnionType(int pUnionType){
+this.unionType = pUnionType;
+ }
+
+ public int getUnionType(){
+return unionType;
+ }
public String getFamily() {
return family;
@@ -67,7 +75,7 @@ public abstract class CassandraColumn {
protected Object fromByteBuffer(Schema schema, ByteBuffer byteBuffer) {
Object value = null;
-Serializer serializer = GoraSerializerTypeInferer.getSerializer(schema);
+Serializer serializer = GoraSerializerTypeInferer.getSerializer(schema);
if (serializer == null) {
LOG.info("Schema is not supported: " + schema.toString());
} else {
Modified:
gora/branches/GORA_174/gora-cassandra/src/main/java/org/apache/gora/cassandra/query/CassandraResult.java
URL:
http://svn.apache.org/viewvc/gora/branches/GORA_174/gora-cassandra/src/main/java/org/apache/gora/cassandra/query/CassandraResult.java?rev=1477735&r1=1477734&r2=1477735&view=diff
==
---
gora/branches/GORA_174/gora-cassandra/src/main/java/org/apache/gora/cassandra/query/CassandraResult.java
(original)
+++
gora/branches/GORA_174/gora-cassandra/src/main/java/org/apache/gora/cassandra/query/CassandraResult.java
Tue Apr 30 17:45:09 2013
@@ -26,7 +26,8 @@ import me.prettyprint.cassandra.serializ
import org.apache.avro.Schema;
import org.apache.avro.Schema.Field;
-import org.apache.avro.specific.SpecificFixed;
+import org.apache.avro.Schema.Type;
+import org.apache.gora.cassandra.store.CassandraStore;
import org.apache.gora.persistency.impl.PersistentBase;
import org.apache.gora.query.Query;
import org.apache.gora.query.impl.ResultBase;
@@ -58,6 +59,25 @@ public class CassandraResult pTypes){
+int iCnt = 0;
+for (Schema sch : pTypes)
+ if (!sch.getName().equals("null"))
+return iCnt;
+ else
+iCnt++;
+return CassandraStore.DEFAULT_UNION_SCHEMA;
+ }
+
@Override
public void close() throws IOException {
// TODO Auto-generated method stub
Modified:
gora/branches/GORA_174/gora-cassandra/src/main/java/org/apache/gora/cassandra/query/CassandraRow.java
URL:
http://svn.apache.org/viewvc/gora/branches/GORA_174/gora-cassandra/src/main/java/org/apache/gora/cassandra/query/CassandraRow.java?rev=1477735&r1=1477734&r2=1477735&view=diff
==
svn commit: r1426357 - in /gora/trunk/gora-dynamodb/src: examples/java/org/apache/gora/examples/generated/ main/java/org/apache/gora/dynamodb/compiler/ main/java/org/apache/gora/dynamodb/query/ main/j
Author: rmarroquin
Date: Thu Dec 27 22:54:54 2012
New Revision: 1426357
URL: http://svn.apache.org/viewvc?rev=1426357&view=rev
Log:
Fixing tabs used.
Modified:
gora/trunk/gora-dynamodb/src/examples/java/org/apache/gora/examples/generated/person.java
gora/trunk/gora-dynamodb/src/main/java/org/apache/gora/dynamodb/compiler/GoraDynamoDBCompiler.java
gora/trunk/gora-dynamodb/src/main/java/org/apache/gora/dynamodb/query/DynamoDBQuery.java
gora/trunk/gora-dynamodb/src/main/java/org/apache/gora/dynamodb/store/DynamoDBMapping.java
gora/trunk/gora-dynamodb/src/main/java/org/apache/gora/dynamodb/store/DynamoDBStore.java
gora/trunk/gora-dynamodb/src/test/java/org/apache/gora/dynamodb/GoraDynamoDBTestDriver.java
Modified:
gora/trunk/gora-dynamodb/src/examples/java/org/apache/gora/examples/generated/person.java
URL:
http://svn.apache.org/viewvc/gora/trunk/gora-dynamodb/src/examples/java/org/apache/gora/examples/generated/person.java?rev=1426357&r1=1426356&r2=1426357&view=diff
==
---
gora/trunk/gora-dynamodb/src/examples/java/org/apache/gora/examples/generated/person.java
(original)
+++
gora/trunk/gora-dynamodb/src/examples/java/org/apache/gora/examples/generated/person.java
Thu Dec 27 22:54:54 2012
@@ -49,19 +49,19 @@ public class person implements Persisten
@Override
public String[] getFields() { return null; }
@Override
-public String getField(int index) {return null; }
+public String getField(int index) { return null; }
@Override
public int getFieldIndex(String field) { return 0; }
@Override
public void clear() { }
@Override
-public person clone() {return null; }
+public person clone() { return null; }
@Override
public boolean isNew() { return false; }
@Override
public void setNew() { }
@Override
-public void clearNew() { }
+public void clearNew() { }
@Override
public boolean isDirty() { return false; }
@Override
@@ -81,7 +81,7 @@ public class person implements Persisten
@Override
public void clearDirty() { }
@Override
-public boolean isReadable(int fieldIndex) {return false; }
+public boolean isReadable(int fieldIndex) { return false; }
@Override
public boolean isReadable(String field) { return false; }
@Override
Modified:
gora/trunk/gora-dynamodb/src/main/java/org/apache/gora/dynamodb/compiler/GoraDynamoDBCompiler.java
URL:
http://svn.apache.org/viewvc/gora/trunk/gora-dynamodb/src/main/java/org/apache/gora/dynamodb/compiler/GoraDynamoDBCompiler.java?rev=1426357&r1=1426356&r2=1426357&view=diff
==
---
gora/trunk/gora-dynamodb/src/main/java/org/apache/gora/dynamodb/compiler/GoraDynamoDBCompiler.java
(original)
+++
gora/trunk/gora-dynamodb/src/main/java/org/apache/gora/dynamodb/compiler/GoraDynamoDBCompiler.java
Thu Dec 27 22:54:54 2012
@@ -53,7 +53,7 @@ public class GoraDynamoDBCompiler {
GoraDynamoDBCompiler compiler = new GoraDynamoDBCompiler(dest);
DynamoDBMapping dynamoDBMap = compiler.readMapping(src);
if (dynamoDBMap.getTables().isEmpty()) throw new
IllegalStateException("There are not tables defined.");
-
+
for(String tableName : dynamoDBMap.getTables().keySet()){
compiler.compile(tableName, dynamoDBMap.getKeySchema(tableName),
dynamoDBMap.getItems(tableName));
}
@@ -61,9 +61,9 @@ public class GoraDynamoDBCompiler {
/**
* Method in charge of compiling a specific table using a key schema and a
set of attributes
- * @param pTableName Table name
- * @param pKeySchema Key schema used
- * @param pItems List of items belonging to a specific table
+ * @param pTableNameTable name
+ * @param pKeySchemaKey schema used
+ * @param pItemsList of items belonging to a specific table
*/
private void compile(String pTableName, KeySchema pKeySchema,
List> pItems){
// TODO define where the generated will go
@@ -88,8 +88,8 @@ public class GoraDynamoDBCompiler {
/**
* Receives a list of all items and creates getters and setters for them
- * @param pItems The items belonging to the table
- * @param pIden The number of spaces used for identation
+ * @param pItemsThe items belonging to the table
+ * @param pIdenThe number of spaces used for identation
* @throws IOException
*/
private void setItems(List> pItems, int pIden) throws
IOException{
@@ -111,9 +111,9 @@ public class GoraDynamoDBCompiler {
/**
* Creates item getters and setters
- * @param pItemName Item's name
- * @param pItemType Item's type
- * @param pIden Number of spaces used for indentation
+ * @param pItemNameItem's name
+ * @param pItemTypeItem's type
+ * @param pIdenNumber of spaces
svn commit: r1426340 - in /gora/trunk/gora-core/src/main/java/org/apache/gora: compiler/GoraCompiler.java util/LicenseHeaders.java util/TimingUtil.java
Author: rmarroquin
Date: Thu Dec 27 22:01:01 2012
New Revision: 1426340
URL: http://svn.apache.org/viewvc?rev=1426340&view=rev
Log:
Adding new features to help GoraCompiler provide new licenses.
Added:
gora/trunk/gora-core/src/main/java/org/apache/gora/util/LicenseHeaders.java
gora/trunk/gora-core/src/main/java/org/apache/gora/util/TimingUtil.java
Modified:
gora/trunk/gora-core/src/main/java/org/apache/gora/compiler/GoraCompiler.java
Modified:
gora/trunk/gora-core/src/main/java/org/apache/gora/compiler/GoraCompiler.java
URL:
http://svn.apache.org/viewvc/gora/trunk/gora-core/src/main/java/org/apache/gora/compiler/GoraCompiler.java?rev=1426340&r1=1426339&r2=1426340&view=diff
==
---
gora/trunk/gora-core/src/main/java/org/apache/gora/compiler/GoraCompiler.java
(original)
+++
gora/trunk/gora-core/src/main/java/org/apache/gora/compiler/GoraCompiler.java
Thu Dec 27 22:01:01 2012
@@ -22,6 +22,7 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStreamWriter;
import java.io.Writer;
+import java.text.SimpleDateFormat;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
@@ -32,28 +33,37 @@ import org.apache.avro.Schema;
import org.apache.avro.Protocol.Message;
import org.apache.avro.Schema.Field;
import org.apache.avro.specific.SpecificData;
+import org.apache.gora.util.LicenseHeaders;
+import org.apache.gora.util.TimingUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-/** Generate specific Java interfaces and classes for protocols and schemas. */
+/** Generate specific Java interfaces and classes for protocols and schemas.
+ * GoraCompiler takes its inspiration from, and is largely based on Avro's
{@link SpecificCompiler}.
+ */
public class GoraCompiler {
private File dest;
private Writer out;
private Set queue = new HashSet();
private static final Logger log =
LoggerFactory.getLogger(GoraCompiler.class);
+ private static LicenseHeaders licenseHeader = new LicenseHeaders(null);
private GoraCompiler(File dest) {
this.dest = dest; // root directory for output
}
-
+
/** Generates Java interface and classes for a protocol.
* @param src the source Avro protocol file
* @param dest the directory to place generated files in
*/
public static void compileProtocol(File src, File dest) throws IOException {
+log.info("Compiling Protocol: " + src + " to: " + dest);
+if(licenseHeader != null) {
+ log.info("The generated file will be " + licenseHeader.getLicenseName()
+ " licensed.");
+}
GoraCompiler compiler = new GoraCompiler(dest);
Protocol protocol = Protocol.parse(src);
-for (Schema s : protocol.getTypes()) // enqueue types
+for (Schema s : protocol.getTypes()) // enqueue types
compiler.enqueue(s);
compiler.compileInterface(protocol); // generate interface
compiler.compile(); // generate classes for types
@@ -61,7 +71,10 @@ public class GoraCompiler {
/** Generates Java classes for a schema. */
public static void compileSchema(File src, File dest) throws IOException {
- log.info("Compiling " + src + " to " + dest );
+log.info("Compiling Schema: " + src + " to: " + dest);
+if(licenseHeader != null) {
+ log.info("The generated artifact will be " +
licenseHeader.getLicenseName() + " licensed.");
+}
GoraCompiler compiler = new GoraCompiler(dest);
compiler.enqueue(Schema.parse(src)); // enqueue types
compiler.compile(); // generate classes for types
@@ -158,6 +171,9 @@ public class GoraCompiler {
}
private void header(String namespace) throws IOException {
+if (licenseHeader != null) {
+ line(0, licenseHeader.getLicense());
+}
if(namespace != null) {
line(0, "package "+namespace+";\n");
}
@@ -445,13 +461,45 @@ public class GoraCompiler {
private static String esc(Object o) {
return o.toString().replace("\"", "\\\"");
}
-
+
+ /**
+ * The main method used to invoke the GoraCompiler. It accepts an input
(JSON) avsc
+ * schema file, the target output directory and an optional parameter
defining the
+ * license header to be used when compiling the avsc into the generated
class.
+ * If no license is explicitely defined, an ASFv2.0 license header is
attributed
+ * to all generated files by default.
+ */
public static void main(String[] args) throws Exception {
if (args.length < 2) {
- System.err.println("Usage: Compiler ");
+ System.err.println("Usage: GoraCompiler
[-license ]");
+ System.err.println("
svn commit: r1403993 [2/2] - in /gora/branches/goraamazon: gora-accumulo/src/main/java/org/apache/gora/accumulo/store/ gora-cassandra/src/main/java/org/apache/gora/cassandra/store/ gora-core/src/main/
Modified:
gora/branches/goraamazon/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java
URL:
http://svn.apache.org/viewvc/gora/branches/goraamazon/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java?rev=1403993&r1=1403992&r2=1403993&view=diff
==
---
gora/branches/goraamazon/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java
(original)
+++
gora/branches/goraamazon/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java
Wed Oct 31 05:53:43 2012
@@ -46,7 +46,6 @@ import org.apache.gora.hbase.query.HBase
import org.apache.gora.hbase.store.HBaseMapping.HBaseMappingBuilder;
import org.apache.gora.hbase.util.HBaseByteInterface;
import org.apache.gora.persistency.ListGenericArray;
-import org.apache.gora.persistency.Persistent;
import org.apache.gora.persistency.State;
import org.apache.gora.persistency.StateManager;
import org.apache.gora.persistency.StatefulHashMap;
@@ -102,35 +101,42 @@ implements Configurable {
@Override
public void initialize(Class keyClass, Class persistentClass,
- Properties properties) throws IOException {
-super.initialize(keyClass, persistentClass, properties);
-this.conf = HBaseConfiguration.create(getConf());
-
-admin = new HBaseAdmin(this.conf);
-
+ Properties properties) {
try {
+
+ super.initialize(keyClass, persistentClass, properties);
+ this.conf = HBaseConfiguration.create(getConf());
+ admin = new HBaseAdmin(this.conf);
mapping = readMapping(getConf().get(PARSE_MAPPING_FILE_KEY,
DEFAULT_MAPPING_FILE));
+
} catch (FileNotFoundException ex) {
try {
mapping = readMapping(getConf().get(PARSE_MAPPING_FILE_KEY,
DEPRECATED_MAPPING_FILE));
LOG.warn(DEPRECATED_MAPPING_FILE + " is deprecated, please rename the
file to "
+ DEFAULT_MAPPING_FILE);
} catch (FileNotFoundException ex1) {
-throw ex; //throw the original exception
+ LOG.error(ex1.getMessage());
+ LOG.error(ex1.getStackTrace().toString());
+ //throw (ex1); //throw the original exception
} catch (Exception ex1) {
LOG.warn(DEPRECATED_MAPPING_FILE + " is deprecated, please rename the
file to "
+ DEFAULT_MAPPING_FILE);
throw new RuntimeException(ex1);
- }
+ }
} catch (Exception e) {
throw new RuntimeException(e);
}
+
if(autoCreateSchema) {
createSchema();
}
-
-boolean autoflush = this.conf.getBoolean("hbase.client.autoflush.default",
false);
-table = new HBaseTableConnection(getConf(), getSchemaName(), autoflush);
+try{
+ boolean autoflush =
this.conf.getBoolean("hbase.client.autoflush.default", false);
+ table = new HBaseTableConnection(getConf(), getSchemaName(), autoflush);
+} catch(IOException ex2){
+ LOG.error(ex2.getMessage());
+ LOG.error(ex2.getStackTrace().toString());
+}
}
@Override
@@ -140,109 +146,136 @@ implements Configurable {
}
@Override
- public void createSchema() throws IOException {
-if(schemaExists()) {
- return;
+ public void createSchema() {
+try{
+ if(schemaExists()) {
+return;
+ }
+ HTableDescriptor tableDesc = mapping.getTable();
+
+ admin.createTable(tableDesc);
+} catch(IOException ex2){
+ LOG.error(ex2.getMessage());
+ LOG.error(ex2.getStackTrace().toString());
}
-HTableDescriptor tableDesc = mapping.getTable();
-
-admin.createTable(tableDesc);
}
@Override
- public void deleteSchema() throws IOException {
-if(!schemaExists()) {
- return;
+ public void deleteSchema() {
+try{
+ if(!schemaExists()) {
+return;
+ }
+ admin.disableTable(getSchemaName());
+ admin.deleteTable(getSchemaName());
+} catch(IOException ex2){
+ LOG.error(ex2.getMessage());
+ LOG.error(ex2.getStackTrace().toString());
}
-admin.disableTable(getSchemaName());
-admin.deleteTable(getSchemaName());
}
@Override
- public boolean schemaExists() throws IOException {
-return admin.tableExists(mapping.getTableName());
+ public boolean schemaExists() {
+try{
+ return admin.tableExists(mapping.getTableName());
+} catch(IOException ex2){
+ LOG.error(ex2.getMessage());
+ LOG.error(ex2.getStackTrace().toString());
+ return false;
+}
}
@Override
- public T get(K key, String[] fields) throws IOException {
-fields = getFieldsToQuery(fields);
-Get get = new Get(toBytes(key));
-addFields(get, fields);
-Result result = table.get(get);
-return newInstance(result, fields);
+ public T get(K key, String[] fields) {
+try{
+ fields = getFieldsToQuery(fields);
+ Get get = new Get(toBytes(key));
+ addFields(get, fields);
+ Result result = table.get(get);
+ return newIns
svn commit: r1400478 - /gora/trunk/pom.xml
Author: rmarroquin
Date: Sat Oct 20 15:51:03 2012
New Revision: 1400478
URL: http://svn.apache.org/viewvc?rev=1400478&view=rev
Log:
Commit to update pom.xml
Modified:
gora/trunk/pom.xml
Modified: gora/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/gora/trunk/pom.xml?rev=1400478&r1=1400477&r2=1400478&view=diff
==
--- gora/trunk/pom.xml (original)
+++ gora/trunk/pom.xml Sat Oct 20 15:51:03 2012
@@ -176,6 +176,15 @@
PMC Member
+
+ rmarroquin
+ Renato Marroquin
+ rmarroquin [at] apache [dot] org
+
+Committer
+PMC Member
+
+
