gora-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djkevi...@apache.org
Subject [4/5] gora git commit: Resolve conflicts with master
Date Sun, 10 Sep 2017 20:38:51 GMT
Resolve conflicts with master


Project: http://git-wip-us.apache.org/repos/asf/gora/repo
Commit: http://git-wip-us.apache.org/repos/asf/gora/commit/f6317e44
Tree: http://git-wip-us.apache.org/repos/asf/gora/tree/f6317e44
Diff: http://git-wip-us.apache.org/repos/asf/gora/diff/f6317e44

Branch: refs/heads/master
Commit: f6317e44558135dcbb58b188900019fe21e4eea6
Parents: 2303e85 7a0174f
Author: Kevin Ratnasekera <djkevincr@yahoo.com>
Authored: Mon Sep 11 01:08:43 2017 +0530
Committer: Kevin Ratnasekera <djkevincr@yahoo.com>
Committed: Mon Sep 11 01:08:43 2017 +0530

----------------------------------------------------------------------
 .gitignore                                      |    1 +
 bin/gora                                        |    5 +
 gora-aerospike/pom.xml                          |  173 ++
 .../org/apache/gora/aerospike/package-info.java |   20 +
 .../gora/aerospike/query/AerospikeQuery.java    |   35 +
 .../aerospike/query/AerospikeQueryResult.java   |   88 +
 .../aerospike/query/AerospikeResultRecord.java  |   52 +
 .../gora/aerospike/store/AerospikeMapping.java  |   88 +
 .../store/AerospikeMappingBuilder.java          |  392 +++++
 .../aerospike/store/AerospikeParameters.java    |  198 +++
 .../aerospike/store/AerospikePolicyConst.java   |   54 +
 .../gora/aerospike/store/AerospikeStore.java    |  618 +++++++
 .../gora/aerospike/store/package-info.java      |   20 +
 .../src/test/conf/gora-aerospike-mapping.xml    |   49 +
 gora-aerospike/src/test/conf/gora.properties    |   18 +
 gora-aerospike/src/test/conf/log4j.properties   |   22 +
 .../gora/aerospike/GoraAerospikeTestDriver.java |   76 +
 .../mapreduce/TestAerospikeStoreCountQuery.java |   68 +
 ...estAerospikeStoreMapReduceSerialization.java |   69 +
 .../mapreduce/TestAerospikeStoreWordCount.java  |   74 +
 .../gora/aerospike/mapreduce/package-info.java  |   21 +
 .../org/apache/gora/aerospike/package-info.java |   17 +
 .../store/AerospikeStartupLogWaitStrategy.java  |   53 +
 .../aerospike/store/TestAerospikeStore.java     |  167 ++
 .../gora/aerospike/store/package-info.java      |   21 +
 gora-cassandra/conf/.gitignore                  |   15 -
 gora-cassandra/pom.xml                          |  163 +-
 .../src/examples/avro/cassandraKey.json         |   22 +
 .../src/examples/avro/cassandraRecord.json      |  107 ++
 gora-cassandra/src/examples/java/.gitignore     |   15 -
 .../AvroSerialization/CassandraKey.java         |  472 +++++
 .../AvroSerialization/CassandraRecord.java      | 1648 ++++++++++++++++++
 .../nativeSerialization/ComplexTypes.java       |  199 +++
 .../generated/nativeSerialization/Customer.java |   75 +
 .../generated/nativeSerialization/Document.java |  136 ++
 .../generated/nativeSerialization/User.java     |  159 ++
 .../gora/cassandra/bean/CassandraKey.java       |   91 +
 .../gora/cassandra/bean/ClusterKeyField.java    |   54 +
 .../org/apache/gora/cassandra/bean/Field.java   |   70 +
 .../apache/gora/cassandra/bean/KeySpace.java    |   84 +
 .../gora/cassandra/bean/PartitionKeyField.java  |   50 +
 .../compiler/GoraCassandraNativeCompiler.java   |  326 ++++
 .../org/apache/gora/cassandra/package-info.java |    7 +-
 .../gora/cassandra/query/CassandraColumn.java   |   97 --
 .../gora/cassandra/query/CassandraQuery.java    |  111 +-
 .../gora/cassandra/query/CassandraResult.java   |  194 ---
 .../cassandra/query/CassandraResultSet.java     |  102 +-
 .../gora/cassandra/query/CassandraRow.java      |   58 -
 .../cassandra/query/CassandraSubColumn.java     |  111 --
 .../cassandra/query/CassandraSuperColumn.java   |  197 ---
 .../gora/cassandra/query/package-info.java      |    7 +-
 .../serializers/AvroCassandraUtils.java         |  354 ++++
 .../cassandra/serializers/AvroSerializer.java   |  446 +++++
 .../serializers/AvroSerializerUtil.java         |   94 -
 .../serializers/CassandraQueryFactory.java      |  836 +++++++++
 .../serializers/CassandraSerializer.java        |  225 +++
 .../serializers/CharSequenceSerializer.java     |   64 -
 .../serializers/GoraSerializerTypeInferer.java  |  230 ---
 .../cassandra/serializers/ListSerializer.java   |  193 --
 .../cassandra/serializers/MapSerializer.java    |  223 ---
 .../cassandra/serializers/NativeSerializer.java |  243 +++
 .../serializers/SpecificFixedSerializer.java    |  119 --
 .../gora/cassandra/serializers/TypeUtils.java   |  232 ---
 .../cassandra/serializers/package-info.java     |    7 +-
 .../gora/cassandra/store/CassandraClient.java   | 1029 +++++------
 .../gora/cassandra/store/CassandraMapping.java  |  427 ++---
 .../store/CassandraMappingBuilder.java          |  321 ++++
 .../store/CassandraMappingManager.java          |  158 --
 .../gora/cassandra/store/CassandraStore.java    |  776 +++------
 .../store/CassandraStoreParameters.java         |  236 +++
 .../gora/cassandra/store/HectorUtils.java       |  117 --
 .../gora/cassandra/store/package-info.java      |    7 +-
 .../test/conf/avro/gora-cassandra-mapping.xml   |   50 +
 .../conf/avroUDT/gora-cassandra-mapping.xml     |   50 +
 gora-cassandra/src/test/conf/cassandra.yaml     | 1248 ++++++++++---
 .../compositeKey/gora-cassandra-mapping.xml     |   54 +
 .../src/test/conf/gora-cassandra-mapping.xml    |   95 -
 gora-cassandra/src/test/conf/gora.properties    |   45 +-
 .../src/test/conf/log4j-server.properties       |   38 +-
 .../conf/nativeSerialization/custom-codecs.xml  |   24 +
 .../gora-cassandra-mapping.xml                  |   45 +
 .../conf/nativeSerialization/gora.properties    |   19 +
 .../conf/nativeUDT/gora-cassandra-mapping.xml   |   32 +
 gora-cassandra/src/test/java/.gitignore         |   15 -
 .../gora/cassandra/GoraCassandraTestDriver.java |  163 +-
 .../org/apache/gora/cassandra/package-info.java |   26 +-
 .../store/TestAvroSerializationWithUDT.java     |   96 +
 .../cassandra/store/TestCassandraStore.java     |  196 ++-
 .../TestCassandraStoreWithCassandraKey.java     |  331 ++++
 ...stCassandraStoreWithNativeSerialization.java |  305 ++++
 .../store/TestNativeSerializationWithUDT.java   |   87 +
 .../nativeSerialization/DateAsStringCodec.java  |   50 +
 .../org/apache/gora/avro/store/AvroStore.java   |   33 +-
 .../java/org/apache/gora/filter/Filter.java     |    7 +-
 .../java/org/apache/gora/filter/FilterList.java |    3 -
 .../apache/gora/filter/MapFieldValueFilter.java |    3 -
 .../gora/filter/SingleFieldValueFilter.java     |    3 -
 .../apache/gora/mapreduce/GoraInputFormat.java  |   12 +-
 .../org/apache/gora/mapreduce/GoraMapper.java   |   50 +-
 .../apache/gora/mapreduce/GoraOutputFormat.java |    8 +-
 .../org/apache/gora/mapreduce/GoraReducer.java  |   24 +-
 .../gora/mapreduce/PersistentSerializer.java    |    4 +-
 .../apache/gora/persistency/BeanFactory.java    |    8 +-
 .../gora/persistency/impl/BeanFactoryImpl.java  |   10 +-
 .../persistency/ws/impl/BeanFactoryWSImpl.java  |    9 +-
 .../persistency/ws/impl/PersistentWSBase.java   |   33 +-
 .../org/apache/gora/spark/GoraSparkEngine.java  |   14 +-
 .../java/org/apache/gora/store/DataStore.java   |    8 +-
 .../apache/gora/store/impl/DataStoreBase.java   |   24 +-
 .../store/impl/FileBackedDataStoreBase.java     |   63 +-
 gora-couchdb/pom.xml                            |    1 -
 gora-mongodb/pom.xml                            |    2 +-
 gora-tutorial/conf/gora-aerospike-mapping.xml   |   44 +
 gora-tutorial/conf/gora.properties              |    7 +
 gora-tutorial/pom.xml                           |    4 +
 pom.xml                                         |   63 +-
 116 files changed, 12307 insertions(+), 4405 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/gora/blob/f6317e44/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 57a7f5a,6117125..840ffda
--- a/pom.xml
+++ b/pom.xml
@@@ -723,11 -723,8 +723,10 @@@
      <module>gora-hbase</module>
      <module>gora-infinispan</module>
      <module>gora-jcache</module>
 +    <module>gora-orientdb</module>
 +    <!-- module>gora-lucene</module -->
      <module>gora-dynamodb</module>
      <module>gora-couchdb</module>
-     <!--module>gora-sql</module -->
      <module>gora-maven-plugin</module>
      <module>gora-mongodb</module>
      <module>gora-solr</module>
@@@ -777,12 -776,9 +778,13 @@@
      <jsr107.api.version>1.0.0</jsr107.api.version>
      <hazelcast.version>3.6.4</hazelcast.version>
  
 +    <!-- OrientDB Dependencies -->
 +    <orientdb.version>2.2.22</orientdb.version>
 +    <orientqb.version>0.2.0</orientqb.version>
 +
      <!-- Testing Dependencies -->
      <junit.version>4.10</junit.version>
+     <test.container.version>1.4.2</test.container.version>
  
      <!-- Maven Plugin Dependencies -->
      <maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>


Mime
View raw message