Skip to content

Commit 85cc69b

Browse files
removed cqlsh
1 parent 5090b5e commit 85cc69b

File tree

1 file changed

+24
-15
lines changed

1 file changed

+24
-15
lines changed

src/main/java/com/datastax/cdm/CassandraDatasetManager.java

Lines changed: 24 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
import java.io.*;
2828
import java.net.URL;
2929
import java.nio.charset.Charset;
30+
import java.nio.file.Files;
31+
import java.nio.file.Paths;
3032
import java.util.*;
3133

3234
/**
@@ -230,33 +232,40 @@ void install(String name) throws IOException, InterruptedException, GitAPIExcept
230232

231233
Config config = mapper.readValue(configFile, Config.class);
232234
String address = this.host;
233-
{
234-
Cluster cluster = Cluster.builder().addContactPoint(address).build();
235-
Session session = cluster.connect();
236235

237-
StringBuilder createKeyspace = new StringBuilder();
238-
createKeyspace.append(" CREATE KEYSPACE ")
239-
.append(config.keyspace)
240-
.append(" WITH replication = {'class': 'SimpleStrategy', 'replication_factor': 1}");
236+
Cluster cluster = Cluster.builder().addContactPoint(address).build();
237+
Session session = cluster.connect();
241238

242-
System.out.println(createKeyspace);
243-
session.execute("DROP KEYSPACE IF EXISTS " + config.keyspace);
244-
session.execute(createKeyspace.toString());
245-
cluster.close();
239+
StringBuilder createKeyspace = new StringBuilder();
240+
createKeyspace.append(" CREATE KEYSPACE ")
241+
.append(config.keyspace)
242+
.append(" WITH replication = {'class': 'SimpleStrategy', 'replication_factor': 1}");
246243

244+
System.out.println(createKeyspace);
245+
session.execute("DROP KEYSPACE IF EXISTS " + config.keyspace);
246+
session.execute(createKeyspace.toString());
247+
session.execute("USE " + config.keyspace);
248+
249+
System.out.println("Schema: " + schema);
250+
// String loadSchema = "cqlsh -k " + config.keyspace + " -f " + schema;
251+
252+
byte[] bytes = Files.readAllBytes(Paths.get(schema));
253+
String[] create_tables = new String(bytes).split(";");
254+
for(String c: create_tables) {
255+
String tmp = c.trim();
256+
if(tmp.length() > 0) {
257+
session.execute(tmp);
258+
}
247259
}
248260

249-
System.out.println("Schema: " + schema);
250-
String loadSchema = "cqlsh -k " + config.keyspace + " -f " + schema;
251-
Runtime.getRuntime().exec(new String[]{"bash", "-c", loadSchema}).waitFor();
261+
// Runtime.getRuntime().exec(new String[]{"bash", "-c", loadSchema}).waitFor();
252262

253263
System.out.println("Loading data");
254264

255265
Cluster cluster2 = Cluster.builder()
256266
.addContactPoint(address)
257267
.build();
258268

259-
Session session = cluster2.connect(config.keyspace);
260269

261270
this.session = session;
262271

0 commit comments

Comments
 (0)