You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@polygene.apache.org by ni...@apache.org on 2017/02/18 09:55:24 UTC

[4/6] polygene-java git commit: Need generics for maps it seems.

Need generics for maps it seems.


Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/2e228a6f
Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/2e228a6f
Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/2e228a6f

Branch: refs/heads/develop
Commit: 2e228a6fdf1ff5c2bfc752a0bed9cf34cdecc17f
Parents: db12d82
Author: niclas <ni...@spicter.com>
Authored: Sat Feb 18 16:52:27 2017 +0800
Committer: niclas <ni...@spicter.com>
Committed: Sat Feb 18 16:52:27 2017 +0800

----------------------------------------------------------------------
 extensions/entitystore-cassandra/dev-status.xml      |  4 ++--
 .../entitystore/cassandra/CassandraCluster.java      | 15 +++++++++------
 2 files changed, 11 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/polygene-java/blob/2e228a6f/extensions/entitystore-cassandra/dev-status.xml
----------------------------------------------------------------------
diff --git a/extensions/entitystore-cassandra/dev-status.xml b/extensions/entitystore-cassandra/dev-status.xml
index fcc2930..aac41cc 100644
--- a/extensions/entitystore-cassandra/dev-status.xml
+++ b/extensions/entitystore-cassandra/dev-status.xml
@@ -24,13 +24,13 @@
         http://polygene.apache.org/schemas/2008/dev-status/1/dev-status.xsd">
   <status>
         <!--none,early,beta,stable,mature-->
-        <codebase>beta</codebase>
+        <codebase>early</codebase>
 
         <!-- none, brief, good, complete -->
         <documentation>none</documentation>
 
         <!-- none, some, good, complete -->
-        <unittests>good</unittests>
+        <unittests>none</unittests>
     </status>
     <licenses>
         <license>ALv2</license>

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/2e228a6f/extensions/entitystore-cassandra/src/main/java/org/apache/polygene/entitystore/cassandra/CassandraCluster.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-cassandra/src/main/java/org/apache/polygene/entitystore/cassandra/CassandraCluster.java b/extensions/entitystore-cassandra/src/main/java/org/apache/polygene/entitystore/cassandra/CassandraCluster.java
index debd680..147ae83 100644
--- a/extensions/entitystore-cassandra/src/main/java/org/apache/polygene/entitystore/cassandra/CassandraCluster.java
+++ b/extensions/entitystore-cassandra/src/main/java/org/apache/polygene/entitystore/cassandra/CassandraCluster.java
@@ -70,7 +70,9 @@ public interface CassandraCluster
     String tableName();
 
     PreparedStatement entityRetrieveStatement();
+
     PreparedStatement versionRetrieveStatement();
+
     PreparedStatement entityUpdateStatement();
 
     String keyspaceName();
@@ -118,7 +120,7 @@ public interface CassandraCluster
             return keyspaceName;
         }
 
-        public  String tableName(  )
+        public String tableName()
         {
             CassandraEntityStoreConfiguration config = configuration.get();
             String tableName = config.table().get();
@@ -200,16 +202,17 @@ public interface CassandraCluster
         private void createPolygeneStateTable( String tableName )
         {
             session.execute( "CREATE TABLE " + tableName + "(\n"
-                             + "   " + IDENTITY_COLUMN + " text PRIMARYKEY,\n"
+                             + "   " + IDENTITY_COLUMN + " text,\n"
                              + "   " + VERSION_COLUMN + " text,\n"
                              + "   " + APP_VERSION_COLUMN + " text,\n"
                              + "   " + STORE_VERSION_COLUMN + " text,\n"
                              + "   " + LASTMODIFIED_COLUMN + " timestamp,\n"
                              + "   " + USECASE_COLUMN + " text,\n"
-                             + "   " + PROPERTIES_COLUMN + " map,\n"
-                             + "   " + ASSOCIATIONS_COLUMN + " map,\n"
-                             + "   " + MANYASSOCIATIONS_COLUMN + " map,\n"
-                             + "   " + NAMEDASSOCIATIONS_COLUMN + " map,\n"
+                             + "   " + PROPERTIES_COLUMN + " map<text,text>,\n"
+                             + "   " + ASSOCIATIONS_COLUMN + " map<text,text>,\n"
+                             + "   " + MANYASSOCIATIONS_COLUMN + " map<text,text>,\n"
+                             + "   " + NAMEDASSOCIATIONS_COLUMN + " map<text,text>,\n"
+                             + "   PRIMARY KEY (" + IDENTITY_COLUMN + ")\n"
                              + "   )" );
         }