[jira] [Comment Edited] (CASSANDRA-11626) cqlsh fails and exists on non-ascii chars

[Wei Deng (JIRA)]

[ 
https://issues.apache.org/jira/browse/CASSANDRA-11626?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15259587#comment-15259587
 ] 

Wei Deng edited comment on CASSANDRA-11626 at 4/27/16 5:40 AM:
---

Yeah I don't think it's the same problem as CASSANDRA-11124. See the following 
using latest trunk build:

{noformat}
root@node0:~/cassandra-trunk# ~/cassandra-trunk/bin/cqlsh --encoding=utf-8 
--debug
Using CQL driver: 
Using connect timeout: 5 seconds
Using 'utf-8' encoding
Using ssl: False
Connected to Test Cluster at 127.0.0.1:9042.
[cqlsh 5.0.1 | Cassandra 3.6-SNAPSHOT | CQL spec 3.4.2 | Native protocol v4]
Use HELP for help.
cqlsh> ä
Invalid syntax at line 1, char 1
Traceback (most recent call last):
  File "/root/cassandra-trunk/bin/cqlsh.py", line 2636, in 
main(*read_options(sys.argv[1:], os.environ))
  File "/root/cassandra-trunk/bin/cqlsh.py", line 2625, in main
shell.cmdloop()
  File "/root/cassandra-trunk/bin/cqlsh.py", line 1114, in cmdloop
if self.onecmd(self.statement.getvalue()):
  File "/root/cassandra-trunk/bin/cqlsh.py", line 1139, in onecmd
self.printerr('  %s' % statementline)
  File "/root/cassandra-trunk/bin/cqlsh.py", line 2314, in printerr
self.writeresult(text, color, newline=newline, out=sys.stderr)
  File "/root/cassandra-trunk/bin/cqlsh.py", line 2303, in writeresult
out.write(self.applycolor(str(text), color) + ('\n' if newline else ''))
UnicodeEncodeError: 'ascii' codec can't encode character u'\xe4' in position 2: 
ordinal not in range(128)
{noformat}

This is easily reproducible on a number C* 3.x version (3.0.4 and 3.6).


was (Author: weideng):
Yeah I don't think it's the same problem. See the following using latest trunk 
build:

{noformat}
root@node0:~/cassandra-trunk# ~/cassandra-trunk/bin/cqlsh --encoding=utf-8 
--debug
Using CQL driver: 
Using connect timeout: 5 seconds
Using 'utf-8' encoding
Using ssl: False
Connected to Test Cluster at 127.0.0.1:9042.
[cqlsh 5.0.1 | Cassandra 3.6-SNAPSHOT | CQL spec 3.4.2 | Native protocol v4]
Use HELP for help.
cqlsh> ä
Invalid syntax at line 1, char 1
Traceback (most recent call last):
  File "/root/cassandra-trunk/bin/cqlsh.py", line 2636, in 
main(*read_options(sys.argv[1:], os.environ))
  File "/root/cassandra-trunk/bin/cqlsh.py", line 2625, in main
shell.cmdloop()
  File "/root/cassandra-trunk/bin/cqlsh.py", line 1114, in cmdloop
if self.onecmd(self.statement.getvalue()):
  File "/root/cassandra-trunk/bin/cqlsh.py", line 1139, in onecmd
self.printerr('  %s' % statementline)
  File "/root/cassandra-trunk/bin/cqlsh.py", line 2314, in printerr
self.writeresult(text, color, newline=newline, out=sys.stderr)
  File "/root/cassandra-trunk/bin/cqlsh.py", line 2303, in writeresult
out.write(self.applycolor(str(text), color) + ('\n' if newline else ''))
UnicodeEncodeError: 'ascii' codec can't encode character u'\xe4' in position 2: 
ordinal not in range(128)
{noformat}

> cqlsh fails and exists on non-ascii chars
> -
>
> Key: CASSANDRA-11626
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11626
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Robert Stupp
>Priority: Minor
>
> Just seen on cqlsh on current trunk:
> To repro, copy {{ä}} (german umlaut) to cqlsh and press return.
> cqlsh errors out and immediately exits.
> {code}
> $ bin/cqlsh
> Connected to Test Cluster at 127.0.0.1:9042.
> [cqlsh 5.0.1 | Cassandra 2.1.13-SNAPSHOT | CQL spec 3.2.1 | Native protocol 
> v3]
> Use HELP for help.
> cqlsh> ä
> Invalid syntax at line 1, char 1
> Traceback (most recent call last):
>   File "/Users/snazy/devel/cassandra/trunk/bin/cqlsh.py", line 2636, in 
> 
> main(*read_options(sys.argv[1:], os.environ))
>   File "/Users/snazy/devel/cassandra/trunk/bin/cqlsh.py", line 2625, in main
> shell.cmdloop()
>   File "/Users/snazy/devel/cassandra/trunk/bin/cqlsh.py", line 1114, in 
> cmdloop
> if self.onecmd(self.statement.getvalue()):
>   File "/Users/snazy/devel/cassandra/trunk/bin/cqlsh.py", line 1139, in onecmd
> self.printerr('  %s' % statementline)
>   File "/Users/snazy/devel/cassandra/trunk/bin/cqlsh.py", line 2314, in 
> printerr
> self.writeresult(text, color, newline=newline, out=sys.stderr)
>   File "/Users/snazy/devel/cassandra/trunk/bin/cqlsh.py", line 2303, in 
> writeresult
> out.write(self.applycolor(str(text), color) + ('\n' if newline else ''))
> UnicodeEncodeError: 'ascii' codec can't encode character u'\xe4' in position 
> 2: ordinal not in range(128)
> $ 
> {code}



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Commented] (CASSANDRA-11626) cqlsh fails and exists on non-ascii chars

[Wei Deng (JIRA)]

[ 
https://issues.apache.org/jira/browse/CASSANDRA-11626?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15259587#comment-15259587
 ] 

Wei Deng commented on CASSANDRA-11626:
--

Yeah I don't think it's the same problem. See the following using latest trunk 
build:

{noformat}
root@node0:~/cassandra-trunk# ~/cassandra-trunk/bin/cqlsh --encoding=utf-8 
--debug
Using CQL driver: 
Using connect timeout: 5 seconds
Using 'utf-8' encoding
Using ssl: False
Connected to Test Cluster at 127.0.0.1:9042.
[cqlsh 5.0.1 | Cassandra 3.6-SNAPSHOT | CQL spec 3.4.2 | Native protocol v4]
Use HELP for help.
cqlsh> ä
Invalid syntax at line 1, char 1
Traceback (most recent call last):
  File "/root/cassandra-trunk/bin/cqlsh.py", line 2636, in 
main(*read_options(sys.argv[1:], os.environ))
  File "/root/cassandra-trunk/bin/cqlsh.py", line 2625, in main
shell.cmdloop()
  File "/root/cassandra-trunk/bin/cqlsh.py", line 1114, in cmdloop
if self.onecmd(self.statement.getvalue()):
  File "/root/cassandra-trunk/bin/cqlsh.py", line 1139, in onecmd
self.printerr('  %s' % statementline)
  File "/root/cassandra-trunk/bin/cqlsh.py", line 2314, in printerr
self.writeresult(text, color, newline=newline, out=sys.stderr)
  File "/root/cassandra-trunk/bin/cqlsh.py", line 2303, in writeresult
out.write(self.applycolor(str(text), color) + ('\n' if newline else ''))
UnicodeEncodeError: 'ascii' codec can't encode character u'\xe4' in position 2: 
ordinal not in range(128)
{noformat}

> cqlsh fails and exists on non-ascii chars
> -
>
> Key: CASSANDRA-11626
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11626
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Robert Stupp
>Priority: Minor
>
> Just seen on cqlsh on current trunk:
> To repro, copy {{ä}} (german umlaut) to cqlsh and press return.
> cqlsh errors out and immediately exits.
> {code}
> $ bin/cqlsh
> Connected to Test Cluster at 127.0.0.1:9042.
> [cqlsh 5.0.1 | Cassandra 2.1.13-SNAPSHOT | CQL spec 3.2.1 | Native protocol 
> v3]
> Use HELP for help.
> cqlsh> ä
> Invalid syntax at line 1, char 1
> Traceback (most recent call last):
>   File "/Users/snazy/devel/cassandra/trunk/bin/cqlsh.py", line 2636, in 
> 
> main(*read_options(sys.argv[1:], os.environ))
>   File "/Users/snazy/devel/cassandra/trunk/bin/cqlsh.py", line 2625, in main
> shell.cmdloop()
>   File "/Users/snazy/devel/cassandra/trunk/bin/cqlsh.py", line 1114, in 
> cmdloop
> if self.onecmd(self.statement.getvalue()):
>   File "/Users/snazy/devel/cassandra/trunk/bin/cqlsh.py", line 1139, in onecmd
> self.printerr('  %s' % statementline)
>   File "/Users/snazy/devel/cassandra/trunk/bin/cqlsh.py", line 2314, in 
> printerr
> self.writeresult(text, color, newline=newline, out=sys.stderr)
>   File "/Users/snazy/devel/cassandra/trunk/bin/cqlsh.py", line 2303, in 
> writeresult
> out.write(self.applycolor(str(text), color) + ('\n' if newline else ''))
> UnicodeEncodeError: 'ascii' codec can't encode character u'\xe4' in position 
> 2: ordinal not in range(128)
> $ 
> {code}



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Commented] (CASSANDRA-11381) Node running with join_ring=false and authentication can not serve requests

[Joel Knighton (JIRA)]

[ 
https://issues.apache.org/jira/browse/CASSANDRA-11381?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15259507#comment-15259507
 ] 

Joel Knighton commented on CASSANDRA-11381:
---

I've tested some scenarios and can confirm that the scenario Sam described 
above is problematic.

Another concern I have is potentially performing auth setup before a node is 
added to its own TokenMetadata in the join_ring false case. It seems to me that 
this might cause problems with our own implementations and could feasibly cause 
problems for 3rd party implementations, so I think the original approach of 
handling auth setup down both branches may be worth pursuing here in the 
interest of safety.

On trunk, we have another property "start_gossip" that stops 
{{StorageService.initServer}} even earlier - I don't think we can support auth 
at this point, so I don't care about supporting it in this ticket (my earlier 
comment hinted at the fact that I was considering whether it was in scope).

> Node running with join_ring=false and authentication can not serve requests
> ---
>
> Key: CASSANDRA-11381
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11381
> Project: Cassandra
>  Issue Type: Bug
>Reporter: mck
>Assignee: mck
> Fix For: 2.1.x, 2.2.x, 3.0.x, 3.x
>
> Attachments: 11381-2.0.txt, 11381-2.1.txt, 11381-2.2.txt, 
> 11381-3.0.txt, 11381-trunk.txt, dtest-11381-trunk.txt
>
>
> Starting up a node with {{-Dcassandra.join_ring=false}} in a cluster that has 
> authentication configured, eg PasswordAuthenticator, won't be able to serve 
> requests. This is because {{Auth.setup()}} never gets called during the 
> startup.
> Without {{Auth.setup()}} having been called in {{StorageService}} clients 
> connecting to the node fail with the node throwing
> {noformat}
> java.lang.NullPointerException
> at 
> org.apache.cassandra.auth.PasswordAuthenticator.authenticate(PasswordAuthenticator.java:119)
> at 
> org.apache.cassandra.thrift.CassandraServer.login(CassandraServer.java:1471)
> at 
> org.apache.cassandra.thrift.Cassandra$Processor$login.getResult(Cassandra.java:3505)
> at 
> org.apache.cassandra.thrift.Cassandra$Processor$login.getResult(Cassandra.java:3489)
> at org.apache.thrift.ProcessFunction.process(ProcessFunction.java:39)
> at org.apache.thrift.TBaseProcessor.process(TBaseProcessor.java:39)
> at com.thinkaurelius.thrift.Message.invoke(Message.java:314)
> at 
> com.thinkaurelius.thrift.Message$Invocation.execute(Message.java:90)
> at 
> com.thinkaurelius.thrift.TDisruptorServer$InvocationHandler.onEvent(TDisruptorServer.java:695)
> at 
> com.thinkaurelius.thrift.TDisruptorServer$InvocationHandler.onEvent(TDisruptorServer.java:689)
> at com.lmax.disruptor.WorkProcessor.run(WorkProcessor.java:112)
> at 
> java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
> at 
> java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
> at java.lang.Thread.run(Thread.java:745)
> {noformat}
> The exception thrown from the 
> [code|https://github.com/apache/cassandra/blob/cassandra-2.0.16/src/java/org/apache/cassandra/auth/PasswordAuthenticator.java#L119]
> {code}
> ResultMessage.Rows rows = 
> authenticateStatement.execute(QueryState.forInternalCalls(), new 
> QueryOptions(consistencyForUser(username),
>   
>Lists.newArrayList(ByteBufferUtil.bytes(username;
> {code}



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Updated] (CASSANDRA-9766) Bootstrap outgoing streaming speeds are much slower than during repair

[T Jake Luciani (JIRA)]

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-9766?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

T Jake Luciani updated CASSANDRA-9766:
--
Issue Type: Improvement  (was: Bug)

> Bootstrap outgoing streaming speeds are much slower than during repair
> --
>
> Key: CASSANDRA-9766
> URL: https://issues.apache.org/jira/browse/CASSANDRA-9766
> Project: Cassandra
>  Issue Type: Improvement
>  Components: Streaming and Messaging
> Environment: Cassandra 2.1.2. more details in the pdf attached 
>Reporter: Alexei K
>Assignee: T Jake Luciani
>  Labels: performance
> Fix For: 3.x
>
> Attachments: problem.pdf
>
>
> I have a cluster in Amazon cloud , its described in detail in the attachment. 
> What I've noticed is that we during bootstrap we never go above 12MB/sec 
> transmission speeds and also those speeds flat line almost like we're hitting 
> some sort of a limit ( this remains true for other tests that I've ran) 
> however during the repair we see much higher,variable sending rates. I've 
> provided network charts in the attachment as well . Is there an explanation 
> for this? Is something wrong with my configuration, or is it a possible bug?



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Updated] (CASSANDRA-9766) Bootstrap outgoing streaming speeds are much slower than during repair

[T Jake Luciani (JIRA)]

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-9766?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

T Jake Luciani updated CASSANDRA-9766:
--
Fix Version/s: (was: 2.1.x)
   3.x

> Bootstrap outgoing streaming speeds are much slower than during repair
> --
>
> Key: CASSANDRA-9766
> URL: https://issues.apache.org/jira/browse/CASSANDRA-9766
> Project: Cassandra
>  Issue Type: Bug
>  Components: Streaming and Messaging
> Environment: Cassandra 2.1.2. more details in the pdf attached 
>Reporter: Alexei K
>Assignee: T Jake Luciani
>  Labels: performance
> Fix For: 3.x
>
> Attachments: problem.pdf
>
>
> I have a cluster in Amazon cloud , its described in detail in the attachment. 
> What I've noticed is that we during bootstrap we never go above 12MB/sec 
> transmission speeds and also those speeds flat line almost like we're hitting 
> some sort of a limit ( this remains true for other tests that I've ran) 
> however during the repair we see much higher,variable sending rates. I've 
> provided network charts in the attachment as well . Is there an explanation 
> for this? Is something wrong with my configuration, or is it a possible bug?



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Updated] (CASSANDRA-9766) Bootstrap outgoing streaming speeds are much slower than during repair

[T Jake Luciani (JIRA)]

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-9766?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

T Jake Luciani updated CASSANDRA-9766:
--
Reviewer: Stefania
  Status: Patch Available  (was: Open)

> Bootstrap outgoing streaming speeds are much slower than during repair
> --
>
> Key: CASSANDRA-9766
> URL: https://issues.apache.org/jira/browse/CASSANDRA-9766
> Project: Cassandra
>  Issue Type: Bug
>  Components: Streaming and Messaging
> Environment: Cassandra 2.1.2. more details in the pdf attached 
>Reporter: Alexei K
>Assignee: T Jake Luciani
>  Labels: performance
> Fix For: 2.1.x
>
> Attachments: problem.pdf
>
>
> I have a cluster in Amazon cloud , its described in detail in the attachment. 
> What I've noticed is that we during bootstrap we never go above 12MB/sec 
> transmission speeds and also those speeds flat line almost like we're hitting 
> some sort of a limit ( this remains true for other tests that I've ran) 
> however during the repair we see much higher,variable sending rates. I've 
> provided network charts in the attachment as well . Is there an explanation 
> for this? Is something wrong with my configuration, or is it a possible bug?



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Commented] (CASSANDRA-9766) Bootstrap outgoing streaming speeds are much slower than during repair

[T Jake Luciani (JIRA)]

[ 
https://issues.apache.org/jira/browse/CASSANDRA-9766?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15259448#comment-15259448
 ] 

T Jake Luciani commented on CASSANDRA-9766:
---

I've finished the allocation work I wanted to do and now I'm seeing 50% less 
allocation during the test with a 25% improvement in throughput compared to 
trunk.

There are a few tests still failing which I will fix tomorrow.

[branch|https://github.com/tjake/cassandra/tree/faster-streaming]


> Bootstrap outgoing streaming speeds are much slower than during repair
> --
>
> Key: CASSANDRA-9766
> URL: https://issues.apache.org/jira/browse/CASSANDRA-9766
> Project: Cassandra
>  Issue Type: Bug
>  Components: Streaming and Messaging
> Environment: Cassandra 2.1.2. more details in the pdf attached 
>Reporter: Alexei K
>Assignee: T Jake Luciani
>  Labels: performance
> Fix For: 2.1.x
>
> Attachments: problem.pdf
>
>
> I have a cluster in Amazon cloud , its described in detail in the attachment. 
> What I've noticed is that we during bootstrap we never go above 12MB/sec 
> transmission speeds and also those speeds flat line almost like we're hitting 
> some sort of a limit ( this remains true for other tests that I've ran) 
> however during the repair we see much higher,variable sending rates. I've 
> provided network charts in the attachment as well . Is there an explanation 
> for this? Is something wrong with my configuration, or is it a possible bug?



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Commented] (CASSANDRA-11303) New inbound throughput parameters for streaming

[Paulo Motta (JIRA)]

[ 
https://issues.apache.org/jira/browse/CASSANDRA-11303?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15259360#comment-15259360
 ] 

Paulo Motta commented on CASSANDRA-11303:
-

Thanks for the patch [~skonno]. Overall the approach looks good. See comments 
and suggestions for improvement below:

* While we can do rate limiting directly at {{StreamReader}}, on 
{{CompressedStreamReader}} the actual read from the network is performed by 
{{CompressedInputStream.Reader}}, and read bytes are uncompressed and cached 
for consumption on {{CompressedStreamReader}} so we probably need to do rate 
limiting on {{CompressedInputStream.Reader}} instead.
* We will need to update {{StorageServiceMBean}} to add new methods to get and 
set inbound throughput in real time via JMX or {{nodetool 
(get/set)streamthroughput}}
** For that, we need to deprecate existing methods 
{{(set/get)StreamThroughputMbPerSec}} and 
{{(set/get)InterDCStreamThroughputMbPerSec}} (we can't remove them yet), and 
add new methods: {{(set/get)(Inbound/Outbound)StreamThroughputMbPerSec}} and 
{{(set/get)(Inbound/Outbound)InterDCStreamThroughputMbPerSec}}
* After that, we will need to add new parameters to {{nodetool 
setstreamthroughput}} and {{nodetool getstreamthroughput}}, perhaps something 
like: {{nodetool setstreamthroughput --inbound 10}} and {{nodetool 
getstreamthroughput --outbound}}, and maybe get/set outbound by default if 
parameters are not specified to maintain backward compatibility?
* The same static {{RateLimiter}} object is being shared between inbound and 
outgoing streams on {{StreamRateLimiter}}, which means the rate will be divided 
between inbound and outbound streams. What we actually want is to have 
independent inbound and outbound throughput limiting, so you'll need to have 4 
static RateLimiter objects: {{inboundLimiter}}, {{outboundLimiter}}, 
{{inboundInterDCLimiter}}, {{outboundInterDCLimiter}}.
** We also need to update them when 
{{StorageServiceMBean.set(Inbound/Outbound)(InterDC)StreamThroughputMbPerSec}} 
is called.
* I think we can move static factory methods {{getInboundRateLimiter}} and 
{{getOutboundRateLimiter}} from {{StreamManager}} to {{StreamRaterLimiter}}
* We're creating a {{StreamInboundRateLimiter}} per peer per stream session, 
but we actually need only 2 {{StreamInboundRateLimiter}} instances: a local-dc 
and an inter-dc
** The factory method {{getInboundRateLimiter(peer)}} can decide which instance 
to pick if peer is from local or remote dc
* I don't think we need separate {{StreamInboundRateLimiter}} and 
{{StreamOutboundRateLimiter}} classes since they're essentially the same, 
except for their underlying rate limiters which can be set by their factory 
methods
* Since we will already update the limiters when 
{{StorageServiceMBean.set(Inbound/Outbound)(InterDC)StreamThroughputMbPerSec}} 
is called, we no longer need to call {{mayUpdateThroughput}} when fetching them 
via {{getInboundRateLimiter}}, etc.. 

* Other comments
** Is there any particular reason you made {{StreamDeserializer}} class and 
fields non-static?
** I noticed you changed a stream throughput comment on {{cassandra.yaml}} from 
{{When unset, the default is 200 Mbps or 25 MB/s}} to {{When unset, the default 
is no limit.}}, but this is not correct as the default values on {{Config}} if 
these properties are unset on {{cassandra.yaml}} is in fact 200Mbps.

> New inbound throughput parameters for streaming
> ---
>
> Key: CASSANDRA-11303
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11303
> Project: Cassandra
>  Issue Type: New Feature
>  Components: Configuration
>Reporter: Satoshi Konno
>Priority: Minor
> Attachments: 11303_inbound_limit_debug_20160419.log, 
> 11303_inbound_nolimit_debug_20160419.log, 
> 11303_inbound_patch_for_trunk_20160419.diff, cassandra_inbound_stream.diff
>
>
> Hi,
> To specify stream throughputs of a node more clearly, I would like to add the 
> following new inbound parameters like existing outbound parameters in the 
> cassandra.yaml.
> - stream_throughput_inbound_megabits_per_sec
> - inter_dc_stream_throughput_outbound_megabits_per_sec  
> We use only the existing outbound parameters now, but it is difficult to 
> control the total throughputs of a node.　In our production network, some 
> critical alerts occurs when a node exceed the specified total throughput 
> which is the sum of the input and output throughputs.
> In our operation of Cassandra, the alerts occurs during the bootstrap or 
> repair processing when a new node is added. In the worst case, we have to 
> stop the operation of the exceed node.
> I have attached the patch under consideration. I would like to add a new 
> limiter class, StreamInboundRateLimiter, and use the limiter class in 
> StreamDeserializer class. I use 

[jira] [Updated] (CASSANDRA-11646) SSTableWriter output discrepancy

[Stefania (JIRA)]

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-11646?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Stefania updated CASSANDRA-11646:
-
Resolution: Fixed
Status: Resolved  (was: Ready to Commit)

> SSTableWriter output discrepancy
> 
>
> Key: CASSANDRA-11646
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11646
> Project: Cassandra
>  Issue Type: Bug
>Reporter: T Jake Luciani
>Assignee: Stefania
> Fix For: 3.6
>
>
> Since CASSANDRA-10624 there is a non-trivial difference in the size of the 
> output in CQLSSTableWriter.
> I've written the following code:
> {code}
>  String KS = "cql_keyspace";
> String TABLE = "table1";
> File tempdir = Files.createTempDir();
> File dataDir = new File(tempdir.getAbsolutePath() + File.separator + 
> KS + File.separator + TABLE);
> assert dataDir.mkdirs();
> String schema = "CREATE TABLE cql_keyspace.table1 ("
> + "  k int PRIMARY KEY,"
> + "  v1 text,"
> + "  v2 int"
> + ");";// with compression = {};";
> String insert = "INSERT INTO cql_keyspace.table1 (k, v1, v2) VALUES 
> (?, ?, ?)";
> CQLSSTableWriter writer = CQLSSTableWriter.builder()
>   .sorted()
>   .inDirectory(dataDir)
>   .forTable(schema)
>   .using(insert).build();
> for (int i = 0; i < 1000; i++)
> writer.addRow(i, "test1", 24);
> writer.close();
> {code}
> Pre CASSANDRA-10624 the data file is ~63MB. Post it's ~69MB



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Commented] (CASSANDRA-11646) SSTableWriter output discrepancy

[Stefania (JIRA)]

[ 
https://issues.apache.org/jira/browse/CASSANDRA-11646?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15259316#comment-15259316
 ] 

Stefania commented on CASSANDRA-11646:
--

Thank you for the review and for testing.

Committed to trunk without the unit test as 
29d4a8297905463e4f0bb28fe0b4cc354dc1a0ab.

> SSTableWriter output discrepancy
> 
>
> Key: CASSANDRA-11646
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11646
> Project: Cassandra
>  Issue Type: Bug
>Reporter: T Jake Luciani
>Assignee: Stefania
> Fix For: 3.6
>
>
> Since CASSANDRA-10624 there is a non-trivial difference in the size of the 
> output in CQLSSTableWriter.
> I've written the following code:
> {code}
>  String KS = "cql_keyspace";
> String TABLE = "table1";
> File tempdir = Files.createTempDir();
> File dataDir = new File(tempdir.getAbsolutePath() + File.separator + 
> KS + File.separator + TABLE);
> assert dataDir.mkdirs();
> String schema = "CREATE TABLE cql_keyspace.table1 ("
> + "  k int PRIMARY KEY,"
> + "  v1 text,"
> + "  v2 int"
> + ");";// with compression = {};";
> String insert = "INSERT INTO cql_keyspace.table1 (k, v1, v2) VALUES 
> (?, ?, ?)";
> CQLSSTableWriter writer = CQLSSTableWriter.builder()
>   .sorted()
>   .inDirectory(dataDir)
>   .forTable(schema)
>   .using(insert).build();
> for (int i = 0; i < 1000; i++)
> writer.addRow(i, "test1", 24);
> writer.close();
> {code}
> Pre CASSANDRA-10624 the data file is ~63MB. Post it's ~69MB



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

cassandra git commit: SSTableWriter output discrepancy

[stefania]

Repository: cassandra
Updated Branches:
  refs/heads/trunk e6505a606 -> 29d4a8297


SSTableWriter output discrepancy

patch by Stefania Alborghetti; reviewed by Alex Petrov for CASSANDRA-11646


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

Branch: refs/heads/trunk
Commit: 29d4a8297905463e4f0bb28fe0b4cc354dc1a0ab
Parents: e6505a6
Author: Stefania Alborghetti 
Authored: Tue Apr 26 16:56:07 2016 +0800
Committer: Stefania Alborghetti 
Committed: Wed Apr 27 09:20:28 2016 +0800

--
 CHANGES.txt|  1 +
 .../apache/cassandra/io/sstable/CQLSSTableWriter.java  | 13 -
 2 files changed, 9 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/29d4a829/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 34c432f..a10a895 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.6
+ * SSTableWriter output discrepancy (CASSANDRA-11646)
  * Fix potential timeout in NativeTransportService.testConcurrentDestroys 
(CASSANDRA-10756)
  * Support large partitions on the 3.0 sstable format (CASSANDRA-11206)
  * JSON datetime formatting needs timezone (CASSANDRA-11137)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/29d4a829/src/java/org/apache/cassandra/io/sstable/CQLSSTableWriter.java
--
diff --git a/src/java/org/apache/cassandra/io/sstable/CQLSSTableWriter.java 
b/src/java/org/apache/cassandra/io/sstable/CQLSSTableWriter.java
index 2de89b1..2d9e379 100644
--- a/src/java/org/apache/cassandra/io/sstable/CQLSSTableWriter.java
+++ b/src/java/org/apache/cassandra/io/sstable/CQLSSTableWriter.java
@@ -27,6 +27,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.SortedSet;
+import java.util.stream.Collectors;
 
 import com.datastax.driver.core.ProtocolVersion;
 import com.datastax.driver.core.TypeCodec;
@@ -45,7 +46,6 @@ import org.apache.cassandra.cql3.statements.ParsedStatement;
 import org.apache.cassandra.cql3.statements.UpdateStatement;
 import org.apache.cassandra.db.Clustering;
 import org.apache.cassandra.db.DecoratedKey;
-import org.apache.cassandra.db.marshal.AbstractType;
 import org.apache.cassandra.db.marshal.UserType;
 import org.apache.cassandra.db.partitions.Partition;
 import org.apache.cassandra.dht.IPartitioner;
@@ -112,12 +112,15 @@ public class CQLSSTableWriter implements Closeable
 private final AbstractSSTableSimpleWriter writer;
 private final UpdateStatement insert;
 private final List boundNames;
+private final List typeCodecs;
 
 private CQLSSTableWriter(AbstractSSTableSimpleWriter writer, 
UpdateStatement insert, List boundNames)
 {
 this.writer = writer;
 this.insert = insert;
 this.boundNames = boundNames;
+this.typeCodecs = boundNames.stream().map(bn ->  
UDHelper.codecFor(UDHelper.driverType(bn.type)))
+ .collect(Collectors.toList());
 }
 
 /**
@@ -168,9 +171,8 @@ public class CQLSSTableWriter implements Closeable
 
 for (int i = 0; i < size; i++)
 {
-TypeCodec typeCodec = 
UDHelper.codecFor(UDHelper.driverType(boundNames.get(i).type));
-rawValues.add(values.get(i) == null ? null : 
typeCodec.serialize(values.get(i),
- 
ProtocolVersion.NEWEST_SUPPORTED));
+Object value = values.get(i);
+rawValues.add(value == null ? null : 
typeCodecs.get(i).serialize(value, ProtocolVersion.NEWEST_SUPPORTED));
 }
 
 return rawAddRow(rawValues);
@@ -205,7 +207,8 @@ public class CQLSSTableWriter implements Closeable
 {
 ColumnSpecification spec = boundNames.get(i);
 Object value = values.get(spec.name.toString());
-rawValues.add(value == null ? null : ((AbstractType) 
spec.type).decompose(value));
+
+rawValues.add(value == null ? null : 
typeCodecs.get(i).serialize(value, ProtocolVersion.NEWEST_SUPPORTED));
 }
 return rawAddRow(rawValues);
 }

[jira] [Updated] (CASSANDRA-11631) cqlsh COPY FROM fails for null values with non-prepared statements

[Stefania (JIRA)]

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-11631?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Stefania updated CASSANDRA-11631:
-
   Resolution: Fixed
Fix Version/s: (was: 3.0.x)
   (was: 2.2.x)
   (was: 2.1.x)
   (was: 3.x)
   2.2.7
   3.0.6
   3.6
   2.1.15
   Status: Resolved  (was: Patch Available)

> cqlsh COPY FROM fails for null values with non-prepared statements
> --
>
> Key: CASSANDRA-11631
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11631
> Project: Cassandra
>  Issue Type: Bug
>  Components: Tools
>Reporter: Robert Stupp
>Assignee: Stefania
>Priority: Minor
>  Labels: cqlsh
> Fix For: 2.1.15, 3.6, 3.0.6, 2.2.7
>
>
> cqlsh's {{COPY FROM ... WITH PREPAREDSTATEMENTS = False}} fails if the row 
> contains null values. Reason is that the {{','.join(r)}} in 
> {{make_non_prepared_batch_statement}} doesn't seem to handle {{None}}, which 
> results in this error message.
> {code}
> Failed to import 1 rows: TypeError - sequence item 2: expected string, 
> NoneType found,  given up without retries
> {code}
> Attached patch should fix the problem.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[04/10] cassandra git commit: cqlsh COPY FROM fails for null values with non-prepared statements

[stefania]

cqlsh COPY FROM fails for null values with non-prepared statements

patch by Stefania Alborghetti and Robert Stupp; reviewed by Robert Stupp for 
CASSANDRA-11631


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

Branch: refs/heads/trunk
Commit: 72057c6971abf40e2d1a545c4b511be84a4eb69f
Parents: b25139f
Author: Stefania Alborghetti 
Authored: Mon Apr 25 10:33:54 2016 +0800
Committer: Stefania Alborghetti 
Committed: Wed Apr 27 09:05:48 2016 +0800

--
 CHANGES.txt|  1 +
 pylib/cqlshlib/copyutil.py | 36 +++-
 2 files changed, 28 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/72057c69/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index ff26fde..5885a9a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.1.15
+ * cqlsh COPY FROM fails for null values with non-prepared statements 
(CASSANDRA-11631)
  * Make cython optional in pylib/setup.py (CASSANDRA-11630)
  * Change order of directory searching for cassandra.in.sh to favor local one 
(CASSANDRA-11628)
  * cqlsh COPY FROM fails with []{} chars in UDT/tuple fields/values 
(CASSANDRA-11633)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/72057c69/pylib/cqlshlib/copyutil.py
--
diff --git a/pylib/cqlshlib/copyutil.py b/pylib/cqlshlib/copyutil.py
index e12b72f..d68812c 100644
--- a/pylib/cqlshlib/copyutil.py
+++ b/pylib/cqlshlib/copyutil.py
@@ -1634,6 +1634,7 @@ class ImportConversion(object):
 self.thousands_sep = parent.thousands_sep
 self.boolean_styles = parent.boolean_styles
 self.time_format = parent.time_format
+self.debug = parent.debug
 
 self.table_meta = table_meta
 self.primary_key_indexes = [self.columns.index(col.name) for col in 
self.table_meta.primary_key]
@@ -1682,7 +1683,16 @@ class ImportConversion(object):
 return CqlRuleSet.dequote_value(v)
 
 def convert(t, v):
-return converters.get(t.typename, convert_unknown)(unprotect(v), 
ct=t)
+v = unprotect(v)
+if v == self.nullval:
+return self.get_null_val()
+return converters.get(t.typename, convert_unknown)(v, ct=t)
+
+def convert_mandatory(t, v):
+v = unprotect(v)
+if v == self.nullval:
+raise ParseError('Empty values are not allowed')
+return converters.get(t.typename, convert_unknown)(v, ct=t)
 
 def convert_blob(v, **_):
 try:
@@ -1788,13 +1798,13 @@ class ImportConversion(object):
 return Time(v)
 
 def convert_tuple(val, ct=cql_type):
-return tuple(convert(t, v) for t, v in zip(ct.subtypes, 
split(val)))
+return tuple(convert_mandatory(t, v) for t, v in zip(ct.subtypes, 
split(val)))
 
 def convert_list(val, ct=cql_type):
-return list(convert(ct.subtypes[0], v) for v in split(val))
+return list(convert_mandatory(ct.subtypes[0], v) for v in 
split(val))
 
 def convert_set(val, ct=cql_type):
-return frozenset(convert(ct.subtypes[0], v) for v in split(val))
+return frozenset(convert_mandatory(ct.subtypes[0], v) for v in 
split(val))
 
 def convert_map(val, ct=cql_type):
 """
@@ -1806,7 +1816,7 @@ class ImportConversion(object):
 class ImmutableDict(frozenset):
 iteritems = frozenset.__iter__
 
-return ImmutableDict(frozenset((convert(ct.subtypes[0], v[0]), 
convert(ct.subtypes[1], v[1]))
+return ImmutableDict(frozenset((convert_mandatory(ct.subtypes[0], 
v[0]), convert(ct.subtypes[1], v[1]))
  for v in [split('{%s}' % vv, sep=':') for vv 
in split(val)]))
 
 def convert_user_type(val, ct=cql_type):
@@ -1862,6 +1872,9 @@ class ImportConversion(object):
 
 return converters.get(cql_type.typename, convert_unknown)
 
+def get_null_val(self):
+return None if self.use_prepared_statements else "NULL"
+
 def convert_row(self, row):
 """
 Convert the row into a list of parsed values if using prepared 
statements, else simply apply the
@@ -1877,10 +1890,15 @@ class ImportConversion(object):
 if row[i] == self.nullval:
 raise ParseError(self.get_null_primary_key_message(i))
 
-try:
-return [conv(val) if val != 

[jira] [Commented] (CASSANDRA-11631) cqlsh COPY FROM fails for null values with non-prepared statements

[Stefania (JIRA)]

[ 
https://issues.apache.org/jira/browse/CASSANDRA-11631?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15259304#comment-15259304
 ] 

Stefania commented on CASSANDRA-11631:
--

CI is good now.

Committed to 2.1 as 72057c6971abf40e2d1a545c4b511be84a4eb69f and merged upwards.

> cqlsh COPY FROM fails for null values with non-prepared statements
> --
>
> Key: CASSANDRA-11631
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11631
> Project: Cassandra
>  Issue Type: Bug
>  Components: Tools
>Reporter: Robert Stupp
>Assignee: Stefania
>Priority: Minor
>  Labels: cqlsh
> Fix For: 2.1.x, 2.2.x, 3.0.x, 3.x
>
>
> cqlsh's {{COPY FROM ... WITH PREPAREDSTATEMENTS = False}} fails if the row 
> contains null values. Reason is that the {{','.join(r)}} in 
> {{make_non_prepared_batch_statement}} doesn't seem to handle {{None}}, which 
> results in this error message.
> {code}
> Failed to import 1 rows: TypeError - sequence item 2: expected string, 
> NoneType found,  given up without retries
> {code}
> Attached patch should fix the problem.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[10/10] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

[stefania]

Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: e6505a606f98707d3aab436e0713f5dab004a5ab
Parents: 0b81f72 f2afd04
Author: Stefania Alborghetti 
Authored: Wed Apr 27 09:09:34 2016 +0800
Committer: Stefania Alborghetti 
Committed: Wed Apr 27 09:10:17 2016 +0800

--
 CHANGES.txt  |  1 +
 pylib/cqlshlib/copyutil.py   | 39 +--
 pylib/cqlshlib/formatting.py | 22 +-
 3 files changed, 51 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e6505a60/CHANGES.txt
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e6505a60/pylib/cqlshlib/copyutil.py
--
diff --cc pylib/cqlshlib/copyutil.py
index 36c951c,b17bdfe..46c7eb6
--- a/pylib/cqlshlib/copyutil.py
+++ b/pylib/cqlshlib/copyutil.py
@@@ -306,9 -306,8 +306,10 @@@ class CopyTask(object)
  copy_options['pagetimeout'] = int(opts.pop('pagetimeout', max(10, 10 
* (copy_options['pagesize'] / 1000
  copy_options['maxattempts'] = int(opts.pop('maxattempts', 5))
  copy_options['dtformats'] = DateTimeFormat(opts.pop('datetimeformat', 
shell.display_timestamp_format),
--   shell.display_date_format, 
shell.display_nanotime_format)
 -copy_options['float_precision'] = shell.display_float_precision
++   shell.display_date_format, 
shell.display_nanotime_format,
++   milliseconds_only=True)
 +copy_options['floatprecision'] = int(opts.pop('floatprecision', '5'))
 +copy_options['doubleprecision'] = int(opts.pop('doubleprecision', 
'12'))
  copy_options['chunksize'] = int(opts.pop('chunksize', 5000))
  copy_options['ingestrate'] = int(opts.pop('ingestrate', 10))
  copy_options['maxbatchsize'] = int(opts.pop('maxbatchsize', 20))

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e6505a60/pylib/cqlshlib/formatting.py
--
diff --cc pylib/cqlshlib/formatting.py
index aa50204,dcd08da..5364c18
--- a/pylib/cqlshlib/formatting.py
+++ b/pylib/cqlshlib/formatting.py
@@@ -101,101 -99,20 +101,102 @@@ def color_text(bval, colormap, displayw
  
  DEFAULT_NANOTIME_FORMAT = '%H:%M:%S.%N'
  DEFAULT_DATE_FORMAT = '%Y-%m-%d'
 -DEFAULT_TIMESTAMP_FORMAT = '%Y-%m-%d %H:%M:%S%z'
  
 -if platform.system() == 'Windows':
 -DEFAULT_TIME_FORMAT = '%Y-%m-%d %H:%M:%S %Z'
 +DEFAULT_TIMESTAMP_FORMAT = os.environ.get('CQLSH_DEFAULT_TIMESTAMP_FORMAT', 
'')
 +if not DEFAULT_TIMESTAMP_FORMAT:
 +DEFAULT_TIMESTAMP_FORMAT = '%Y-%m-%d %H:%M:%S.%f%z'
  
  
 -class DateTimeFormat():
 +class DateTimeFormat:
  
  def __init__(self, timestamp_format=DEFAULT_TIMESTAMP_FORMAT, 
date_format=DEFAULT_DATE_FORMAT,
-- nanotime_format=DEFAULT_NANOTIME_FORMAT, timezone=None):
++ nanotime_format=DEFAULT_NANOTIME_FORMAT, timezone=None, 
milliseconds_only=False):
  self.timestamp_format = timestamp_format
  self.date_format = date_format
  self.nanotime_format = nanotime_format
  self.timezone = timezone
++self.milliseconds_only = milliseconds_only  # the microseconds part, 
.NN, wil be rounded to .NNN
 +
 +
 +class CqlType(object):
 +"""
 +A class for converting a string into a cql type name that can match a 
formatter
 +and a list of its sub-types, if any.
 +"""
 +pattern = re.compile('^([^<]*)<(.*)>$')  # *<*>
 +
 +def __init__(self, typestring, ksmeta=None):
 +self.type_name, self.sub_types, self.formatter = 
self.parse(typestring, ksmeta)
 +
 +def __str__(self):
 +return "%s%s" % (self.type_name, self.sub_types or '')
 +
 +__repr__ = __str__
 +
 +def get_n_sub_types(self, num):
 +"""
 +Return the sub-types if the requested number matches the length of 
the sub-types (tuples)
 +or the first sub-type times the number requested if the length of the 
sub-types is one (list, set),
 +otherwise raise an exception
 +"""
 +if len(self.sub_types) == num:
 +return self.sub_types
 +elif len(self.sub_types) == 1:
 +return [self.sub_types[0]] * num
 +else:
 +raise 

[01/10] cassandra git commit: cqlsh COPY FROM fails for null values with non-prepared statements

[stefania]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 b25139f8a -> 72057c697
  refs/heads/cassandra-2.2 2dbcb5dae -> b6b251770
  refs/heads/cassandra-3.0 fae7bf9c2 -> f2afd04e7
  refs/heads/trunk 0b81f72ed -> e6505a606


cqlsh COPY FROM fails for null values with non-prepared statements

patch by Stefania Alborghetti and Robert Stupp; reviewed by Robert Stupp for 
CASSANDRA-11631


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

Branch: refs/heads/cassandra-2.1
Commit: 72057c6971abf40e2d1a545c4b511be84a4eb69f
Parents: b25139f
Author: Stefania Alborghetti 
Authored: Mon Apr 25 10:33:54 2016 +0800
Committer: Stefania Alborghetti 
Committed: Wed Apr 27 09:05:48 2016 +0800

--
 CHANGES.txt|  1 +
 pylib/cqlshlib/copyutil.py | 36 +++-
 2 files changed, 28 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/72057c69/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index ff26fde..5885a9a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.1.15
+ * cqlsh COPY FROM fails for null values with non-prepared statements 
(CASSANDRA-11631)
  * Make cython optional in pylib/setup.py (CASSANDRA-11630)
  * Change order of directory searching for cassandra.in.sh to favor local one 
(CASSANDRA-11628)
  * cqlsh COPY FROM fails with []{} chars in UDT/tuple fields/values 
(CASSANDRA-11633)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/72057c69/pylib/cqlshlib/copyutil.py
--
diff --git a/pylib/cqlshlib/copyutil.py b/pylib/cqlshlib/copyutil.py
index e12b72f..d68812c 100644
--- a/pylib/cqlshlib/copyutil.py
+++ b/pylib/cqlshlib/copyutil.py
@@ -1634,6 +1634,7 @@ class ImportConversion(object):
 self.thousands_sep = parent.thousands_sep
 self.boolean_styles = parent.boolean_styles
 self.time_format = parent.time_format
+self.debug = parent.debug
 
 self.table_meta = table_meta
 self.primary_key_indexes = [self.columns.index(col.name) for col in 
self.table_meta.primary_key]
@@ -1682,7 +1683,16 @@ class ImportConversion(object):
 return CqlRuleSet.dequote_value(v)
 
 def convert(t, v):
-return converters.get(t.typename, convert_unknown)(unprotect(v), 
ct=t)
+v = unprotect(v)
+if v == self.nullval:
+return self.get_null_val()
+return converters.get(t.typename, convert_unknown)(v, ct=t)
+
+def convert_mandatory(t, v):
+v = unprotect(v)
+if v == self.nullval:
+raise ParseError('Empty values are not allowed')
+return converters.get(t.typename, convert_unknown)(v, ct=t)
 
 def convert_blob(v, **_):
 try:
@@ -1788,13 +1798,13 @@ class ImportConversion(object):
 return Time(v)
 
 def convert_tuple(val, ct=cql_type):
-return tuple(convert(t, v) for t, v in zip(ct.subtypes, 
split(val)))
+return tuple(convert_mandatory(t, v) for t, v in zip(ct.subtypes, 
split(val)))
 
 def convert_list(val, ct=cql_type):
-return list(convert(ct.subtypes[0], v) for v in split(val))
+return list(convert_mandatory(ct.subtypes[0], v) for v in 
split(val))
 
 def convert_set(val, ct=cql_type):
-return frozenset(convert(ct.subtypes[0], v) for v in split(val))
+return frozenset(convert_mandatory(ct.subtypes[0], v) for v in 
split(val))
 
 def convert_map(val, ct=cql_type):
 """
@@ -1806,7 +1816,7 @@ class ImportConversion(object):
 class ImmutableDict(frozenset):
 iteritems = frozenset.__iter__
 
-return ImmutableDict(frozenset((convert(ct.subtypes[0], v[0]), 
convert(ct.subtypes[1], v[1]))
+return ImmutableDict(frozenset((convert_mandatory(ct.subtypes[0], 
v[0]), convert(ct.subtypes[1], v[1]))
  for v in [split('{%s}' % vv, sep=':') for vv 
in split(val)]))
 
 def convert_user_type(val, ct=cql_type):
@@ -1862,6 +1872,9 @@ class ImportConversion(object):
 
 return converters.get(cql_type.typename, convert_unknown)
 
+def get_null_val(self):
+return None if self.use_prepared_statements else "NULL"
+
 def convert_row(self, row):
 """
 Convert the row into a list of parsed values if using prepared 
statements, else simply 

[03/10] cassandra git commit: cqlsh COPY FROM fails for null values with non-prepared statements

[stefania]

cqlsh COPY FROM fails for null values with non-prepared statements

patch by Stefania Alborghetti and Robert Stupp; reviewed by Robert Stupp for 
CASSANDRA-11631


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

Branch: refs/heads/cassandra-3.0
Commit: 72057c6971abf40e2d1a545c4b511be84a4eb69f
Parents: b25139f
Author: Stefania Alborghetti 
Authored: Mon Apr 25 10:33:54 2016 +0800
Committer: Stefania Alborghetti 
Committed: Wed Apr 27 09:05:48 2016 +0800

--
 CHANGES.txt|  1 +
 pylib/cqlshlib/copyutil.py | 36 +++-
 2 files changed, 28 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/72057c69/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index ff26fde..5885a9a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.1.15
+ * cqlsh COPY FROM fails for null values with non-prepared statements 
(CASSANDRA-11631)
  * Make cython optional in pylib/setup.py (CASSANDRA-11630)
  * Change order of directory searching for cassandra.in.sh to favor local one 
(CASSANDRA-11628)
  * cqlsh COPY FROM fails with []{} chars in UDT/tuple fields/values 
(CASSANDRA-11633)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/72057c69/pylib/cqlshlib/copyutil.py
--
diff --git a/pylib/cqlshlib/copyutil.py b/pylib/cqlshlib/copyutil.py
index e12b72f..d68812c 100644
--- a/pylib/cqlshlib/copyutil.py
+++ b/pylib/cqlshlib/copyutil.py
@@ -1634,6 +1634,7 @@ class ImportConversion(object):
 self.thousands_sep = parent.thousands_sep
 self.boolean_styles = parent.boolean_styles
 self.time_format = parent.time_format
+self.debug = parent.debug
 
 self.table_meta = table_meta
 self.primary_key_indexes = [self.columns.index(col.name) for col in 
self.table_meta.primary_key]
@@ -1682,7 +1683,16 @@ class ImportConversion(object):
 return CqlRuleSet.dequote_value(v)
 
 def convert(t, v):
-return converters.get(t.typename, convert_unknown)(unprotect(v), 
ct=t)
+v = unprotect(v)
+if v == self.nullval:
+return self.get_null_val()
+return converters.get(t.typename, convert_unknown)(v, ct=t)
+
+def convert_mandatory(t, v):
+v = unprotect(v)
+if v == self.nullval:
+raise ParseError('Empty values are not allowed')
+return converters.get(t.typename, convert_unknown)(v, ct=t)
 
 def convert_blob(v, **_):
 try:
@@ -1788,13 +1798,13 @@ class ImportConversion(object):
 return Time(v)
 
 def convert_tuple(val, ct=cql_type):
-return tuple(convert(t, v) for t, v in zip(ct.subtypes, 
split(val)))
+return tuple(convert_mandatory(t, v) for t, v in zip(ct.subtypes, 
split(val)))
 
 def convert_list(val, ct=cql_type):
-return list(convert(ct.subtypes[0], v) for v in split(val))
+return list(convert_mandatory(ct.subtypes[0], v) for v in 
split(val))
 
 def convert_set(val, ct=cql_type):
-return frozenset(convert(ct.subtypes[0], v) for v in split(val))
+return frozenset(convert_mandatory(ct.subtypes[0], v) for v in 
split(val))
 
 def convert_map(val, ct=cql_type):
 """
@@ -1806,7 +1816,7 @@ class ImportConversion(object):
 class ImmutableDict(frozenset):
 iteritems = frozenset.__iter__
 
-return ImmutableDict(frozenset((convert(ct.subtypes[0], v[0]), 
convert(ct.subtypes[1], v[1]))
+return ImmutableDict(frozenset((convert_mandatory(ct.subtypes[0], 
v[0]), convert(ct.subtypes[1], v[1]))
  for v in [split('{%s}' % vv, sep=':') for vv 
in split(val)]))
 
 def convert_user_type(val, ct=cql_type):
@@ -1862,6 +1872,9 @@ class ImportConversion(object):
 
 return converters.get(cql_type.typename, convert_unknown)
 
+def get_null_val(self):
+return None if self.use_prepared_statements else "NULL"
+
 def convert_row(self, row):
 """
 Convert the row into a list of parsed values if using prepared 
statements, else simply apply the
@@ -1877,10 +1890,15 @@ class ImportConversion(object):
 if row[i] == self.nullval:
 raise ParseError(self.get_null_primary_key_message(i))
 
-try:
-return [conv(val) if val != 

[06/10] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

[stefania]

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/cassandra-2.2
Commit: b6b2517700b058900ec15b0c61717f82308c9138
Parents: 2dbcb5d 72057c6
Author: Stefania Alborghetti 
Authored: Wed Apr 27 09:06:45 2016 +0800
Committer: Stefania Alborghetti 
Committed: Wed Apr 27 09:07:48 2016 +0800

--
 CHANGES.txt|  1 +
 pylib/cqlshlib/copyutil.py | 36 +++-
 2 files changed, 28 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b6b25177/CHANGES.txt
--
diff --cc CHANGES.txt
index b3dea85,5885a9a..bdabf29
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,5 +1,11 @@@
 -2.1.15
 +2.2.7
 + * Add missing files to debian packages (CASSANDRA-11642)
 + * Avoid calling Iterables::concat in loops during 
ModificationStatement::getFunctions (CASSANDRA-11621)
 + * cqlsh: COPY FROM should use regular inserts for single statement batches 
and
 +  report errors correctly if workers processes crash on 
initialization (CASSANDRA-11474)
 + * Always close cluster with connection in CqlRecordWriter (CASSANDRA-11553)
 +Merged from 2.1:
+  * cqlsh COPY FROM fails for null values with non-prepared statements 
(CASSANDRA-11631)
   * Make cython optional in pylib/setup.py (CASSANDRA-11630)
   * Change order of directory searching for cassandra.in.sh to favor local one 
(CASSANDRA-11628)
   * cqlsh COPY FROM fails with []{} chars in UDT/tuple fields/values 
(CASSANDRA-11633)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b6b25177/pylib/cqlshlib/copyutil.py
--
diff --cc pylib/cqlshlib/copyutil.py
index e927ccc,d68812c..a7a6671
--- a/pylib/cqlshlib/copyutil.py
+++ b/pylib/cqlshlib/copyutil.py
@@@ -1657,7 -1633,8 +1657,8 @@@ class ImportConversion(object)
  self.decimal_sep = parent.decimal_sep
  self.thousands_sep = parent.thousands_sep
  self.boolean_styles = parent.boolean_styles
 -self.time_format = parent.time_format
 +self.date_time_format = parent.date_time_format.timestamp_format
+ self.debug = parent.debug
  
  self.table_meta = table_meta
  self.primary_key_indexes = [self.columns.index(col.name) for col in 
self.table_meta.primary_key]
@@@ -1706,10 -1683,23 +1707,19 @@@
  return CqlRuleSet.dequote_value(v)
  
  def convert(t, v):
- return converters.get(t.typename, convert_unknown)(unprotect(v), 
ct=t)
+ v = unprotect(v)
+ if v == self.nullval:
+ return self.get_null_val()
+ return converters.get(t.typename, convert_unknown)(v, ct=t)
+ 
+ def convert_mandatory(t, v):
+ v = unprotect(v)
+ if v == self.nullval:
+ raise ParseError('Empty values are not allowed')
+ return converters.get(t.typename, convert_unknown)(v, ct=t)
  
  def convert_blob(v, **_):
 -try:
 -return bytearray.fromhex(v[2:])
 -except TypeError:
 -# Work-around for Python 2.6 bug
 -return bytearray.fromhex(unicode(v[2:]))
 +return bytearray.fromhex(v[2:])
  
  def convert_text(v, **_):
  return v
@@@ -1897,10 -1890,15 +1910,15 @@@
  if row[i] == self.nullval:
  raise ParseError(self.get_null_primary_key_message(i))
  
- try:
- return [conv(val) if val != self.nullval else None for conv, val 
in zip(converters, row)]
- except Exception, e:
- raise ParseError(e.message)
+ def convert(c, v):
+ try:
+ return c(v) if v != self.nullval else self.get_null_val()
+ except Exception, e:
+ if self.debug:
+ traceback.print_exc()
 -raise ParseError("Failed to parse %s : %s" % (val, str(e)))
++raise ParseError("Failed to parse %s : %s" % (val, e.message))
+ 
+ return [convert(conv, val) for conv, val in zip(converters, row)]
  
  def get_null_primary_key_message(self, idx):
  message = "Cannot insert null value for primary key column '%s'." % 
(self.columns[idx],)

[07/10] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

[stefania]

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/trunk
Commit: b6b2517700b058900ec15b0c61717f82308c9138
Parents: 2dbcb5d 72057c6
Author: Stefania Alborghetti 
Authored: Wed Apr 27 09:06:45 2016 +0800
Committer: Stefania Alborghetti 
Committed: Wed Apr 27 09:07:48 2016 +0800

--
 CHANGES.txt|  1 +
 pylib/cqlshlib/copyutil.py | 36 +++-
 2 files changed, 28 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b6b25177/CHANGES.txt
--
diff --cc CHANGES.txt
index b3dea85,5885a9a..bdabf29
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,5 +1,11 @@@
 -2.1.15
 +2.2.7
 + * Add missing files to debian packages (CASSANDRA-11642)
 + * Avoid calling Iterables::concat in loops during 
ModificationStatement::getFunctions (CASSANDRA-11621)
 + * cqlsh: COPY FROM should use regular inserts for single statement batches 
and
 +  report errors correctly if workers processes crash on 
initialization (CASSANDRA-11474)
 + * Always close cluster with connection in CqlRecordWriter (CASSANDRA-11553)
 +Merged from 2.1:
+  * cqlsh COPY FROM fails for null values with non-prepared statements 
(CASSANDRA-11631)
   * Make cython optional in pylib/setup.py (CASSANDRA-11630)
   * Change order of directory searching for cassandra.in.sh to favor local one 
(CASSANDRA-11628)
   * cqlsh COPY FROM fails with []{} chars in UDT/tuple fields/values 
(CASSANDRA-11633)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b6b25177/pylib/cqlshlib/copyutil.py
--
diff --cc pylib/cqlshlib/copyutil.py
index e927ccc,d68812c..a7a6671
--- a/pylib/cqlshlib/copyutil.py
+++ b/pylib/cqlshlib/copyutil.py
@@@ -1657,7 -1633,8 +1657,8 @@@ class ImportConversion(object)
  self.decimal_sep = parent.decimal_sep
  self.thousands_sep = parent.thousands_sep
  self.boolean_styles = parent.boolean_styles
 -self.time_format = parent.time_format
 +self.date_time_format = parent.date_time_format.timestamp_format
+ self.debug = parent.debug
  
  self.table_meta = table_meta
  self.primary_key_indexes = [self.columns.index(col.name) for col in 
self.table_meta.primary_key]
@@@ -1706,10 -1683,23 +1707,19 @@@
  return CqlRuleSet.dequote_value(v)
  
  def convert(t, v):
- return converters.get(t.typename, convert_unknown)(unprotect(v), 
ct=t)
+ v = unprotect(v)
+ if v == self.nullval:
+ return self.get_null_val()
+ return converters.get(t.typename, convert_unknown)(v, ct=t)
+ 
+ def convert_mandatory(t, v):
+ v = unprotect(v)
+ if v == self.nullval:
+ raise ParseError('Empty values are not allowed')
+ return converters.get(t.typename, convert_unknown)(v, ct=t)
  
  def convert_blob(v, **_):
 -try:
 -return bytearray.fromhex(v[2:])
 -except TypeError:
 -# Work-around for Python 2.6 bug
 -return bytearray.fromhex(unicode(v[2:]))
 +return bytearray.fromhex(v[2:])
  
  def convert_text(v, **_):
  return v
@@@ -1897,10 -1890,15 +1910,15 @@@
  if row[i] == self.nullval:
  raise ParseError(self.get_null_primary_key_message(i))
  
- try:
- return [conv(val) if val != self.nullval else None for conv, val 
in zip(converters, row)]
- except Exception, e:
- raise ParseError(e.message)
+ def convert(c, v):
+ try:
+ return c(v) if v != self.nullval else self.get_null_val()
+ except Exception, e:
+ if self.debug:
+ traceback.print_exc()
 -raise ParseError("Failed to parse %s : %s" % (val, str(e)))
++raise ParseError("Failed to parse %s : %s" % (val, e.message))
+ 
+ return [convert(conv, val) for conv, val in zip(converters, row)]
  
  def get_null_primary_key_message(self, idx):
  message = "Cannot insert null value for primary key column '%s'." % 
(self.columns[idx],)

[02/10] cassandra git commit: cqlsh COPY FROM fails for null values with non-prepared statements

[stefania]

cqlsh COPY FROM fails for null values with non-prepared statements

patch by Stefania Alborghetti and Robert Stupp; reviewed by Robert Stupp for 
CASSANDRA-11631


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

Branch: refs/heads/cassandra-2.2
Commit: 72057c6971abf40e2d1a545c4b511be84a4eb69f
Parents: b25139f
Author: Stefania Alborghetti 
Authored: Mon Apr 25 10:33:54 2016 +0800
Committer: Stefania Alborghetti 
Committed: Wed Apr 27 09:05:48 2016 +0800

--
 CHANGES.txt|  1 +
 pylib/cqlshlib/copyutil.py | 36 +++-
 2 files changed, 28 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/72057c69/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index ff26fde..5885a9a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.1.15
+ * cqlsh COPY FROM fails for null values with non-prepared statements 
(CASSANDRA-11631)
  * Make cython optional in pylib/setup.py (CASSANDRA-11630)
  * Change order of directory searching for cassandra.in.sh to favor local one 
(CASSANDRA-11628)
  * cqlsh COPY FROM fails with []{} chars in UDT/tuple fields/values 
(CASSANDRA-11633)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/72057c69/pylib/cqlshlib/copyutil.py
--
diff --git a/pylib/cqlshlib/copyutil.py b/pylib/cqlshlib/copyutil.py
index e12b72f..d68812c 100644
--- a/pylib/cqlshlib/copyutil.py
+++ b/pylib/cqlshlib/copyutil.py
@@ -1634,6 +1634,7 @@ class ImportConversion(object):
 self.thousands_sep = parent.thousands_sep
 self.boolean_styles = parent.boolean_styles
 self.time_format = parent.time_format
+self.debug = parent.debug
 
 self.table_meta = table_meta
 self.primary_key_indexes = [self.columns.index(col.name) for col in 
self.table_meta.primary_key]
@@ -1682,7 +1683,16 @@ class ImportConversion(object):
 return CqlRuleSet.dequote_value(v)
 
 def convert(t, v):
-return converters.get(t.typename, convert_unknown)(unprotect(v), 
ct=t)
+v = unprotect(v)
+if v == self.nullval:
+return self.get_null_val()
+return converters.get(t.typename, convert_unknown)(v, ct=t)
+
+def convert_mandatory(t, v):
+v = unprotect(v)
+if v == self.nullval:
+raise ParseError('Empty values are not allowed')
+return converters.get(t.typename, convert_unknown)(v, ct=t)
 
 def convert_blob(v, **_):
 try:
@@ -1788,13 +1798,13 @@ class ImportConversion(object):
 return Time(v)
 
 def convert_tuple(val, ct=cql_type):
-return tuple(convert(t, v) for t, v in zip(ct.subtypes, 
split(val)))
+return tuple(convert_mandatory(t, v) for t, v in zip(ct.subtypes, 
split(val)))
 
 def convert_list(val, ct=cql_type):
-return list(convert(ct.subtypes[0], v) for v in split(val))
+return list(convert_mandatory(ct.subtypes[0], v) for v in 
split(val))
 
 def convert_set(val, ct=cql_type):
-return frozenset(convert(ct.subtypes[0], v) for v in split(val))
+return frozenset(convert_mandatory(ct.subtypes[0], v) for v in 
split(val))
 
 def convert_map(val, ct=cql_type):
 """
@@ -1806,7 +1816,7 @@ class ImportConversion(object):
 class ImmutableDict(frozenset):
 iteritems = frozenset.__iter__
 
-return ImmutableDict(frozenset((convert(ct.subtypes[0], v[0]), 
convert(ct.subtypes[1], v[1]))
+return ImmutableDict(frozenset((convert_mandatory(ct.subtypes[0], 
v[0]), convert(ct.subtypes[1], v[1]))
  for v in [split('{%s}' % vv, sep=':') for vv 
in split(val)]))
 
 def convert_user_type(val, ct=cql_type):
@@ -1862,6 +1872,9 @@ class ImportConversion(object):
 
 return converters.get(cql_type.typename, convert_unknown)
 
+def get_null_val(self):
+return None if self.use_prepared_statements else "NULL"
+
 def convert_row(self, row):
 """
 Convert the row into a list of parsed values if using prepared 
statements, else simply apply the
@@ -1877,10 +1890,15 @@ class ImportConversion(object):
 if row[i] == self.nullval:
 raise ParseError(self.get_null_primary_key_message(i))
 
-try:
-return [conv(val) if val != 

[08/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[stefania]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: f2afd04e7335060f06d2143a6cda00287dfcceb1
Parents: fae7bf9 b6b2517
Author: Stefania Alborghetti 
Authored: Wed Apr 27 09:08:28 2016 +0800
Committer: Stefania Alborghetti 
Committed: Wed Apr 27 09:09:10 2016 +0800

--
 CHANGES.txt|  1 +
 pylib/cqlshlib/copyutil.py | 36 +++-
 2 files changed, 28 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f2afd04e/CHANGES.txt
--
diff --cc CHANGES.txt
index b1cf2ac,bdabf29..f02d4f2
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -17,11 -4,8 +17,12 @@@ Merged from 2.2
   * cqlsh: COPY FROM should use regular inserts for single statement batches 
and
report errors correctly if workers processes crash on 
initialization (CASSANDRA-11474)
   * Always close cluster with connection in CqlRecordWriter (CASSANDRA-11553)
 + * Allow only DISTINCT queries with partition keys restrictions 
(CASSANDRA-11339)
 + * CqlConfigHelper no longer requires both a keystore and truststore to work 
(CASSANDRA-11532)
 + * Make deprecated repair methods backward-compatible with previous 
notification service (CASSANDRA-11430)
 + * IncomingStreamingConnection version check message wrong (CASSANDRA-11462)
  Merged from 2.1:
+  * cqlsh COPY FROM fails for null values with non-prepared statements 
(CASSANDRA-11631)
   * Make cython optional in pylib/setup.py (CASSANDRA-11630)
   * Change order of directory searching for cassandra.in.sh to favor local one 
(CASSANDRA-11628)
   * cqlsh COPY FROM fails with []{} chars in UDT/tuple fields/values 
(CASSANDRA-11633)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f2afd04e/pylib/cqlshlib/copyutil.py
--

[05/10] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

[stefania]

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/cassandra-3.0
Commit: b6b2517700b058900ec15b0c61717f82308c9138
Parents: 2dbcb5d 72057c6
Author: Stefania Alborghetti 
Authored: Wed Apr 27 09:06:45 2016 +0800
Committer: Stefania Alborghetti 
Committed: Wed Apr 27 09:07:48 2016 +0800

--
 CHANGES.txt|  1 +
 pylib/cqlshlib/copyutil.py | 36 +++-
 2 files changed, 28 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b6b25177/CHANGES.txt
--
diff --cc CHANGES.txt
index b3dea85,5885a9a..bdabf29
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,5 +1,11 @@@
 -2.1.15
 +2.2.7
 + * Add missing files to debian packages (CASSANDRA-11642)
 + * Avoid calling Iterables::concat in loops during 
ModificationStatement::getFunctions (CASSANDRA-11621)
 + * cqlsh: COPY FROM should use regular inserts for single statement batches 
and
 +  report errors correctly if workers processes crash on 
initialization (CASSANDRA-11474)
 + * Always close cluster with connection in CqlRecordWriter (CASSANDRA-11553)
 +Merged from 2.1:
+  * cqlsh COPY FROM fails for null values with non-prepared statements 
(CASSANDRA-11631)
   * Make cython optional in pylib/setup.py (CASSANDRA-11630)
   * Change order of directory searching for cassandra.in.sh to favor local one 
(CASSANDRA-11628)
   * cqlsh COPY FROM fails with []{} chars in UDT/tuple fields/values 
(CASSANDRA-11633)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b6b25177/pylib/cqlshlib/copyutil.py
--
diff --cc pylib/cqlshlib/copyutil.py
index e927ccc,d68812c..a7a6671
--- a/pylib/cqlshlib/copyutil.py
+++ b/pylib/cqlshlib/copyutil.py
@@@ -1657,7 -1633,8 +1657,8 @@@ class ImportConversion(object)
  self.decimal_sep = parent.decimal_sep
  self.thousands_sep = parent.thousands_sep
  self.boolean_styles = parent.boolean_styles
 -self.time_format = parent.time_format
 +self.date_time_format = parent.date_time_format.timestamp_format
+ self.debug = parent.debug
  
  self.table_meta = table_meta
  self.primary_key_indexes = [self.columns.index(col.name) for col in 
self.table_meta.primary_key]
@@@ -1706,10 -1683,23 +1707,19 @@@
  return CqlRuleSet.dequote_value(v)
  
  def convert(t, v):
- return converters.get(t.typename, convert_unknown)(unprotect(v), 
ct=t)
+ v = unprotect(v)
+ if v == self.nullval:
+ return self.get_null_val()
+ return converters.get(t.typename, convert_unknown)(v, ct=t)
+ 
+ def convert_mandatory(t, v):
+ v = unprotect(v)
+ if v == self.nullval:
+ raise ParseError('Empty values are not allowed')
+ return converters.get(t.typename, convert_unknown)(v, ct=t)
  
  def convert_blob(v, **_):
 -try:
 -return bytearray.fromhex(v[2:])
 -except TypeError:
 -# Work-around for Python 2.6 bug
 -return bytearray.fromhex(unicode(v[2:]))
 +return bytearray.fromhex(v[2:])
  
  def convert_text(v, **_):
  return v
@@@ -1897,10 -1890,15 +1910,15 @@@
  if row[i] == self.nullval:
  raise ParseError(self.get_null_primary_key_message(i))
  
- try:
- return [conv(val) if val != self.nullval else None for conv, val 
in zip(converters, row)]
- except Exception, e:
- raise ParseError(e.message)
+ def convert(c, v):
+ try:
+ return c(v) if v != self.nullval else self.get_null_val()
+ except Exception, e:
+ if self.debug:
+ traceback.print_exc()
 -raise ParseError("Failed to parse %s : %s" % (val, str(e)))
++raise ParseError("Failed to parse %s : %s" % (val, e.message))
+ 
+ return [convert(conv, val) for conv, val in zip(converters, row)]
  
  def get_null_primary_key_message(self, idx):
  message = "Cannot insert null value for primary key column '%s'." % 
(self.columns[idx],)

[09/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[stefania]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: f2afd04e7335060f06d2143a6cda00287dfcceb1
Parents: fae7bf9 b6b2517
Author: Stefania Alborghetti 
Authored: Wed Apr 27 09:08:28 2016 +0800
Committer: Stefania Alborghetti 
Committed: Wed Apr 27 09:09:10 2016 +0800

--
 CHANGES.txt|  1 +
 pylib/cqlshlib/copyutil.py | 36 +++-
 2 files changed, 28 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f2afd04e/CHANGES.txt
--
diff --cc CHANGES.txt
index b1cf2ac,bdabf29..f02d4f2
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -17,11 -4,8 +17,12 @@@ Merged from 2.2
   * cqlsh: COPY FROM should use regular inserts for single statement batches 
and
report errors correctly if workers processes crash on 
initialization (CASSANDRA-11474)
   * Always close cluster with connection in CqlRecordWriter (CASSANDRA-11553)
 + * Allow only DISTINCT queries with partition keys restrictions 
(CASSANDRA-11339)
 + * CqlConfigHelper no longer requires both a keystore and truststore to work 
(CASSANDRA-11532)
 + * Make deprecated repair methods backward-compatible with previous 
notification service (CASSANDRA-11430)
 + * IncomingStreamingConnection version check message wrong (CASSANDRA-11462)
  Merged from 2.1:
+  * cqlsh COPY FROM fails for null values with non-prepared statements 
(CASSANDRA-11631)
   * Make cython optional in pylib/setup.py (CASSANDRA-11630)
   * Change order of directory searching for cassandra.in.sh to favor local one 
(CASSANDRA-11628)
   * cqlsh COPY FROM fails with []{} chars in UDT/tuple fields/values 
(CASSANDRA-11633)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f2afd04e/pylib/cqlshlib/copyutil.py
--

[jira] [Updated] (CASSANDRA-11630) Make cython optional in pylib/setup.py

[Stefania (JIRA)]

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-11630?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Stefania updated CASSANDRA-11630:
-
   Resolution: Fixed
Fix Version/s: (was: 3.0.x)
   (was: 2.2.x)
   (was: 2.1.x)
   (was: 3.x)
   2.2.7
   3.0.6
   3.6
   2.1.15
   Status: Resolved  (was: Patch Available)

> Make cython optional in pylib/setup.py
> --
>
> Key: CASSANDRA-11630
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11630
> Project: Cassandra
>  Issue Type: Bug
>  Components: Tools
>Reporter: Stefania
>Assignee: Stefania
> Fix For: 2.1.15, 3.6, 3.0.6, 2.2.7
>
> Attachments: cassandra_3.4_amd64.build.txt
>
>
> When building deb packages, we currently run [this 
> line|https://github.com/apache/cassandra/blob/trunk/debian/rules#L33-L34]:
> {code}
> cd pylib && python setup.py install --no-compile --install-layout deb \
>   --root $(CURDIR)/debian/cassandra
> {code}
> Since CASSANDRA-11053 was introduced, this will build the cython extensions 
> for _copyutil.py_.
> We should change _setup.py_ so that when we specify {{--no-compile}} then the 
> cython extensions are not built, in a similar way to what is done for the 
> Python driver.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Commented] (CASSANDRA-11630) Make cython optional in pylib/setup.py

[Stefania (JIRA)]

[ 
https://issues.apache.org/jira/browse/CASSANDRA-11630?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15259281#comment-15259281
 ] 

Stefania commented on CASSANDRA-11630:
--

Thank you. Committed to 2.1 as b25139f8ac5dd8a2955c4a0c13df61d529852e2f and 
merged upwards.

> Make cython optional in pylib/setup.py
> --
>
> Key: CASSANDRA-11630
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11630
> Project: Cassandra
>  Issue Type: Bug
>  Components: Tools
>Reporter: Stefania
>Assignee: Stefania
> Fix For: 2.1.15, 3.6, 3.0.6, 2.2.7
>
> Attachments: cassandra_3.4_amd64.build.txt
>
>
> When building deb packages, we currently run [this 
> line|https://github.com/apache/cassandra/blob/trunk/debian/rules#L33-L34]:
> {code}
> cd pylib && python setup.py install --no-compile --install-layout deb \
>   --root $(CURDIR)/debian/cassandra
> {code}
> Since CASSANDRA-11053 was introduced, this will build the cython extensions 
> for _copyutil.py_.
> We should change _setup.py_ so that when we specify {{--no-compile}} then the 
> cython extensions are not built, in a similar way to what is done for the 
> Python driver.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[04/10] cassandra git commit: Make cython optional in pylib/setup.py

[stefania]

Make cython optional in pylib/setup.py

patch by Stefania Alborghetti; reviewed by tjake for CASSANDRA-11630


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

Branch: refs/heads/trunk
Commit: b25139f8ac5dd8a2955c4a0c13df61d529852e2f
Parents: ae03066
Author: Stefania Alborghetti 
Authored: Fri Apr 22 10:15:01 2016 +0800
Committer: Stefania Alborghetti 
Committed: Wed Apr 27 08:42:32 2016 +0800

--
 CHANGES.txt|  1 +
 pylib/setup.py | 12 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b25139f8/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index d170def..ff26fde 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.1.15
+ * Make cython optional in pylib/setup.py (CASSANDRA-11630)
  * Change order of directory searching for cassandra.in.sh to favor local one 
(CASSANDRA-11628)
  * cqlsh COPY FROM fails with []{} chars in UDT/tuple fields/values 
(CASSANDRA-11633)
  * clqsh: COPY FROM throws TypeError with Cython extensions enabled 
(CASSANDRA-11574)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b25139f8/pylib/setup.py
--
diff --git a/pylib/setup.py b/pylib/setup.py
index 3654502..a9f654a 100755
--- a/pylib/setup.py
+++ b/pylib/setup.py
@@ -15,12 +15,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import sys
 from distutils.core import setup
-from Cython.Build import cythonize
+
+
+def get_extensions():
+if "--no-compile" in sys.argv:
+return []
+
+from Cython.Build import cythonize
+return cythonize("cqlshlib/copyutil.py")
 
 setup(
 name="cassandra-pylib",
 description="Cassandra Python Libraries",
 packages=["cqlshlib"],
-ext_modules=cythonize("cqlshlib/copyutil.py"),
+ext_modules=get_extensions(),
 )

[02/10] cassandra git commit: Make cython optional in pylib/setup.py

[stefania]

Make cython optional in pylib/setup.py

patch by Stefania Alborghetti; reviewed by tjake for CASSANDRA-11630


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

Branch: refs/heads/cassandra-2.2
Commit: b25139f8ac5dd8a2955c4a0c13df61d529852e2f
Parents: ae03066
Author: Stefania Alborghetti 
Authored: Fri Apr 22 10:15:01 2016 +0800
Committer: Stefania Alborghetti 
Committed: Wed Apr 27 08:42:32 2016 +0800

--
 CHANGES.txt|  1 +
 pylib/setup.py | 12 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b25139f8/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index d170def..ff26fde 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.1.15
+ * Make cython optional in pylib/setup.py (CASSANDRA-11630)
  * Change order of directory searching for cassandra.in.sh to favor local one 
(CASSANDRA-11628)
  * cqlsh COPY FROM fails with []{} chars in UDT/tuple fields/values 
(CASSANDRA-11633)
  * clqsh: COPY FROM throws TypeError with Cython extensions enabled 
(CASSANDRA-11574)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b25139f8/pylib/setup.py
--
diff --git a/pylib/setup.py b/pylib/setup.py
index 3654502..a9f654a 100755
--- a/pylib/setup.py
+++ b/pylib/setup.py
@@ -15,12 +15,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import sys
 from distutils.core import setup
-from Cython.Build import cythonize
+
+
+def get_extensions():
+if "--no-compile" in sys.argv:
+return []
+
+from Cython.Build import cythonize
+return cythonize("cqlshlib/copyutil.py")
 
 setup(
 name="cassandra-pylib",
 description="Cassandra Python Libraries",
 packages=["cqlshlib"],
-ext_modules=cythonize("cqlshlib/copyutil.py"),
+ext_modules=get_extensions(),
 )

[10/10] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

[stefania]

Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 0b81f72ed09b542174f4fefef0c5023b87ddef30
Parents: ac902a5 fae7bf9
Author: Stefania Alborghetti 
Authored: Wed Apr 27 08:45:55 2016 +0800
Committer: Stefania Alborghetti 
Committed: Wed Apr 27 08:45:55 2016 +0800

--
 CHANGES.txt|  1 +
 pylib/setup.py | 12 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0b81f72e/CHANGES.txt
--

[07/10] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

[stefania]

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/trunk
Commit: 2dbcb5dae15ac0c2dc0a35b83e820f6a9147b9fb
Parents: cfc398e b25139f
Author: Stefania Alborghetti 
Authored: Wed Apr 27 08:44:04 2016 +0800
Committer: Stefania Alborghetti 
Committed: Wed Apr 27 08:44:04 2016 +0800

--
 CHANGES.txt|  1 +
 pylib/setup.py | 12 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2dbcb5da/CHANGES.txt
--
diff --cc CHANGES.txt
index d73ed01,ff26fde..b3dea85
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,5 +1,11 @@@
 -2.1.15
 +2.2.7
 + * Add missing files to debian packages (CASSANDRA-11642)
 + * Avoid calling Iterables::concat in loops during 
ModificationStatement::getFunctions (CASSANDRA-11621)
 + * cqlsh: COPY FROM should use regular inserts for single statement batches 
and
 +  report errors correctly if workers processes crash on 
initialization (CASSANDRA-11474)
 + * Always close cluster with connection in CqlRecordWriter (CASSANDRA-11553)
 +Merged from 2.1:
+  * Make cython optional in pylib/setup.py (CASSANDRA-11630)
   * Change order of directory searching for cassandra.in.sh to favor local one 
(CASSANDRA-11628)
   * cqlsh COPY FROM fails with []{} chars in UDT/tuple fields/values 
(CASSANDRA-11633)
   * clqsh: COPY FROM throws TypeError with Cython extensions enabled 
(CASSANDRA-11574)

[09/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[stefania]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: fae7bf9c22c6a7f9c06e14c6ae299e9a330cda30
Parents: 5d37fc4 2dbcb5d
Author: Stefania Alborghetti 
Authored: Wed Apr 27 08:45:14 2016 +0800
Committer: Stefania Alborghetti 
Committed: Wed Apr 27 08:45:14 2016 +0800

--
 CHANGES.txt|  1 +
 pylib/setup.py | 12 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/fae7bf9c/CHANGES.txt
--
diff --cc CHANGES.txt
index 277eac4,b3dea85..b1cf2ac
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -17,11 -4,8 +17,12 @@@ Merged from 2.2
   * cqlsh: COPY FROM should use regular inserts for single statement batches 
and
report errors correctly if workers processes crash on 
initialization (CASSANDRA-11474)
   * Always close cluster with connection in CqlRecordWriter (CASSANDRA-11553)
 + * Allow only DISTINCT queries with partition keys restrictions 
(CASSANDRA-11339)
 + * CqlConfigHelper no longer requires both a keystore and truststore to work 
(CASSANDRA-11532)
 + * Make deprecated repair methods backward-compatible with previous 
notification service (CASSANDRA-11430)
 + * IncomingStreamingConnection version check message wrong (CASSANDRA-11462)
  Merged from 2.1:
+  * Make cython optional in pylib/setup.py (CASSANDRA-11630)
   * Change order of directory searching for cassandra.in.sh to favor local one 
(CASSANDRA-11628)
   * cqlsh COPY FROM fails with []{} chars in UDT/tuple fields/values 
(CASSANDRA-11633)
   * clqsh: COPY FROM throws TypeError with Cython extensions enabled 
(CASSANDRA-11574)

[08/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[stefania]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: fae7bf9c22c6a7f9c06e14c6ae299e9a330cda30
Parents: 5d37fc4 2dbcb5d
Author: Stefania Alborghetti 
Authored: Wed Apr 27 08:45:14 2016 +0800
Committer: Stefania Alborghetti 
Committed: Wed Apr 27 08:45:14 2016 +0800

--
 CHANGES.txt|  1 +
 pylib/setup.py | 12 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/fae7bf9c/CHANGES.txt
--
diff --cc CHANGES.txt
index 277eac4,b3dea85..b1cf2ac
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -17,11 -4,8 +17,12 @@@ Merged from 2.2
   * cqlsh: COPY FROM should use regular inserts for single statement batches 
and
report errors correctly if workers processes crash on 
initialization (CASSANDRA-11474)
   * Always close cluster with connection in CqlRecordWriter (CASSANDRA-11553)
 + * Allow only DISTINCT queries with partition keys restrictions 
(CASSANDRA-11339)
 + * CqlConfigHelper no longer requires both a keystore and truststore to work 
(CASSANDRA-11532)
 + * Make deprecated repair methods backward-compatible with previous 
notification service (CASSANDRA-11430)
 + * IncomingStreamingConnection version check message wrong (CASSANDRA-11462)
  Merged from 2.1:
+  * Make cython optional in pylib/setup.py (CASSANDRA-11630)
   * Change order of directory searching for cassandra.in.sh to favor local one 
(CASSANDRA-11628)
   * cqlsh COPY FROM fails with []{} chars in UDT/tuple fields/values 
(CASSANDRA-11633)
   * clqsh: COPY FROM throws TypeError with Cython extensions enabled 
(CASSANDRA-11574)

[01/10] cassandra git commit: Make cython optional in pylib/setup.py

[stefania]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 ae03066f4 -> b25139f8a
  refs/heads/cassandra-2.2 cfc398e81 -> 2dbcb5dae
  refs/heads/cassandra-3.0 5d37fc4c4 -> fae7bf9c2
  refs/heads/trunk ac902a505 -> 0b81f72ed


Make cython optional in pylib/setup.py

patch by Stefania Alborghetti; reviewed by tjake for CASSANDRA-11630


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

Branch: refs/heads/cassandra-2.1
Commit: b25139f8ac5dd8a2955c4a0c13df61d529852e2f
Parents: ae03066
Author: Stefania Alborghetti 
Authored: Fri Apr 22 10:15:01 2016 +0800
Committer: Stefania Alborghetti 
Committed: Wed Apr 27 08:42:32 2016 +0800

--
 CHANGES.txt|  1 +
 pylib/setup.py | 12 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b25139f8/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index d170def..ff26fde 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.1.15
+ * Make cython optional in pylib/setup.py (CASSANDRA-11630)
  * Change order of directory searching for cassandra.in.sh to favor local one 
(CASSANDRA-11628)
  * cqlsh COPY FROM fails with []{} chars in UDT/tuple fields/values 
(CASSANDRA-11633)
  * clqsh: COPY FROM throws TypeError with Cython extensions enabled 
(CASSANDRA-11574)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b25139f8/pylib/setup.py
--
diff --git a/pylib/setup.py b/pylib/setup.py
index 3654502..a9f654a 100755
--- a/pylib/setup.py
+++ b/pylib/setup.py
@@ -15,12 +15,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import sys
 from distutils.core import setup
-from Cython.Build import cythonize
+
+
+def get_extensions():
+if "--no-compile" in sys.argv:
+return []
+
+from Cython.Build import cythonize
+return cythonize("cqlshlib/copyutil.py")
 
 setup(
 name="cassandra-pylib",
 description="Cassandra Python Libraries",
 packages=["cqlshlib"],
-ext_modules=cythonize("cqlshlib/copyutil.py"),
+ext_modules=get_extensions(),
 )

[05/10] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

[stefania]

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/cassandra-3.0
Commit: 2dbcb5dae15ac0c2dc0a35b83e820f6a9147b9fb
Parents: cfc398e b25139f
Author: Stefania Alborghetti 
Authored: Wed Apr 27 08:44:04 2016 +0800
Committer: Stefania Alborghetti 
Committed: Wed Apr 27 08:44:04 2016 +0800

--
 CHANGES.txt|  1 +
 pylib/setup.py | 12 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2dbcb5da/CHANGES.txt
--
diff --cc CHANGES.txt
index d73ed01,ff26fde..b3dea85
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,5 +1,11 @@@
 -2.1.15
 +2.2.7
 + * Add missing files to debian packages (CASSANDRA-11642)
 + * Avoid calling Iterables::concat in loops during 
ModificationStatement::getFunctions (CASSANDRA-11621)
 + * cqlsh: COPY FROM should use regular inserts for single statement batches 
and
 +  report errors correctly if workers processes crash on 
initialization (CASSANDRA-11474)
 + * Always close cluster with connection in CqlRecordWriter (CASSANDRA-11553)
 +Merged from 2.1:
+  * Make cython optional in pylib/setup.py (CASSANDRA-11630)
   * Change order of directory searching for cassandra.in.sh to favor local one 
(CASSANDRA-11628)
   * cqlsh COPY FROM fails with []{} chars in UDT/tuple fields/values 
(CASSANDRA-11633)
   * clqsh: COPY FROM throws TypeError with Cython extensions enabled 
(CASSANDRA-11574)

[03/10] cassandra git commit: Make cython optional in pylib/setup.py

[stefania]

Make cython optional in pylib/setup.py

patch by Stefania Alborghetti; reviewed by tjake for CASSANDRA-11630


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

Branch: refs/heads/cassandra-3.0
Commit: b25139f8ac5dd8a2955c4a0c13df61d529852e2f
Parents: ae03066
Author: Stefania Alborghetti 
Authored: Fri Apr 22 10:15:01 2016 +0800
Committer: Stefania Alborghetti 
Committed: Wed Apr 27 08:42:32 2016 +0800

--
 CHANGES.txt|  1 +
 pylib/setup.py | 12 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b25139f8/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index d170def..ff26fde 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.1.15
+ * Make cython optional in pylib/setup.py (CASSANDRA-11630)
  * Change order of directory searching for cassandra.in.sh to favor local one 
(CASSANDRA-11628)
  * cqlsh COPY FROM fails with []{} chars in UDT/tuple fields/values 
(CASSANDRA-11633)
  * clqsh: COPY FROM throws TypeError with Cython extensions enabled 
(CASSANDRA-11574)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b25139f8/pylib/setup.py
--
diff --git a/pylib/setup.py b/pylib/setup.py
index 3654502..a9f654a 100755
--- a/pylib/setup.py
+++ b/pylib/setup.py
@@ -15,12 +15,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import sys
 from distutils.core import setup
-from Cython.Build import cythonize
+
+
+def get_extensions():
+if "--no-compile" in sys.argv:
+return []
+
+from Cython.Build import cythonize
+return cythonize("cqlshlib/copyutil.py")
 
 setup(
 name="cassandra-pylib",
 description="Cassandra Python Libraries",
 packages=["cqlshlib"],
-ext_modules=cythonize("cqlshlib/copyutil.py"),
+ext_modules=get_extensions(),
 )

[06/10] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

[stefania]

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/cassandra-2.2
Commit: 2dbcb5dae15ac0c2dc0a35b83e820f6a9147b9fb
Parents: cfc398e b25139f
Author: Stefania Alborghetti 
Authored: Wed Apr 27 08:44:04 2016 +0800
Committer: Stefania Alborghetti 
Committed: Wed Apr 27 08:44:04 2016 +0800

--
 CHANGES.txt|  1 +
 pylib/setup.py | 12 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2dbcb5da/CHANGES.txt
--
diff --cc CHANGES.txt
index d73ed01,ff26fde..b3dea85
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,5 +1,11 @@@
 -2.1.15
 +2.2.7
 + * Add missing files to debian packages (CASSANDRA-11642)
 + * Avoid calling Iterables::concat in loops during 
ModificationStatement::getFunctions (CASSANDRA-11621)
 + * cqlsh: COPY FROM should use regular inserts for single statement batches 
and
 +  report errors correctly if workers processes crash on 
initialization (CASSANDRA-11474)
 + * Always close cluster with connection in CqlRecordWriter (CASSANDRA-11553)
 +Merged from 2.1:
+  * Make cython optional in pylib/setup.py (CASSANDRA-11630)
   * Change order of directory searching for cassandra.in.sh to favor local one 
(CASSANDRA-11628)
   * cqlsh COPY FROM fails with []{} chars in UDT/tuple fields/values 
(CASSANDRA-11633)
   * clqsh: COPY FROM throws TypeError with Cython extensions enabled 
(CASSANDRA-11574)

[jira] [Created] (CASSANDRA-11668) dtest failure in upgrade_tests.upgrade_through_versions_test.ProtoV4Upgrade_3_2_UpTo_3_3_HEAD.rolling_upgrade_with_internode_ssl_test

[Russ Hatch (JIRA)]

Russ Hatch created CASSANDRA-11668:
--

 Summary: dtest failure in 
upgrade_tests.upgrade_through_versions_test.ProtoV4Upgrade_3_2_UpTo_3_3_HEAD.rolling_upgrade_with_internode_ssl_test
 Key: CASSANDRA-11668
 URL: https://issues.apache.org/jira/browse/CASSANDRA-11668
 Project: Cassandra
  Issue Type: Test
Reporter: Russ Hatch
Assignee: DS Test Eng


since this was on upgrade to 3.3 head, I doubt it's an actual problem (assuming 
changes aren't actively happening there). Nevertheless, should take a quick 
look and see if there's anything going on.

example failure:

http://cassci.datastax.com/job/upgrade_tests-all/39/testReport/upgrade_tests.upgrade_through_versions_test/ProtoV4Upgrade_3_2_UpTo_3_3_HEAD/rolling_upgrade_with_internode_ssl_test

Failed on CassCI build upgrade_tests-all #39



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Commented] (CASSANDRA-11661) Cassandra 2.0 and later require Java 7u25 or later - jdk 101

[Tianon Gravi (JIRA)]

[ 
https://issues.apache.org/jira/browse/CASSANDRA-11661?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15259164#comment-15259164
 ] 

Tianon Gravi commented on CASSANDRA-11661:
--

I can confirm this behavior, and it's caused by the following lines in 
{{cassandra-env.sh}}:
{code}
if [ "$JVM_VERSION" \< "1.7" ] ; then
echo "Cassandra 2.0 and later require Java 7u25 or later."
exit 1;
fi

if [ "$JVM_VERSION" \< "1.8" ] && [ "$JVM_PATCH_VERSION" \< "25" ] ; then
echo "Cassandra 2.0 and later require Java 7u25 or later."
exit 1;
fi
{code}

{code}
$ help test
...
  STRING1 < STRING2
 True if STRING1 sorts before STRING2 lexicographically.
  STRING1 > STRING2
 True if STRING1 sorts after STRING2 lexicographically.
...
  arg1 OP arg2   Arithmetic tests.  OP is one of -eq, -ne,
 -lt, -le, -gt, or -ge.
...
{code}

At the very least, that {{[ "$JVM_PATCH_VERSION" \< "25" ]}} should be replaced 
by {{[ "$JVM_PATCH_VERSION" -lt "25" ]}}, but the {{$JVM_VERSION}} comparison 
should also be split out into major/minor and compared separately via {{-lt}} 
as well.

> Cassandra 2.0 and later require Java 7u25 or later - jdk 101
> 
>
> Key: CASSANDRA-11661
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11661
> Project: Cassandra
>  Issue Type: Bug
>  Components: Testing
> Environment: Cassandra Server 2.1.5 and Java jdk1.7.0_101-b14
>Reporter: William Boutin
>Priority: Critical
> Fix For: 2.1.x
>
>
> We have been running the cassandr server version 2.1.5. Friday, we applied 
> the latest java patch, Java(TM) SE Runtime Environment (build 1.7.0_101-b14). 
> Cassandra cannot start with this patch. The cassandra log states:  Cassandra 
> 2.0 and later require Java 7u25 or later.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Commented] (CASSANDRA-11662) Cassandra 2.0 and later require Java 7u25 or later - java sre 1.7.0_101-b14

[Tianon Gravi (JIRA)]

[ 
https://issues.apache.org/jira/browse/CASSANDRA-11662?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15259155#comment-15259155
 ] 

Tianon Gravi commented on CASSANDRA-11662:
--

This is a duplicate of CASSANDRA-11661.

> Cassandra 2.0 and later require Java 7u25 or later - java sre 1.7.0_101-b14
> ---
>
> Key: CASSANDRA-11662
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11662
> Project: Cassandra
>  Issue Type: Bug
>  Components: Testing
> Environment: cassandra server 2.1.5 and java jdk1.7.0_101-b14
>Reporter: William Boutin
> Fix For: 2.1.x
>
>
> We have the Cassandra Server 2.1.5 running. When we applied java patch java 
> jdk1.7.0_101-b14, cassandra will not start. The cassandra log states 
> "Cassandra 2.0 and later require Java 7u25 or later".



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Created] (CASSANDRA-11667) dtest failure in pushed_notifications_test.TestPushedNotifications.move_single_node_test

[Russ Hatch (JIRA)]

Russ Hatch created CASSANDRA-11667:
--

 Summary: dtest failure in 
pushed_notifications_test.TestPushedNotifications.move_single_node_test
 Key: CASSANDRA-11667
 URL: https://issues.apache.org/jira/browse/CASSANDRA-11667
 Project: Cassandra
  Issue Type: Test
Reporter: Russ Hatch
Assignee: DS Test Eng


single test flap, so could be a fluke. happened on the trunk no-vnode test:

http://cassci.datastax.com/job/trunk_novnode_dtest/354/testReport/pushed_notifications_test/TestPushedNotifications/move_single_node_test

Failed on CassCI build trunk_novnode_dtest #354



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Commented] (CASSANDRA-10853) deb package migration to dh_python2

[Michael Shuler (JIRA)]

[ 
https://issues.apache.org/jira/browse/CASSANDRA-10853?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15259124#comment-15259124
 ] 

Michael Shuler commented on CASSANDRA-10853:


sed and a rebuild verified this looks better :)
{noformat}
22:42:07 + /var/lib/jenkins/automaton/bin/ctool run --stream 
jenkins-mshuler_trunk_deb-18 0 echo "DESCRIBE TABLES;" | cqlsh
22:42:11 
22:42:11 Keyspace system_traces
22:42:11 --
22:42:11 events  sessions
22:42:11 
22:42:11 Keyspace system_schema
22:42:11 --
22:42:11 tables triggersviewskeyspaces  dropped_columns
22:42:11 functions  aggregates  indexes  types  columns
22:42:11 
22:42:11 Keyspace system_auth
22:42:11 
22:42:11 resource_role_permissons_index  role_permissions  role_members  roles
22:42:11 
22:42:11 Keyspace system
22:42:11 ---
22:42:11 available_ranges  peers   paxos   
range_xfers
22:42:11 batches   compaction_history  batchloglocal
  
22:42:11 "IndexInfo"   sstable_activitysize_estimates  hints
  
22:42:11 views_builds_in_progress  peer_events built_views   
22:42:11 
22:42:11 Keyspace system_distributed
22:42:11 ---
22:42:11 repair_history  view_build_status  parent_repair_history
22:42:11 
22:42:11
{noformat}

> deb package migration to dh_python2
> ---
>
> Key: CASSANDRA-10853
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10853
> Project: Cassandra
>  Issue Type: Task
>  Components: Packaging
>Reporter: Michael Shuler
>Assignee: Michael Shuler
> Fix For: 2.1.15, 3.6, 3.0.6, 2.2.7
>
> Attachments: 10853_2.1.txt, 10853_3.0.txt, 10853_rules.txt
>
>
> I'm working on a deb job in jenkins, and I had forgotten to open a bug for 
> this. There is no urgent need, since {{python-support}} is in Jessie, but 
> this package is currently in transition to be removed.
> http://deb.li/dhs2p
> During deb build:
> {noformat}
> dh_pysupport: This program is deprecated, you should use dh_python2 instead. 
> Migration guide: http://deb.li/dhs2p
> {noformat}



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Commented] (CASSANDRA-11666) dtest failure in topology_test.TestTopology.movement_test

[Russ Hatch (JIRA)]

[ 
https://issues.apache.org/jira/browse/CASSANDRA-11666?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15259109#comment-15259109
 ] 

Russ Hatch commented on CASSANDRA-11666:


looks likely to be a test problem with a number not quite fitting an expected 
range.

> dtest failure in topology_test.TestTopology.movement_test
> -
>
> Key: CASSANDRA-11666
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11666
> Project: Cassandra
>  Issue Type: Test
>Reporter: Russ Hatch
>Assignee: DS Test Eng
>  Labels: dtest
>
> example failure:
> http://cassci.datastax.com/job/trunk_novnode_dtest/353/testReport/topology_test/TestTopology/movement_test
> Failed on CassCI build trunk_novnode_dtest #353



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Created] (CASSANDRA-11666) dtest failure in topology_test.TestTopology.movement_test

[Russ Hatch (JIRA)]

Russ Hatch created CASSANDRA-11666:
--

 Summary: dtest failure in topology_test.TestTopology.movement_test
 Key: CASSANDRA-11666
 URL: https://issues.apache.org/jira/browse/CASSANDRA-11666
 Project: Cassandra
  Issue Type: Test
Reporter: Russ Hatch
Assignee: DS Test Eng


example failure:

http://cassci.datastax.com/job/trunk_novnode_dtest/353/testReport/topology_test/TestTopology/movement_test

Failed on CassCI build trunk_novnode_dtest #353



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Created] (CASSANDRA-11665) dtest failure in topology_test.TestTopology.decommissioned_node_cant_rejoin_test

[Russ Hatch (JIRA)]

Russ Hatch created CASSANDRA-11665:
--

 Summary: dtest failure in 
topology_test.TestTopology.decommissioned_node_cant_rejoin_test
 Key: CASSANDRA-11665
 URL: https://issues.apache.org/jira/browse/CASSANDRA-11665
 Project: Cassandra
  Issue Type: Test
Reporter: Russ Hatch
Assignee: Philip Thompson


intermittent failure, example failure:

failed on trunk no-vnodes job

"True is not false"

http://cassci.datastax.com/job/trunk_novnode_dtest/351/testReport/topology_test/TestTopology/decommissioned_node_cant_rejoin_test

Failed on CassCI build trunk_novnode_dtest #351



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Updated] (CASSANDRA-10853) deb package migration to dh_python2

[Michael Shuler (JIRA)]

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-10853?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Michael Shuler updated CASSANDRA-10853:
---
Status: Patch Available  (was: Reopened)

> deb package migration to dh_python2
> ---
>
> Key: CASSANDRA-10853
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10853
> Project: Cassandra
>  Issue Type: Task
>  Components: Packaging
>Reporter: Michael Shuler
>Assignee: Michael Shuler
> Fix For: 2.1.15, 3.6, 3.0.6, 2.2.7
>
> Attachments: 10853_2.1.txt, 10853_3.0.txt, 10853_rules.txt
>
>
> I'm working on a deb job in jenkins, and I had forgotten to open a bug for 
> this. There is no urgent need, since {{python-support}} is in Jessie, but 
> this package is currently in transition to be removed.
> http://deb.li/dhs2p
> During deb build:
> {noformat}
> dh_pysupport: This program is deprecated, you should use dh_python2 instead. 
> Migration guide: http://deb.li/dhs2p
> {noformat}



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Commented] (CASSANDRA-11656) sstabledump has inconsistency in deletion_time printout

[Chris Lohfink (JIRA)]

[ 
https://issues.apache.org/jira/browse/CASSANDRA-11656?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15259064#comment-15259064
 ] 

Chris Lohfink commented on CASSANDRA-11656:
---

The current mode is {{tstamp}} is the timestamp of the tombstone 
"localDeletionTime". While the {{deletion_time}} is the "markedForDeleteAt". We 
could just call them that exactly as it would be less ambiguous. Them being 
longs/ints are the underlying data not how the transformer chooses to represent 
them. I kinda like idea of having a "human" readable format too though thats 
actually a local or utc iso date string since as is they are hard to read.

> sstabledump has inconsistency in deletion_time printout
> ---
>
> Key: CASSANDRA-11656
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11656
> Project: Cassandra
>  Issue Type: Bug
>  Components: Tools
>Reporter: Wei Deng
>  Labels: Tools
>
> See the following output (note the deletion info under the second row):
> {noformat}
> [
>   {
> "partition" : {
>   "key" : [ "1" ],
>   "position" : 0
> },
> "rows" : [
>   {
> "type" : "row",
> "position" : 18,
> "clustering" : [ "c1" ],
> "liveness_info" : { "tstamp" : 1461646542601774 },
> "cells" : [
>   { "name" : "val0_int", "deletion_time" : 1461647421, "tstamp" : 
> 1461647421344759 },
>   { "name" : "val1_set_of_int", "path" : [ "1" ], "deletion_time" : 
> 1461647320, "tstamp" : 1461647320160261 },
>   { "name" : "val1_set_of_int", "path" : [ "10" ], "value" : "", 
> "tstamp" : 1461647295880444 },
>   { "name" : "val1_set_of_int", "path" : [ "11" ], "value" : "", 
> "tstamp" : 1461647295880444 },
>   { "name" : "val1_set_of_int", "path" : [ "12" ], "value" : "", 
> "tstamp" : 1461647295880444 }
> ]
>   },
>   {
> "type" : "row",
> "position" : 85,
> "clustering" : [ "c2" ],
> "deletion_info" : { "deletion_time" : 1461647588089843, "tstamp" : 
> 1461647588 },
> "cells" : [ ]
>   }
> ]
>   }
> ]
> {noformat}
> To avoid confusion, we need to have consistency in printing out the 
> DeletionTime object. By definition, markedForDeleteAt is in microseconds 
> since epoch and marks the time when the "delete" mutation happens; 
> localDeletionTime is in seconds since epoch and allows GC to collect the 
> tombstone if the current epoch second is greater than localDeletionTime + 
> gc_grace_seconds. I'm ok to use "tstamp" to represent markedForDeleteAt 
> because markedForDeleteAt does represent this delete mutation's timestamp, 
> but we need to be consistent everywhere.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Updated] (CASSANDRA-10853) deb package migration to dh_python2

[Michael Shuler (JIRA)]

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-10853?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Michael Shuler updated CASSANDRA-10853:
---
Attachment: 10853_rules.txt

[~tjake] I missed the {{debian/rules}} edit when I recreated patches. 
10853_rules.txt is attached. It's one line and should merge from 2.1 all the 
way up. Sorry about that!

> deb package migration to dh_python2
> ---
>
> Key: CASSANDRA-10853
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10853
> Project: Cassandra
>  Issue Type: Task
>  Components: Packaging
>Reporter: Michael Shuler
>Assignee: Michael Shuler
> Fix For: 2.1.15, 3.6, 3.0.6, 2.2.7
>
> Attachments: 10853_2.1.txt, 10853_3.0.txt, 10853_rules.txt
>
>
> I'm working on a deb job in jenkins, and I had forgotten to open a bug for 
> this. There is no urgent need, since {{python-support}} is in Jessie, but 
> this package is currently in transition to be removed.
> http://deb.li/dhs2p
> During deb build:
> {noformat}
> dh_pysupport: This program is deprecated, you should use dh_python2 instead. 
> Migration guide: http://deb.li/dhs2p
> {noformat}



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Comment Edited] (CASSANDRA-11656) sstabledump has inconsistency in deletion_time printout

[Wei Deng (JIRA)]

[ 
https://issues.apache.org/jira/browse/CASSANDRA-11656?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15259049#comment-15259049
 ] 

Wei Deng edited comment on CASSANDRA-11656 at 4/26/16 10:16 PM:


I tested out the patch [~cnlwsu] provided in CASSANDRA-11655. However, I still 
see some discrepancies like the following:

{noformat}
~/cassandra-trunk/tools/bin/sstabledump ma-15-big-Data.db
[
  {
"partition" : {
  "key" : [ "1" ],
  "position" : 0
},
"rows" : [
  {
"type" : "row",
"position" : 18,
"clustering" : [ "c1" ],
"liveness_info" : { "tstamp" : 1461646542601774 },
"cells" : [
  { "name" : "val0_int", "deletion_info" : { "tstamp" : 1461649343 },
"tstamp" : 1461649343000508
  },
  { "name" : "val1_set_of_int", "deletion_info" : { "deletion_time" : 
1461647295880443, "tstamp" : 1461647295 } },
  { "name" : "val1_set_of_int", "path" : [ "1" ], "deletion_info" : { 
"tstamp" : 1461647320 },
"tstamp" : 1461647320160261
  },
  { "name" : "val1_set_of_int", "path" : [ "10" ], "value" : "", 
"tstamp" : 1461647295880444 },
  { "name" : "val1_set_of_int", "path" : [ "11" ], "value" : "", 
"tstamp" : 1461647295880444 },
  { "name" : "val1_set_of_int", "path" : [ "12" ], "value" : "", 
"tstamp" : 1461647295880444 }
]
  },
  {
"type" : "row",
"position" : 86,
"clustering" : [ "c2" ],
"deletion_info" : { "deletion_time" : 1461647588089843, "tstamp" : 
1461647588 },
"cells" : [ ]
  },
  {
"type" : "row",
"position" : 101,
"clustering" : [ "c4" ],
"liveness_info" : { "tstamp" : 1461649635932899 },
"cells" : [ ]
  },
  {
"type" : "row",
"position" : 114,
"clustering" : [ "c5" ],
"liveness_info" : { "tstamp" : 1461650266651050, "ttl" : 60, 
"expires_at" : 1461650326, "expired" : true },
"cells" : [
  { "name" : "val0_int", "value" : "500", "tstamp" : 1461650241403672 },
  { "name" : "val1_set_of_int", "deletion_info" : { "deletion_time" : 
1461650241403671, "tstamp" : 1461650241 } },
  { "name" : "val1_set_of_int", "path" : [ "111" ], "value" : "", 
"tstamp" : 1461650241403672 },
  { "name" : "val1_set_of_int", "path" : [ "222" ], "value" : "", 
"tstamp" : 1461650241403672 },
  { "name" : "val1_set_of_int", "path" : [ "333" ], "value" : "", 
"tstamp" : 1461650241403672 }
]
  },
  {
"type" : "row",
"position" : 180,
"clustering" : [ "c6" ],
"deletion_info" : { "deletion_time" : 1461708091029189, "tstamp" : 
1461708091 },
"cells" : [ ]
  }
]
  }
]
{noformat}

Note in the above output some tstamp values are 16 digits, some are 10 digits.

IMHO if we decide to use tstamp to represent timestamp of the writes (whether 
it's a delete or a regular mutation), then it should always be microseconds 
since epoch (16 digits), and it should be consistent across regular cells and 
tombstones.

In my view, the "deletion_time" can be a good short name for localDeletionTime 
(which only guides compaction to do GC) and as long as we are consistent across 
the board and always use that to represent localDeletionTime that has only 10 
digits (seconds since epoch), it's good to me too.


was (Author: weideng):
I tested out the patch [~cnlwsu] provided in CASSANDRA-11655. However, I still 
see some discrepancies like the following:

{noformat}
~/cassandra-trunk/tools/bin/sstabledump ma-15-big-Data.db
[
  {
"partition" : {
  "key" : [ "1" ],
  "position" : 0
},
"rows" : [
  {
"type" : "row",
"position" : 18,
"clustering" : [ "c1" ],
"liveness_info" : { "tstamp" : 1461646542601774 },
"cells" : [
  { "name" : "val0_int", "deletion_info" : { "tstamp" : 1461649343 },
"tstamp" : 1461649343000508
  },
  { "name" : "val1_set_of_int", "deletion_info" : { "deletion_time" : 
1461647295880443, "tstamp" : 1461647295 } },
  { "name" : "val1_set_of_int", "path" : [ "1" ], "deletion_info" : { 
"tstamp" : 1461647320 },
"tstamp" : 1461647320160261
  },
  { "name" : "val1_set_of_int", "path" : [ "10" ], "value" : "", 
"tstamp" : 1461647295880444 },
  { "name" : "val1_set_of_int", "path" : [ "11" ], "value" : "", 
"tstamp" : 1461647295880444 },
  { "name" : "val1_set_of_int", "path" : [ "12" ], "value" : "", 
"tstamp" : 1461647295880444 }
]
  },
  {
"type" : "row",
"position" : 86,
"clustering" : [ "c2" ],
"deletion_info" : { "deletion_time" : 1461647588089843, "tstamp" : 
1461647588 },
"cells" : [ ]
  },
  {
"type" : "row",
"position" : 

[jira] [Commented] (CASSANDRA-11656) sstabledump has inconsistency in deletion_time printout

[Wei Deng (JIRA)]

[ 
https://issues.apache.org/jira/browse/CASSANDRA-11656?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15259049#comment-15259049
 ] 

Wei Deng commented on CASSANDRA-11656:
--

I tested out the patch [~cnlwsu] provided in CASSANDRA-11655. However, I still 
see some discrepancies like the following:

{noformat}
~/cassandra-trunk/tools/bin/sstabledump ma-15-big-Data.db
[
  {
"partition" : {
  "key" : [ "1" ],
  "position" : 0
},
"rows" : [
  {
"type" : "row",
"position" : 18,
"clustering" : [ "c1" ],
"liveness_info" : { "tstamp" : 1461646542601774 },
"cells" : [
  { "name" : "val0_int", "deletion_info" : { "tstamp" : 1461649343 },
"tstamp" : 1461649343000508
  },
  { "name" : "val1_set_of_int", "deletion_info" : { "deletion_time" : 
1461647295880443, "tstamp" : 1461647295 } },
  { "name" : "val1_set_of_int", "path" : [ "1" ], "deletion_info" : { 
"tstamp" : 1461647320 },
"tstamp" : 1461647320160261
  },
  { "name" : "val1_set_of_int", "path" : [ "10" ], "value" : "", 
"tstamp" : 1461647295880444 },
  { "name" : "val1_set_of_int", "path" : [ "11" ], "value" : "", 
"tstamp" : 1461647295880444 },
  { "name" : "val1_set_of_int", "path" : [ "12" ], "value" : "", 
"tstamp" : 1461647295880444 }
]
  },
  {
"type" : "row",
"position" : 86,
"clustering" : [ "c2" ],
"deletion_info" : { "deletion_time" : 1461647588089843, "tstamp" : 
1461647588 },
"cells" : [ ]
  },
  {
"type" : "row",
"position" : 101,
"clustering" : [ "c4" ],
"liveness_info" : { "tstamp" : 1461649635932899 },
"cells" : [ ]
  },
  {
"type" : "row",
"position" : 114,
"clustering" : [ "c5" ],
"liveness_info" : { "tstamp" : 1461650266651050, "ttl" : 60, 
"expires_at" : 1461650326, "expired" : true },
"cells" : [
  { "name" : "val0_int", "value" : "500", "tstamp" : 1461650241403672 },
  { "name" : "val1_set_of_int", "deletion_info" : { "deletion_time" : 
1461650241403671, "tstamp" : 1461650241 } },
  { "name" : "val1_set_of_int", "path" : [ "111" ], "value" : "", 
"tstamp" : 1461650241403672 },
  { "name" : "val1_set_of_int", "path" : [ "222" ], "value" : "", 
"tstamp" : 1461650241403672 },
  { "name" : "val1_set_of_int", "path" : [ "333" ], "value" : "", 
"tstamp" : 1461650241403672 }
]
  },
  {
"type" : "row",
"position" : 180,
"clustering" : [ "c6" ],
"deletion_info" : { "deletion_time" : 1461708091029189, "tstamp" : 
1461708091 },
"cells" : [ ]
  }
]
  }
]
{noformat}

IMHO if we decide to use tstamp to represent timestamp of the writes (whether 
it's a delete or a regular mutation), then it should always be microseconds 
since epoch (16 digits), and it should be consistent across regular cells and 
tombstones.

In my view, the "deletion_time" can be a good short name for localDeletionTime 
(which only guides compaction to do GC) and as long as we are consistent across 
the board and always use that to represent localDeletionTime that has only 10 
digits (seconds since epoch), it's good to me too.

> sstabledump has inconsistency in deletion_time printout
> ---
>
> Key: CASSANDRA-11656
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11656
> Project: Cassandra
>  Issue Type: Bug
>  Components: Tools
>Reporter: Wei Deng
>  Labels: Tools
>
> See the following output (note the deletion info under the second row):
> {noformat}
> [
>   {
> "partition" : {
>   "key" : [ "1" ],
>   "position" : 0
> },
> "rows" : [
>   {
> "type" : "row",
> "position" : 18,
> "clustering" : [ "c1" ],
> "liveness_info" : { "tstamp" : 1461646542601774 },
> "cells" : [
>   { "name" : "val0_int", "deletion_time" : 1461647421, "tstamp" : 
> 1461647421344759 },
>   { "name" : "val1_set_of_int", "path" : [ "1" ], "deletion_time" : 
> 1461647320, "tstamp" : 1461647320160261 },
>   { "name" : "val1_set_of_int", "path" : [ "10" ], "value" : "", 
> "tstamp" : 1461647295880444 },
>   { "name" : "val1_set_of_int", "path" : [ "11" ], "value" : "", 
> "tstamp" : 1461647295880444 },
>   { "name" : "val1_set_of_int", "path" : [ "12" ], "value" : "", 
> "tstamp" : 1461647295880444 }
> ]
>   },
>   {
> "type" : "row",
> "position" : 85,
> "clustering" : [ "c2" ],
> "deletion_info" : { "deletion_time" : 1461647588089843, "tstamp" : 
> 1461647588 },
> "cells" : [ ]
>   }
> ]
>   }
> ]
> {noformat}
> To avoid confusion, we need to 

[jira] [Reopened] (CASSANDRA-10853) deb package migration to dh_python2

[Michael Shuler (JIRA)]

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-10853?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Michael Shuler reopened CASSANDRA-10853:


I believe my initial test environment was tainted with cqlshlib in PYTHONPATH 
or similar.. A package build of trunk after this commit and installation on a 
fresh m3.medium gave me an error on import:
{noformat}
21:20:22 + /var/lib/jenkins/automaton/bin/ctool run --stream 
jenkins-mshuler_trunk_deb-17 0 echo "DESCRIBE TABLES;" | cqlsh
21:20:24 Traceback (most recent call last):
21:20:24   File "/usr/bin/cqlsh.py", line 167, in 
21:20:24 from cqlshlib import cql3handling, cqlhandling, pylexotron, 
sslhandling
21:20:24 ImportError: No module named cqlshlib
21:20:24 
21:20:24 Results for Node 0:
21:20:24 Host: ec2-54-172-207-27.compute-1.amazonaws.com
21:20:24 Private: 172.31.25.94
21:20:24 Start: 1461705623.42
21:20:24 Finished: 1461705624.03
21:20:24 Elapsed: 0.610841035843
21:20:24 Return Code: 1
21:20:24 Out: 
21:20:24 Traceback (most recent call last):
21:20:24 File "/usr/bin/cqlsh.py", line 167, in 
21:20:24 from cqlshlib import cql3handling, cqlhandling, pylexotron, sslhandling
21:20:24 ImportError: No module named cqlshlib
21:20:24 Err: 
21:20:24 
21:20:24 
{noformat}

I'll see if I can find the problem.

> deb package migration to dh_python2
> ---
>
> Key: CASSANDRA-10853
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10853
> Project: Cassandra
>  Issue Type: Task
>  Components: Packaging
>Reporter: Michael Shuler
>Assignee: Michael Shuler
> Fix For: 2.1.15, 3.6, 3.0.6, 2.2.7
>
> Attachments: 10853_2.1.txt, 10853_3.0.txt
>
>
> I'm working on a deb job in jenkins, and I had forgotten to open a bug for 
> this. There is no urgent need, since {{python-support}} is in Jessie, but 
> this package is currently in transition to be removed.
> http://deb.li/dhs2p
> During deb build:
> {noformat}
> dh_pysupport: This program is deprecated, you should use dh_python2 instead. 
> Migration guide: http://deb.li/dhs2p
> {noformat}



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Commented] (CASSANDRA-11655) sstabledump doesn't print out tombstone information for deleted collection column

[Wei Deng (JIRA)]

[ 
https://issues.apache.org/jira/browse/CASSANDRA-11655?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15259035#comment-15259035
 ] 

Wei Deng commented on CASSANDRA-11655:
--

I manually merged locally and I can confirm it does print out collection 
tombstone now.

> sstabledump doesn't print out tombstone information for deleted collection 
> column
> -
>
> Key: CASSANDRA-11655
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11655
> Project: Cassandra
>  Issue Type: Bug
>  Components: Tools
>Reporter: Wei Deng
>Assignee: Chris Lohfink
>  Labels: Tools
> Attachments: CASSANDRA-11655.patch
>
>
> Pretty trivial to reproduce.
> {noformat}
> echo "CREATE KEYSPACE IF NOT EXISTS testks WITH replication = {'class': 
> 'SimpleStrategy', 'replication_factor': '1'};" | cqlsh
> echo "CREATE TABLE IF NOT EXISTS testks.testcf ( k int, c text, val0_int int, 
> val1_set_of_int set, PRIMARY KEY (k, c) );" | cqlsh
> echo "INSERT INTO testks.testcf (k, c, val0_int, val1_set_of_int) VALUES (1, 
> 'c1', 100, {1, 2, 3, 4, 5});" | cqlsh
> echo "delete val1_set_of_int from testks.testcf where k=1 and c='c1';" | cqlsh
> echo "select * from testks.testcf;" | cqlsh
> nodetool flush testks testcf
> {noformat}
> Now if you run sstabledump (even after taking the 
> [patch|https://github.com/yukim/cassandra/tree/11654-3.0] for 
> CASSANDRA-11654) against the newly generated SSTable like the following:
> {noformat}
> ~/cassandra-trunk/tools/bin/sstabledump ma-1-big-Data.db
> [
>   {
> "partition" : {
>   "key" : [ "1" ],
>   "position" : 0
> },
> "rows" : [
>   {
> "type" : "row",
> "position" : 18,
> "clustering" : [ "c1" ],
> "liveness_info" : { "tstamp" : 1461645231352208 },
> "cells" : [
>   { "name" : "val0_int", "value" : "100" }
> ]
>   }
> ]
>   }
> ]
> {noformat}
> You will see that the collection-level Deletion Info is nowhere to be found, 
> so you will not be able to know "markedForDeleteAt" or "localDeletionTime" 
> for this collection tombstone.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Commented] (CASSANDRA-11655) sstabledump doesn't print out tombstone information for deleted collection column

[Wei Deng (JIRA)]

[ 
https://issues.apache.org/jira/browse/CASSANDRA-11655?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15259033#comment-15259033
 ] 

Wei Deng commented on CASSANDRA-11655:
--

[~cnlwsu] Could you please rebase and generate a new patch against latest 
trunk? It doesn't merge cleanly, likely due to conflict with Yuki's fix for 
CASSANDRA-11654.

> sstabledump doesn't print out tombstone information for deleted collection 
> column
> -
>
> Key: CASSANDRA-11655
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11655
> Project: Cassandra
>  Issue Type: Bug
>  Components: Tools
>Reporter: Wei Deng
>Assignee: Chris Lohfink
>  Labels: Tools
> Attachments: CASSANDRA-11655.patch
>
>
> Pretty trivial to reproduce.
> {noformat}
> echo "CREATE KEYSPACE IF NOT EXISTS testks WITH replication = {'class': 
> 'SimpleStrategy', 'replication_factor': '1'};" | cqlsh
> echo "CREATE TABLE IF NOT EXISTS testks.testcf ( k int, c text, val0_int int, 
> val1_set_of_int set, PRIMARY KEY (k, c) );" | cqlsh
> echo "INSERT INTO testks.testcf (k, c, val0_int, val1_set_of_int) VALUES (1, 
> 'c1', 100, {1, 2, 3, 4, 5});" | cqlsh
> echo "delete val1_set_of_int from testks.testcf where k=1 and c='c1';" | cqlsh
> echo "select * from testks.testcf;" | cqlsh
> nodetool flush testks testcf
> {noformat}
> Now if you run sstabledump (even after taking the 
> [patch|https://github.com/yukim/cassandra/tree/11654-3.0] for 
> CASSANDRA-11654) against the newly generated SSTable like the following:
> {noformat}
> ~/cassandra-trunk/tools/bin/sstabledump ma-1-big-Data.db
> [
>   {
> "partition" : {
>   "key" : [ "1" ],
>   "position" : 0
> },
> "rows" : [
>   {
> "type" : "row",
> "position" : 18,
> "clustering" : [ "c1" ],
> "liveness_info" : { "tstamp" : 1461645231352208 },
> "cells" : [
>   { "name" : "val0_int", "value" : "100" }
> ]
>   }
> ]
>   }
> ]
> {noformat}
> You will see that the collection-level Deletion Info is nowhere to be found, 
> so you will not be able to know "markedForDeleteAt" or "localDeletionTime" 
> for this collection tombstone.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Commented] (CASSANDRA-3486) Node Tool command to stop repair

[Paulo Motta (JIRA)]

[ 
https://issues.apache.org/jira/browse/CASSANDRA-3486?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15259008#comment-15259008
 ] 

Paulo Motta commented on CASSANDRA-3486:


Thanks for the feedback [~nickmbailey]. See follow-up below:

bq. If the abort is initiated on the coordinator can we return the 
success/failure of the attempt to abort on the participants as well? And vice 
versa? Similarly for the list of results when aborting all jobs.

We could, but in this initial implementation I opted to take an optimistic 
approach to keep the protocol simple and non-blocking. If for some reason there 
is a network partition and "orphaned" sessions keep running, you can always 
abort them individually later. Do you think a blocking + timeout approach would 
be preferable?

bq. Can we make sure we are testing the case where for whatever reason a 
coordinator or participant receives an abort for a repair it doesn't know about?

Sure. One of the changes of this patch that I forgot to mention is that all 
messages are validated against the repair session UUID, so if a node receives a 
message from a repair it doesn't know about it logs and ignores it.

bq. Since we are now tracking repairs by uuid like this, can we expose a 
progress API outside of the jmx notification process? An mbean for retrieving 
the progress/status of a repair job by uuid?

We could, but we currently don't keep state or progress information in the 
repair session. Furthermore we clear repair session information as soon as it's 
finished, so the list repairs stub only list currently active repairs. So we 
would need to maintain progress status and provide some way to clear repair 
information after some time. 

I personally think we should go this route of making repair more stateful, what 
will not only improve monitoring but will also allow us to break up a repair 
job into more decoupled subtasks, simplifying the single chain of futures we 
have today, which can be quite complex to understand and error-prone.

> Node Tool command to stop repair
> 
>
> Key: CASSANDRA-3486
> URL: https://issues.apache.org/jira/browse/CASSANDRA-3486
> Project: Cassandra
>  Issue Type: Improvement
>  Components: Tools
> Environment: JVM
>Reporter: Vijay
>Assignee: Paulo Motta
>Priority: Minor
>  Labels: repair
> Fix For: 2.1.x
>
> Attachments: 0001-stop-repair-3583.patch
>
>
> After CASSANDRA-1740, If the validation compaction is stopped then the repair 
> will hang. This ticket will allow users to kill the original repair.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Commented] (CASSANDRA-5863) In process (uncompressed) page cache

[Pavel Yaskevich (JIRA)]

[ 
https://issues.apache.org/jira/browse/CASSANDRA-5863?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15258961#comment-15258961
 ] 

Pavel Yaskevich commented on CASSANDRA-5863:


[~blambov] What I meant is similar to per-file map with shared eviction 
strategy, if you already have that in mind - perfect :) What you are saying 
regarding rebufferers makes sense to me, I was just trying to advocate for is 
providing better distinction between BufferlessRebufferer and Rebufferer at 
least via naming so "rebuffer" or "buffer processor" is the thing with holds 
the actual processing logic and BufferlessRebufferer is essentially "data 
source" or "data provider/producer" for it. I'm asking to do this because for 
me, as an observer of the changes, the distinction wasn't clear from the first 
glimpse, what made it especially confusing is rebuffer method itself.

> In process (uncompressed) page cache
> 
>
> Key: CASSANDRA-5863
> URL: https://issues.apache.org/jira/browse/CASSANDRA-5863
> Project: Cassandra
>  Issue Type: Sub-task
>Reporter: T Jake Luciani
>Assignee: Branimir Lambov
>  Labels: performance
> Fix For: 3.x
>
>
> Currently, for every read, the CRAR reads each compressed chunk into a 
> byte[], sends it to ICompressor, gets back another byte[] and verifies a 
> checksum.  
> This process is where the majority of time is spent in a read request.  
> Before compression, we would have zero-copy of data and could respond 
> directly from the page-cache.
> It would be useful to have some kind of Chunk cache that could speed up this 
> process for hot data, possibly off heap.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Updated] (CASSANDRA-674) New SSTable Format

[Paulo Motta (JIRA)]

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-674?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Paulo Motta updated CASSANDRA-674:
--
Assignee: Stu Hood  (was: Paulo Motta)

> New SSTable Format
> --
>
> Key: CASSANDRA-674
> URL: https://issues.apache.org/jira/browse/CASSANDRA-674
> Project: Cassandra
>  Issue Type: Improvement
>Reporter: Stu Hood
>Assignee: Stu Hood
> Attachments: 674-v1.diff, 674-v2.tgz, 674-v3.tgz, 674-ycsb.log, 
> trunk-ycsb.log
>
>
> Various tickets exist due to limitations in the SSTable file format, 
> including #16, #47 and #328. Attached is a proposed design/implementation of 
> a new file format for SSTables that addresses a few of these limitations.
> This v2 implementation is not ready for serious use: see comments for 
> remaining issues. It is roughly the format described here: 
> http://wiki.apache.org/cassandra/FileFormatDesignDoc 



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Commented] (CASSANDRA-9652) Nodetool cleanup does not work for nodes taken out of replication

[Thom Valley (JIRA)]

[ 
https://issues.apache.org/jira/browse/CASSANDRA-9652?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15258884#comment-15258884
 ] 

Thom Valley commented on CASSANDRA-9652:


We are seeing this in our POC testing as well (4.8.5 / 2.1.13).

All nodes are UN in nodetool status

The node in question was "partially" cleaned up.
Thinking we might have some funky state issues with host ids.

> Nodetool cleanup does not work for nodes taken out of replication
> -
>
> Key: CASSANDRA-9652
> URL: https://issues.apache.org/jira/browse/CASSANDRA-9652
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Erick Ramirez
> Fix For: 2.1.x
>
>
> After taking a node (DC) out of replication, running a cleanup does not get 
> rid of the data on the node. The SSTables remain on disk and no data is 
> cleared out.
> The following entry is recorded in {{system.log}}:
> {noformat}
>  INFO [CompactionExecutor:8] 2015-06-25 12:33:01,417 CompactionManager.java 
> (line 527) Cleanup cannot run before a node has joined the ring
> {noformat}
> *STEPS TO REPRODUCE*
> # Build a (C* 2.0.10) cluster with multiple DCs.
> # Run {{cassandra-stress -n1}}  to create schema.
> # Alter schema to replicate to all DCs.
> {noformat}
> cqlsh> ALTER KEYSPACE "Keyspace1" WITH replication = { 'class' : 
> 'NetworkTopologyStrategy', 'DC1' : 2, 'DC2' : 2, 'DC3' : 1 } ;
> {noformat}
> # Run {{cassandra-stress -n10}} to generate data.
> # Alter schema to stop replication to {{DC3}}.
> # On node in {{DC3}}, run {{nodetool cleanup}}.
> *WORKAROUND*
> # Stop Cassandra.
> # Manually delete the SSTables on disk.
> # Start Cassandra.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Created] (CASSANDRA-11664) Tab completion in cqlsh doesn't work for capitalized letters

[J.B. Langston (JIRA)]

J.B. Langston created CASSANDRA-11664:
-

 Summary: Tab completion in cqlsh doesn't work for capitalized 
letters
 Key: CASSANDRA-11664
 URL: https://issues.apache.org/jira/browse/CASSANDRA-11664
 Project: Cassandra
  Issue Type: Bug
Reporter: J.B. Langston
Priority: Minor


Tab completion in cqlsh doesn't work for capitalized letters, either in 
keyspace names or table names. Typing quotes and a corresponding capital letter 
should complete the table/keyspace name and the closing quote.

{code}

cqlsh> create keyspace "Test" WITH replication = {'class': 'SimpleStrategy', 
'replication_factor': 1};
cqlsh> use "Tes
cqlsh> use tes
cqlsh> use Test;
InvalidRequest: code=2200 [Invalid query] message="Keyspace 'test' does not 
exist"
cqlsh> use "Test";
cqlsh:Test> drop keyspace "Test"
cqlsh:Test> create table "TestTable" (a text primary key, b text);
cqlsh:Test> select * from "TestTable";

 a | b
---+---

(0 rows)
cqlsh:Test> select * from "Test
{code}



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Commented] (CASSANDRA-11657) LongLeveledCompactionStrategyTest broken since CASSANDRA-10099

[Marcus Eriksson (JIRA)]

[ 
https://issues.apache.org/jira/browse/CASSANDRA-11657?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15258810#comment-15258810
 ] 

Marcus Eriksson commented on CASSANDRA-11657:
-

http://cassci.datastax.com/view/trunk/job/trunk_testall/lastCompletedBuild/testReport/org.apache.cassandra.db.compaction/LongLeveledCompactionStrategyTest/history/

it fails with the last written key >= current key error

> LongLeveledCompactionStrategyTest broken since CASSANDRA-10099
> --
>
> Key: CASSANDRA-11657
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11657
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Marcus Eriksson
>Assignee: Marcus Eriksson
> Fix For: 3.x
>
>
> Seems CASSANDRA-10099 broke LongLeveledCompactionStrategyTest



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Commented] (CASSANDRA-11657) LongLeveledCompactionStrategyTest broken since CASSANDRA-10099

[Yuki Morishita (JIRA)]

[ 
https://issues.apache.org/jira/browse/CASSANDRA-11657?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15258801#comment-15258801
 ] 

Yuki Morishita commented on CASSANDRA-11657:


hmm, I don't see LongLeveledCompactionStrategyTest failure in the latest trunk.
What do you see when the test fails?

> LongLeveledCompactionStrategyTest broken since CASSANDRA-10099
> --
>
> Key: CASSANDRA-11657
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11657
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Marcus Eriksson
>Assignee: Marcus Eriksson
> Fix For: 3.x
>
>
> Seems CASSANDRA-10099 broke LongLeveledCompactionStrategyTest



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Commented] (CASSANDRA-11605) dtest failure in repair_tests.repair_test.TestRepair.dc_parallel_repair_test

[Joshua McKenzie (JIRA)]

[ 
https://issues.apache.org/jira/browse/CASSANDRA-11605?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15258784#comment-15258784
 ] 

Joshua McKenzie commented on CASSANDRA-11605:
-

Reference CASSANDRA-9658. Due to perf. delta for buffered vs. mmap idx reads, I 
re-enabled mmap'ed path on Windows w/some infrastructure surrounding it to try 
and recover on failed deletions. Seeing this message on Windows is possible 
though should be infrequent.

> dtest failure in repair_tests.repair_test.TestRepair.dc_parallel_repair_test
> 
>
> Key: CASSANDRA-11605
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11605
> Project: Cassandra
>  Issue Type: Test
>Reporter: Jim Witschey
>Assignee: DS Test Eng
>  Labels: dtest, windows
>
> example failure:
> http://cassci.datastax.com/job/cassandra-2.2_dtest_win32/217/testReport/repair_tests.repair_test/TestRepair/dc_parallel_repair_test
> Failed on CassCI build cassandra-2.2_dtest_win32 #217
> [~philipthompson] may be the person to look -- did you do the most recent 
> stuff with the repair tests?
> Here's the output:
> {code}
> Error Message
> Unexpected error in log, see stdout
>  >> begin captured logging << 
> dtest: DEBUG: cluster ccm directory: d:\temp\dtest-mr7s9s
> dtest: DEBUG: Custom init_config not found. Setting defaults.
> dtest: DEBUG: Done setting configuration options:
> {   'initial_token': None,
> 'num_tokens': '32',
> 'phi_convict_threshold': 5,
> 'range_request_timeout_in_ms': 1,
> 'read_request_timeout_in_ms': 1,
> 'request_timeout_in_ms': 1,
> 'truncate_request_timeout_in_ms': 1,
> 'write_request_timeout_in_ms': 1}
> dtest: DEBUG: Starting cluster..
> dtest: DEBUG: Inserting data...
> dtest: DEBUG: Checking data...
> dtest: DEBUG: starting repair...
> dtest: DEBUG: removing ccm cluster test at: d:\temp\dtest-mr7s9s
> dtest: DEBUG: clearing ssl stores from [d:\temp\dtest-mr7s9s] directory
> - >> end captured logging << -
> Stacktrace
>   File "C:\tools\python2\lib\unittest\case.py", line 358, in run
> self.tearDown()
>   File 
> "D:\jenkins\workspace\cassandra-2.2_dtest_win32\cassandra-dtest\dtest.py", 
> line 667, in tearDown
> raise AssertionError('Unexpected error in log, see stdout')
> "Unexpected error in log, see stdout\n >> begin captured 
> logging << \ndtest: DEBUG: cluster ccm directory: 
> d:\\temp\\dtest-mr7s9s\ndtest: DEBUG: Custom init_config not found. Setting 
> defaults.\ndtest: DEBUG: Done setting configuration options:\n{   
> 'initial_token': None,\n'num_tokens': '32',\n'phi_convict_threshold': 
> 5,\n'range_request_timeout_in_ms': 1,\n
> 'read_request_timeout_in_ms': 1,\n'request_timeout_in_ms': 1,\n   
>  'truncate_request_timeout_in_ms': 1,\n'write_request_timeout_in_ms': 
> 1}\ndtest: DEBUG: Starting cluster..\ndtest: DEBUG: Inserting 
> data...\ndtest: DEBUG: Checking data...\ndtest: DEBUG: starting 
> repair...\ndtest: DEBUG: removing ccm cluster test at: 
> d:\\temp\\dtest-mr7s9s\ndtest: DEBUG: clearing ssl stores from 
> [d:\\temp\\dtest-mr7s9s] directory\n- >> end captured 
> logging << -"
> Standard Output
> Unexpected error in node2 log, error: 
> ERROR [NonPeriodicTasks:1] 2016-03-31 23:44:07,365 
> SSTableDeletingTask.java:83 - Unable to delete 
> d:\temp\dtest-mr7s9s\test\node2\data2\ks\cf-a61921b0f79911e581805f908c518710\la-2-big-Data.db
>  (it will be removed on server restart; we'll also retry after GC)
> ERROR [NonPeriodicTasks:1] 2016-03-31 23:44:07,371 
> SSTableDeletingTask.java:83 - Unable to delete 
> d:\temp\dtest-mr7s9s\test\node2\data2\ks\cf-a61921b0f79911e581805f908c518710\la-1-big-Data.db
>  (it will be removed on server restart; we'll also retry after GC)
> Standard Error
> Started: node1 with pid: 1344
> Started: node3 with pid: 4788
> Started: node2 with pid: 5552
> Started: node4 with pid: 7532
> Started: node2 with pid: 7828
> Started: node1 with pid: 5424
> Started: node3 with pid: 3448
> Started: node4 with pid: 3316
> Started: node3 with pid: 6464
> Started: node2 with pid: 2824
> Started: node4 with pid: 4692
> Started: node1 with pid: 7868
> Started: node2 with pid: 3824
> Started: node4 with pid: 6340
> Started: node1 with pid: 6412
> Started: node3 with pid: 6172
> Started: node2 with pid: 7280
> {code}



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Resolved] (CASSANDRA-11585) Architecture advice on Cassandra on Kubernetes

[Joshua McKenzie (JIRA)]

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-11585?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Joshua McKenzie resolved CASSANDRA-11585.
-
Resolution: Invalid

Questions like this are better served by hitting up the [user mailing 
list|https://mail-archives.apache.org/mod_mbox/cassandra-user/].

JIRA is for code-changes, bugs, improvements, etc rather than usage questions.

> Architecture advice on Cassandra on Kubernetes
> --
>
> Key: CASSANDRA-11585
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11585
> Project: Cassandra
>  Issue Type: Wish
>  Components: Lifecycle
> Environment: Kubernetes 1.2
>Reporter: Chris Love
>Priority: Minor
>
> Would appreciate some advice on the conversation that we are having in 
> regards to Snitches and Seed Providers on Kubernetes.  GitHub issue is open 
> here: 
> https://github.com/kubernetes/kubernetes/issues/24286#issuecomment-210566088
> Thanks
> Chris



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Commented] (CASSANDRA-3486) Node Tool command to stop repair

[Nick Bailey (JIRA)]

[ 
https://issues.apache.org/jira/browse/CASSANDRA-3486?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15258764#comment-15258764
 ] 

Nick Bailey commented on CASSANDRA-3486:


Some questions:

* If the abort is initiated on the coordinator can we return the 
success/failure of the attempt to abort on the participants as well? And vice 
versa?
* Similarly for the list of results when aborting all jobs.
* Can we make sure we are testing the case where for whatever reason a 
coordinator or participant receives an abort for a repair it doesn't know about?
* Since we are now tracking repairs by uuid like this, can we expose a progress 
API outside of the jmx notification process? An mbean for retrieving the 
progress/status of a repair job by uuid?


> Node Tool command to stop repair
> 
>
> Key: CASSANDRA-3486
> URL: https://issues.apache.org/jira/browse/CASSANDRA-3486
> Project: Cassandra
>  Issue Type: Improvement
>  Components: Tools
> Environment: JVM
>Reporter: Vijay
>Assignee: Paulo Motta
>Priority: Minor
>  Labels: repair
> Fix For: 2.1.x
>
> Attachments: 0001-stop-repair-3583.patch
>
>
> After CASSANDRA-1740, If the validation compaction is stopped then the repair 
> will hang. This ticket will allow users to kill the original repair.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Commented] (CASSANDRA-11663) dtest failure in upgrade_tests.storage_engine_upgrade_test.TestStorageEngineUpgrade.upgrade_with_wide_partition_test and upgrade_with_wide_partition_reversed_test

[Russ Hatch (JIRA)]

[ 
https://issues.apache.org/jira/browse/CASSANDRA-11663?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15258750#comment-15258750
 ] 

Russ Hatch commented on CASSANDRA-11663:


looks like maybe a timeout issue. look to be failing every time as well.

> dtest failure in 
> upgrade_tests.storage_engine_upgrade_test.TestStorageEngineUpgrade.upgrade_with_wide_partition_test
>  and upgrade_with_wide_partition_reversed_test
> --
>
> Key: CASSANDRA-11663
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11663
> Project: Cassandra
>  Issue Type: Test
>Reporter: Russ Hatch
>Assignee: DS Test Eng
>  Labels: dtest
>
> including two tests here, look to be failing for the same reason, example 
> failures:
> http://cassci.datastax.com/job/trunk_dtest/1152/testReport/upgrade_tests.storage_engine_upgrade_test/TestStorageEngineUpgrade/upgrade_with_wide_partition_test
> http://cassci.datastax.com/job/trunk_dtest/1152/testReport/upgrade_tests.storage_engine_upgrade_test/TestStorageEngineUpgrade/upgrade_with_wide_partition_reversed_test/
> Failed on CassCI build trunk_dtest #1152



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Created] (CASSANDRA-11663) dtest failure in upgrade_tests.storage_engine_upgrade_test.TestStorageEngineUpgrade.upgrade_with_wide_partition_test and upgrade_with_wide_partition_reversed_test

[Russ Hatch (JIRA)]

Russ Hatch created CASSANDRA-11663:
--

 Summary: dtest failure in 
upgrade_tests.storage_engine_upgrade_test.TestStorageEngineUpgrade.upgrade_with_wide_partition_test
 and upgrade_with_wide_partition_reversed_test
 Key: CASSANDRA-11663
 URL: https://issues.apache.org/jira/browse/CASSANDRA-11663
 Project: Cassandra
  Issue Type: Test
Reporter: Russ Hatch
Assignee: DS Test Eng


including two tests here, look to be failing for the same reason, example 
failures:

http://cassci.datastax.com/job/trunk_dtest/1152/testReport/upgrade_tests.storage_engine_upgrade_test/TestStorageEngineUpgrade/upgrade_with_wide_partition_test

http://cassci.datastax.com/job/trunk_dtest/1152/testReport/upgrade_tests.storage_engine_upgrade_test/TestStorageEngineUpgrade/upgrade_with_wide_partition_reversed_test/

Failed on CassCI build trunk_dtest #1152



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Commented] (CASSANDRA-9167) Improve bloom-filter false-positive-ratio

[Robert Stupp (JIRA)]

[ 
https://issues.apache.org/jira/browse/CASSANDRA-9167?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15258728#comment-15258728
 ] 

Robert Stupp commented on CASSANDRA-9167:
-

Rebased and updated the patch to address the comments.
But I just removed the {{1.03}} fudge factor - otherwise, if the 
buckets-per-element is calculated from the rounded hash code , it ends up with 
a too high false-positive-ratio (sometime 20% and more).

This patch also requires a change to {{KeyCacheCqlTest}}, because it checks the 
number requests against the key cache, which this patch reduces.

Also scheduled a couple of cstar tests to check for any notable change. Just 
[Trades|http://cstar.datastax.com/tests/id/b87cc382-0bc3-11e6-a0f0-0256e416528f]
 shows a slight 5% improvement. The other tests 
[Read/Write|http://cstar.datastax.com/tests/id/e8e12b4e-0bc3-11e6-a0f0-0256e416528f]
 and [3 
MV|http://cstar.datastax.com/tests/id/0c8b8fe4-0bc4-11e6-a0f0-0256e416528f] 
show a very marginal change, that I’d file under normal stress result variance.


> Improve bloom-filter false-positive-ratio
> -
>
> Key: CASSANDRA-9167
> URL: https://issues.apache.org/jira/browse/CASSANDRA-9167
> Project: Cassandra
>  Issue Type: Improvement
>Reporter: Robert Stupp
>Assignee: Robert Stupp
>Priority: Minor
>  Labels: perfomance
>
> {{org.apache.cassandra.utils.BloomCalculations}} performs some table lookups 
> to calculate the bloom filter specification (size, # of hashes). Using the 
> exact maths for that computation brings a better false-positive-ratio (the 
> maths usually returns higher numbers for hash-counts).
> TL;DR increasing the number of hash-rounds brings a nice improvement. Finally 
> it's a trade-off between CPU and I/O.
> ||false-positive-chance||elements||capacity||hash count 
> new||false-positive-ratio new||hash count current||false-positive-ratio 
> current||improvement
> |0.1|1|50048|3|0.0848|3|0.0848|0
> |0.1|10|500032|3|0.09203|3|0.09203|0
> |0.1|100|564|3|0.0919|3|0.0919|0
> |0.1|1000|5064|3|0.09182|3|0.09182|0
> |0.1|1|50064|3|0.091874|3|0.091874|0
> |0.01|1|100032|7|0.0092|5|0.0107|0.1630434783
> |0.01|10|164|7|0.00818|5|0.00931|0.1381418093
> |0.01|100|1064|7|0.008072|5|0.009405|0.1651387512
> |0.01|1000|10064|7|0.008174|5|0.009375|0.146929288
> |0.01|1|100064|7|0.008197|5|0.009428|0.150176894
> |0.001|1|150080|10|0.0008|7|0.001|0.25
> |0.001|10|1500032|10|0.0006|7|0.00094|0.57
> |0.001|100|1564|10|0.000717|7|0.000991|0.3821478382
> |0.001|1000|15064|10|0.000743|7|0.000992|0.33512786
> |0.001|1|150064|10|0.000741|7|0.001002|0.3522267206
> |0.0001|1|200064|13|0|10|0.0002|#DIV/0!
> |0.0001|10|264|13|0.4|10|0.0001|1.5
> |0.0001|100|2064|13|0.75|10|0.91|0.21
> |0.0001|1000|20064|13|0.69|10|0.87|0.2608695652
> |0.0001|1|200064|13|0.68|10|0.9|0.3235294118
> If we decide to allow more hash-rounds, it could be nicely back-ported even 
> to 2.0 without affecting existing sstables.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Updated] (CASSANDRA-7019) Improve tombstone compactions

[T Jake Luciani (JIRA)]

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-7019?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

T Jake Luciani updated CASSANDRA-7019:
--
Labels: compaction fallout  (was: compaction)

> Improve tombstone compactions
> -
>
> Key: CASSANDRA-7019
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7019
> Project: Cassandra
>  Issue Type: Improvement
>  Components: Compaction
>Reporter: Marcus Eriksson
>Assignee: Branimir Lambov
>  Labels: compaction, fallout
> Fix For: 3.x
>
> Attachments: 7019-2-system.log, 7019-debug.log
>
>
> When there are no other compactions to do, we trigger a single-sstable 
> compaction if there is more than X% droppable tombstones in the sstable.
> In this ticket we should try to include overlapping sstables in those 
> compactions to be able to actually drop the tombstones. Might only be doable 
> with LCS (with STCS we would probably end up including all sstables)



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Commented] (CASSANDRA-11381) Node running with join_ring=false and authentication can not serve requests

[Sam Tunnicliffe (JIRA)]

[ 
https://issues.apache.org/jira/browse/CASSANDRA-11381?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15258492#comment-15258492
 ] 

Sam Tunnicliffe commented on CASSANDRA-11381:
-

Giving it some further thought, I think that the moving {{doAuthSetup}} to 
before joining is only going to be problematic for the first node in a fresh 
cluster, and then only if it doesn't join (at least in 3.0+). Starting a new 
coordinator-only node in an existing cluster should be fine, and re-starting an 
existing node without joining should also be ok, as long as the replication of 
{{system_auth}} can cope with it. 


> Node running with join_ring=false and authentication can not serve requests
> ---
>
> Key: CASSANDRA-11381
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11381
> Project: Cassandra
>  Issue Type: Bug
>Reporter: mck
>Assignee: mck
> Fix For: 2.1.x, 2.2.x, 3.0.x, 3.x
>
> Attachments: 11381-2.0.txt, 11381-2.1.txt, 11381-2.2.txt, 
> 11381-3.0.txt, 11381-trunk.txt, dtest-11381-trunk.txt
>
>
> Starting up a node with {{-Dcassandra.join_ring=false}} in a cluster that has 
> authentication configured, eg PasswordAuthenticator, won't be able to serve 
> requests. This is because {{Auth.setup()}} never gets called during the 
> startup.
> Without {{Auth.setup()}} having been called in {{StorageService}} clients 
> connecting to the node fail with the node throwing
> {noformat}
> java.lang.NullPointerException
> at 
> org.apache.cassandra.auth.PasswordAuthenticator.authenticate(PasswordAuthenticator.java:119)
> at 
> org.apache.cassandra.thrift.CassandraServer.login(CassandraServer.java:1471)
> at 
> org.apache.cassandra.thrift.Cassandra$Processor$login.getResult(Cassandra.java:3505)
> at 
> org.apache.cassandra.thrift.Cassandra$Processor$login.getResult(Cassandra.java:3489)
> at org.apache.thrift.ProcessFunction.process(ProcessFunction.java:39)
> at org.apache.thrift.TBaseProcessor.process(TBaseProcessor.java:39)
> at com.thinkaurelius.thrift.Message.invoke(Message.java:314)
> at 
> com.thinkaurelius.thrift.Message$Invocation.execute(Message.java:90)
> at 
> com.thinkaurelius.thrift.TDisruptorServer$InvocationHandler.onEvent(TDisruptorServer.java:695)
> at 
> com.thinkaurelius.thrift.TDisruptorServer$InvocationHandler.onEvent(TDisruptorServer.java:689)
> at com.lmax.disruptor.WorkProcessor.run(WorkProcessor.java:112)
> at 
> java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
> at 
> java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
> at java.lang.Thread.run(Thread.java:745)
> {noformat}
> The exception thrown from the 
> [code|https://github.com/apache/cassandra/blob/cassandra-2.0.16/src/java/org/apache/cassandra/auth/PasswordAuthenticator.java#L119]
> {code}
> ResultMessage.Rows rows = 
> authenticateStatement.execute(QueryState.forInternalCalls(), new 
> QueryOptions(consistencyForUser(username),
>   
>Lists.newArrayList(ByteBufferUtil.bytes(username;
> {code}



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Updated] (CASSANDRA-11642) sstabledump and sstableverify need to be added to deb packages

[T Jake Luciani (JIRA)]

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-11642?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

T Jake Luciani updated CASSANDRA-11642:
---
Resolution: Fixed
Status: Resolved  (was: Patch Available)

Committed thx

> sstabledump and sstableverify need to be added to deb packages
> --
>
> Key: CASSANDRA-11642
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11642
> Project: Cassandra
>  Issue Type: Bug
>  Components: Tools
> Environment: OS: Debian
> Cassandra 3.5
>Reporter: Attila Szucs
>Assignee: T Jake Luciani
> Fix For: 3.6, 3.0.6, 2.2.7
>
> Attachments: CASSANDRA-11642.txt, CASSANDRA-11642_2.2.txt
>
>
> Command-line tool sstabledump is not installed on Debian. 
> I used the following source:
> {code}
> deb http://www.apache.org/dist/cassandra/debian 35x main
> {code}
> with the following installation commands:
> {code}
> sudo apt-get install cassandra
> sudo apt-get install cassandra-tools
> {code}



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[1/8] cassandra git commit: Fix typo

[jake]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.2 487c8f79d -> cfc398e81
  refs/heads/cassandra-3.0 d87921c56 -> 5d37fc4c4
  refs/heads/trunk 75177696d -> ac902a505


Fix typo


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

Branch: refs/heads/trunk
Commit: 487c8f79de0a8cdd357e1cd23e03783db1623c54
Parents: ec1772a
Author: T Jake Luciani 
Authored: Tue Apr 26 12:49:23 2016 -0400
Committer: T Jake Luciani 
Committed: Tue Apr 26 12:49:23 2016 -0400

--
 src/java/org/apache/cassandra/utils/Interval.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/487c8f79/src/java/org/apache/cassandra/utils/Interval.java
--
diff --git a/src/java/org/apache/cassandra/utils/Interval.java 
b/src/java/org/apache/cassandra/utils/Interval.java
index b96a3d7..335ef27 100644
--- a/src/java/org/apache/cassandra/utils/Interval.java
+++ b/src/java/org/apache/cassandra/utils/Interval.java
@@ -39,7 +39,7 @@ public class Interval
 return create(min, max, null);
 }
 
-public static  Interval git gitcreate(C min, C max, D data)
+public static  Interval create(C min, C max, D data)
 {
 return new Interval(min, max, data);
 }

[8/8] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

[jake]

Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: ac902a505ec3edd79db7e765ec09be72a8f06180
Parents: 7517769 5d37fc4
Author: T Jake Luciani 
Authored: Tue Apr 26 13:15:05 2016 -0400
Committer: T Jake Luciani 
Committed: Tue Apr 26 13:15:05 2016 -0400

--
 CHANGES.txt| 5 -
 debian/cassandra-tools.install | 1 +
 debian/cassandra.install   | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ac902a50/CHANGES.txt
--

[3/8] cassandra git commit: Add missing tools to debian package

[jake]

Add missing tools to debian package

Patch by tjake and Michael Shuler; reviewed by Michael Shuler for 
CASSANDRA-11642


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

Branch: refs/heads/cassandra-2.2
Commit: cfc398e81839bbb0337b4e5073b82bb7dee2996a
Parents: 487c8f7
Author: T Jake Luciani 
Authored: Tue Apr 26 13:08:03 2016 -0400
Committer: T Jake Luciani 
Committed: Tue Apr 26 13:08:03 2016 -0400

--
 CHANGES.txt  | 1 +
 debian/cassandra.install | 1 +
 2 files changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/cfc398e8/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 06b27b4..d73ed01 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.7
+ * Add missing files to debian packages (CASSANDRA-11642)
  * Avoid calling Iterables::concat in loops during 
ModificationStatement::getFunctions (CASSANDRA-11621)
  * cqlsh: COPY FROM should use regular inserts for single statement batches and
   report errors correctly if workers processes crash on initialization 
(CASSANDRA-11474)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/cfc398e8/debian/cassandra.install
--
diff --git a/debian/cassandra.install b/debian/cassandra.install
index 6488dbe..91faca4 100644
--- a/debian/cassandra.install
+++ b/debian/cassandra.install
@@ -17,6 +17,7 @@ bin/cqlsh usr/bin
 bin/cqlsh.py usr/bin
 bin/sstablescrub usr/bin
 bin/sstableupgrade usr/bin
+bin/sstableverify usr/bin
 tools/bin/cassandra-stress usr/bin
 lib/*.jar usr/share/cassandra/lib
 lib/*.zip usr/share/cassandra/lib

[6/8] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[jake]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 5d37fc4c4eb5e82f11194b1b5ce3b1a9f463e607
Parents: d87921c cfc398e
Author: T Jake Luciani 
Authored: Tue Apr 26 13:13:16 2016 -0400
Committer: T Jake Luciani 
Committed: Tue Apr 26 13:13:42 2016 -0400

--
 CHANGES.txt| 2 ++
 debian/cassandra-tools.install | 1 +
 debian/cassandra.install   | 1 +
 3 files changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d37fc4c/CHANGES.txt
--
diff --cc CHANGES.txt
index 11bbbed,d73ed01..277eac4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,17 -1,6 +1,19 @@@
 -2.2.7
 +3.0.6
 + * Fix sstabledump not showing cells after tombstone marker (CASSANDRA-11654)
 + * Ignore all LocalStrategy keyspaces for streaming and other related
 +   operations (CASSANDRA-11627)
 + * Ensure columnfilter covers indexed columns for thrift 2i queries 
(CASSANDRA-11523)
 + * Only open one sstable scanner per sstable (CASSANDRA-11412)
 + * Option to specify ProtocolVersion in cassandra-stress (CASSANDRA-11410)
 + * ArithmeticException in avgFunctionForDecimal (CASSANDRA-11485)
 + * LogAwareFileLister should only use OLD sstable files in current folder to 
determine disk consistency (CASSANDRA-11470)
 + * Notify indexers of expired rows during compaction (CASSANDRA-11329)
 + * Properly respond with ProtocolError when a v1/v2 native protocol
 +   header is received (CASSANDRA-11464)
 + * Validate that num_tokens and initial_token are consistent with one another 
(CASSANDRA-10120)
 +Merged from 2.2:
+  * Add missing files to debian packages (CASSANDRA-11642)
+  * Avoid calling Iterables::concat in loops during 
ModificationStatement::getFunctions (CASSANDRA-11621)
   * cqlsh: COPY FROM should use regular inserts for single statement batches 
and
report errors correctly if workers processes crash on 
initialization (CASSANDRA-11474)
   * Always close cluster with connection in CqlRecordWriter (CASSANDRA-11553)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d37fc4c/debian/cassandra-tools.install
--
diff --cc debian/cassandra-tools.install
index 957f2c0,6df21f3..8806344
--- a/debian/cassandra-tools.install
+++ b/debian/cassandra-tools.install
@@@ -1,6 -1,7 +1,7 @@@
 -tools/bin/json2sstable usr/bin
 -tools/bin/sstable2json usr/bin
 +tools/bin/sstableexpiredblockers usr/bin
  tools/bin/sstablelevelreset usr/bin
  tools/bin/sstablemetadata usr/bin
 +tools/bin/sstableofflinerelevel usr/bin
  tools/bin/sstablerepairedset usr/bin
  tools/bin/sstablesplit usr/bin
 -tools/bin/token-generator usr/bin
++tools/bin/sstabledump usr/bin

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d37fc4c/debian/cassandra.install
--

[7/8] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[jake]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: 5d37fc4c4eb5e82f11194b1b5ce3b1a9f463e607
Parents: d87921c cfc398e
Author: T Jake Luciani 
Authored: Tue Apr 26 13:13:16 2016 -0400
Committer: T Jake Luciani 
Committed: Tue Apr 26 13:13:42 2016 -0400

--
 CHANGES.txt| 2 ++
 debian/cassandra-tools.install | 1 +
 debian/cassandra.install   | 1 +
 3 files changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d37fc4c/CHANGES.txt
--
diff --cc CHANGES.txt
index 11bbbed,d73ed01..277eac4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,17 -1,6 +1,19 @@@
 -2.2.7
 +3.0.6
 + * Fix sstabledump not showing cells after tombstone marker (CASSANDRA-11654)
 + * Ignore all LocalStrategy keyspaces for streaming and other related
 +   operations (CASSANDRA-11627)
 + * Ensure columnfilter covers indexed columns for thrift 2i queries 
(CASSANDRA-11523)
 + * Only open one sstable scanner per sstable (CASSANDRA-11412)
 + * Option to specify ProtocolVersion in cassandra-stress (CASSANDRA-11410)
 + * ArithmeticException in avgFunctionForDecimal (CASSANDRA-11485)
 + * LogAwareFileLister should only use OLD sstable files in current folder to 
determine disk consistency (CASSANDRA-11470)
 + * Notify indexers of expired rows during compaction (CASSANDRA-11329)
 + * Properly respond with ProtocolError when a v1/v2 native protocol
 +   header is received (CASSANDRA-11464)
 + * Validate that num_tokens and initial_token are consistent with one another 
(CASSANDRA-10120)
 +Merged from 2.2:
+  * Add missing files to debian packages (CASSANDRA-11642)
+  * Avoid calling Iterables::concat in loops during 
ModificationStatement::getFunctions (CASSANDRA-11621)
   * cqlsh: COPY FROM should use regular inserts for single statement batches 
and
report errors correctly if workers processes crash on 
initialization (CASSANDRA-11474)
   * Always close cluster with connection in CqlRecordWriter (CASSANDRA-11553)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d37fc4c/debian/cassandra-tools.install
--
diff --cc debian/cassandra-tools.install
index 957f2c0,6df21f3..8806344
--- a/debian/cassandra-tools.install
+++ b/debian/cassandra-tools.install
@@@ -1,6 -1,7 +1,7 @@@
 -tools/bin/json2sstable usr/bin
 -tools/bin/sstable2json usr/bin
 +tools/bin/sstableexpiredblockers usr/bin
  tools/bin/sstablelevelreset usr/bin
  tools/bin/sstablemetadata usr/bin
 +tools/bin/sstableofflinerelevel usr/bin
  tools/bin/sstablerepairedset usr/bin
  tools/bin/sstablesplit usr/bin
 -tools/bin/token-generator usr/bin
++tools/bin/sstabledump usr/bin

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d37fc4c/debian/cassandra.install
--

[4/8] cassandra git commit: Add missing tools to debian package

[jake]

Add missing tools to debian package

Patch by tjake and Michael Shuler; reviewed by Michael Shuler for 
CASSANDRA-11642


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

Branch: refs/heads/trunk
Commit: cfc398e81839bbb0337b4e5073b82bb7dee2996a
Parents: 487c8f7
Author: T Jake Luciani 
Authored: Tue Apr 26 13:08:03 2016 -0400
Committer: T Jake Luciani 
Committed: Tue Apr 26 13:08:03 2016 -0400

--
 CHANGES.txt  | 1 +
 debian/cassandra.install | 1 +
 2 files changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/cfc398e8/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 06b27b4..d73ed01 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.7
+ * Add missing files to debian packages (CASSANDRA-11642)
  * Avoid calling Iterables::concat in loops during 
ModificationStatement::getFunctions (CASSANDRA-11621)
  * cqlsh: COPY FROM should use regular inserts for single statement batches and
   report errors correctly if workers processes crash on initialization 
(CASSANDRA-11474)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/cfc398e8/debian/cassandra.install
--
diff --git a/debian/cassandra.install b/debian/cassandra.install
index 6488dbe..91faca4 100644
--- a/debian/cassandra.install
+++ b/debian/cassandra.install
@@ -17,6 +17,7 @@ bin/cqlsh usr/bin
 bin/cqlsh.py usr/bin
 bin/sstablescrub usr/bin
 bin/sstableupgrade usr/bin
+bin/sstableverify usr/bin
 tools/bin/cassandra-stress usr/bin
 lib/*.jar usr/share/cassandra/lib
 lib/*.zip usr/share/cassandra/lib

[5/8] cassandra git commit: Add missing tools to debian package

[jake]

Add missing tools to debian package

Patch by tjake and Michael Shuler; reviewed by Michael Shuler for 
CASSANDRA-11642


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

Branch: refs/heads/cassandra-3.0
Commit: cfc398e81839bbb0337b4e5073b82bb7dee2996a
Parents: 487c8f7
Author: T Jake Luciani 
Authored: Tue Apr 26 13:08:03 2016 -0400
Committer: T Jake Luciani 
Committed: Tue Apr 26 13:08:03 2016 -0400

--
 CHANGES.txt  | 1 +
 debian/cassandra.install | 1 +
 2 files changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/cfc398e8/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 06b27b4..d73ed01 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.7
+ * Add missing files to debian packages (CASSANDRA-11642)
  * Avoid calling Iterables::concat in loops during 
ModificationStatement::getFunctions (CASSANDRA-11621)
  * cqlsh: COPY FROM should use regular inserts for single statement batches and
   report errors correctly if workers processes crash on initialization 
(CASSANDRA-11474)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/cfc398e8/debian/cassandra.install
--
diff --git a/debian/cassandra.install b/debian/cassandra.install
index 6488dbe..91faca4 100644
--- a/debian/cassandra.install
+++ b/debian/cassandra.install
@@ -17,6 +17,7 @@ bin/cqlsh usr/bin
 bin/cqlsh.py usr/bin
 bin/sstablescrub usr/bin
 bin/sstableupgrade usr/bin
+bin/sstableverify usr/bin
 tools/bin/cassandra-stress usr/bin
 lib/*.jar usr/share/cassandra/lib
 lib/*.zip usr/share/cassandra/lib

[2/8] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[jake]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: d87921c56daa4c96105c1ebaf5c7d9e557b68a6e
Parents: 8d69cab 487c8f7
Author: T Jake Luciani 
Authored: Tue Apr 26 12:49:38 2016 -0400
Committer: T Jake Luciani 
Committed: Tue Apr 26 12:49:38 2016 -0400

--

--

[3/3] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[jake]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: d87921c56daa4c96105c1ebaf5c7d9e557b68a6e
Parents: 8d69cab 487c8f7
Author: T Jake Luciani 
Authored: Tue Apr 26 12:49:38 2016 -0400
Committer: T Jake Luciani 
Committed: Tue Apr 26 12:49:38 2016 -0400

--

--

[2/3] cassandra git commit: Fix typo

[jake]

Fix typo


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

Branch: refs/heads/cassandra-3.0
Commit: 487c8f79de0a8cdd357e1cd23e03783db1623c54
Parents: ec1772a
Author: T Jake Luciani 
Authored: Tue Apr 26 12:49:23 2016 -0400
Committer: T Jake Luciani 
Committed: Tue Apr 26 12:49:23 2016 -0400

--
 src/java/org/apache/cassandra/utils/Interval.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/487c8f79/src/java/org/apache/cassandra/utils/Interval.java
--
diff --git a/src/java/org/apache/cassandra/utils/Interval.java 
b/src/java/org/apache/cassandra/utils/Interval.java
index b96a3d7..335ef27 100644
--- a/src/java/org/apache/cassandra/utils/Interval.java
+++ b/src/java/org/apache/cassandra/utils/Interval.java
@@ -39,7 +39,7 @@ public class Interval
 return create(min, max, null);
 }
 
-public static  Interval git gitcreate(C min, C max, D data)
+public static  Interval create(C min, C max, D data)
 {
 return new Interval(min, max, data);
 }

[1/3] cassandra git commit: Fix typo

[jake]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.2 ec1772ad8 -> 487c8f79d
  refs/heads/cassandra-3.0 8d69cabd5 -> d87921c56


Fix typo


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

Branch: refs/heads/cassandra-2.2
Commit: 487c8f79de0a8cdd357e1cd23e03783db1623c54
Parents: ec1772a
Author: T Jake Luciani 
Authored: Tue Apr 26 12:49:23 2016 -0400
Committer: T Jake Luciani 
Committed: Tue Apr 26 12:49:23 2016 -0400

--
 src/java/org/apache/cassandra/utils/Interval.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/487c8f79/src/java/org/apache/cassandra/utils/Interval.java
--
diff --git a/src/java/org/apache/cassandra/utils/Interval.java 
b/src/java/org/apache/cassandra/utils/Interval.java
index b96a3d7..335ef27 100644
--- a/src/java/org/apache/cassandra/utils/Interval.java
+++ b/src/java/org/apache/cassandra/utils/Interval.java
@@ -39,7 +39,7 @@ public class Interval
 return create(min, max, null);
 }
 
-public static  Interval git gitcreate(C min, C max, D data)
+public static  Interval create(C min, C max, D data)
 {
 return new Interval(min, max, data);
 }

[jira] [Updated] (CASSANDRA-10853) deb package migration to dh_python2

[T Jake Luciani (JIRA)]

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-10853?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

T Jake Luciani updated CASSANDRA-10853:
---
Resolution: Fixed
Status: Resolved  (was: Patch Available)

+1 committed

> deb package migration to dh_python2
> ---
>
> Key: CASSANDRA-10853
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10853
> Project: Cassandra
>  Issue Type: Task
>  Components: Packaging
>Reporter: Michael Shuler
>Assignee: Michael Shuler
> Fix For: 2.1.15, 3.6, 3.0.6, 2.2.7
>
> Attachments: 10853_2.1.txt, 10853_3.0.txt
>
>
> I'm working on a deb job in jenkins, and I had forgotten to open a bug for 
> this. There is no urgent need, since {{python-support}} is in Jessie, but 
> this package is currently in transition to be removed.
> http://deb.li/dhs2p
> During deb build:
> {noformat}
> dh_pysupport: This program is deprecated, you should use dh_python2 instead. 
> Migration guide: http://deb.li/dhs2p
> {noformat}



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[02/18] cassandra git commit: deb package migration to dh_python2

[jake]

deb package migration to dh_python2

Patch by Michael Shuler; reviewed by tjake for CASSANDRA-10853


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

Branch: refs/heads/cassandra-3.0
Commit: 26e0a33fafd77c900abad1db4d43a29985d3341f
Parents: cc75de6
Author: T Jake Luciani 
Authored: Tue Apr 26 12:06:46 2016 -0400
Committer: T Jake Luciani 
Committed: Tue Apr 26 12:06:46 2016 -0400

--
 debian/control| 4 ++--
 src/java/org/apache/cassandra/utils/Interval.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/26e0a33f/debian/control
--
diff --git a/debian/control b/debian/control
index 8a30de1..cc5928c 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: misc
 Priority: extra
 Maintainer: Eric Evans 
 Uploaders: Sylvain Lebresne 
-Build-Depends: debhelper (>= 5), openjdk-7-jdk | java7-jdk, ant (>= 1.7), 
ant-optional (>= 1.7), python-support, dpatch, bash-completion
+Build-Depends: debhelper (>= 5), openjdk-7-jdk | java7-jdk, ant (>= 1.7), 
ant-optional (>= 1.7), dh-python, python-dev (>= 2.7), dpatch, bash-completion
 Homepage: http://cassandra.apache.org
 Vcs-Git: http://git-wip-us.apache.org/repos/asf/cassandra.git
 Vcs-Browser: https://git-wip-us.apache.org/repos/asf?p=cassandra.git
@@ -11,7 +11,7 @@ Standards-Version: 3.8.3
 
 Package: cassandra
 Architecture: all
-Depends: openjdk-7-jre-headless | java7-runtime, adduser, python (>= 2.7), 
python-support (>= 0.90.0), ${misc:Depends}
+Depends: openjdk-7-jre-headless | java7-runtime, adduser, python (>= 2.7), 
${misc:Depends}
 Recommends: ntp | time-daemon
 Suggests: cassandra-tools
 Conflicts: apache-cassandra1

http://git-wip-us.apache.org/repos/asf/cassandra/blob/26e0a33f/src/java/org/apache/cassandra/utils/Interval.java
--
diff --git a/src/java/org/apache/cassandra/utils/Interval.java 
b/src/java/org/apache/cassandra/utils/Interval.java
index c74f153..33b4188 100644
--- a/src/java/org/apache/cassandra/utils/Interval.java
+++ b/src/java/org/apache/cassandra/utils/Interval.java
@@ -37,7 +37,7 @@ public class Interval
 return create(min, max, null);
 }
 
-public static  Interval create(C min, C max, D data)
+public static  Interval git gitcreate(C min, C max, D data)
 {
 return new Interval(min, max, data);
 }

[14/18] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[jake]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: aea8e082f96fd41385b29ea9dd975576a6357a3e
Parents: 049d70c ec1772a
Author: T Jake Luciani 
Authored: Tue Apr 26 12:28:23 2016 -0400
Committer: T Jake Luciani 
Committed: Tue Apr 26 12:28:23 2016 -0400

--

--

[15/18] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[jake]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: aea8e082f96fd41385b29ea9dd975576a6357a3e
Parents: 049d70c ec1772a
Author: T Jake Luciani 
Authored: Tue Apr 26 12:28:23 2016 -0400
Committer: T Jake Luciani 
Committed: Tue Apr 26 12:28:23 2016 -0400

--

--

[05/18] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

[jake]

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/cassandra-3.0
Commit: fb20023fb5cfa063b5a46dd1c422bd1e9273d4c3
Parents: 3128802 26e0a33
Author: T Jake Luciani 
Authored: Tue Apr 26 12:11:15 2016 -0400
Committer: T Jake Luciani 
Committed: Tue Apr 26 12:11:15 2016 -0400

--
 debian/control| 4 ++--
 src/java/org/apache/cassandra/utils/Interval.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/fb20023f/src/java/org/apache/cassandra/utils/Interval.java
--

[03/18] cassandra git commit: deb package migration to dh_python2

[jake]

deb package migration to dh_python2

Patch by Michael Shuler; reviewed by tjake for CASSANDRA-10853


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

Branch: refs/heads/trunk
Commit: 26e0a33fafd77c900abad1db4d43a29985d3341f
Parents: cc75de6
Author: T Jake Luciani 
Authored: Tue Apr 26 12:06:46 2016 -0400
Committer: T Jake Luciani 
Committed: Tue Apr 26 12:06:46 2016 -0400

--
 debian/control| 4 ++--
 src/java/org/apache/cassandra/utils/Interval.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/26e0a33f/debian/control
--
diff --git a/debian/control b/debian/control
index 8a30de1..cc5928c 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: misc
 Priority: extra
 Maintainer: Eric Evans 
 Uploaders: Sylvain Lebresne 
-Build-Depends: debhelper (>= 5), openjdk-7-jdk | java7-jdk, ant (>= 1.7), 
ant-optional (>= 1.7), python-support, dpatch, bash-completion
+Build-Depends: debhelper (>= 5), openjdk-7-jdk | java7-jdk, ant (>= 1.7), 
ant-optional (>= 1.7), dh-python, python-dev (>= 2.7), dpatch, bash-completion
 Homepage: http://cassandra.apache.org
 Vcs-Git: http://git-wip-us.apache.org/repos/asf/cassandra.git
 Vcs-Browser: https://git-wip-us.apache.org/repos/asf?p=cassandra.git
@@ -11,7 +11,7 @@ Standards-Version: 3.8.3
 
 Package: cassandra
 Architecture: all
-Depends: openjdk-7-jre-headless | java7-runtime, adduser, python (>= 2.7), 
python-support (>= 0.90.0), ${misc:Depends}
+Depends: openjdk-7-jre-headless | java7-runtime, adduser, python (>= 2.7), 
${misc:Depends}
 Recommends: ntp | time-daemon
 Suggests: cassandra-tools
 Conflicts: apache-cassandra1

http://git-wip-us.apache.org/repos/asf/cassandra/blob/26e0a33f/src/java/org/apache/cassandra/utils/Interval.java
--
diff --git a/src/java/org/apache/cassandra/utils/Interval.java 
b/src/java/org/apache/cassandra/utils/Interval.java
index c74f153..33b4188 100644
--- a/src/java/org/apache/cassandra/utils/Interval.java
+++ b/src/java/org/apache/cassandra/utils/Interval.java
@@ -37,7 +37,7 @@ public class Interval
 return create(min, max, null);
 }
 
-public static  Interval create(C min, C max, D data)
+public static  Interval git gitcreate(C min, C max, D data)
 {
 return new Interval(min, max, data);
 }

[17/18] cassandra git commit: deb package migration to dh_python2

[jake]

deb package migration to dh_python2

Patch by Michael Shuler; reviewed by tjake for CASSANDRA-10853


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

Branch: refs/heads/cassandra-3.0
Commit: 8d69cabd5a1f6089ffe5892a18fcbcc5b850fe8e
Parents: aea8e08
Author: T Jake Luciani 
Authored: Tue Apr 26 12:29:06 2016 -0400
Committer: T Jake Luciani 
Committed: Tue Apr 26 12:29:06 2016 -0400

--
 debian/control | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d69cabd/debian/control
--
diff --git a/debian/control b/debian/control
index d3f6974..2d30077 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: misc
 Priority: extra
 Maintainer: Eric Evans 
 Uploaders: Sylvain Lebresne 
-Build-Depends: debhelper (>= 5), openjdk-8-jdk | java8-jdk, ant (>= 1.7), 
ant-optional (>= 1.7), python-support, dpatch, bash-completion
+Build-Depends: debhelper (>= 5), openjdk-8-jdk | java8-jdk, ant (>= 1.7), 
ant-optional (>= 1.7), dh-python, python-dev (>= 2.7), dpatch, bash-completion
 Homepage: http://cassandra.apache.org
 Vcs-Git: http://git-wip-us.apache.org/repos/asf/cassandra.git
 Vcs-Browser: https://git-wip-us.apache.org/repos/asf?p=cassandra.git
@@ -11,7 +11,7 @@ Standards-Version: 3.8.3
 
 Package: cassandra
 Architecture: all
-Depends: openjdk-8-jre-headless | java8-runtime, adduser, python (>= 2.7), 
python-support (>= 0.90.0), ${misc:Depends}
+Depends: openjdk-8-jre-headless | java8-runtime, adduser, python (>= 2.7), 
${misc:Depends}
 Recommends: ntp | time-daemon
 Suggests: cassandra-tools
 Conflicts: apache-cassandra1

[18/18] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

[jake]

Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 75177696da5b593297a243037ee7d0e5930f641a
Parents: 53b4ffa 8d69cab
Author: T Jake Luciani 
Authored: Tue Apr 26 12:29:35 2016 -0400
Committer: T Jake Luciani 
Committed: Tue Apr 26 12:29:35 2016 -0400

--
 debian/control | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--

[10/18] cassandra git commit: deb package migration to dh_python2

[jake]

deb package migration to dh_python2

Patch by Michael Shuler; reviewed by tjake for CASSANDRA-10853


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

Branch: refs/heads/cassandra-3.0
Commit: ae03066f4cc194ec5951898d83a1294531e96b21
Parents: cc75de6
Author: T Jake Luciani 
Authored: Tue Apr 26 12:13:48 2016 -0400
Committer: T Jake Luciani 
Committed: Tue Apr 26 12:13:48 2016 -0400

--
 debian/control | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ae03066f/debian/control
--
diff --git a/debian/control b/debian/control
index 8a30de1..cc5928c 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: misc
 Priority: extra
 Maintainer: Eric Evans 
 Uploaders: Sylvain Lebresne 
-Build-Depends: debhelper (>= 5), openjdk-7-jdk | java7-jdk, ant (>= 1.7), 
ant-optional (>= 1.7), python-support, dpatch, bash-completion
+Build-Depends: debhelper (>= 5), openjdk-7-jdk | java7-jdk, ant (>= 1.7), 
ant-optional (>= 1.7), dh-python, python-dev (>= 2.7), dpatch, bash-completion
 Homepage: http://cassandra.apache.org
 Vcs-Git: http://git-wip-us.apache.org/repos/asf/cassandra.git
 Vcs-Browser: https://git-wip-us.apache.org/repos/asf?p=cassandra.git
@@ -11,7 +11,7 @@ Standards-Version: 3.8.3
 
 Package: cassandra
 Architecture: all
-Depends: openjdk-7-jre-headless | java7-runtime, adduser, python (>= 2.7), 
python-support (>= 0.90.0), ${misc:Depends}
+Depends: openjdk-7-jre-headless | java7-runtime, adduser, python (>= 2.7), 
${misc:Depends}
 Recommends: ntp | time-daemon
 Suggests: cassandra-tools
 Conflicts: apache-cassandra1

[09/18] cassandra git commit: deb package migration to dh_python2

[jake]

deb package migration to dh_python2

Patch by Michael Shuler; reviewed by tjake for CASSANDRA-10853


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

Branch: refs/heads/cassandra-2.1
Commit: ae03066f4cc194ec5951898d83a1294531e96b21
Parents: cc75de6
Author: T Jake Luciani 
Authored: Tue Apr 26 12:13:48 2016 -0400
Committer: T Jake Luciani 
Committed: Tue Apr 26 12:13:48 2016 -0400

--
 debian/control | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ae03066f/debian/control
--
diff --git a/debian/control b/debian/control
index 8a30de1..cc5928c 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: misc
 Priority: extra
 Maintainer: Eric Evans 
 Uploaders: Sylvain Lebresne 
-Build-Depends: debhelper (>= 5), openjdk-7-jdk | java7-jdk, ant (>= 1.7), 
ant-optional (>= 1.7), python-support, dpatch, bash-completion
+Build-Depends: debhelper (>= 5), openjdk-7-jdk | java7-jdk, ant (>= 1.7), 
ant-optional (>= 1.7), dh-python, python-dev (>= 2.7), dpatch, bash-completion
 Homepage: http://cassandra.apache.org
 Vcs-Git: http://git-wip-us.apache.org/repos/asf/cassandra.git
 Vcs-Browser: https://git-wip-us.apache.org/repos/asf?p=cassandra.git
@@ -11,7 +11,7 @@ Standards-Version: 3.8.3
 
 Package: cassandra
 Architecture: all
-Depends: openjdk-7-jre-headless | java7-runtime, adduser, python (>= 2.7), 
python-support (>= 0.90.0), ${misc:Depends}
+Depends: openjdk-7-jre-headless | java7-runtime, adduser, python (>= 2.7), 
${misc:Depends}
 Recommends: ntp | time-daemon
 Suggests: cassandra-tools
 Conflicts: apache-cassandra1

[12/18] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

[jake]

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/cassandra-3.0
Commit: ec1772ad879ad8dac247a8d1fe32c3ece45c5e62
Parents: fb20023 ae03066
Author: T Jake Luciani 
Authored: Tue Apr 26 12:18:10 2016 -0400
Committer: T Jake Luciani 
Committed: Tue Apr 26 12:18:10 2016 -0400

--

--

[01/18] cassandra git commit: deb package migration to dh_python2

[jake]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 cc75de691 -> ae03066f4
  refs/heads/cassandra-2.2 3128802a5 -> ec1772ad8
  refs/heads/cassandra-3.0 049d70c2e -> 8d69cabd5
  refs/heads/trunk 53b4ffac3 -> 75177696d


deb package migration to dh_python2

Patch by Michael Shuler; reviewed by tjake for CASSANDRA-10853


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

Branch: refs/heads/cassandra-2.2
Commit: 26e0a33fafd77c900abad1db4d43a29985d3341f
Parents: cc75de6
Author: T Jake Luciani 
Authored: Tue Apr 26 12:06:46 2016 -0400
Committer: T Jake Luciani 
Committed: Tue Apr 26 12:06:46 2016 -0400

--
 debian/control| 4 ++--
 src/java/org/apache/cassandra/utils/Interval.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/26e0a33f/debian/control
--
diff --git a/debian/control b/debian/control
index 8a30de1..cc5928c 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: misc
 Priority: extra
 Maintainer: Eric Evans 
 Uploaders: Sylvain Lebresne 
-Build-Depends: debhelper (>= 5), openjdk-7-jdk | java7-jdk, ant (>= 1.7), 
ant-optional (>= 1.7), python-support, dpatch, bash-completion
+Build-Depends: debhelper (>= 5), openjdk-7-jdk | java7-jdk, ant (>= 1.7), 
ant-optional (>= 1.7), dh-python, python-dev (>= 2.7), dpatch, bash-completion
 Homepage: http://cassandra.apache.org
 Vcs-Git: http://git-wip-us.apache.org/repos/asf/cassandra.git
 Vcs-Browser: https://git-wip-us.apache.org/repos/asf?p=cassandra.git
@@ -11,7 +11,7 @@ Standards-Version: 3.8.3
 
 Package: cassandra
 Architecture: all
-Depends: openjdk-7-jre-headless | java7-runtime, adduser, python (>= 2.7), 
python-support (>= 0.90.0), ${misc:Depends}
+Depends: openjdk-7-jre-headless | java7-runtime, adduser, python (>= 2.7), 
${misc:Depends}
 Recommends: ntp | time-daemon
 Suggests: cassandra-tools
 Conflicts: apache-cassandra1

http://git-wip-us.apache.org/repos/asf/cassandra/blob/26e0a33f/src/java/org/apache/cassandra/utils/Interval.java
--
diff --git a/src/java/org/apache/cassandra/utils/Interval.java 
b/src/java/org/apache/cassandra/utils/Interval.java
index c74f153..33b4188 100644
--- a/src/java/org/apache/cassandra/utils/Interval.java
+++ b/src/java/org/apache/cassandra/utils/Interval.java
@@ -37,7 +37,7 @@ public class Interval
 return create(min, max, null);
 }
 
-public static  Interval create(C min, C max, D data)
+public static  Interval git gitcreate(C min, C max, D data)
 {
 return new Interval(min, max, data);
 }

[07/18] cassandra git commit: deb package migration to dh_python2

[jake]

deb package migration to dh_python2

Patch by Michael Shuler; reviewed by tjake for CASSANDRA-10853


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

Branch: refs/heads/cassandra-2.2
Commit: ae03066f4cc194ec5951898d83a1294531e96b21
Parents: cc75de6
Author: T Jake Luciani 
Authored: Tue Apr 26 12:13:48 2016 -0400
Committer: T Jake Luciani 
Committed: Tue Apr 26 12:13:48 2016 -0400

--
 debian/control | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ae03066f/debian/control
--
diff --git a/debian/control b/debian/control
index 8a30de1..cc5928c 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: misc
 Priority: extra
 Maintainer: Eric Evans 
 Uploaders: Sylvain Lebresne 
-Build-Depends: debhelper (>= 5), openjdk-7-jdk | java7-jdk, ant (>= 1.7), 
ant-optional (>= 1.7), python-support, dpatch, bash-completion
+Build-Depends: debhelper (>= 5), openjdk-7-jdk | java7-jdk, ant (>= 1.7), 
ant-optional (>= 1.7), dh-python, python-dev (>= 2.7), dpatch, bash-completion
 Homepage: http://cassandra.apache.org
 Vcs-Git: http://git-wip-us.apache.org/repos/asf/cassandra.git
 Vcs-Browser: https://git-wip-us.apache.org/repos/asf?p=cassandra.git
@@ -11,7 +11,7 @@ Standards-Version: 3.8.3
 
 Package: cassandra
 Architecture: all
-Depends: openjdk-7-jre-headless | java7-runtime, adduser, python (>= 2.7), 
python-support (>= 0.90.0), ${misc:Depends}
+Depends: openjdk-7-jre-headless | java7-runtime, adduser, python (>= 2.7), 
${misc:Depends}
 Recommends: ntp | time-daemon
 Suggests: cassandra-tools
 Conflicts: apache-cassandra1

[06/18] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

[jake]

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/trunk
Commit: fb20023fb5cfa063b5a46dd1c422bd1e9273d4c3
Parents: 3128802 26e0a33
Author: T Jake Luciani 
Authored: Tue Apr 26 12:11:15 2016 -0400
Committer: T Jake Luciani 
Committed: Tue Apr 26 12:11:15 2016 -0400

--
 debian/control| 4 ++--
 src/java/org/apache/cassandra/utils/Interval.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/fb20023f/src/java/org/apache/cassandra/utils/Interval.java
--

[16/18] cassandra git commit: deb package migration to dh_python2

[jake]

deb package migration to dh_python2

Patch by Michael Shuler; reviewed by tjake for CASSANDRA-10853


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

Branch: refs/heads/trunk
Commit: 8d69cabd5a1f6089ffe5892a18fcbcc5b850fe8e
Parents: aea8e08
Author: T Jake Luciani 
Authored: Tue Apr 26 12:29:06 2016 -0400
Committer: T Jake Luciani 
Committed: Tue Apr 26 12:29:06 2016 -0400

--
 debian/control | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d69cabd/debian/control
--
diff --git a/debian/control b/debian/control
index d3f6974..2d30077 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: misc
 Priority: extra
 Maintainer: Eric Evans 
 Uploaders: Sylvain Lebresne 
-Build-Depends: debhelper (>= 5), openjdk-8-jdk | java8-jdk, ant (>= 1.7), 
ant-optional (>= 1.7), python-support, dpatch, bash-completion
+Build-Depends: debhelper (>= 5), openjdk-8-jdk | java8-jdk, ant (>= 1.7), 
ant-optional (>= 1.7), dh-python, python-dev (>= 2.7), dpatch, bash-completion
 Homepage: http://cassandra.apache.org
 Vcs-Git: http://git-wip-us.apache.org/repos/asf/cassandra.git
 Vcs-Browser: https://git-wip-us.apache.org/repos/asf?p=cassandra.git
@@ -11,7 +11,7 @@ Standards-Version: 3.8.3
 
 Package: cassandra
 Architecture: all
-Depends: openjdk-8-jre-headless | java8-runtime, adduser, python (>= 2.7), 
python-support (>= 0.90.0), ${misc:Depends}
+Depends: openjdk-8-jre-headless | java8-runtime, adduser, python (>= 2.7), 
${misc:Depends}
 Recommends: ntp | time-daemon
 Suggests: cassandra-tools
 Conflicts: apache-cassandra1

[04/18] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

[jake]

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/cassandra-2.2
Commit: fb20023fb5cfa063b5a46dd1c422bd1e9273d4c3
Parents: 3128802 26e0a33
Author: T Jake Luciani 
Authored: Tue Apr 26 12:11:15 2016 -0400
Committer: T Jake Luciani 
Committed: Tue Apr 26 12:11:15 2016 -0400

--
 debian/control| 4 ++--
 src/java/org/apache/cassandra/utils/Interval.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/fb20023f/src/java/org/apache/cassandra/utils/Interval.java
--

[11/18] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

[jake]

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/trunk
Commit: ec1772ad879ad8dac247a8d1fe32c3ece45c5e62
Parents: fb20023 ae03066
Author: T Jake Luciani 
Authored: Tue Apr 26 12:18:10 2016 -0400
Committer: T Jake Luciani 
Committed: Tue Apr 26 12:18:10 2016 -0400

--

--

[13/18] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

[jake]

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/cassandra-2.2
Commit: ec1772ad879ad8dac247a8d1fe32c3ece45c5e62
Parents: fb20023 ae03066
Author: T Jake Luciani 
Authored: Tue Apr 26 12:18:10 2016 -0400
Committer: T Jake Luciani 
Committed: Tue Apr 26 12:18:10 2016 -0400

--

--

[08/18] cassandra git commit: deb package migration to dh_python2

[jake]

deb package migration to dh_python2

Patch by Michael Shuler; reviewed by tjake for CASSANDRA-10853


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

Branch: refs/heads/trunk
Commit: ae03066f4cc194ec5951898d83a1294531e96b21
Parents: cc75de6
Author: T Jake Luciani 
Authored: Tue Apr 26 12:13:48 2016 -0400
Committer: T Jake Luciani 
Committed: Tue Apr 26 12:13:48 2016 -0400

--
 debian/control | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ae03066f/debian/control
--
diff --git a/debian/control b/debian/control
index 8a30de1..cc5928c 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: misc
 Priority: extra
 Maintainer: Eric Evans 
 Uploaders: Sylvain Lebresne 
-Build-Depends: debhelper (>= 5), openjdk-7-jdk | java7-jdk, ant (>= 1.7), 
ant-optional (>= 1.7), python-support, dpatch, bash-completion
+Build-Depends: debhelper (>= 5), openjdk-7-jdk | java7-jdk, ant (>= 1.7), 
ant-optional (>= 1.7), dh-python, python-dev (>= 2.7), dpatch, bash-completion
 Homepage: http://cassandra.apache.org
 Vcs-Git: http://git-wip-us.apache.org/repos/asf/cassandra.git
 Vcs-Browser: https://git-wip-us.apache.org/repos/asf?p=cassandra.git
@@ -11,7 +11,7 @@ Standards-Version: 3.8.3
 
 Package: cassandra
 Architecture: all
-Depends: openjdk-7-jre-headless | java7-runtime, adduser, python (>= 2.7), 
python-support (>= 0.90.0), ${misc:Depends}
+Depends: openjdk-7-jre-headless | java7-runtime, adduser, python (>= 2.7), 
${misc:Depends}
 Recommends: ntp | time-daemon
 Suggests: cassandra-tools
 Conflicts: apache-cassandra1

[jira] [Commented] (CASSANDRA-11659) Set a variable for cassandra.logdir instead hardcoding in bin/cassandra.

[Chris Lohfink (JIRA)]

[ 
https://issues.apache.org/jira/browse/CASSANDRA-11659?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15258354#comment-15258354
 ] 

Chris Lohfink commented on CASSANDRA-11659:
---

may want to consider gc logs that also use {{$CASSANDRA_HOME/logs}}: 
https://github.com/apache/cassandra/blob/b78117cf3b5222d4e227d9e8c9ae1b5dc29c9f90/conf/cassandra-env.sh#L160

> Set a variable for cassandra.logdir instead hardcoding in bin/cassandra.
> 
>
> Key: CASSANDRA-11659
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11659
> Project: Cassandra
>  Issue Type: Bug
>  Components: Packaging
>Reporter: Ahmed AbouZaid
>Priority: Minor
>  Labels: patch
> Attachments: cassandra_logdir_path_v.01.patch
>
>   Original Estimate: 5m
>  Remaining Estimate: 5m
>
> Hello,
> I think we need a way to overwrite value of "cassandra.logdir", that in case 
> the user needs to change logdir path.
> Since it's hard-coded inside "/usr/sbin/cassandra" (as "/var/log/cassandra" 
> or  "$CASSANDRA_HOME/logs") and also it's defined after includes, so it 
> should be as variable, just like "cassandra.storagedir".
> Something like that:
> {code}
> cassandra_parms="$cassandra_parms -Dcassandra.logdir=$cassandra_logdir"
> cassandra_parms="$cassandra_parms 
> -Dcassandra.storagedir=$cassandra_storagedir"
> {code}
> And as in Debian, we can set "/var/log/cassandra" as default value somewhere.
> Thanks



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Updated] (CASSANDRA-11600) Don't require HEAP_NEW_SIZE to be set when using G1

[Blake Eggleston (JIRA)]

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-11600?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Blake Eggleston updated CASSANDRA-11600:

Status: Ready to Commit  (was: Patch Available)

> Don't require HEAP_NEW_SIZE to be set when using G1
> ---
>
> Key: CASSANDRA-11600
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11600
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Blake Eggleston
>Assignee: Blake Eggleston
>Priority: Minor
> Fix For: 3.6, 3.0.x
>
>
> Although cassandra-env.sh doesn't set -Xmn (unless set in jvm.options) when 
> using G1GC, it still requires that you set HEAP_NEW_SIZE and MAX_HEAP_SIZE 
> together, and won't start until you do. Since we ignore that setting if 
> you're using G1, we shouldn't require that the user set it.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Commented] (CASSANDRA-11600) Don't require HEAP_NEW_SIZE to be set when using G1

[Blake Eggleston (JIRA)]

[ 
https://issues.apache.org/jira/browse/CASSANDRA-11600?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15258333#comment-15258333
 ] 

Blake Eggleston commented on CASSANDRA-11600:
-

Squashed / formatted commit for 3.0 branch is 
[here|https://github.com/bdeggleston/cassandra/commit/e920ccf1cac268cf1406c1819403803a5b4367be]

> Don't require HEAP_NEW_SIZE to be set when using G1
> ---
>
> Key: CASSANDRA-11600
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11600
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Blake Eggleston
>Assignee: Blake Eggleston
>Priority: Minor
> Fix For: 3.6, 3.0.x
>
>
> Although cassandra-env.sh doesn't set -Xmn (unless set in jvm.options) when 
> using G1GC, it still requires that you set HEAP_NEW_SIZE and MAX_HEAP_SIZE 
> together, and won't start until you do. Since we ignore that setting if 
> you're using G1, we shouldn't require that the user set it.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)