Merge branch 'penberg/cql-cleanups' of github.com:cloudius-systems/seastar-dev into db

cql cleanups, from Pekka.

cql3/abstract_marker.hh

@@ -22,8 +22,7 @@
  * Modified by Cloudius Systems
  */
 
-#ifndef CQL3_ABSTRACT_MARKER_HH
-#define CQL3_ABSTRACT_MARKER_HH
+#pragma once
 
 #include "cql3/variable_specifications.hh"
 #include "cql3/column_specification.hh"
@@ -100,5 +99,3 @@ public:
 };
 
 }
-
-#endif

cql3/assignment_testable.hh

@@ -22,8 +22,7 @@
  * Modified by Cloudius Systems
  */
 
-#ifndef CQL3_ASSIGNMENT_TESTABLE_HH
-#define CQL3_ASSIGNMENT_TESTABLE_HH
+#pragma once
 
 #include "column_specification.hh"
 #include <memory>
@@ -104,5 +103,3 @@ operator<<(std::ostream& os, const assignment_testable& at) {
 }
 
 }
-
-#endif

cql3/attributes.hh

@@ -22,9 +22,7 @@
  * Modified by Cloudius Systems
  */
 
-#ifndef CQL3_ATTRIBUTES_HH
-#define CQL3_ATTRIBUTES_HH
-
+#pragma once
 
 #include "exceptions/exceptions.hh"
 #include "cql3/term.hh"
@@ -144,5 +142,3 @@ public:
 };
 
 }
-
-#endif

cql3/cf_name.hh

@@ -22,8 +22,7 @@
  * Modified by Cloudius Systems
  */
 
-#ifndef CQL3_CFNAME_HH
-#define CQL3_CFNAME_HH
+#pragma once
 
 #include <experimental/optional>
 
@@ -74,5 +73,3 @@ operator<<(std::ostream& os, const cf_name& n) {
 }
 
 }
-
-#endif

cql3/column_condition.hh

@@ -22,33 +22,12 @@
  * Modified by Cloudius Systems
  */
 
-#ifndef CQL3_COLUMN_CONDITION_HH
-#define CQL3_COLUMN_CONDITION_HH
+#pragma once
 
 #include "cql3/term.hh"
 #include "cql3/abstract_marker.hh"
 #include "cql3/operator.hh"
 
-#if 0
-import java.nio.ByteBuffer;
-import java.util.*;
-
-import com.google.common.base.Predicate;
-import com.google.common.collect.Iterators;
-import static com.google.common.collect.Lists.newArrayList;
-
-import org.apache.cassandra.config.ColumnDefinition;
-import org.apache.cassandra.db.*;
-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.filter.ColumnSlice;
-import org.apache.cassandra.db.marshal.*;
-import org.apache.cassandra.exceptions.InvalidRequestException;
-import org.apache.cassandra.transport.Server;
-import org.apache.cassandra.utils.ByteBufferUtil;
-#endif
-
 namespace cql3 {
 
 /**
@@ -763,5 +742,3 @@ public:
 };
 
 }
-
-#endif

cql3/column_identifier.hh

@@ -22,8 +22,7 @@
  * Modified by Cloudius Systems
  */
 
-#ifndef CQL3_COLUMN_IDENTIFIER_HH
-#define CQL3_COLUMN_IDENTIFIER_HH
+#pragma once
 
 #include "cql3/selection/selectable.hh"
 
@@ -35,26 +34,6 @@
 
 namespace cql3 {
 
-#if 0
-import java.util.List;
-import java.util.Locale;
-import java.nio.ByteBuffer;
-
-import org.apache.cassandra.cache.IMeasurableMemory;
-import org.apache.cassandra.config.CFMetaData;
-import org.apache.cassandra.config.ColumnDefinition;
-import org.apache.cassandra.cql3.selection.Selectable;
-import org.apache.cassandra.cql3.selection.Selector;
-import org.apache.cassandra.cql3.selection.SimpleSelector;
-import org.apache.cassandra.db.marshal.AbstractType;
-import org.apache.cassandra.exceptions.InvalidRequestException;
-import org.apache.cassandra.db.marshal.CompositeType;
-import org.apache.cassandra.db.marshal.UTF8Type;
-import org.apache.cassandra.utils.ByteBufferUtil;
-import org.apache.cassandra.utils.ObjectSizes;
-import org.apache.cassandra.utils.memory.AbstractAllocator;
-#endif
-
 /**
  * Represents an identifer for a CQL column definition.
  * TODO : should support light-weight mode without text representation for when not interned
@@ -216,5 +195,3 @@ struct hash<cql3::column_identifier::raw> {
 };
 
 }
-
-#endif

cql3/column_specification.hh

@@ -22,8 +22,7 @@
  * Modified by Cloudius Systems
  */
 
-#ifndef CQL3_COLUMN_SPECIFICATION_HH
-#define CQL3_COLUMN_SPECIFICATION_HH
+#pragma once
 
 #include "db/marshal/reversed_type.hh"
 #include "types.hh"
@@ -63,5 +62,3 @@ public:
 };
 
 }
-
-#endif

cql3/constants.hh

@@ -22,8 +22,7 @@
  * Modified by Cloudius Systems
  */
 
-#ifndef CQL3_CONSTANTS_HH
-#define CQL3_CONSTANTS_HH
+#pragma once
 
 #include "cql3/abstract_marker.hh"
 #include "cql3/update_parameters.hh"
@@ -234,5 +233,3 @@ public:
 std::ostream& operator<<(std::ostream&out, constants::type t);
 
 }
-
-#endif

cql3/cql3_type.cc

@@ -207,7 +207,7 @@ cql3_type::raw::is_counter() const {
 
 std::experimental::optional<sstring>
 cql3_type::raw::keyspace() const {
-    return std::experimental::optional<sstring>{};
+    return std::experimental::nullopt;
 }
 
 void

cql3/cql_statement.hh

@@ -22,8 +22,7 @@
  * Modified by Cloudius Systems
  */
 
-#ifndef CQL3_CQL_STATEMENT_HH
-#define CQL3_CQL_STATEMENT_HH
+#pragma once
 
 #include "service/client_state.hh"
 #include "service/query_state.hh"
@@ -85,5 +84,3 @@ public:
 };
 
 }
-
-#endif

cql3/functions/abstract_function.hh

@@ -22,8 +22,7 @@
  * Modified by Cloudius Systems
  */
 
-#ifndef CQL3_FUNCTIONS_ABSTRACT_FUNCTION_HH
-#define CQL3_FUNCTIONS_ABSTRACT_FUNCTION_HH
+#pragma once
 
 #include "types.hh"
 #include <vector>
@@ -109,5 +108,3 @@ struct hash<cql3::functions::abstract_function> {
 };
 
 }
-
-#endif

cql3/functions/aggregate_function.hh

@@ -22,8 +22,7 @@
  * Copyright 2014 Cloudius Systems
  */
 
-#ifndef CQL3_FUNCTIONS_AGGREGATE_FUNCTION_HH_
-#define CQL3_FUNCTIONS_AGGREGATE_FUNCTION_HH_
+#pragma once
 
 #include "function.hh"
 #include <experimental/optional>
@@ -80,5 +79,3 @@ public:
 
 }
 }
-
-#endif /* CQL3_FUNCTIONS_AGGREGATE_FUNCTION_HH_ */

cql3/functions/function.hh

@@ -22,8 +22,7 @@
  * Modified by Cloudius Systems
  */
 
-#ifndef CQL3_FUNCTIONS_FUNCTION_HH
-#define CQL3_FUNCTIONS_FUNCTION_HH
+#pragma once
 
 #include "function_name.hh"
 #include "types.hh"
@@ -78,5 +77,3 @@ operator<<(std::ostream& os, const function& f) {
 
 }
 }
-
-#endif

cql3/functions/function_name.hh

@@ -22,8 +22,7 @@
  * Modified by Cloudius Systems
  */
 
-#ifndef CQL3_FUNCTION_NAME_HH
-#define CQL3_FUNCTION_NAME_HH
+#pragma once
 
 #include "core/sstring.hh"
 #include "db/system_keyspace.hh"
@@ -82,5 +81,3 @@ struct hash<cql3::functions::function_name> {
 };
 
 }
-
-#endif

cql3/functions/native_aggregate_function.hh

@@ -22,8 +22,7 @@
  * Copyright 2014 Cloudius Systems
  */
 
-#ifndef CQL3_FUNCTIONS_NATIVE_AGGREGATE_FUNCTION_HH
-#define CQL3_FUNCTIONS_NATIVE_AGGREGATE_FUNCTION_HH
+#pragma once
 
 #include "types.hh"
 #include "native_function.hh"
@@ -68,6 +67,3 @@ make_native_aggregate_function_using(sstring name, data_type type) {
 
 }
 }
-
-#endif
-

cql3/functions/native_function.hh

@@ -22,8 +22,7 @@
  * Copyright 2014 Cloudius Systems
  */
 
-#ifndef CQL3_FUNCTIONS_NATIVE_FUNCTION_HH
-#define CQL3_FUNCTIONS_NATIVE_FUNCTION_HH
+#pragma once
 
 #include "abstract_function.hh"
 
@@ -53,5 +52,3 @@ public:
 
 }
 }
-
-#endif

cql3/functions/native_scalar_function.hh

@@ -22,8 +22,7 @@
  * Copyright 2014 Cloudius Systems
  */
 
-#ifndef CQL3_FUNCTIONS_NATIVE_SCALAR_FUNCTION_HH_
-#define CQL3_FUNCTIONS_NATIVE_SCALAR_FUNCTION_HH_
+#pragma once
 
 #include "native_function.hh"
 #include "scalar_function.hh"
@@ -77,5 +76,3 @@ make_native_scalar_function(sstring name,
 
 }
 }
-
-#endif /* CQL3_FUNCTIONS_NATIVE_SCALAR_FUNCTION_HH_ */

cql3/functions/scalar_function.hh

@@ -22,8 +22,7 @@
  * Modified by Cloudius Systems
  */
 
-#ifndef CQL3_FUNCTIONS_SCALAR_FUNCTION_HH
-#define CQL3_FUNCTIONS_SCALAR_FUNCTION_HH
+#pragma once
 
 #include "bytes.hh"
 #include <vector>
@@ -48,5 +47,3 @@ public:
 
 }
 }
-
-#endif

cql3/lists.hh

@@ -22,8 +22,7 @@
  * Modified by Cloudius Systems
  */
 
-#ifndef CQL3_LISTS_HH
-#define CQL3_LISTS_HH
+#pragma once
 
 #include "cql3/abstract_marker.hh"
 #include "to_string.hh"
@@ -182,5 +181,3 @@ public:
 };
 
 }
-
-#endif

cql3/maps.hh

@@ -22,8 +22,7 @@
  * Modified by Cloudius Systems
  */
 
-#ifndef CQL3_MAPS_HH
-#define CQL3_MAPS_HH
+#pragma once
 
 #include "cql3/abstract_marker.hh"
 #include "cql3/term.hh"
@@ -134,5 +133,3 @@ public:
 };
 
 }
-
-#endif

cql3/operation.hh

@@ -22,8 +22,7 @@
  * Modified by Cloudius Systems
  */
 
-#ifndef CQL3_OPERATION_HH
-#define CQL3_OPERATION_HH
+#pragma once
 
 #include "core/shared_ptr.hh"
 #include "exceptions/exceptions.hh"
@@ -36,18 +35,6 @@ namespace cql3 {
 
 class update_parameters;
 
-#if 0
-package org.apache.cassandra.cql3;
-
-import java.nio.ByteBuffer;
-
-import org.apache.cassandra.config.ColumnDefinition;
-import org.apache.cassandra.db.ColumnFamily;
-import org.apache.cassandra.db.composites.Composite;
-import org.apache.cassandra.db.marshal.*;
-import org.apache.cassandra.exceptions.InvalidRequestException;
-#endif
-
 /**
  * An UPDATE or DELETE operation.
  *
@@ -267,5 +254,3 @@ public:
 };
 
 }
-
-#endif

cql3/query_options.hh

@@ -22,8 +22,7 @@
  * Modified by Cloudius Systems
  */
 
-#ifndef CQL3_CQL_QUERY_OPTIONS_HH
-#define CQL3_CQL_QUERY_OPTIONS_HH
+#pragma once
 
 #include "timestamp.hh"
 #include "bytes.hh"
@@ -253,5 +252,3 @@ public:
 };
 
 }
-
-#endif

cql3/selection/selectable.hh

@@ -23,8 +23,7 @@
  * Modified by Cloudius Systems
  */
 
-#ifndef CQL3_SELECTION_SELECTABLE_HH
-#define CQL3_SELECTION_SELECTABLE_HH
+#pragma once
 
 #include "schema.hh"
 #include "core/shared_ptr.hh"
@@ -35,22 +34,6 @@ namespace cql3 {
 
 namespace selection {
 
-#if 0
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.cassandra.config.CFMetaData;
-import org.apache.cassandra.config.ColumnDefinition;
-import org.apache.cassandra.cql3.ColumnIdentifier;
-import org.apache.cassandra.cql3.functions.Function;
-import org.apache.cassandra.cql3.functions.FunctionName;
-import org.apache.cassandra.cql3.functions.Functions;
-import org.apache.cassandra.db.marshal.AbstractType;
-import org.apache.cassandra.db.marshal.UserType;
-import org.apache.cassandra.exceptions.InvalidRequestException;
-import org.apache.commons.lang3.text.StrBuilder;
-#endif
-
 class selectable {
 public:
     virtual ~selectable() {}
@@ -120,5 +103,3 @@ public:
 }
 
 }
-
-#endif

cql3/sets.hh

@@ -22,8 +22,7 @@
  * Modified by Cloudius Systems
  */
 
-#ifndef CQL3_SETS_HH
-#define CQL3_SETS_HH
+#pragma once
 
 #include "cql3/abstract_marker.hh"
 #include "maps.hh"
@@ -34,29 +33,6 @@
 
 namespace cql3 {
 
-#if 0
-package org.apache.cassandra.cql3;
-
-import java.nio.ByteBuffer;
-import java.util.*;
-
-import com.google.common.base.Joiner;
-
-import org.apache.cassandra.config.ColumnDefinition;
-import org.apache.cassandra.db.ColumnFamily;
-import org.apache.cassandra.db.composites.CellName;
-import org.apache.cassandra.db.composites.Composite;
-import org.apache.cassandra.db.marshal.AbstractType;
-import org.apache.cassandra.db.marshal.MapType;
-import org.apache.cassandra.db.marshal.SetType;
-import org.apache.cassandra.exceptions.InvalidRequestException;
-import org.apache.cassandra.serializers.CollectionSerializer;
-import org.apache.cassandra.serializers.MarshalException;
-import org.apache.cassandra.transport.Server;
-import org.apache.cassandra.utils.ByteBufferUtil;
-import org.apache.cassandra.utils.FBUtilities;
-#endif
-
 /**
  * Static helper methods and classes for sets.
  */
@@ -157,5 +133,3 @@ public:
 };
 
 }
-
-#endif

cql3/statements/alter_keyspace_statement.hh

@@ -22,8 +22,7 @@
  * Modified by Cloudius Systems
  */
 
-#ifndef CQL3_STATEMENTS_ALTER_KEYSPACE_STATEMENT_HH
-#define CQL3_STATEMENTS_ALTER_KEYSPACE_STATEMENT_HH
+#pragma once
 
 #include "cql3/statements/schema_altering_statement.hh"
 #include "cql3/statements/ks_prop_defs.hh"
@@ -34,22 +33,6 @@ namespace cql3 {
 
 namespace statements {
 
-#if 0
-package org.apache.cassandra.cql3.statements;
-
-import org.apache.cassandra.auth.Permission;
-import org.apache.cassandra.config.DatabaseDescriptor;
-import org.apache.cassandra.config.KSMetaData;
-import org.apache.cassandra.config.Schema;
-import org.apache.cassandra.db.SystemKeyspace;
-import org.apache.cassandra.exceptions.*;
-import org.apache.cassandra.locator.AbstractReplicationStrategy;
-import org.apache.cassandra.service.ClientState;
-import org.apache.cassandra.service.MigrationManager;
-import org.apache.cassandra.service.StorageService;
-import org.apache.cassandra.transport.Event;
-#endif
-
 class alter_keyspace_statement : public schema_altering_statement {
     sstring _name;
     std::unique_ptr<ks_prop_defs> _attrs;
@@ -118,5 +101,3 @@ public:
 }
 
 }
-
-#endif

cql3/statements/alter_type_statement.hh

@@ -22,8 +22,7 @@
  * Modified by Cloudius Systems
  */
 
-#ifndef CQL_STATEMENTS_ALTER_TYPE_STATEMENT_HH
-#define CQL_STATEMENTS_ALTER_TYPE_STATEMENT_HH
+#pragma once
 
 #include "cql3/ut_name.hh"
 
@@ -33,21 +32,6 @@ namespace cql3 {
 
 namespace statements {
 
-#if 0
-import java.nio.ByteBuffer;
-import java.util.*;
-
-import org.apache.cassandra.auth.Permission;
-import org.apache.cassandra.config.*;
-import org.apache.cassandra.cql3.*;
-import org.apache.cassandra.db.composites.CellNames;
-import org.apache.cassandra.db.marshal.*;
-import org.apache.cassandra.exceptions.*;
-import org.apache.cassandra.service.ClientState;
-import org.apache.cassandra.service.MigrationManager;
-import org.apache.cassandra.transport.Event;
-#endif
-
 class alter_type_statement : public schema_altering_statement {
 protected:
     const ::shared_ptr<ut_name> _name;
@@ -368,5 +352,3 @@ protected:
 }
 
 }
-
-#endif

cql3/statements/cf_prop_defs.hh

@@ -28,24 +28,6 @@
 
 #include "schema.hh"
 
-#if 0
-package org.apache.cassandra.cql3.statements;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.cassandra.cache.CachingOptions;
-import org.apache.cassandra.config.CFMetaData;
-import org.apache.cassandra.config.CFMetaData.SpeculativeRetry;
-import org.apache.cassandra.db.compaction.AbstractCompactionStrategy;
-import org.apache.cassandra.exceptions.ConfigurationException;
-import org.apache.cassandra.exceptions.SyntaxException;
-import org.apache.cassandra.io.compress.CompressionParameters;
-#endif
-
 namespace cql3 {
 
 namespace statements {

cql3/statements/cf_statement.hh

@@ -22,8 +22,7 @@
  * Modified by Cloudius Systems
  */
 
-#ifndef CQL3_STATEMENTS_CF_STATEMENT_HH
-#define CQL3_STATEMENTS_CF_STATEMENT_HH
+#pragma once
 
 #include "cql3/statements/parsed_statement.hh"
 #include "cql3/cf_name.hh"
@@ -75,5 +74,3 @@ public:
 }
 
 }
-
-#endif

cql3/statements/create_keyspace_statement.hh

@@ -32,25 +32,6 @@
 
 #include "core/shared_ptr.hh"
 
-#if 0
-package org.apache.cassandra.cql3.statements;
-
-import org.apache.cassandra.exceptions.ConfigurationException;
-import org.apache.cassandra.auth.Permission;
-import org.apache.cassandra.config.DatabaseDescriptor;
-import org.apache.cassandra.config.Schema;
-import org.apache.cassandra.exceptions.AlreadyExistsException;
-import org.apache.cassandra.exceptions.InvalidRequestException;
-import org.apache.cassandra.exceptions.RequestValidationException;
-import org.apache.cassandra.exceptions.UnauthorizedException;
-import org.apache.cassandra.locator.AbstractReplicationStrategy;
-import org.apache.cassandra.service.ClientState;
-import org.apache.cassandra.service.MigrationManager;
-import org.apache.cassandra.service.StorageService;
-import org.apache.cassandra.thrift.ThriftValidation;
-import org.apache.cassandra.transport.Event;
-#endif
-
 namespace cql3 {
 
 namespace statements {

cql3/statements/create_table_statement.hh

@@ -39,33 +39,6 @@
 #include <vector>
 #include <set>
 
-#if 0
-package org.apache.cassandra.cql3.statements;
-
-import java.nio.ByteBuffer;
-import java.util.*;
-
-import org.apache.cassandra.exceptions.*;
-import org.apache.commons.lang3.StringUtils;
-import com.google.common.collect.HashMultiset;
-import com.google.common.collect.Multiset;
-
-import org.apache.cassandra.auth.Permission;
-import org.apache.cassandra.config.ColumnDefinition;
-import org.apache.cassandra.config.CFMetaData;
-import org.apache.cassandra.config.Schema;
-import org.apache.cassandra.cql3.*;
-import org.apache.cassandra.db.composites.*;
-import org.apache.cassandra.db.ColumnFamilyType;
-import org.apache.cassandra.db.marshal.*;
-import org.apache.cassandra.exceptions.AlreadyExistsException;
-import org.apache.cassandra.io.compress.CompressionParameters;
-import org.apache.cassandra.service.ClientState;
-import org.apache.cassandra.service.MigrationManager;
-import org.apache.cassandra.transport.Event;
-import org.apache.cassandra.utils.ByteBufferUtil;
-#endif
-
 namespace cql3 {
 
 namespace statements {

cql3/statements/delete_statement.hh

@@ -33,22 +33,6 @@ namespace cql3 {
 
 namespace statements {
 
-#if 0
-import java.nio.ByteBuffer;
-import java.util.*;
-
-import com.google.common.collect.Iterators;
-
-import org.apache.cassandra.cql3.*;
-import org.apache.cassandra.cql3.restrictions.Restriction;
-import org.apache.cassandra.config.CFMetaData;
-import org.apache.cassandra.config.ColumnDefinition;
-import org.apache.cassandra.db.*;
-import org.apache.cassandra.db.composites.Composite;
-import org.apache.cassandra.exceptions.*;
-import org.apache.cassandra.utils.Pair;
-#endif
-
 /**
 * A <code>DELETE</code> parsed from a CQL query statement.
 */

cql3/statements/ks_prop_defs.hh

@@ -22,8 +22,7 @@
  * Modified by Cloudius Systems
  */
 
-#ifndef CQL3_STATEMENTS_KS_PROP_DEFS_HH
-#define CQL3_STATEMENTS_KS_PROP_DEFS_HH
+#pragma once
 
 #include "cql3/statements/property_definitions.hh"
 #include "config/ks_meta_data.hh"
@@ -106,5 +105,3 @@ public:
 }
 
 }
-
-#endif

cql3/statements/modification_statement.hh

@@ -22,8 +22,7 @@
  * Modified by Cloudius Systems
  */
 
-#ifndef CQL3_STATEMENTS_MODIFICATION_STATEMENT_HH
-#define CQL3_STATEMENTS_MODIFICATION_STATEMENT_HH
+#pragma once
 
 #include "cql3/restrictions/restriction.hh"
 #include "cql3/statements/cf_statement.hh"
@@ -447,5 +446,3 @@ std::ostream& operator<<(std::ostream& out, modification_statement::statement_ty
 }
 
 }
-
-#endif

cql3/statements/parsed_statement.hh

@@ -22,8 +22,7 @@
  * Modified by Cloudius Systems
  */
 
-#ifndef CQL3_STATEMENTS_PARSED_STATEMENT_HH
-#define CQL3_STATEMENTS_PARSED_STATEMENT_HH
+#pragma once
 
 #include "cql3/variable_specifications.hh"
 #include "cql3/column_specification.hh"
@@ -90,5 +89,3 @@ public:
 }
 
 }
-
-#endif

cql3/statements/property_definitions.hh

@@ -87,7 +87,7 @@ protected:
     std::experimental::optional<sstring> get_simple(const sstring& name) const {
         auto it = _properties.find(name);
         if (it == _properties.end()) {
-            return std::experimental::optional<sstring>{};
+            return std::experimental::nullopt;
         }
         try {
             return boost::any_cast<sstring>(it->second);
@@ -99,7 +99,7 @@ protected:
     std::experimental::optional<std::unordered_map<sstring, sstring>> get_map(const sstring& name) const {
         auto it = _properties.find(name);
         if (it == _properties.end()) {
-            return std::experimental::optional<std::unordered_map<sstring, sstring>>{};
+            return std::experimental::nullopt;
         }
         try {
             return boost::any_cast<std::unordered_map<sstring, sstring>>(it->second);

cql3/statements/select_statement.hh

@@ -22,8 +22,7 @@
  * Modified by Cloudius Systems
  */
 
-#ifndef CQL3_STATEMENTS_SELECT_STATEMENT_HH
-#define CQL3_STATEMENTS_SELECT_STATEMENT_HH
+#pragma once
 
 #include "cql3/statements/cf_statement.hh"
 #include "cql3/cql_statement.hh"
@@ -502,5 +501,3 @@ private:
 }
 
 }
-
-#endif

cql3/statements/truncate_statement.hh

@@ -22,8 +22,7 @@
  * Modified by Cloudius Systems
  */
 
-#ifndef CQL3_STATEMENTS_TRUNCATE_STATEMENT_HH
-#define CQL3_STATEMENTS_TRUNCATE_STATEMENT_HH
+#pragma once
 
 #include "cql3/statements/cf_statement.hh"
 #include "cql3/cql_statement.hh"
@@ -95,5 +94,3 @@ public:
 }
 
 }
-
-#endif

cql3/statements/update_statement.hh

@@ -22,8 +22,7 @@
  * Modified by Cloudius Systems
  */
 
-#ifndef CQL_STATEMENTS_UPDATE_STATEMENT_HH
-#define CQL_STATEMENTS_UPDATE_STATEMENT_HH
+#pragma once
 
 #include "cql3/statements/modification_statement.hh"
 #include "cql3/column_identifier.hh"
@@ -34,23 +33,6 @@
 #include <vector>
 #include "unimplemented.hh"
 
-#if 0
-package org.apache.cassandra.cql3.statements;
-
-import java.nio.ByteBuffer;
-import java.util.*;
-
-import org.apache.cassandra.cql3.*;
-import org.apache.cassandra.config.CFMetaData;
-import org.apache.cassandra.config.ColumnDefinition;
-import org.apache.cassandra.db.*;
-import org.apache.cassandra.db.composites.Composite;
-import org.apache.cassandra.db.index.SecondaryIndexManager;
-import org.apache.cassandra.exceptions.*;
-import org.apache.cassandra.utils.ByteBufferUtil;
-import org.apache.cassandra.utils.Pair;
-#endif
-
 namespace cql3 {
 
 namespace statements {
@@ -137,5 +119,3 @@ public:
 }
 
 }
-
-#endif

cql3/term.hh

@@ -22,8 +22,7 @@
  * Modified by Cloudius Systems
  */
 
-#ifndef CQL3_TERM_HH
-#define CQL3_TERM_HH
+#pragma once
 
 #include <experimental/optional>
 #include "variable_specifications.hh"
@@ -218,5 +217,3 @@ public:
 };
 
 }
-
-#endif

cql3/update_parameters.hh

@@ -22,8 +22,7 @@
  * Modified by Cloudius Systems
  */
 
-#ifndef CQL3_UPDATE_PARAMETERS_HH
-#define CQL3_UPDATE_PARAMETERS_HH
+#pragma once
 
 #include "gc_clock.hh"
 #include "timestamp.hh"
@@ -164,5 +163,3 @@ public:
 };
 
 }
-
-#endif

cql3/ut_name.hh

@@ -22,8 +22,7 @@
  * Modified by Cloudius Systems
  */
 
-#ifndef CQL3_UT_NAME_HH
-#define CQL3_UT_NAME_HH
+#pragma once
 
 #include "core/shared_ptr.hh"
 #include "column_identifier.hh"
@@ -37,7 +36,7 @@ class ut_name final {
     ::shared_ptr<column_identifier> _ut_name;
 public:
     ut_name(shared_ptr<column_identifier> ks_name, ::shared_ptr<column_identifier> ut_name)
-        : _ks_name{!ks_name ? std::experimental::optional<sstring>{} : std::experimental::optional<sstring>{ks_name->to_string()}}
+        : _ks_name{!ks_name ? std::experimental::nullopt : std::experimental::optional<sstring>{ks_name->to_string()}}
         , _ut_name{ut_name}
     { }
 
@@ -72,5 +71,3 @@ public:
 };
 
 }
-
-#endif

cql3/variable_specifications.hh

@@ -22,8 +22,7 @@
  * Modified by Cloudius Systems
  */
 
-#ifndef CQL3_VARIABLE_SPECIFICATIONS_HH
-#define CQL3_VARIABLE_SPECIFICATIONS_HH
+#pragma once
 
 #include "cql3/column_specification.hh"
 #include "cql3/column_identifier.hh"
@@ -83,5 +82,3 @@ public:
 };
 
 }
-
-#endif