mirror of https://github.com/apache/cassandra
Fix size calculations for prepared statements
Patch by Benjamin Lerer; reviewed by Dave Brosius for CASSANDRA-8231
This commit is contained in:
blerer
Tyler Hobbs
parent
6826888be8
commit
1bb2dd906c
|
|
@ -1,4 +1,5 @@
|
|||
2.1.3
|
||||
* Fix high size calculations for prepared statements (CASSANDRA-8231)
|
||||
* Centralize shared executors (CASSANDRA-8055)
|
||||
* Fix filtering for CONTAINS (KEY) relations on frozen collection
|
||||
clustering columns when the query is restricted to a single
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ if NOT DEFINED JAVA_HOME goto :err
|
|||
REM -----------------------------------------------------------------------------
|
||||
REM JVM Opts we'll use in legacy run or installation
|
||||
set JAVA_OPTS=-ea^
|
||||
-javaagent:"%CASSANDRA_HOME%\lib\jamm-0.2.8.jar"^
|
||||
-javaagent:"%CASSANDRA_HOME%\lib\jamm-0.3.0.jar"^
|
||||
-Xms2G^
|
||||
-Xmx2G^
|
||||
-XX:+HeapDumpOnOutOfMemoryError^
|
||||
|
|
|
|||
|
|
@ -48,5 +48,5 @@ done
|
|||
if [ "$JVM_VENDOR" != "OpenJDK" -o "$JVM_VERSION" \> "1.6.0" ] \
|
||||
|| [ "$JVM_VERSION" = "1.6.0" -a "$JVM_PATCH_VERSION" -ge 23 ]
|
||||
then
|
||||
JAVA_AGENT="$JAVA_AGENT -javaagent:$CASSANDRA_HOME/lib/jamm-0.2.8.jar"
|
||||
JAVA_AGENT="$JAVA_AGENT -javaagent:$CASSANDRA_HOME/lib/jamm-0.3.0.jar"
|
||||
fi
|
||||
|
|
|
|||
10
build.xml
10
build.xml
|
|
@ -369,7 +369,7 @@
|
|||
</dependency>
|
||||
<dependency groupId="com.googlecode.json-simple" artifactId="json-simple" version="1.1"/>
|
||||
<dependency groupId="com.boundary" artifactId="high-scale-lib" version="1.0.6"/>
|
||||
<dependency groupId="com.github.jbellis" artifactId="jamm" version="0.2.8"/>
|
||||
<dependency groupId="com.github.jbellis" artifactId="jamm" version="0.3.0"/>
|
||||
<dependency groupId="com.thinkaurelius.thrift" artifactId="thrift-server" version="0.3.7">
|
||||
<exclusion groupId="org.slf4j" artifactId="slf4j-log4j12"/>
|
||||
</dependency>
|
||||
|
|
@ -688,7 +688,7 @@
|
|||
<pathelement location="${test.conf}"/>
|
||||
</classpath>
|
||||
<jvmarg value="-Dstorage-config=${test.conf}"/>
|
||||
<jvmarg value="-javaagent:${basedir}/lib/jamm-0.2.8.jar" />
|
||||
<jvmarg value="-javaagent:${basedir}/lib/jamm-0.3.0.jar" />
|
||||
<jvmarg value="-ea"/>
|
||||
</java>
|
||||
</target>
|
||||
|
|
@ -1107,7 +1107,7 @@
|
|||
<formatter type="brief" usefile="false"/>
|
||||
<jvmarg value="-Dstorage-config=${test.conf}"/>
|
||||
<jvmarg value="-Djava.awt.headless=true"/>
|
||||
<jvmarg value="-javaagent:${basedir}/lib/jamm-0.2.8.jar" />
|
||||
<jvmarg value="-javaagent:${basedir}/lib/jamm-0.3.0.jar" />
|
||||
<jvmarg value="-ea"/>
|
||||
<jvmarg value="-Xss256k"/>
|
||||
<jvmarg value="-Dcassandra.memtable_row_overhead_computation_step=100"/>
|
||||
|
|
@ -1266,7 +1266,7 @@
|
|||
<formatter type="brief" usefile="false"/>
|
||||
<jvmarg value="-Dstorage-config=${test.conf}"/>
|
||||
<jvmarg value="-Djava.awt.headless=true"/>
|
||||
<jvmarg value="-javaagent:${basedir}/lib/jamm-0.2.8.jar" />
|
||||
<jvmarg value="-javaagent:${basedir}/lib/jamm-0.3.0.jar" />
|
||||
<jvmarg value="-ea"/>
|
||||
<jvmarg value="-Xss256k"/>
|
||||
<jvmarg value="-Dcassandra.memtable_row_overhead_computation_step=100"/>
|
||||
|
|
@ -1309,7 +1309,7 @@
|
|||
<formatter type="brief" usefile="false"/>
|
||||
<jvmarg value="-Dstorage-config=${test.conf}"/>
|
||||
<jvmarg value="-Djava.awt.headless=true"/>
|
||||
<jvmarg value="-javaagent:${basedir}/lib/jamm-0.2.8.jar" />
|
||||
<jvmarg value="-javaagent:${basedir}/lib/jamm-0.3.0.jar" />
|
||||
<jvmarg value="-ea"/>
|
||||
<jvmarg value="-Xss256k"/>
|
||||
<jvmarg value="-Dcassandra.test.use_prepared=${cassandra.test.use_prepared}"/>
|
||||
|
|
|
|||
|
|
@ -301,7 +301,7 @@ Function SetCassandraEnvironment
|
|||
if (($env:JVM_VENDOR -ne "OpenJDK") -or ($env:JVM_VERSION.CompareTo("1.6.0") -eq 1) -or
|
||||
(($env:JVM_VERSION -eq "1.6.0") -and ($env:JVM_PATCH_VERSION.CompareTo("22") -eq 1)))
|
||||
{
|
||||
$env:JVM_OPTS = "$env:JVM_OPTS -javaagent:""$env:CASSANDRA_HOME\lib\jamm-0.2.8.jar"""
|
||||
$env:JVM_OPTS = "$env:JVM_OPTS -javaagent:""$env:CASSANDRA_HOME\lib\jamm-0.3.0.jar"""
|
||||
}
|
||||
|
||||
# enable assertions. disabling this in production will give a modest
|
||||
|
|
|
|||
|
|
@ -173,7 +173,7 @@ JMX_PORT="7199"
|
|||
JVM_OPTS="$JVM_OPTS -ea"
|
||||
|
||||
# add the jamm javaagent
|
||||
JVM_OPTS="$JVM_OPTS -javaagent:$CASSANDRA_HOME/lib/jamm-0.2.8.jar"
|
||||
JVM_OPTS="$JVM_OPTS -javaagent:$CASSANDRA_HOME/lib/jamm-0.3.0.jar"
|
||||
|
||||
# some JVMs will fill up their heap when accessed via JMX, see CASSANDRA-6541
|
||||
JVM_OPTS="$JVM_OPTS -XX:+CMSClassUnloadingEnabled"
|
||||
|
|
|
|||
|
|
@ -26,5 +26,5 @@ CLASSPATH="$CLASSPATH:$EXTRA_CLASSPATH"
|
|||
if [ "$JVM_VENDOR" != "OpenJDK" -o "$JVM_VERSION" \> "1.6.0" ] \
|
||||
|| [ "$JVM_VERSION" = "1.6.0" -a "$JVM_PATCH_VERSION" -ge 23 ]
|
||||
then
|
||||
JAVA_AGENT="$JAVA_AGENT -javaagent:$CASSANDRA_HOME/lib/jamm-0.2.8.jar"
|
||||
JAVA_AGENT="$JAVA_AGENT -javaagent:$CASSANDRA_HOME/lib/jamm-0.3.0.jar"
|
||||
fi
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,202 +0,0 @@
|
|||
|
||||
Apache License
|
||||
Version 2.0, January 2004
|
||||
http://www.apache.org/licenses/
|
||||
|
||||
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||
|
||||
1. Definitions.
|
||||
|
||||
"License" shall mean the terms and conditions for use, reproduction,
|
||||
and distribution as defined by Sections 1 through 9 of this document.
|
||||
|
||||
"Licensor" shall mean the copyright owner or entity authorized by
|
||||
the copyright owner that is granting the License.
|
||||
|
||||
"Legal Entity" shall mean the union of the acting entity and all
|
||||
other entities that control, are controlled by, or are under common
|
||||
control with that entity. For the purposes of this definition,
|
||||
"control" means (i) the power, direct or indirect, to cause the
|
||||
direction or management of such entity, whether by contract or
|
||||
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
||||
outstanding shares, or (iii) beneficial ownership of such entity.
|
||||
|
||||
"You" (or "Your") shall mean an individual or Legal Entity
|
||||
exercising permissions granted by this License.
|
||||
|
||||
"Source" form shall mean the preferred form for making modifications,
|
||||
including but not limited to software source code, documentation
|
||||
source, and configuration files.
|
||||
|
||||
"Object" form shall mean any form resulting from mechanical
|
||||
transformation or translation of a Source form, including but
|
||||
not limited to compiled object code, generated documentation,
|
||||
and conversions to other media types.
|
||||
|
||||
"Work" shall mean the work of authorship, whether in Source or
|
||||
Object form, made available under the License, as indicated by a
|
||||
copyright notice that is included in or attached to the work
|
||||
(an example is provided in the Appendix below).
|
||||
|
||||
"Derivative Works" shall mean any work, whether in Source or Object
|
||||
form, that is based on (or derived from) the Work and for which the
|
||||
editorial revisions, annotations, elaborations, or other modifications
|
||||
represent, as a whole, an original work of authorship. For the purposes
|
||||
of this License, Derivative Works shall not include works that remain
|
||||
separable from, or merely link (or bind by name) to the interfaces of,
|
||||
the Work and Derivative Works thereof.
|
||||
|
||||
"Contribution" shall mean any work of authorship, including
|
||||
the original version of the Work and any modifications or additions
|
||||
to that Work or Derivative Works thereof, that is intentionally
|
||||
submitted to Licensor for inclusion in the Work by the copyright owner
|
||||
or by an individual or Legal Entity authorized to submit on behalf of
|
||||
the copyright owner. For the purposes of this definition, "submitted"
|
||||
means any form of electronic, verbal, or written communication sent
|
||||
to the Licensor or its representatives, including but not limited to
|
||||
communication on electronic mailing lists, source code control systems,
|
||||
and issue tracking systems that are managed by, or on behalf of, the
|
||||
Licensor for the purpose of discussing and improving the Work, but
|
||||
excluding communication that is conspicuously marked or otherwise
|
||||
designated in writing by the copyright owner as "Not a Contribution."
|
||||
|
||||
"Contributor" shall mean Licensor and any individual or Legal Entity
|
||||
on behalf of whom a Contribution has been received by Licensor and
|
||||
subsequently incorporated within the Work.
|
||||
|
||||
2. Grant of Copyright License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
copyright license to reproduce, prepare Derivative Works of,
|
||||
publicly display, publicly perform, sublicense, and distribute the
|
||||
Work and such Derivative Works in Source or Object form.
|
||||
|
||||
3. Grant of Patent License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
(except as stated in this section) patent license to make, have made,
|
||||
use, offer to sell, sell, import, and otherwise transfer the Work,
|
||||
where such license applies only to those patent claims licensable
|
||||
by such Contributor that are necessarily infringed by their
|
||||
Contribution(s) alone or by combination of their Contribution(s)
|
||||
with the Work to which such Contribution(s) was submitted. If You
|
||||
institute patent litigation against any entity (including a
|
||||
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
||||
or a Contribution incorporated within the Work constitutes direct
|
||||
or contributory patent infringement, then any patent licenses
|
||||
granted to You under this License for that Work shall terminate
|
||||
as of the date such litigation is filed.
|
||||
|
||||
4. Redistribution. You may reproduce and distribute copies of the
|
||||
Work or Derivative Works thereof in any medium, with or without
|
||||
modifications, and in Source or Object form, provided that You
|
||||
meet the following conditions:
|
||||
|
||||
(a) You must give any other recipients of the Work or
|
||||
Derivative Works a copy of this License; and
|
||||
|
||||
(b) You must cause any modified files to carry prominent notices
|
||||
stating that You changed the files; and
|
||||
|
||||
(c) You must retain, in the Source form of any Derivative Works
|
||||
that You distribute, all copyright, patent, trademark, and
|
||||
attribution notices from the Source form of the Work,
|
||||
excluding those notices that do not pertain to any part of
|
||||
the Derivative Works; and
|
||||
|
||||
(d) If the Work includes a "NOTICE" text file as part of its
|
||||
distribution, then any Derivative Works that You distribute must
|
||||
include a readable copy of the attribution notices contained
|
||||
within such NOTICE file, excluding those notices that do not
|
||||
pertain to any part of the Derivative Works, in at least one
|
||||
of the following places: within a NOTICE text file distributed
|
||||
as part of the Derivative Works; within the Source form or
|
||||
documentation, if provided along with the Derivative Works; or,
|
||||
within a display generated by the Derivative Works, if and
|
||||
wherever such third-party notices normally appear. The contents
|
||||
of the NOTICE file are for informational purposes only and
|
||||
do not modify the License. You may add Your own attribution
|
||||
notices within Derivative Works that You distribute, alongside
|
||||
or as an addendum to the NOTICE text from the Work, provided
|
||||
that such additional attribution notices cannot be construed
|
||||
as modifying the License.
|
||||
|
||||
You may add Your own copyright statement to Your modifications and
|
||||
may provide additional or different license terms and conditions
|
||||
for use, reproduction, or distribution of Your modifications, or
|
||||
for any such Derivative Works as a whole, provided Your use,
|
||||
reproduction, and distribution of the Work otherwise complies with
|
||||
the conditions stated in this License.
|
||||
|
||||
5. Submission of Contributions. Unless You explicitly state otherwise,
|
||||
any Contribution intentionally submitted for inclusion in the Work
|
||||
by You to the Licensor shall be under the terms and conditions of
|
||||
this License, without any additional terms or conditions.
|
||||
Notwithstanding the above, nothing herein shall supersede or modify
|
||||
the terms of any separate license agreement you may have executed
|
||||
with Licensor regarding such Contributions.
|
||||
|
||||
6. Trademarks. This License does not grant permission to use the trade
|
||||
names, trademarks, service marks, or product names of the Licensor,
|
||||
except as required for reasonable and customary use in describing the
|
||||
origin of the Work and reproducing the content of the NOTICE file.
|
||||
|
||||
7. Disclaimer of Warranty. Unless required by applicable law or
|
||||
agreed to in writing, Licensor provides the Work (and each
|
||||
Contributor provides its Contributions) on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||
implied, including, without limitation, any warranties or conditions
|
||||
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
||||
PARTICULAR PURPOSE. You are solely responsible for determining the
|
||||
appropriateness of using or redistributing the Work and assume any
|
||||
risks associated with Your exercise of permissions under this License.
|
||||
|
||||
8. Limitation of Liability. In no event and under no legal theory,
|
||||
whether in tort (including negligence), contract, or otherwise,
|
||||
unless required by applicable law (such as deliberate and grossly
|
||||
negligent acts) or agreed to in writing, shall any Contributor be
|
||||
liable to You for damages, including any direct, indirect, special,
|
||||
incidental, or consequential damages of any character arising as a
|
||||
result of this License or out of the use or inability to use the
|
||||
Work (including but not limited to damages for loss of goodwill,
|
||||
work stoppage, computer failure or malfunction, or any and all
|
||||
other commercial damages or losses), even if such Contributor
|
||||
has been advised of the possibility of such damages.
|
||||
|
||||
9. Accepting Warranty or Additional Liability. While redistributing
|
||||
the Work or Derivative Works thereof, You may choose to offer,
|
||||
and charge a fee for, acceptance of support, warranty, indemnity,
|
||||
or other liability obligations and/or rights consistent with this
|
||||
License. However, in accepting such obligations, You may act only
|
||||
on Your own behalf and on Your sole responsibility, not on behalf
|
||||
of any other Contributor, and only if You agree to indemnify,
|
||||
defend, and hold each Contributor harmless for any liability
|
||||
incurred by, or claims asserted against, such Contributor by reason
|
||||
of your accepting any such warranty or additional liability.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
APPENDIX: How to apply the Apache License to your work.
|
||||
|
||||
To apply the Apache License to your work, attach the following
|
||||
boilerplate notice, with the fields enclosed by brackets "[]"
|
||||
replaced with your own identifying information. (Don't include
|
||||
the brackets!) The text should be enclosed in the appropriate
|
||||
comment syntax for the file format. We also recommend that a
|
||||
file or class name and description of purpose be included on the
|
||||
same "printed page" as the copyright notice for easier
|
||||
identification within third-party archives.
|
||||
|
||||
Copyright [yyyy] [name of copyright owner]
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
|
|
@ -57,6 +57,7 @@ import org.apache.cassandra.tracing.Tracing;
|
|||
import org.apache.cassandra.utils.ByteBufferUtil;
|
||||
import org.apache.cassandra.utils.FBUtilities;
|
||||
import org.apache.cassandra.utils.UUIDGen;
|
||||
import org.github.jamm.Unmetered;
|
||||
|
||||
import static org.apache.cassandra.utils.FBUtilities.fromJsonList;
|
||||
import static org.apache.cassandra.utils.FBUtilities.fromJsonMap;
|
||||
|
|
@ -65,6 +66,7 @@ import static org.apache.cassandra.utils.FBUtilities.json;
|
|||
/**
|
||||
* This class can be tricky to modify. Please read http://wiki.apache.org/cassandra/ConfigurationNotes for how to do so safely.
|
||||
*/
|
||||
@Unmetered
|
||||
public final class CFMetaData
|
||||
{
|
||||
private static final Logger logger = LoggerFactory.getLogger(CFMetaData.class);
|
||||
|
|
|
|||
|
|
@ -1,26 +0,0 @@
|
|||
/*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
* distributed with this work for additional information
|
||||
* regarding copyright ownership. The ASF licenses this file
|
||||
* to you under the Apache License, Version 2.0 (the
|
||||
* "License"); you may not use this file except in compliance
|
||||
* with the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing,
|
||||
* software distributed under the License is distributed on an
|
||||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
* KIND, either express or implied. See the License for the
|
||||
* specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*/
|
||||
package org.apache.cassandra.cql3;
|
||||
|
||||
import org.github.jamm.MemoryMeter;
|
||||
|
||||
public interface MeasurableForPreparedCache
|
||||
{
|
||||
public long measureForPreparedCache(MemoryMeter meter);
|
||||
}
|
||||
|
|
@ -18,28 +18,40 @@
|
|||
package org.apache.cassandra.cql3;
|
||||
|
||||
import java.nio.ByteBuffer;
|
||||
import java.util.*;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
import java.util.concurrent.*;
|
||||
import java.util.concurrent.atomic.AtomicInteger;
|
||||
|
||||
import com.google.common.primitives.Ints;
|
||||
|
||||
import com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap;
|
||||
import com.googlecode.concurrentlinkedhashmap.EntryWeigher;
|
||||
import com.googlecode.concurrentlinkedhashmap.EvictionListener;
|
||||
import org.antlr.runtime.*;
|
||||
import org.github.jamm.MemoryMeter;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap;
|
||||
import com.googlecode.concurrentlinkedhashmap.EntryWeigher;
|
||||
import com.googlecode.concurrentlinkedhashmap.EvictionListener;
|
||||
|
||||
import org.apache.cassandra.concurrent.ScheduledExecutors;
|
||||
import org.antlr.runtime.*;
|
||||
import org.apache.cassandra.cql3.statements.*;
|
||||
import org.apache.cassandra.db.*;
|
||||
import org.apache.cassandra.db.composites.*;
|
||||
import org.apache.cassandra.db.composites.CType;
|
||||
import org.apache.cassandra.db.composites.CellName;
|
||||
import org.apache.cassandra.db.composites.CellNameType;
|
||||
import org.apache.cassandra.db.composites.Composite;
|
||||
import org.apache.cassandra.db.marshal.AbstractType;
|
||||
import org.apache.cassandra.exceptions.*;
|
||||
import org.apache.cassandra.exceptions.InvalidRequestException;
|
||||
import org.apache.cassandra.exceptions.RequestExecutionException;
|
||||
import org.apache.cassandra.exceptions.RequestValidationException;
|
||||
import org.apache.cassandra.exceptions.SyntaxException;
|
||||
import org.apache.cassandra.metrics.CQLMetrics;
|
||||
import org.apache.cassandra.service.*;
|
||||
import org.apache.cassandra.service.ClientState;
|
||||
import org.apache.cassandra.service.IMigrationListener;
|
||||
import org.apache.cassandra.service.MigrationManager;
|
||||
import org.apache.cassandra.service.QueryState;
|
||||
import org.apache.cassandra.service.pager.QueryPager;
|
||||
import org.apache.cassandra.service.pager.QueryPagers;
|
||||
import org.apache.cassandra.thrift.ThriftClientState;
|
||||
|
|
@ -48,6 +60,7 @@ import org.apache.cassandra.transport.messages.ResultMessage;
|
|||
import org.apache.cassandra.utils.FBUtilities;
|
||||
import org.apache.cassandra.utils.MD5Digest;
|
||||
import org.apache.cassandra.utils.SemanticVersion;
|
||||
import org.github.jamm.MemoryMeter;
|
||||
|
||||
public class QueryProcessor implements QueryHandler
|
||||
{
|
||||
|
|
@ -542,9 +555,7 @@ public class QueryProcessor implements QueryHandler
|
|||
|
||||
private static long measure(Object key)
|
||||
{
|
||||
return key instanceof MeasurableForPreparedCache
|
||||
? ((MeasurableForPreparedCache)key).measureForPreparedCache(meter)
|
||||
: meter.measureDeep(key);
|
||||
return meter.measureDeep(key);
|
||||
}
|
||||
|
||||
private static class MigrationSubscriber implements IMigrationListener
|
||||
|
|
|
|||
|
|
@ -22,7 +22,9 @@ import java.util.List;
|
|||
|
||||
import org.apache.cassandra.db.marshal.AbstractType;
|
||||
import org.apache.cassandra.exceptions.InvalidRequestException;
|
||||
import org.github.jamm.Unmetered;
|
||||
|
||||
@Unmetered
|
||||
public interface Function
|
||||
{
|
||||
public String name();
|
||||
|
|
|
|||
|
|
@ -23,7 +23,6 @@ import java.util.*;
|
|||
import com.google.common.base.Function;
|
||||
import com.google.common.collect.*;
|
||||
import org.apache.cassandra.config.DatabaseDescriptor;
|
||||
import org.github.jamm.MemoryMeter;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
|
|
@ -41,7 +40,7 @@ import org.apache.cassandra.transport.messages.ResultMessage;
|
|||
* A <code>BATCH</code> statement parsed from a CQL query.
|
||||
*
|
||||
*/
|
||||
public class BatchStatement implements CQLStatement, MeasurableForPreparedCache
|
||||
public class BatchStatement implements CQLStatement
|
||||
{
|
||||
public static enum Type
|
||||
{
|
||||
|
|
@ -76,17 +75,6 @@ public class BatchStatement implements CQLStatement, MeasurableForPreparedCache
|
|||
this.hasConditions = hasConditions;
|
||||
}
|
||||
|
||||
public long measureForPreparedCache(MemoryMeter meter)
|
||||
{
|
||||
long size = meter.measure(this)
|
||||
+ meter.measureDeep(type)
|
||||
+ meter.measure(statements)
|
||||
+ meter.measureDeep(attrs);
|
||||
for (ModificationStatement stmt : statements)
|
||||
size += stmt.measureForPreparedCache(meter);
|
||||
return size;
|
||||
}
|
||||
|
||||
public int getBoundTerms()
|
||||
{
|
||||
return boundTerms;
|
||||
|
|
|
|||
|
|
@ -22,8 +22,6 @@ import java.util.*;
|
|||
|
||||
import com.google.common.base.Function;
|
||||
import com.google.common.collect.Iterables;
|
||||
import org.apache.cassandra.db.marshal.AbstractType;
|
||||
import org.github.jamm.MemoryMeter;
|
||||
|
||||
import org.apache.cassandra.auth.Permission;
|
||||
import org.apache.cassandra.config.CFMetaData;
|
||||
|
|
@ -46,7 +44,7 @@ import org.apache.cassandra.utils.Pair;
|
|||
/*
|
||||
* Abstract parent class of individual modifications, i.e. INSERT, UPDATE and DELETE.
|
||||
*/
|
||||
public abstract class ModificationStatement implements CQLStatement, MeasurableForPreparedCache
|
||||
public abstract class ModificationStatement implements CQLStatement
|
||||
{
|
||||
private static final ColumnIdentifier CAS_RESULT_COLUMN = new ColumnIdentifier("[applied]", false);
|
||||
|
||||
|
|
@ -87,16 +85,6 @@ public abstract class ModificationStatement implements CQLStatement, MeasurableF
|
|||
this.attrs = attrs;
|
||||
}
|
||||
|
||||
public long measureForPreparedCache(MemoryMeter meter)
|
||||
{
|
||||
return meter.measure(this)
|
||||
+ meter.measureDeep(attrs)
|
||||
+ meter.measureDeep(processedKeys)
|
||||
+ meter.measureDeep(columnOperations)
|
||||
+ (columnConditions == null ? 0 : meter.measureDeep(columnConditions))
|
||||
+ (staticConditions == null ? 0 : meter.measureDeep(staticConditions));
|
||||
}
|
||||
|
||||
public abstract boolean requireFullClusteringKey();
|
||||
public abstract void addUpdateForKey(ColumnFamily updates, ByteBuffer key, Composite prefix, UpdateParameters params) throws InvalidRequestException;
|
||||
|
||||
|
|
|
|||
|
|
@ -27,8 +27,6 @@ import com.google.common.collect.AbstractIterator;
|
|||
import com.google.common.collect.Iterables;
|
||||
import com.google.common.collect.Iterators;
|
||||
|
||||
import org.github.jamm.MemoryMeter;
|
||||
|
||||
import org.apache.cassandra.auth.Permission;
|
||||
import org.apache.cassandra.cql3.*;
|
||||
import org.apache.cassandra.cql3.statements.SingleColumnRestriction.Contains;
|
||||
|
|
@ -61,7 +59,7 @@ import org.slf4j.LoggerFactory;
|
|||
* column family, expression, result count, and ordering clause.
|
||||
*
|
||||
*/
|
||||
public class SelectStatement implements CQLStatement, MeasurableForPreparedCache
|
||||
public class SelectStatement implements CQLStatement
|
||||
{
|
||||
private static final Logger logger = LoggerFactory.getLogger(SelectStatement.class);
|
||||
|
||||
|
|
@ -162,20 +160,6 @@ public class SelectStatement implements CQLStatement, MeasurableForPreparedCache
|
|||
: selection.getResultMetadata();
|
||||
}
|
||||
|
||||
public long measureForPreparedCache(MemoryMeter meter)
|
||||
{
|
||||
return meter.measure(this)
|
||||
+ meter.measureDeep(parameters)
|
||||
+ meter.measureDeep(selection)
|
||||
+ (limit == null ? 0 : meter.measureDeep(limit))
|
||||
+ meter.measureDeep(keyRestrictions)
|
||||
+ meter.measureDeep(columnRestrictions)
|
||||
+ meter.measureDeep(metadataRestrictions)
|
||||
+ meter.measureDeep(restrictedColumns)
|
||||
+ (sliceRestriction == null ? 0 : meter.measureDeep(sliceRestriction))
|
||||
+ (orderingIndexes == null ? 0 : meter.measureDeep(orderingIndexes));
|
||||
}
|
||||
|
||||
public int getBoundTerms()
|
||||
{
|
||||
return boundTerms;
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@ import org.apache.cassandra.cql3.CQL3Type;
|
|||
import org.apache.cassandra.exceptions.SyntaxException;
|
||||
import org.apache.cassandra.serializers.TypeSerializer;
|
||||
import org.apache.cassandra.serializers.MarshalException;
|
||||
import org.github.jamm.Unmetered;
|
||||
|
||||
/**
|
||||
* Specifies a Comparator for a specific type of ByteBuffer.
|
||||
|
|
@ -37,6 +38,7 @@ import org.apache.cassandra.serializers.MarshalException;
|
|||
* should always handle those values even if they normally do not
|
||||
* represent a valid ByteBuffer for the type being compared.
|
||||
*/
|
||||
@Unmetered
|
||||
public abstract class AbstractType<T> implements Comparator<ByteBuffer>
|
||||
{
|
||||
public final Comparator<ByteBuffer> reverseComparator;
|
||||
|
|
|
|||
Loading…
Reference in New Issue