summaryrefslogtreecommitdiffstats
path: root/vdslib
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2019-08-09 13:34:18 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2019-08-09 14:38:18 +0000
commit840aacbbae61a4d0162d2decb534a6fe5fae030a (patch)
tree5077bdbf21edac80543673cca052b46ec108db18 /vdslib
parent247c57f87631a684fa72f410a8c896900c01e303 (diff)
Remove visitor ordering and order selection.
Diffstat (limited to 'vdslib')
-rw-r--r--vdslib/src/main/java/com/yahoo/vdslib/VisitorOrdering.java40
-rw-r--r--vdslib/src/vespa/vdslib/container/CMakeLists.txt1
-rw-r--r--vdslib/src/vespa/vdslib/container/visitorordering.cpp15
-rw-r--r--vdslib/src/vespa/vdslib/container/visitorordering.h37
4 files changed, 0 insertions, 93 deletions
diff --git a/vdslib/src/main/java/com/yahoo/vdslib/VisitorOrdering.java b/vdslib/src/main/java/com/yahoo/vdslib/VisitorOrdering.java
deleted file mode 100644
index 5cd7b23e5c4..00000000000
--- a/vdslib/src/main/java/com/yahoo/vdslib/VisitorOrdering.java
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.vdslib;
-
-public class VisitorOrdering {
- public static int ASCENDING = 0;
- public static int DESCENDING = 1;
-
- public int order;
- public long orderingStart;
- public short widthBits;
- public short divisionBits;
-
- public VisitorOrdering() {
- this(ASCENDING, (long)0, (short)0, (short)0);
- }
-
- public VisitorOrdering(int order) {
- this(order, (long)0, (short)0, (short)0);
- }
-
- public VisitorOrdering(int order, long orderingStart, short widthBits, short divisionBits) {
- this.order = order;
- this.orderingStart = orderingStart;
- this.widthBits = widthBits;
- this.divisionBits = divisionBits;
- }
-
- public int getOrder() { return order; }
- public long getOrderingStart() { return orderingStart; }
- public short getWidthBits() { return widthBits; }
- public short getDivisionBits() { return divisionBits; }
-
- public String toString() {
- String out = (order == ASCENDING ? "+" : "-") +
- "," + widthBits +
- "," + divisionBits +
- "," + orderingStart;
- return out;
- }
-}
diff --git a/vdslib/src/vespa/vdslib/container/CMakeLists.txt b/vdslib/src/vespa/vdslib/container/CMakeLists.txt
index 0526606196b..614c08e5947 100644
--- a/vdslib/src/vespa/vdslib/container/CMakeLists.txt
+++ b/vdslib/src/vespa/vdslib/container/CMakeLists.txt
@@ -6,6 +6,5 @@ vespa_add_library(vdslib_container OBJECT
searchresult.cpp
documentsummary.cpp
visitorstatistics.cpp
- visitorordering.cpp
DEPENDS
)
diff --git a/vdslib/src/vespa/vdslib/container/visitorordering.cpp b/vdslib/src/vespa/vdslib/container/visitorordering.cpp
deleted file mode 100644
index 895c102015e..00000000000
--- a/vdslib/src/vespa/vdslib/container/visitorordering.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-
-#include "visitorordering.h"
-#include <sstream>
-
-namespace vdslib {
-
-std::string
-VisitorOrdering::toString() const {
- std::ostringstream ost;
- ost << (_order == ASCENDING ? "+" : "-") << "," << _widthBits << "," << _divisionBits << "," << _orderingStart;
- return ost.str();
-}
-
-}
diff --git a/vdslib/src/vespa/vdslib/container/visitorordering.h b/vdslib/src/vespa/vdslib/container/visitorordering.h
deleted file mode 100644
index e8a5c5fcde8..00000000000
--- a/vdslib/src/vespa/vdslib/container/visitorordering.h
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#pragma once
-
-#include <string>
-#include <cstdint>
-
-namespace vdslib {
-
-class VisitorOrdering {
-public:
- enum Order { ASCENDING = 0, DESCENDING };
-
- VisitorOrdering()
- : _order(ASCENDING), _orderingStart(0), _widthBits(0), _divisionBits(0) {};
-
- VisitorOrdering(Order order)
- : _order(order), _orderingStart(0), _widthBits(0), _divisionBits(0) {};
-
- VisitorOrdering(Order order, uint64_t orderingStart, uint16_t widthBits, uint16_t divisionBits)
- : _order(order), _orderingStart(orderingStart), _widthBits(widthBits), _divisionBits(divisionBits) {}
-
- Order getOrder() const { return _order; }
- uint64_t getOrderingStart() const { return _orderingStart; }
- uint16_t getWidthBits() const { return _widthBits; }
- uint16_t getDivisionBits() const { return _divisionBits; }
-
- std::string toString() const;
-
-private:
- Order _order;
- uint64_t _orderingStart;
- uint16_t _widthBits;
- uint16_t _divisionBits;
-};
-
-}
-