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

2018-03-19 Thread paulo 
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/53b6116d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/53b6116d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/53b6116d

Branch: refs/heads/trunk
Commit: 53b6116d56a9353ad46fb90f181cd33fcabb9e0e
Parents: 9715fc0 19d26bc
Author: Paulo Motta 
Authored: Mon Mar 19 22:03:46 2018 -0300
Committer: Paulo Motta 
Committed: Mon Mar 19 22:15:55 2018 -0300

--
 src/java/org/apache/cassandra/tools/nodetool/Scrub.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/53b6116d/src/java/org/apache/cassandra/tools/nodetool/Scrub.java
--
diff --cc src/java/org/apache/cassandra/tools/nodetool/Scrub.java
index 50224a0,000..3c726b9
mode 100644,00..100644
--- a/src/java/org/apache/cassandra/tools/nodetool/Scrub.java
+++ b/src/java/org/apache/cassandra/tools/nodetool/Scrub.java
@@@ -1,82 -1,0 +1,82 @@@
 +/*
 + * 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.tools.nodetool;
 +
 +import io.airlift.command.Arguments;
 +import io.airlift.command.Command;
 +import io.airlift.command.Option;
 +
 +import java.util.ArrayList;
 +import java.util.List;
 +
 +import org.apache.cassandra.tools.NodeProbe;
 +import org.apache.cassandra.tools.NodeTool.NodeToolCmd;
 +import org.apache.cassandra.tools.StandaloneScrubber;
 +
 +@Command(name = "scrub", description = "Scrub (rebuild sstables for) one or 
more tables")
 +public class Scrub extends NodeToolCmd
 +{
 +@Arguments(usage = "[ ...]", description = "The 
keyspace followed by one or many tables")
 +private List args = new ArrayList<>();
 +
 +@Option(title = "disable_snapshot",
 +name = {"-ns", "--no-snapshot"},
 +description = "Scrubbed CFs will be snapshotted first, if 
disableSnapshot is false. (default false)")
 +private boolean disableSnapshot = false;
 +
 +@Option(title = "skip_corrupted",
 +name = {"-s", "--skip-corrupted"},
 +description = "Skip corrupted partitions even when scrubbing 
counter tables. (default false)")
 +private boolean skipCorrupted = false;
 +
 +@Option(title = "no_validate",
 +   name = {"-n", "--no-validate"},
 +   description = "Do not validate columns using column 
validator")
 +private boolean noValidation = false;
 +
 +@Option(title = "jobs",
 +name = {"-j", "--jobs"},
 +description = "Number of sstables to scrub simultanously, set to 
0 to use all available compaction threads")
 +private int jobs = 2;
 +
 +@Option(title = "reinsert_overflowed_ttl",
- name = {"r", "--reinsert-overflowed-ttl"},
++name = {"-r", "--reinsert-overflowed-ttl"},
 +description = 
StandaloneScrubber.REINSERT_OVERFLOWED_TTL_OPTION_DESCRIPTION)
 +private boolean reinsertOverflowedTTL = false;
 +
 +@Override
 +public void execute(NodeProbe probe)
 +{
 +List keyspaces = parseOptionalKeyspace(args, probe);
 +String[] cfnames = parseOptionalColumnFamilies(args);
 +
 +for (String keyspace : keyspaces)
 +{
 +try
 +{
 +probe.scrub(System.out, disableSnapshot, skipCorrupted, 
!noValidation, reinsertOverflowedTTL, jobs, keyspace, cfnames);
 +} catch (IllegalArgumentException e)
 +{
 +throw e;
 +} catch (Exception e)
 +{
 +throw new RuntimeException("Error occurred during scrubbing", 
e);
 +}
 +}
 +}
 +}


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

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

2015-09-30 Thread benedict 
Merge branch 'cassandra-2.1' into cassandra-2.2

Conflicts:

src/java/org/apache/cassandra/io/sstable/SSTableSimpleUnsortedWriter.java
src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
src/java/org/apache/cassandra/io/util/MmappedSegmentedFile.java


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

Branch: refs/heads/cassandra-3.0
Commit: 25de92e321604626d6c098233082904832c07814
Parents: 7452b20 c37562e
Author: Benedict Elliott Smith 
Authored: Wed Sep 30 19:47:14 2015 +0100
Committer: Benedict Elliott Smith 
Committed: Wed Sep 30 19:47:14 2015 +0100

--
 .../io/sstable/AbstractSSTableSimpleWriter.java |   2 +
 .../cassandra/io/sstable/CQLSSTableWriter.java  |  15 +
 .../io/sstable/SSTableSimpleUnsortedWriter.java |   6 +
 .../io/sstable/SSTableSimpleWriter.java |  13 +
 .../io/sstable/format/SSTableReader.java|  17 +
 .../cassandra/io/util/ByteBufferDataInput.java  |   8 +-
 .../cassandra/io/util/MmappedSegmentedFile.java | 275 
 .../apache/cassandra/io/util/SegmentedFile.java |   1 +
 .../sstable/LongSegmentedFileBoundaryTest.java  | 324 +++
 9 files changed, 605 insertions(+), 56 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/25de92e3/src/java/org/apache/cassandra/io/sstable/AbstractSSTableSimpleWriter.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/25de92e3/src/java/org/apache/cassandra/io/sstable/CQLSSTableWriter.java
--
diff --cc src/java/org/apache/cassandra/io/sstable/CQLSSTableWriter.java
index 4181ed0,c364171..8873f88
--- a/src/java/org/apache/cassandra/io/sstable/CQLSSTableWriter.java
+++ b/src/java/org/apache/cassandra/io/sstable/CQLSSTableWriter.java
@@@ -370,20 -376,22 +380,25 @@@ public class CQLSSTableWriter implement
  }
  }
  
+ CFMetaData metadata()
+ {
+ return schema;
+ }
+ 
  /**
 - * Adds the specified column family to the specified keyspace.
 + * Creates the keyspace with the specified table.
   *
 - * @param ksm the keyspace meta data
 - * @param cfm the column family meta data
 + * @param the table the table that must be created.
   */
 -private static void addTableToKeyspace(KSMetaData ksm, CFMetaData cfm)
 +private static void createKeyspaceWithTable(CFMetaData table)
  {
 -ksm = KSMetaData.cloneWith(ksm, 
Iterables.concat(ksm.cfMetaData().values(), Collections.singleton(cfm)));
 -Schema.instance.load(cfm);
 -Schema.instance.setKeyspaceDefinition(ksm);
 +KSMetaData ksm;
 +ksm = KSMetaData.newKeyspace(table.ksName,
 + 
AbstractReplicationStrategy.getClass("org.apache.cassandra.locator.SimpleStrategy"),
 + 
ImmutableMap.of("replication_factor", "1"),
 + true,
 + Collections.singleton(table));
 +Schema.instance.load(ksm);
  }
  
  /**

http://git-wip-us.apache.org/repos/asf/cassandra/blob/25de92e3/src/java/org/apache/cassandra/io/sstable/SSTableSimpleUnsortedWriter.java
--
diff --cc 
src/java/org/apache/cassandra/io/sstable/SSTableSimpleUnsortedWriter.java
index 4bb75bc,25ec354..534e77b
--- a/src/java/org/apache/cassandra/io/sstable/SSTableSimpleUnsortedWriter.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTableSimpleUnsortedWriter.java
@@@ -143,7 -140,13 +143,13 @@@ public class SSTableSimpleUnsortedWrite
  return previous;
  }
  
+ public Descriptor getCurrentDescriptor()
+ {
+ // can be implemented, but isn't necessary
+ throw new UnsupportedOperationException();
+ }
+ 
 -protected ColumnFamily createColumnFamily() throws IOException
 +protected ColumnFamily createColumnFamily()
  {
  return ArrayBackedSortedColumns.factory.create(metadata);
  }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/25de92e3/src/java/org/apache/cassandra/io/sstable/SSTableSimpleWriter.java
--
diff --cc src/java/org/apache/cassandra/io/sstable/SSTableSimpleWriter.java
index 2601d6d,23da501..f81e57d
---