Repository: polygene-java Updated Branches: refs/heads/develop 849c75da9 -> 62f4eeb64
Invalid character in column names. Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/a4bfcf10 Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/a4bfcf10 Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/a4bfcf10 Branch: refs/heads/develop Commit: a4bfcf10733ff531e85eedee8156822e05706cf4 Parents: 849c75d Author: niclas <[email protected]> Authored: Sat Feb 18 16:40:18 2017 +0800 Committer: niclas <[email protected]> Committed: Sat Feb 18 16:40:18 2017 +0800 ---------------------------------------------------------------------- .../entitystore/cassandra/CassandraCluster.java | 43 ++++++++++++++------ 1 file changed, 31 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/polygene-java/blob/a4bfcf10/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 c5bcf72..debd680 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 @@ -17,6 +17,25 @@ * * */ +/* + * 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 + * + * 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. + * + * + */ package org.apache.polygene.entitystore.cassandra; import com.datastax.driver.core.Cluster; @@ -34,17 +53,17 @@ public interface CassandraCluster String CURRENT_STORAGE_VERSION = "1"; String DEFAULT_KEYSPACE_NAME = "polygene:entitystore"; String DEFAULT_TABLE_NAME = "polygene:entitystore:entities"; - String IDENTITY_COLUMN = "_id"; - String VERSION_COLUMN = "_version"; - String USECASE_COLUMN = "_usecase"; - String LASTMODIFIED_COLUMN = "_modified"; - String APP_VERSION_COLUMN = "_appversion"; - String STORE_VERSION_COLUMN = "_storeversion"; - String TYPE_COLUMN = "_type"; - String PROPERTIES_COLUMN = "_props"; - String ASSOCIATIONS_COLUMN = "_assocs"; - String MANYASSOCIATIONS_COLUMN = "_manyassocs"; - String NAMEDASSOCIATIONS_COLUMN = "_namedassocs"; + String IDENTITY_COLUMN = "id"; + String VERSION_COLUMN = "version"; + String USECASE_COLUMN = "usecase"; + String LASTMODIFIED_COLUMN = "modified"; + String APP_VERSION_COLUMN = "appversion"; + String STORE_VERSION_COLUMN = "storeversion"; + String TYPE_COLUMN = "type"; + String PROPERTIES_COLUMN = "props"; + String ASSOCIATIONS_COLUMN = "assocs"; + String MANYASSOCIATIONS_COLUMN = "manyassocs"; + String NAMEDASSOCIATIONS_COLUMN = "namedassocs"; Session session(); @@ -198,7 +217,7 @@ public interface CassandraCluster { try( Session defaultSession = cluster.connect() ) { - String query = "CREATE KEYSPACE " + keyspaceName + "WITH replication = {'class':'SimpleStrategy', 'replication_factor' : " + replication + "};"; + String query = "CREATE KEYSPACE " + keyspaceName + " WITH replication = {'class':'SimpleStrategy', 'replication_factor' : " + replication + "};"; defaultSession.execute( query ); } }
